任务的html

src/views/alter/admin/components/order/addModal.vue

@@ -446,16 +446,17 @@ const uploadFormProps = {
 
 // 文件上传成功的回调
 const uploadFileSuccess = ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: contractId.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
     })
 }
 

src/views/debit-pay/material/components/order/dataModal.vue

@@ -124,7 +124,7 @@ import { useAppStore } from '~src/store'
 import contractApi from '~api/debit-pay/material/contract.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import orderApi from '~api/debit-pay/material/order.js'
-import { formValidate, getArrValue, isNullES } from 'js-fast-way'
+import { formValidate, getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import { isNumberReg } from '~uti/tools'
 import BigNumber from 'bignumber.js'
 
@@ -367,14 +367,15 @@ const HcUploadFileFinish = async (data) => {
 
 // 文件上传成功的回调
 const uploadFileSuccess = ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
     } else {
         resolve({
-            fileName: res.originalName ?? '',
-            filePdfUrl: res.pdfUrl ?? '',
-            fileUrl: res.link ?? '',
+            fileName: originalName ?? '',
+            filePdfUrl: pdfUrl ?? '',
+            fileUrl: link ?? '',
         })
     }
 }

src/views/debit-pay/material/order.vue

@@ -9,11 +9,11 @@
         </template>
         <template #extra>
             <el-button hc-btn type="primary" :disabled="approveStatus !== 0" @click="addModalClick">
-                <HcIcon name="add" />
+                <hc-icon name="add" />
                 <span>新增</span>
             </el-button>
             <el-button hc-btn type="primary" :disabled="approveStatus !== 0" @click="reportClick">
-                <HcIcon name="send-plane-2" />
+                <hc-icon name="send-plane-2" />
                 <span>上报</span>
             </el-button>
         </template>
@@ -21,11 +21,9 @@
             <div class="flex-1">
                 <hc-card-item>
                     <hc-table
-                        is-current-row
-                        :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                        is-current-row :column="tableColumn" :datas="tableData" :loading="tableLoading"
                         is-new is-check :check-style="{ width: 29 }" :index-style="{ width: 60 }"
-                        @selection-change="tableCheckChange"
-                        @row-click="hanleRow"
+                        @selection-change="tableCheckChange" @row-click="hanleRow"
                     >
                         <template #action="{ row }">
                             <el-link type="success" :disabled="approveStatus !== 0" @click="rowEditClick(row)">修改</el-link>

src/views/debit-pay/start-work/components/order/dataModal.vue

@@ -48,7 +48,7 @@
 <script setup>
 import { ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
-import { formValidate, getArrValue, isNullES } from 'js-fast-way'
+import { formValidate, getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import periodApi from '~api/debit-pay/material/periods.js'
 import orderApi from '~api/debit-pay/start-work/order.js'
 import { isNumberReg } from '~uti/tools'
@@ -225,14 +225,15 @@ const changeMoney = (val)=>{
 
 // 文件上传成功的回调
 const uploadFileSuccess = ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
     } else {
         resolve({
-            fileName: res.originalName ?? '',
-            filePdfUrl: res.pdfUrl ?? '',
-            fileUrl: res.link ?? '',
+            fileName: originalName ?? '',
+            filePdfUrl: pdfUrl ?? '',
+            fileUrl: link ?? '',
         })
     }
 }

src/views/tasks/components/hc-data/alter-form.vue

@@ -482,16 +482,17 @@ const uploadFormProps = {
 
 // 文件上传成功的回调
 const uploadFileSuccess = async ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: contractId.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
         taskId: taskInfo.value.id,
     })
     //发起请求

src/views/tasks/components/hc-data/material-form.vue

@@ -218,16 +218,17 @@ const uploadFormProps = {
 
 // 文件上传成功的回调
 const uploadFileSuccess = async ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: contractId.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
         taskId: taskInfo.value.id,
     })
     //发起请求

src/views/tasks/components/hc-data/middlepay-form.vue

@@ -330,16 +330,17 @@ const uploadFormProps = {
 
 // 文件上传成功的回调
 const uploadFileSuccess = async ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: contractId.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
         taskId: taskInfo.value.id,
     })
     //发起请求

src/views/tasks/components/hc-data/start-work-form.vue

@@ -189,16 +189,17 @@ const uploadFormProps = {
 
 // 文件上传成功的回调
 const uploadFileSuccess = async ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: contractId.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
         taskId: taskInfo.value.id,
     })
     //发起请求