fix:收款管理页面修改

src/views/business/financial/collection/form.vue

@@ -15,7 +15,7 @@
           <el-button v-show="(!editStatus && form.verifyDate == null)&& auth.hasPermi('business:collection:edit') " type="warning" size="small" icon="Edit"
             @click="editStatus = true">修改</el-button>
           <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
-            @click="editStatus = false">取消修改</el-button>
+            @click="reForm()">取消修改</el-button>
           <el-button v-show="(form.id && !editStatus && form.verifyDate == null)
           && auth.hasPermi('business:collection:verify')"
            type="primary" size="small" icon="Check"
@@ -104,7 +104,7 @@
             <el-col :span="6">
               <el-form-item label="到账日期：" prop="arriveDate">
                 <el-date-picker v-if="editStatus" v-model.trim="form.arriveDate" size="small" :clearable="true"
-                  style="width: 100%" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" align="center" type="date"
+                  style="width: 100%" format="YYYY-MM-DD" value-format="YYYY-MM-DD" align="center" type="date"
                   placeholder="到账日期" />
                 <span v-else>{{ form.arriveDate }}</span>
               </el-form-item>
@@ -140,8 +140,8 @@
             <el-col :span="6">
               <el-form-item label="收款金额：" required>
                 <el-input-number v-if="editStatus" v-model.trim="form.arriveAmount" size="small" placeholder="收款金额"
-                  :clearable="true" :precision="2" controls-position="right" :controls="false" @change="amountChange" />
-                <span>{{ rowNum(form.arriveAmount) }}</span>
+                  :clearable="true" disabled :precision="2" controls-position="right" :controls="false" @change="amountChange" />
+                <span v-else>{{ rowNum(form.arriveAmount) }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -346,7 +346,7 @@
     <el-dialog title="审核详情" v-model="rejectOpen" width="500px" append-to-body draggable :close-on-click-modal="false">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-form-item label="审核状态">
-          <el-select style="width: 100%" v-model.trim="form.status" placeholder="请选择" size="small">
+          <el-select style="width: 100%" v-model.trim="form.verifyStatus" placeholder="请选择" size="small">
             <el-option v-for="i in verified" :key="i.value" :label="i.label" :value="i.value" />
           </el-select>
         </el-form-item>
@@ -355,7 +355,7 @@
             format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" align="center" type="datetime"
             placeholder="确认所属时间" />
         </el-form-item>
-        <el-form-item :label="form.status == 2 ? '驳回原因' : '审核意见'" :prop="verifyComment">
+        <el-form-item :label="form.verifyStatus === 2 ? '驳回原因' : '审核意见'" :prop="verifyComment">
           <el-input type="textarea" maxlength="200" show-word-limit v-model.trim="form.verifyComment" :rows="3"
             placeholder="请输入审核意见" />
         </el-form-item>
@@ -559,10 +559,10 @@
   }
 
   function returnZero() {
-    form.value.status = 0;
     proxy.$modal
       .confirm("是否确认退回")
       .then(function () {
+        form.value.status = 0;
         setCollectionZero(form.value.id)
       })
       .then(() => {
@@ -651,16 +651,18 @@
     // const formValue = proxy.deepClone(form.value);
     // formValue.verifyStatus = status;
     // formValue.status = status;
-    if (form.value.status === 0) {
+
+    if (form.value.verifyStatus === 0) {
       proxy.$modal.msgError("请选择审核结果");
       return;
     }
+
     if (form.value.actuallyDate == null || form.value.actuallyDate === "") {
       proxy.$modal.msgError("请选择确认所属时间");
       return;
     }
     if (
-      form.value.status === 2 &&
+      form.value.verifyStatus === 2 &&
       (form.value.verifyComment == null || form.value.verifyComment === "")
     ) {
       proxy.$modal.msgError("请输入审核意见");
@@ -673,6 +675,7 @@
     //   proxy.$modal.msgError("请上传凭证并至多上传5个");
     //   return;
     // }
+    form.value.status = form.value.verifyStatus;
     form.value.arriveStatus = form.value.status === 1 ? 1 : 0;
     verifyCollection(form.value).then((res) => {
       open(form.value.id);
@@ -790,7 +793,9 @@
         proxy.$modal.msgError("取消删除");
       });
   }
-
+  const reForm = () =>{
+    open(form.value.id);
+  }
   /** 暴露给父组件的方法 */
   defineExpose({
     open,