材料调差

src/views/debit-pay/admin/components/middlepay/addBillBaseModal.vue

@@ -75,7 +75,6 @@ watch(isShow, (val) => {
         setTimeout(() => {
             getTableData()
         }, 500)
-    
     }
 })
 
@@ -119,15 +118,19 @@ const modalSave = async () => {
         return false
     }
     const rowIds = arrToId(rows)
-    const { data } = await mainApi.addResolveForm({
+    const { error, code, data, msg } = await mainApi.addResolveForm({
         contractPeriodId: contractPeriodId.value ?? '',
         contractId: cid.value ?? '',
         nodeId: nodeId.value ?? '',
         id: dataIds.value ?? '',
         ids: rowIds,
     })
-    emit('finish', getArrValue(data))
-    modalClose()
+    if (!error && code === 200) {
+        emit('finish', getArrValue(data))
+        modalClose()
+    } else {
+        window.$message.error(msg ?? '操作失败')
+    }
 }
 
 //取消关闭

src/views/debit-pay/admin/components/middlepay/addModal.vue

@@ -714,33 +714,35 @@ const attachMentDel = ({ file }, resolve)=>{
 
 //草图文件上传成功的回调
 const pictureUploadSuccess = ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
-    baseForm.value.pictureUrl = res.link ?? ''
-    baseForm.value.pictureName = res.originalName ?? ''
+    baseForm.value.pictureUrl = link ?? ''
+    baseForm.value.pictureName = originalName ?? ''
     resolve({
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl:  res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl:  link ?? '',
     })
     ischangeByGetNode.value = false
 }
 
 //附件上传成功的回调
 const fileUploadSuccess = ({ res }, resolve) => {
-    if (isNullES(res.pdfUrl)) {
+    const { link, pdfUrl, originalName } = getObjValue(res.data)
+    if (isNullES(pdfUrl)) {
         window.$message.warning('该文件不能生成pdf,请更换文件上传')
         resolve()
         return
     }
     resolve({
         contractId: cid.value,
-        fileName: res.originalName ?? '',
-        filePdfUrl: res.pdfUrl ?? '',
-        fileUrl: res.link ?? '',
+        fileName: originalName ?? '',
+        filePdfUrl: pdfUrl ?? '',
+        fileUrl: link ?? '',
         fileType: 1,
     })
     ischangeByGetNode.value = false