1.仓储业务：调整撤销请核、请核、撤销接单请核

2.财务管理：对账、收费、付费当撤销审批、撤销对账时
增加1,2两条其中面对的情况时，弹出相应的禁告提示框，点击确认才执行操作，取消则不执行下一步操作

src/views/Warehousing/components/incomeMoney.vue

@@ -1610,33 +1610,45 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        this.$message.success('请核成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          this.$message.success('请核成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        this.$message.success('操作成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          this.$message.success('操作成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 打印费用确认单准备
     feesConfirm() {

src/views/Warehousing/components/payMoney.vue

@@ -1511,33 +1511,45 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        this.$message.success('请核成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          this.$message.success('请核成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        this.$message.success('操作成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          this.$message.success('操作成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 付款明细多选
     SelectCr(selection) {

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -3148,11 +3148,17 @@ export default {
         id: this.form.fId,
         fidStatus: status,
       };
-      RevocationApproval(data).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销审批?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        RevocationApproval(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     // 查看审批流
@@ -3750,13 +3756,19 @@ export default {
           );
           formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
           formData.append("tCntr", JSON.stringify(this.CntrTable));
-          warehouseSubmission(formData).then((response) => {
-            if (response.code == 200) {
-              this.msgSuccess("提交成功");
-              setTimeout(() => {
-                this.cancel();
-              }, 200);
-            }
+          this.$confirm("是否发起请核?", "提示", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            warehouseSubmission(formData).then((response) => {
+              if (response.code == 200) {
+                this.msgSuccess("提交成功");
+                setTimeout(() => {
+                  this.cancel();
+                }, 200);
+              }
+            });
           });
         }
       });
@@ -4532,42 +4544,60 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        this.$message.success('请核成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          this.$message.success('请核成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        this.$message.success('操作成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          this.$message.success('操作成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.form.fBillstatus = 2
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.form.fBillstatus = 2
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     // 付款明细多选

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -5460,103 +5460,115 @@ export default {
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          getWarehousebills(this.chiId).then((response) => {
-            this.form = response.data.warehousebills;
-            if (this.form.fBillstatus > 3) {
-              this.approvalStatus = false;
-              this.browseStatus = true;
-            } else {
-              this.approvalStatus = true;
-              this.browseStatus = false;
-            }
-            this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-            this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
-            this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-            this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
-            this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
-            this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
-            if (this.form.fCartype || this.form.fCartype == 0) {
-              this.$set(this.form, "fCartype", this.form.fCartype.toString());
-            }
-            if (this.form.fStltypeid || this.form.fStltypeid == 0) {
-              this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
-            }
-            if (this.form.fTrademodeid) {
-              this.$set(
-                this.form,
-                "fTrademodeid",
-                this.form.fTrademodeid.toString()
-              );
-            }
-            if (!this.copyStatus) {
-              if (response.data.warehouseBillsItem) {
-                response.data.warehouseBillsItem.map((e) => {
-                  e.fBsdate = Date.parse(e.fBsdate);
-                  e.fBusinessType = e.fBusinessType.toString();
-                  e.fLntype = e.fLntype ? e.fLntype.toString() : null;
-                });
-                response.data.warehouseBillsItem.forEach(item => {
-                  item.fCntrtype = parseInt(item.fCntrtype)
-                  item.disabled = true
-                })
-                this.detailList1 = response.data.warehouseBillsItem.filter(item=>item.fDc=='D');
-                this.detailList = response.data.warehouseBillsItem.filter(item=>item.fDc=='C');
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            getWarehousebills(this.chiId).then((response) => {
+              this.form = response.data.warehousebills;
+              if (this.form.fBillstatus > 3) {
+                this.approvalStatus = false;
+                this.browseStatus = true;
               } else {
-                this.detailList = [];
+                this.approvalStatus = true;
+                this.browseStatus = false;
               }
-              response.data.warehousebillsfeesCr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString();
-                }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString();
+              this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
+              this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+              this.$set(this.form, "createTime", Date.parse(this.form.createTime));
+              this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+              this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
+              this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4);
+              if (this.form.fCartype || this.form.fCartype == 0) {
+                this.$set(this.form, "fCartype", this.form.fCartype.toString());
+              }
+              if (this.form.fStltypeid || this.form.fStltypeid == 0) {
+                this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
+              }
+              if (this.form.fTrademodeid) {
+                this.$set(
+                  this.form,
+                  "fTrademodeid",
+                  this.form.fTrademodeid.toString()
+                );
+              }
+              if (!this.copyStatus) {
+                if (response.data.warehouseBillsItem) {
+                  response.data.warehouseBillsItem.map((e) => {
+                    e.fBsdate = Date.parse(e.fBsdate);
+                    e.fBusinessType = e.fBusinessType.toString();
+                    e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                  });
+                  response.data.warehouseBillsItem.forEach(item => {
+                    item.fCntrtype = parseInt(item.fCntrtype)
+                    item.disabled = true
+                  })
+                  this.detailList1 = response.data.warehouseBillsItem.filter(item=>item.fDc=='D');
+                  this.detailList = response.data.warehouseBillsItem.filter(item=>item.fDc=='C');
+                } else {
+                  this.detailList = [];
                 }
-              });
-              this.warehouseCrList = response.data.warehousebillsfeesCr;
-              response.data.warehousebillsfeesDr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString();
+                response.data.warehousebillsfeesCr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString();
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString();
+                  }
+                });
+                this.warehouseCrList = response.data.warehousebillsfeesCr;
+                response.data.warehousebillsfeesDr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString();
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString();
+                  }
+                });
+                this.warehouseDrList = response.data.warehousebillsfeesDr;
+                this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
+                if (response.data.tCntrList) {
+                  this.CntrTable = response.data.tCntrList;
+                } else {
+                  this.CntrTable = [];
                 }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString();
+                if (response.data.enclosures) {
+                  this.relevantAttachments = response.data.enclosures;
                 }
-              });
-              this.warehouseDrList = response.data.warehousebillsfeesDr;
-              this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
-              if (response.data.tCntrList) {
-                this.CntrTable = response.data.tCntrList;
               } else {
-                this.CntrTable = [];
-              }
-              if (response.data.enclosures) {
-                this.relevantAttachments = response.data.enclosures;
+                this.$set(this.form, "fId", null);
+                this.$set(this.form, "fMblno", null);
+                this.$set(this.form, "fMarks", null);
+                this.$set(this.form, "fProductName",null);
+                this.$set(this.form, "fNetweight", 0);
+                this.$set(this.form, "fPlanvolumn", 0);
+                this.$set(this.form, "fGrossweight", 0);
               }
-            } else {
-              this.$set(this.form, "fId", null);
-              this.$set(this.form, "fMblno", null);
-              this.$set(this.form, "fMarks", null);
-              this.$set(this.form, "fProductName",null);
-              this.$set(this.form, "fNetweight", 0);
-              this.$set(this.form, "fPlanvolumn", 0);
-              this.$set(this.form, "fGrossweight", 0);
-            }
-            treeselect(this.form.fWarehouseid).then((response) => {
-              this.fWarehouseidOptions = response.data;
+              treeselect(this.form.fWarehouseid).then((response) => {
+                this.fWarehouseidOptions = response.data;
+              });
             });
-          });
-          this.msgSuccess("撤销成功");
-        }
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     ordersRevoke() {
-      ordersRevoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.$set(this.form, "warehouseStatus", 2);
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销接单请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        ordersRevoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.$set(this.form, "warehouseStatus", 2);
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     //撤销审批
@@ -5567,14 +5579,20 @@ export default {
         id: this.form.fId,
         fidStatus: status,
       };
-      revokeTwo(data).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-          if (status) {
-            this.$set(this.form, "warehouseStatus", 2);
+      this.$confirm("是否撤销审批?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokeTwo(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+            if (status) {
+              this.$set(this.form, "warehouseStatus", 2);
+            }
           }
-        }
+        });
       });
     },
     // 查看审批流
@@ -6329,13 +6347,19 @@ export default {
               );
               formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
               formData.append("tCntr", JSON.stringify(this.CntrTable));
-              warehouseSubmission(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess("提交成功");
-                  setTimeout(() => {
-                    this.cancel();
-                  }, 200);
-                }
+              this.$confirm("是否发起请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                warehouseSubmission(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess("提交成功");
+                    setTimeout(() => {
+                      this.cancel();
+                    }, 200);
+                  }
+                });
               });
             }
           });
@@ -6466,12 +6490,18 @@ export default {
               );
               formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
               formData.append("tCntr", JSON.stringify(this.CntrTable));
-              submitWarehousingApproval(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess("请核成功");
-                  this.$set(this.form, "warehouseStatus", 4);
-                  this.cancel();
-                }
+              this.$confirm("是否发起接单请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                submitWarehousingApproval(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess("请核成功");
+                    this.$set(this.form, "warehouseStatus", 4);
+                    this.cancel();
+                  }
+                });
               });
             }
           });
@@ -7911,33 +7941,45 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        this.$message.success('请核成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          this.$message.success('请核成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        this.$message.success('操作成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          this.$message.success('操作成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     feeChoice(row) {
       getFees(row.fFeeid).then(res => {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -7206,90 +7206,102 @@ export default {
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then(async (data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          await getWarehousebills(this.form.fId).then((response) => {
-            this.TFformdata(response.data.warehousebills);
-            if (!this.copyStatus || this.recordStatus === true) {
-              if (response.data.warehouseBillsItem) {
-                response.data.warehouseBillsItem.map((e) => {
-                  e.fLntype = e.fLntype ? e.fLntype.toString() : null;
-                });
-                this.detailList = response.data.warehouseBillsItem;
-              } else {
-                this.detailList = [];
-              }
-              response.data.warehousebillsfeesCr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString();
-                }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString();
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revoke(this.form.fId).then(async (data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            await getWarehousebills(this.form.fId).then((response) => {
+              this.TFformdata(response.data.warehousebills);
+              if (!this.copyStatus || this.recordStatus === true) {
+                if (response.data.warehouseBillsItem) {
+                  response.data.warehouseBillsItem.map((e) => {
+                    e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+                  });
+                  this.detailList = response.data.warehouseBillsItem;
+                } else {
+                  this.detailList = [];
                 }
-              });
-              this.warehouseCrList = response.data.warehousebillsfeesCr;
-              response.data.warehousebillsfeesDr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString();
+                response.data.warehousebillsfeesCr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString();
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString();
+                  }
+                });
+                this.warehouseCrList = response.data.warehousebillsfeesCr;
+                response.data.warehousebillsfeesDr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString();
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString();
+                  }
+                });
+                this.warehouseDrList = response.data.warehousebillsfeesDr;
+                if (response.data.tCntrList) {
+                  this.CntrTable = response.data.tCntrList;
+                } else {
+                  this.CntrTable = [];
                 }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString();
+                if (response.data.enclosures) {
+                  this.relevantAttachments = response.data.enclosures;
                 }
-              });
-              this.warehouseDrList = response.data.warehousebillsfeesDr;
-              if (response.data.tCntrList) {
-                this.CntrTable = response.data.tCntrList;
               } else {
-                this.CntrTable = [];
+                this.approvalStatus = false;
+                this.browseStatus = false;
+                this.$set(this.form, "fId", null);
+                this.$set(this.form, "fMblno", null);
+                this.$set(this.form, "fMarks", null);
+                this.$set(this.form, "fProductName", null);
+                this.$set(this.form, "warehouseStatus", null);
+                this.$set(this.form, "fBillstatus", null);
+                this.$set(this.form, "fItemsStatus", null);
+                this.$set(this.form, "fNetweight", 0);
+                this.$set(this.form, "fPlanvolumn", 0);
+                this.$set(this.form, "fGrossweight", 0);
+                // this.recordStatus = true
               }
-              if (response.data.enclosures) {
-                this.relevantAttachments = response.data.enclosures;
+            });
+            this.warehouseCrList.forEach((item, index) => {
+              if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !==0) {
+                item.fBillstatus = 6;
               }
-            } else {
-              this.approvalStatus = false;
-              this.browseStatus = false;
-              this.$set(this.form, "fId", null);
-              this.$set(this.form, "fMblno", null);
-              this.$set(this.form, "fMarks", null);
-              this.$set(this.form, "fProductName", null);
-              this.$set(this.form, "warehouseStatus", null);
-              this.$set(this.form, "fBillstatus", null);
-              this.$set(this.form, "fItemsStatus", null);
-              this.$set(this.form, "fNetweight", 0);
-              this.$set(this.form, "fPlanvolumn", 0);
-              this.$set(this.form, "fGrossweight", 0);
-              // this.recordStatus = true
-            }
-          });
-          this.warehouseCrList.forEach((item, index) => {
-            if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !==0) {
-              item.fBillstatus = 6;
-            }
-          })
-          let formData = new window.FormData();
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
-          // 库存明细
-          formData.append("tWarehousebillsitems",JSON.stringify(this.detailList));
-          // 附件数据
-          formData.append("tEnclosure",JSON.stringify(this.relevantAttachments));
-          // 费用明细付款
-          formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList));
-          // 收款
-          formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList));
-          formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
-          formData.append("tCntr", JSON.stringify(this.CntrTable));
-          addWarehousebills(formData).then(res => {})
-          this.msgSuccess("撤销成功");
-        }
+            })
+            let formData = new window.FormData();
+            formData.append("tWarehouseBills", JSON.stringify(this.form));
+            // 库存明细
+            formData.append("tWarehousebillsitems",JSON.stringify(this.detailList));
+            // 附件数据
+            formData.append("tEnclosure",JSON.stringify(this.relevantAttachments));
+            // 费用明细付款
+            formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList));
+            // 收款
+            formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList));
+            formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
+            formData.append("tCntr", JSON.stringify(this.CntrTable));
+            addWarehousebills(formData).then(res => {})
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     ordersRevoke() {
-      ordersRevoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.$set(this.form, "warehouseStatus", 2);
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        ordersRevoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.$set(this.form, "warehouseStatus", 2);
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     //撤销审批
@@ -7300,15 +7312,21 @@ export default {
         id: this.form.fId,
         fidStatus: status,
       };
-      revokeTwo(data).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-          if (status) {
-            this.$set(this.form, "warehouseStatus", 2);
-            this.$set(this.form, "fBillstatus", 2);
+      this.$confirm("是否撤销审批?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokeTwo(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+            if (status) {
+              this.$set(this.form, "warehouseStatus", 2);
+              this.$set(this.form, "fBillstatus", 2);
+            }
           }
-        }
+        });
       });
     },
     // 查看审批流
@@ -7994,13 +8012,19 @@ export default {
               );
               formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
               formData.append("tCntr", JSON.stringify(this.CntrTable));
-              addWarehouse(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess("提交成功");
-                  setTimeout(() => {
-                    this.cancel();
-                  }, 200);
-                }
+              this.$confirm("是否确认请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                addWarehouse(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess("提交成功");
+                    setTimeout(() => {
+                      this.cancel();
+                    }, 200);
+                  }
+                });
               });
             }
           });
@@ -8098,12 +8122,18 @@ export default {
               );
               formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
               formData.append("tCntr", JSON.stringify(this.CntrTable));
-              submitWarehousingApproval(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess("请核成功");
-                  this.$set(this.form, "warehouseStatus", 4);
-                  this.cancel();
-                }
+              this.$confirm("是否发起接单请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                submitWarehousingApproval(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess("请核成功");
+                    this.$set(this.form, "warehouseStatus", 4);
+                    this.cancel();
+                  }
+                });
               });
             }
           });
@@ -8668,12 +8698,18 @@ export default {
     },
     detailedApproval(command) {
       if (command === 'QH') {
-        pleaseCheck(this.form.fId).then(res => {
-          if (res.code == 200) {
-            this.msgSuccess("请核成功");
-            this.$set(this.form, 'fItemstatus', 4)
-          }
-        })
+        this.$confirm("是否发起明细请核?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          pleaseCheck(this.form.fId).then(res => {
+            if (res.code == 200) {
+              this.msgSuccess("请核成功");
+              this.$set(this.form, 'fItemstatus', 4)
+            }
+          })
+        });
       } else if (command === 'CK') {
         this.addOrUpdateVisible = true;
         let actId = "170";
@@ -8692,12 +8728,18 @@ export default {
           id: this.form.fId,
           fidStatus: 'f_itemstatus',
         };
-        revokeTwo(data).then((data) => {
-          if (data.code === 200) {
-            this.browseStatus = false;
-            this.msgSuccess("撤销成功");
-            this.$set(this.form, 'fItemstatus', 2)
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revokeTwo(data).then((data) => {
+            if (data.code === 200) {
+              this.browseStatus = false;
+              this.msgSuccess("撤销成功");
+              this.$set(this.form, 'fItemstatus', 2)
+            }
+          });
         });
       }
     },

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -6709,133 +6709,145 @@ export default {
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then(async(data) => {
-        if (data.code === 200) {
-          this.browseStatus = false
-          await getWarehousebills(this.form.fId).then((response) => {
-            this.form = response.data.warehousebills
-            if (this.form.fBillstatus > 3) {
-              this.approvalStatus = false
-              this.browseStatus = true
-            } else {
-              this.approvalStatus = true
-              this.browseStatus = false
-            }
-            this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
-            this.$set(this.form, 'fBstime', Date.parse(this.form.fBstime))
-            this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
-            this.$set(this.form, 'fFeetUnit', this.form.fFeetunit)
-            this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4)
-            this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4)
-            if (this.form.fCartype || this.form.fCartype == 0) {
-              this.$set(this.form, 'fCartype', this.form.fCartype.toString())
-            }
-            if (this.form.fStltypeid || this.form.fStltypeid == 0) {
-              this.$set(this.form, 'fStltypeid', this.form.fStltypeid.toString())
-            }
-            if (this.form.fTrademodeid) {
-              this.$set(
-                this.form,
-                'fTrademodeid',
-                this.form.fTrademodeid.toString()
-              )
-            }
-            if (!this.copyStatus) {
-              if (response.data.warehouseBillsItem) {
-                response.data.warehouseBillsItem.map((e) => {
-                  e.fBsdate = Date.parse(e.fBsdate)
-                  e.fBusinessType = e.fBusinessType.toString()
-                  e.fLntype = e.fLntype ? e.fLntype.toString() : null
-                })
-                this.detailList = response.data.warehouseBillsItem
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revoke(this.form.fId).then(async(data) => {
+          if (data.code === 200) {
+            this.browseStatus = false
+            await getWarehousebills(this.form.fId).then((response) => {
+              this.form = response.data.warehousebills
+              if (this.form.fBillstatus > 3) {
+                this.approvalStatus = false
+                this.browseStatus = true
               } else {
-                this.detailList = []
+                this.approvalStatus = true
+                this.browseStatus = false
               }
-              response.data.warehousebillsfeesCr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString()
-                }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString()
+              this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
+              this.$set(this.form, 'fBstime', Date.parse(this.form.fBstime))
+              this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+              this.$set(this.form, 'fFeetUnit', this.form.fFeetunit)
+              this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4)
+              this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(4)
+              if (this.form.fCartype || this.form.fCartype == 0) {
+                this.$set(this.form, 'fCartype', this.form.fCartype.toString())
+              }
+              if (this.form.fStltypeid || this.form.fStltypeid == 0) {
+                this.$set(this.form, 'fStltypeid', this.form.fStltypeid.toString())
+              }
+              if (this.form.fTrademodeid) {
+                this.$set(
+                  this.form,
+                  'fTrademodeid',
+                  this.form.fTrademodeid.toString()
+                )
+              }
+              if (!this.copyStatus) {
+                if (response.data.warehouseBillsItem) {
+                  response.data.warehouseBillsItem.map((e) => {
+                    e.fBsdate = Date.parse(e.fBsdate)
+                    e.fBusinessType = e.fBusinessType.toString()
+                    e.fLntype = e.fLntype ? e.fLntype.toString() : null
+                  })
+                  this.detailList = response.data.warehouseBillsItem
+                } else {
+                  this.detailList = []
                 }
-              })
-              this.warehouseCrList = response.data.warehousebillsfeesCr
-              response.data.warehousebillsfeesDr.map((e) => {
-                if (e.fFeeunitid) {
-                  e.fFeeUnitid = e.fFeeunitid.toString()
+                response.data.warehousebillsfeesCr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString()
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString()
+                  }
+                })
+                this.warehouseCrList = response.data.warehousebillsfeesCr
+                response.data.warehousebillsfeesDr.map((e) => {
+                  if (e.fFeeunitid) {
+                    e.fFeeUnitid = e.fFeeunitid.toString()
+                  }
+                  if (e.fStltypeid || e.fStltypeid == 0) {
+                    e.fStltypeid = e.fStltypeid.toString()
+                  }
+                })
+                this.warehouseDrList = response.data.warehousebillsfeesDr
+                this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
+                if (response.data.tCntrList) {
+                  this.CntrTable = response.data.tCntrList
+                } else {
+                  this.CntrTable = []
                 }
-                if (e.fStltypeid || e.fStltypeid == 0) {
-                  e.fStltypeid = e.fStltypeid.toString()
+                if (response.data.enclosures) {
+                  this.relevantAttachments = response.data.enclosures
                 }
-              })
-              this.warehouseDrList = response.data.warehousebillsfeesDr
-              this.warehouseDrList.forEach(item => item.fBillingway = JSON.stringify(item.fBillingway))
-              if (response.data.tCntrList) {
-                this.CntrTable = response.data.tCntrList
               } else {
-                this.CntrTable = []
+                this.$set(this.form, 'fId', null)
+                this.$set(this.form, 'fMblno', null)
+                this.$set(this.form, 'fMarks', null)
+                this.$set(this.form, 'fProductName', null)
+                this.$set(this.form, 'fNetweight', 0)
+                this.$set(this.form, 'fPlanvolumn', 0)
+                this.$set(this.form, 'fGrossweight', 0)
               }
-              if (response.data.enclosures) {
-                this.relevantAttachments = response.data.enclosures
+            })
+            this.warehouseCrList.forEach((item, index) => {
+              if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !== 0) {
+                item.fBillstatus = 6
               }
-            } else {
-              this.$set(this.form, 'fId', null)
-              this.$set(this.form, 'fMblno', null)
-              this.$set(this.form, 'fMarks', null)
-              this.$set(this.form, 'fProductName', null)
-              this.$set(this.form, 'fNetweight', 0)
-              this.$set(this.form, 'fPlanvolumn', 0)
-              this.$set(this.form, 'fGrossweight', 0)
-            }
-          })
-          this.warehouseCrList.forEach((item, index) => {
-            if (item.fQty != 0 && item.fUnitprice !== 0 && item.fAmount !== 0) {
-              item.fBillstatus = 6
-            }
-          })
-          let formData = new window.FormData()
-          formData.append('warehouseBills', JSON.stringify(this.form))
-          this.detailList.forEach(item => {
-            if (item.srcId !== null) {
-              // item.fStorageFeeDeadline = item.fBsdate
-            }
-          })
-          // 费用明细付款
-          formData.append(
-            'warehousebillsfeesCr',
-            JSON.stringify(this.warehouseCrList)
-          )
+            })
+            let formData = new window.FormData()
+            formData.append('warehouseBills', JSON.stringify(this.form))
+            this.detailList.forEach(item => {
+              if (item.srcId !== null) {
+                // item.fStorageFeeDeadline = item.fBsdate
+              }
+            })
+            // 费用明细付款
+            formData.append(
+              'warehousebillsfeesCr',
+              JSON.stringify(this.warehouseCrList)
+            )
 
-          // 库存明细
-          formData.append(
-            'warehousebillsitems',
-            JSON.stringify(this.detailList)
-          )
-          formData.append(
-            'tEnclosure',
-            JSON.stringify(this.relevantAttachments)
-          )
+            // 库存明细
+            formData.append(
+              'warehousebillsitems',
+              JSON.stringify(this.detailList)
+            )
+            formData.append(
+              'tEnclosure',
+              JSON.stringify(this.relevantAttachments)
+            )
 
-          // 收款
-          formData.append(
-            'warehousebillsfeesDr',
-            JSON.stringify(this.warehouseDrList)
-          )
-          formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
-          formData.append('tCntr', JSON.stringify(this.CntrTable))
-          addWarehousebills(formData).then(res => {
-          })
-          this.msgSuccess('撤销成功')
-        }
-      })
+            // 收款
+            formData.append(
+              'warehousebillsfeesDr',
+              JSON.stringify(this.warehouseDrList)
+            )
+            formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
+            formData.append('tCntr', JSON.stringify(this.CntrTable))
+            addWarehousebills(formData).then(res => {
+            })
+            this.msgSuccess('撤销成功')
+          }
+        })
+      });
     },
     ordersRevoke() {
-      ordersRevoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.$set(this.form, 'warehouseStatus', 2)
-          this.msgSuccess('撤销成功')
-        }
-      })
+      this.$confirm("是否撤销接单请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        ordersRevoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.$set(this.form, 'warehouseStatus', 2)
+            this.msgSuccess('撤销成功')
+          }
+        })
+      });
     },
     //撤销审批
     revokeTwo(status) {
@@ -6845,15 +6857,21 @@ export default {
         id: this.form.fId,
         fidStatus: status
       }
-      revokeTwo(data).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false
-          this.msgSuccess('撤销成功')
-          if (status) {
-            this.$set(this.form, 'warehouseStatus', 2)
+      this.$confirm("是否撤销审批?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokeTwo(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false
+            this.msgSuccess('撤销成功')
+            if (status) {
+              this.$set(this.form, 'warehouseStatus', 2)
+            }
           }
-        }
-      })
+        })
+      });
     },
     // 查看审批流
     getDataList() {
@@ -7696,14 +7714,20 @@ export default {
               )
               formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
               formData.append('tCntr', JSON.stringify(this.CntrTable))
-              warehouseSubmission(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess('提交成功')
-                  setTimeout(() => {
-                    this.cancel()
-                  }, 200)
-                }
-              })
+              this.$confirm("是否发起请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                warehouseSubmission(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess('提交成功')
+                    setTimeout(() => {
+                      this.cancel()
+                    }, 200)
+                  }
+                })
+              });
             }
           })
         }
@@ -7854,13 +7878,19 @@ export default {
               )
               formData.append('mblnoStatus', JSON.stringify(this.mblnoStatus))
               formData.append('tCntr', JSON.stringify(this.CntrTable))
-              submitWarehousingApproval(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess('请核成功')
-                  this.$set(this.form, 'warehouseStatus', 4)
-                  this.cancel()
-                }
-              })
+              this.$confirm("是否发起接单请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                submitWarehousingApproval(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess('请核成功')
+                    this.$set(this.form, 'warehouseStatus', 4)
+                    this.cancel()
+                  }
+                })
+              });
             }
           })
         }
@@ -9380,33 +9410,45 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        this.$message.success('请核成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString()
-        res.data.fStltypeid = res.data.fStltypeid.toString()
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          this.$message.success('请核成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString()
+          res.data.fStltypeid = res.data.fStltypeid.toString()
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString()
-        res.data.fStltypeid = res.data.fStltypeid.toString()
-        this.$message.success('操作成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString()
+          res.data.fStltypeid = res.data.fStltypeid.toString()
+          this.$message.success('操作成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+        })
+      });
     },
     // 获取仓库信息
     warehouseChange() {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -4746,14 +4746,20 @@ export default {
         id: this.form.fId,
         fidStatus: status,
       };
-      RevocationApproval(data).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-          if (status) {
-            this.$set(this.form, "warehouseStatus", 2);
+      this.$confirm("是否撤销审批?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        RevocationApproval(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+            if (status) {
+              this.$set(this.form, "warehouseStatus", 2);
+            }
           }
-        }
+        });
       });
     },
     // 查看审批流
@@ -5363,13 +5369,19 @@ export default {
           );
           formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
           formData.append("tCntr", JSON.stringify(this.CntrTable));
-          warehouseSubmission(formData).then((response) => {
-            if (response.code == 200) {
-              this.msgSuccess("提交成功");
-              setTimeout(() => {
-                this.cancel();
-              }, 200);
-            }
+          this.$confirm("是否发起请核?", "提示", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            warehouseSubmission(formData).then((response) => {
+              if (response.code == 200) {
+                this.msgSuccess("提交成功");
+                setTimeout(() => {
+                  this.cancel();
+                }, 200);
+              }
+            });
           });
         }
       });
@@ -5468,12 +5480,18 @@ export default {
               );
               formData.append("mblnoStatus", JSON.stringify(this.mblnoStatus));
               formData.append("tCntr", JSON.stringify(this.CntrTable));
-              submitWarehousingApproval(formData).then((response) => {
-                if (response.code == 200) {
-                  this.msgSuccess("请核成功");
-                  this.$set(this.form, "warehouseStatus", 4);
-                  this.cancel();
-                }
+              this.$confirm("是否发起接单请核?", "提示", {
+                confirmButtonText: "确认",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                submitWarehousingApproval(formData).then((response) => {
+                  if (response.code == 200) {
+                    this.msgSuccess("请核成功");
+                    this.$set(this.form, "warehouseStatus", 4);
+                    this.cancel();
+                  }
+                });
               });
             }
           });
@@ -5911,19 +5929,31 @@ export default {
     },
     //撤销请核
     revoke() {
-      revoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.browseStatus = false;
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     ordersRevoke() {
-      ordersRevoke(this.form.fId).then((data) => {
-        if (data.code === 200) {
-          this.$set(this.form, "warehouseStatus", 2);
-          this.msgSuccess("撤销成功");
-        }
+      this.$confirm("是否撤销接单请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        ordersRevoke(this.form.fId).then((data) => {
+          if (data.code === 200) {
+            this.$set(this.form, "warehouseStatus", 2);
+            this.msgSuccess("撤销成功");
+          }
+        });
       });
     },
     printZyd() {
@@ -6543,35 +6573,47 @@ export default {
     },
     // 费用明细请核
     listCheck(row) {
-      feesCheck(row.fId).then(res => {
-        this.$message.success('请核成功')
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-        console.log(res)
-      })
+      this.$confirm("是否发起费用明细请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        feesCheck(row.fId).then(res => {
+          this.$message.success('请核成功')
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+          console.log(res)
+        })
+      });
     },
     // 费用明细撤销请核
     revokeListCheck(row) {
-      revokefeeCheck(row.fId).then(res => {
-        res.data.fFeeUnitid = res.data.fFeeunitid.toString();
-        res.data.fStltypeid = res.data.fStltypeid.toString();
-        this.$message.success('操作成功')
-        if (res.data.fDc == 'D') {
-          let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseDrList.splice(index, 1, res.data)
-        } else {
-          let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
-          this.warehouseCrList.splice(index, 1, res.data)
-        }
-        console.log(this.warehouseDrList)
-      })
+      this.$confirm("是否撤销请核?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        revokefeeCheck(row.fId).then(res => {
+          res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+          res.data.fStltypeid = res.data.fStltypeid.toString();
+          this.$message.success('操作成功')
+          if (res.data.fDc == 'D') {
+            let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseDrList.splice(index, 1, res.data)
+          } else {
+            let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
+            this.warehouseCrList.splice(index, 1, res.data)
+          }
+          console.log(this.warehouseDrList)
+        })
+      });
     },
     // 付款明细多选
     SelectCr(selection) {

src/views/finance/Invoicing/index.vue

@@ -2985,13 +2985,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.mainTable = false;
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.mainTable = false;
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       } else {
         let data = {
@@ -3000,13 +3006,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.mainTable = false;
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.mainTable = false;
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       }
     },
@@ -3220,15 +3232,21 @@ export default {
 
     // 撤销付费
     revokeCharge() {
-      this.queryParams.fBillstatus = "1";
-      let formDate = new window.FormData();
-      formDate.append("tFee", JSON.stringify(this.queryParams));
-      formDate.append("tFeeDo", JSON.stringify(this.increase_s));
-      backCharge(formDate).then((response) => {
-        this.open = false;
-        this.mainTable = false;
-        this.msgSuccess("操作成功");
-        this.getList();
+      this.$confirm("是否撤销开票?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.queryParams.fBillstatus = "1";
+        let formDate = new window.FormData();
+        formDate.append("tFee", JSON.stringify(this.queryParams));
+        formDate.append("tFeeDo", JSON.stringify(this.increase_s));
+        backCharge(formDate).then((response) => {
+          this.open = false;
+          this.mainTable = false;
+          this.msgSuccess("操作成功");
+          this.getList();
+        });
       });
     },
 

src/views/finance/charge/index.vue

@@ -2290,13 +2290,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.mainTable = false
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.mainTable = false
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       }else{
         let data = {
@@ -2305,13 +2311,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.open = false;
-            this.mainTable = false
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.open = false;
+              this.mainTable = false
+              this.getList();
+            }
+          });
         });
       }
     },
@@ -2491,15 +2503,21 @@ export default {
 
     // 撤销收费
     revokeCharge() {
-      this.queryParams.fBillstatus = "1";
-      let formDate = new window.FormData();
-      formDate.append("tFee", JSON.stringify(this.queryParams));
-      formDate.append("tFeeDo", JSON.stringify(this.increase_s));
-      backCharge(formDate).then((response) => {
-        this.open = false;
-        this.mainTable = false
-        this.msgSuccess("操作成功");
-        this.getList();
+      this.$confirm("是否撤销收费?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.queryParams.fBillstatus = "1";
+        let formDate = new window.FormData();
+        formDate.append("tFee", JSON.stringify(this.queryParams));
+        formDate.append("tFeeDo", JSON.stringify(this.increase_s));
+        backCharge(formDate).then((response) => {
+          this.open = false;
+          this.mainTable = false
+          this.msgSuccess("操作成功");
+          this.getList();
+        });
       });
     },
 

src/views/finance/contrast/index.vue

@@ -3373,14 +3373,20 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        RevocationApproval(data).then((response) => {
-          if (response.code === 200) {
-            this.msgSuccess("撤销审批成功");
-            this.disappear = true;
-            this.mainTable = false;
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          RevocationApproval(data).then((response) => {
+            if (response.code === 200) {
+              this.msgSuccess("撤销审批成功");
+              this.disappear = true;
+              this.mainTable = false;
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       } else {
         let data = {
@@ -3389,12 +3395,18 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        RevocationApproval(data).then((response) => {
-          this.msgSuccess("撤销审批成功");
-          this.disappear = true;
-          this.open = false;
-          this.mainTable = false;
-          this.getList();
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          RevocationApproval(data).then((response) => {
+            this.msgSuccess("撤销审批成功");
+            this.disappear = true;
+            this.open = false;
+            this.mainTable = false;
+            this.getList();
+          });
         });
       }
     },
@@ -3441,16 +3453,22 @@ export default {
     },
     // 撤销对账
     backrRconciliation() {
-      this.queryParams.fBillstatus = "1";
-      let formDate = new window.FormData();
-      formDate.append("tFee", JSON.stringify(this.queryParams));
-      formDate.append("tFeeDo", JSON.stringify(this.DzfeeList));
-      backFee(formDate).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.open = false;
-        this.mainTable = false;
-        this.reset();
-        this.getList();
+      this.$confirm("是否撤销对账?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.queryParams.fBillstatus = "1";
+        let formDate = new window.FormData();
+        formDate.append("tFee", JSON.stringify(this.queryParams));
+        formDate.append("tFeeDo", JSON.stringify(this.DzfeeList));
+        backFee(formDate).then((response) => {
+          this.msgSuccess("撤回成功");
+          this.open = false;
+          this.mainTable = false;
+          this.reset();
+          this.getList();
+        });
       });
     },
 

src/views/finance/payment/index.vue

@@ -3033,13 +3033,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.mainTable = false;
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.mainTable = false;
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       } else {
         let data = {
@@ -3048,13 +3054,19 @@ export default {
           billId: this.queryParams.fId,
           fidStatus: status,
         };
-        revocation(data).then((data) => {
-          if (data.code === 200) {
-            this.$message.success("撤销成功");
-            this.mainTable = false;
-            this.open = false;
-            this.getList();
-          }
+        this.$confirm("是否撤销审批?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          revocation(data).then((data) => {
+            if (data.code === 200) {
+              this.$message.success("撤销成功");
+              this.mainTable = false;
+              this.open = false;
+              this.getList();
+            }
+          });
         });
       }
     },
@@ -3268,15 +3280,21 @@ export default {
 
     // 撤销付费
     revokeCharge() {
-      this.queryParams.fBillstatus = "1";
-      let formDate = new window.FormData();
-      formDate.append("tFee", JSON.stringify(this.queryParams));
-      formDate.append("tFeeDo", JSON.stringify(this.increase_s));
-      backCharge(formDate).then((response) => {
-        this.open = false;
-        this.mainTable = false;
-        this.msgSuccess("操作成功");
-        this.getList();
+      this.$confirm("是否撤销付费?", "提示", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.queryParams.fBillstatus = "1";
+        let formDate = new window.FormData();
+        formDate.append("tFee", JSON.stringify(this.queryParams));
+        formDate.append("tFeeDo", JSON.stringify(this.increase_s));
+        backCharge(formDate).then((response) => {
+          this.open = false;
+          this.mainTable = false;
+          this.msgSuccess("操作成功");
+          this.getList();
+        });
       });
     },
 

src/views/morePage/stock/index.vue

@@ -83,6 +83,17 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="100px" label="系统编号" prop="billNo">
+            <el-input
+              v-model="queryParams.billNo"
+              placeholder="请输入业务编号"
+              clearable
+              size="small"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">