往来账款禅道bug修改、融信流程优化、待办弹窗处理

front-vue/src/views/home.vue

@@ -959,6 +959,7 @@ export default {
         },
         // 取消按钮
         cancel() {
+            this.getWorkList()
             this.openWork = false;
         },
     },

front-vue/src/views/service/bill/bill.vue

@@ -135,7 +135,7 @@
             type="text"
             icon="el-icon-info"
             @click="handleDetail(scope.row)"
-            v-if="scope.row.zfiNumber"
+            v-show="scope.row.zfiNumber"
             v-hasPermi="['service:bill:detail']"
           >详情</el-button>
           <el-button
@@ -143,7 +143,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="!scope.row.zfiNumber"
+            v-show="!scope.row.zfiNumber"
             v-hasPermi="['service:bill:edit']"
           >修改</el-button>
           <el-button
@@ -151,7 +151,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="!scope.row.zfiNumber"
+            v-show="!scope.row.zfiNumber"
             v-hasPermi="['service:bill:del']"
           >删除</el-button>
         </template>

front-vue/src/views/service/bill/billEdit.vue

@@ -1053,65 +1053,65 @@ export default {
     //删除合同附件
     handleRemoveContract(file, fileList) {
       var self = this
-      if (self.contractList) {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        delFile(file.id).then(function () {
+      // if (self.contractList) {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   });
+      //   delFile(file.id).then(function () {
           self.contractList = self.contractList.reduce((total, current) => {
             current.id !== file.id && total.push(current);
             return total;
           }, []);
-          loading.close();
-        }).catch(() => {
-          loading.close();
-        });
-      }
+      //     loading.close();
+      //   }).catch(() => {
+      //     loading.close();
+      //   });
+      // }
     },
     //删除物流附件
     handleRemoveLogistics(file, fileList) {
-      var self = this
-      if (this.logisticsList) {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        delFile(file.id).then(function () {
+      // var self = this
+      // if (this.logisticsList) {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   });
+      //   delFile(file.id).then(function () {
           self.logisticsList = self.logisticsList.reduce((total, current) => {
             current.id !== file.id && total.push(current);
             return total;
           }, []);
-          loading.close();
-        }).catch(() => {
-          loading.close();
-        });
-      }
+      //     loading.close();
+      //   }).catch(() => {
+      //     loading.close();
+      //   });
+      // }
     },
     //删除其他附件
     handleRemoveOther(file, fileList) {
-      var self = this
-      if (this.otherList) {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        delFile(file.id).then(function () {
+      // var self = this
+      // if (this.otherList) {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   });
+      //   delFile(file.id).then(function () {
           self.otherList = self.otherList.reduce((total, current) => {
             current.id !== file.id && total.push(current);
             return total;
           }, []);
-          loading.close();
-        }).catch(() => {
-          loading.close();
-        });
-      }
+      //     loading.close();
+      //   }).catch(() => {
+      //     loading.close();
+      //   });
+      // }
     },
     //删除附件
     delFile(row) {
@@ -1135,20 +1135,20 @@ export default {
           if (item.uid !== file.uid) {
             return item;
           } else {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            });
-            delFile(item.id)
-              .then(function () {
-                loading.close();
-                this.msgSuccess("删除成功");
-              })
-              .catch(() => {
-                loading.close();
-              });
+            // const loading = this.$loading({
+            //   lock: true,
+            //   text: 'Loading',
+            //   spinner: 'el-icon-loading',
+            //   background: 'rgba(0, 0, 0, 0.7)'
+            // });
+            // delFile(item.id)
+            //   .then(function () {
+            //     loading.close();
+            //     this.msgSuccess("删除成功");
+            //   })
+            //   .catch(() => {
+            //     loading.close();
+            //   });
           }
         });
       }
@@ -1163,12 +1163,12 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         })
-          .then(function () {
-            self.fullscreenLoading = true;
-            return delFile(ids);
-          })
+          // .then(function () {
+          //   self.fullscreenLoading = true;
+          //   return delFile(ids);
+          // })
           .then(() => {
-            self.fullscreenLoading = false;
+            // self.fullscreenLoading = false;
             ids.forEach((element) => {
               self.fileList = self.fileList.reduce((total, current) => {
                 current.id !== element && total.push(current);

front-vue/src/views/service/credit/flowDetail.vue

@@ -21,7 +21,7 @@
         </el-steps>
       </el-header>
       <el-main style="border: 1px solid;margin:10%;min-height:300px">
-        <el-steps direction="vertical" :active="1" :space="200">
+        <el-steps direction="vertical" :active="financeLogList.length" :space="200">
           <el-step v-for="(item, index) in financeLogList" :key="index" :title="item.zflContent" :description="parseTime(new Date(item.createTime),'{y}-{m}-{d}')"></el-step>
         </el-steps>
       </el-main>

front-vue/src/views/workDeal.vue

@@ -154,6 +154,7 @@ export default {
                     if (this.form.zfrId != null) {
                         this.form.zfrApplyFile = this.fileList;
                         RepaymentRegistration(this.form).then(response => {
+                            this.$emit("cancelOpen");
                             this.msgSuccess("登记成功");
                         });
                     } 
@@ -166,6 +167,7 @@ export default {
                 if (valid) {
                     if (this.form.noticeId != null) {
                         dealWork(this.form).then(response => {
+                            this.$emit("cancelOpen");
                             this.msgSuccess("处理成功");
                         });
                     }