Merge pull request 'fix : 修复细节' (#138) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/138

src/api/project-demand/index.js

@@ -34,3 +34,9 @@ export const addRequirement = (data) => {
     data: data
   });
 };
+export const deleteFile = (path) => {
+  return request({
+    url: '/process/file/delete/'+ path,
+    method: "delete"
+  });
+};

src/components/FileUpload.vue

@@ -9,6 +9,9 @@
              :auto-upload="true"
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
+             :before-remove="beforeRemove"
+             :on-remove="handleRemoveAttachment"
+             @handleRemove="handleRemove1"
   >
     <el-button color="#DED0B2">上传文件</el-button>
   </el-upload>
@@ -16,10 +19,12 @@
 
 <script setup>
 import {defineProps, computed, ref} from "vue";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
+import {deleteFile} from "@/api/project-demand";
+
 const baseURL = import.meta.env.VITE_BASE_URL
-const uploadFileUrl = ref(baseURL + "/workflow/process/file")
+const uploadFileUrl = ref(baseURL + "/workflow/process/file/upload")
 const headers = reactive({
   authorization: getToken()
 })
@@ -34,10 +39,11 @@ const props = defineProps({
   },
   maxSize: {
     type: Number,
-    default: 5
+    default: 30
   }
 })
-const emit = defineEmits(["input","getFile"])
+
+const emit = defineEmits(["input", "getFile"])
 const fileList = ref([])
 const _value = computed({
   get() {
@@ -49,11 +55,11 @@ const _value = computed({
 })
 
 const beforeUpload = (file) => {
-  // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
+  if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
-  //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
+    ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
-  // } else {
+  } else {
     return true
-  // }
+  }
 }
 const handleUploadSuccess = (res, file) => {
   if (res.code !== 1000) {
@@ -63,5 +69,42 @@ const handleUploadSuccess = (res, file) => {
   fileList.value.push(data)
   emit("getFile", fileList.value)
 }
+const beforeRemove = (file) => {
+  console.log('file.response.data.originalFilename', file.response)
+  return ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的文件吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => true
+      // () => false
+  )
+  // ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的表格吗?`, '系统提示', {
+  //   confirmButtonText: '确定',
+  //   cancelButtonText: '取消',
+  //   type: 'warning'
+  // }).then(() => {
+  //   return true;
+  // }).catch(()=>{
+  //   ElMessage.warning("用户取消删除! ");
+  //   return false;
+  // })
+}
+const handleRemoveAttachment = (file) => {
+  handleRemove(file.response.data)
+}
+const handleRemove = (file) => {
+  console.log('fil对对对e', file,fileList.value)
+  // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
+
+  // deleteFile(file.id).then(res => {
+  //   if (res.code === 1000) {
+  //     ElMessage.success("删除成功");
+  //     fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
+  //   }
+  // });
+};
+const handleRemove1=()=>{
+  console.log('handleRemove1vdvd')
+}
 </script>
 

src/views/home/index.vue

@@ -119,7 +119,7 @@ const tableConfig = reactive({
       label: '类型',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.state}/>)
+      currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.targetState}/>)
     },
     {
       prop: 'submitTime',

vite.config.js

@@ -18,7 +18,6 @@ export default defineConfig({
     AutoImport({
       //自动导入vue相关函数
       imports: ['vue','vue-router'],
-
       resolvers: [
         ElementPlusResolver(),
         //自动导入图标组件
@@ -70,6 +69,7 @@ export default defineConfig({
     open: true,
     proxy: {
       '/api/workflow': {
+        // target: 'http://frp.feashow.cn:31800/',
         target: 'http://clay.frp.feashow.cn/',
         // target: 'http://192.168.31.175:8000',
         changeOrigin: true,