Merge pull request 'fix : 修复附件上传' (#263) from dj into master

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

src/components/AttachmentUpload.vue

@@ -114,9 +114,14 @@ watch(() => props.showTable, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   console.log('newotherFileList',newVal)
   if (props.preview) {
-    newVal?.forEach(item => {
+    if(props.formData.fileList==null){
-      allFileList.value.push(item)
+      allFileList.value=newVal
-    })
+    }else {
+      newVal?.forEach(item => {
+        allFileList.value.push(item)
+      })
+    }
+
   }else {
     allFileList.value=newVal
   }
@@ -124,9 +129,9 @@ watch(() => props.otherFileList, (newVal) => {
 watch(() => props.formData.fileList, (newVal) => {
   console.log('newVal-fileList',newVal)
   if (props.preview) {
-    newVal?.forEach(item => {
+      newVal?.forEach(item => {
-      allFileList.value.push(item)
+        allFileList.value.push(item)
-    })
+      })
   }
 }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {

src/views/expense-management/share/index.vue

@@ -90,18 +90,18 @@ const tableConfig = reactive({
         if(row.buttons){
           buttons = new Set(Array.from(row.buttons))
         }
-        // if (buttons.has("details")) {
+        if (buttons.has("details")) {
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
-        // }
+        }
-        // if (buttons.has("edit")) {
+        if (buttons.has("edit")) {
           btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
-        // }
+        }
-        // if (buttons.has("report")) {
+        if (buttons.has("report")) {
           btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
+        }
-        // if (buttons.has("report")) {
+        if (buttons.has("report")) {
           btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {
@@ -117,11 +117,11 @@ const tableConfig = reactive({
                 ))
               }
               {
-                // buttons.has("delete") ?
+                buttons.has("delete") ?
                     <popover-delete name={row.requirementName} type={'费用分摊'} btnType={'danger'}
                                     perm={['mosr:requirement:del']}
                                     onDelete={() => handleDelete(row)}/>
-                // : ''
+                : ''
               }
             </div>
         )

src/views/project-demand/summary/add.vue

@@ -393,6 +393,7 @@ const handleSubmit = debounce(async (instance) => {
     // }
     let params = {
       ...formData.value,
+      isSpecialFund:false,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       singleFile: singleFile,

src/views/project-management/filing/index.vue

@@ -167,7 +167,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {

src/views/project-management/implementation/index.vue

@@ -172,7 +172,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {

src/views/project-management/initiation/index.vue

@@ -166,7 +166,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {