fix:修改财务管理审核和提现审核占单功能

src/http/moudules/task.js

@@ -619,8 +619,41 @@ export const auditFee = (data) => {
     data
   })
 }
+
+// 审核之前校验查询费用明细是否占单
+export const validateFeeDetail = (data) => {
+  return axios({
+    url: '/fnc/carSettle/validateFeeDetail',
+    method: 'post',
+    data
+  })
+}
+
+// 体现
+export const occupyTheOrder = (data) => {
+  return axios({
+    url: '/sysAmountAuditing/occupyTheOrder ',
+    method: 'post',
+    data
+  })
+}
+export const liftOrder = (data) => {
+  return axios({
+    url: '/sysAmountAuditing/liftOrder ',
+    method: 'post',
+    data
+  })
+}
+
 //订单审核费用调整
 
+export const liftFeeDetail = (data) => {
+  return axios({
+    url: '/fnc/carSettle/liftFeeDetail',
+    method: 'post',
+    data
+  })
+}
 
 export const costsadjust = (data) => {
   return axios({

src/views/Core/components/detailsDialogPro.vue

@@ -1225,6 +1225,11 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <template v-if="auditStatus != 1">
+        <el-button
+          size="small"
+          type="warning"
+          @click="liftFeeDetail"
+        >解除订单占用</el-button>
         <el-button
           size="small"
           type="warning"
@@ -1314,6 +1319,17 @@ export default {
     rejectionFUn() {
       this.$emit("rejectionFUn");
     },
+    liftFeeDetail() {
+      this.$api.task.liftFeeDetail({
+        id: this.orderInfo.id
+      }).then(res => {
+        if(res.code == 200) {
+          this.$message.success(res.msg)
+        } else {
+          this.$message.warning(res.msg)
+        }
+      })
+    },
     updatedCost() {
       let newCost = {
         deptManagerFee: this.feeOrderNewVoList.deptManagerFee,

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -127,6 +127,7 @@ import retrievalForm from "@/components/Form/retrievalForm.vue";
 import Cookies from "js-cookie";
 import KtButton from "@/views/Core/KtButton";//按钮权限组件
 import detailsDialog from "@/views/Core/components/detailsDialogPro.vue";
+import {validateFeeDetail} from "../../../../http/moudules/task";
 
 export default {
   components: {
@@ -812,7 +813,6 @@ export default {
     },
     //应用详情
     OrderDetails(dy) {
-      console.log(dy)
       if (dy.isExternal == 1) {
         this.isrejection = true
       }
@@ -828,111 +828,115 @@ export default {
         orderNo: dy.orderno,
       }
       this.insOrderNo = dy.orderno
-      this.$api.task.feeDetail(params).then((res) => {
-        if (res.code == 200) {
-          res.data.kindinfo.map((ele, index) => {
-            switch (ele.kindCode) {
-              case "A":
-                ele.amount = "投保";
-                break;
-              case "D4":
-              case "SY_FJ_YBW2":
-                ele.unitAmount = this.toChinesNum(ele.unitAmount);
-                break;
-              case "MJ1":
-              case "MJ2":
-              case "MJ3":
-              case "MJ4":
-                ele.deductibleRate = ele.deductibleRate + "%";
-                break;
-              default:
-                ele.amount = this.toChinesNum(ele.amount);
-            }
-            return ele;
-          });
-          // 获取影像
-          this.$api.letter.findByQuoteNo(dy.quoteno).then((resImage) => {
-            Object.keys(resImage.data).forEach((keys) => {
-              if (resImage.data[keys]) {
-                resImage.data[keys].url = resImage.data[keys].url
-                  ? process.env.BASE_URL + resImage.data[keys].url
-                  : null;
-                switch (keys) {
-                  case "C01":
-                  case "D01":
-                    resImage.data[keys].url
-                      ? this.carImageList.push(resImage.data[keys].url)
-                      : "";
-                    break;
-                  case "C02":
-                  case "D02":
-                    resImage.data[keys].url
-                      ? this.ownerImageList.push(resImage.data[keys].url)
-                      : "";
-                    break;
-                  case "C03":
-                  case "D03":
-                    resImage.data[keys].url
-                      ? this.policyImageList.push(resImage.data[keys].url)
-                      : "";
+      this.$api.task.validateFeeDetail({
+        id: dy.id
+      }).then(res => {
+        if(res.code == 200) {
+          this.$api.task.feeDetail(params).then((res) => {
+            if (res.code == 200) {
+              res.data.kindinfo.map((ele, index) => {
+                switch (ele.kindCode) {
+                  case "A":
+                    ele.amount = "投保";
                     break;
-                  case "C04":
-                  case "D04":
-                    resImage.data[keys].url
-                      ? this.insuredImageList.push(resImage.data[keys].url)
-                      : "";
+                  case "D4":
+                  case "SY_FJ_YBW2":
+                    ele.unitAmount = this.toChinesNum(ele.unitAmount);
                     break;
-                  case "XC00":
-                  case "GC00":
-                  case "GX00":
-                    resImage.data[keys].url
-                      ? this.carCheckImageList.push(resImage.data[keys].url)
-                      : "";
+                  case "MJ1":
+                  case "MJ2":
+                  case "MJ3":
+                  case "MJ4":
+                    ele.deductibleRate = ele.deductibleRate + "%";
                     break;
                   default:
-                    break;
+                    ele.amount = this.toChinesNum(ele.amount);
+                }
+                return ele;
+              });
+              // 获取影像
+              this.$api.letter.findByQuoteNo(dy.quoteno).then((resImage) => {
+                Object.keys(resImage.data).forEach((keys) => {
+                  if (resImage.data[keys]) {
+                    resImage.data[keys].url = resImage.data[keys].url
+                      ? process.env.BASE_URL + resImage.data[keys].url
+                      : null;
+                    switch (keys) {
+                      case "C01":
+                      case "D01":
+                        resImage.data[keys].url
+                          ? this.carImageList.push(resImage.data[keys].url)
+                          : "";
+                        break;
+                      case "C02":
+                      case "D02":
+                        resImage.data[keys].url
+                          ? this.ownerImageList.push(resImage.data[keys].url)
+                          : "";
+                        break;
+                      case "C03":
+                      case "D03":
+                        resImage.data[keys].url
+                          ? this.policyImageList.push(resImage.data[keys].url)
+                          : "";
+                        break;
+                      case "C04":
+                      case "D04":
+                        resImage.data[keys].url
+                          ? this.insuredImageList.push(resImage.data[keys].url)
+                          : "";
+                        break;
+                      case "XC00":
+                      case "GC00":
+                      case "GX00":
+                        resImage.data[keys].url
+                          ? this.carCheckImageList.push(resImage.data[keys].url)
+                          : "";
+                        break;
+                      default:
+                        break;
+                    }
+                  }
+                });
+                let obj = {
+                  carImageList: this.carImageList,
+                  ownerImageList: this.ownerImageList,
+                  policyImageList: this.policyImageList,
+                  insuredImageList: this.insuredImageList,
+                  carCheckImageList: this.carCheckImageList
+                }
+                this.$refs.detailsDialog.imageFun(obj);
+              });
+              if (res.data.feeOrderNewVo && res.data.feeOrderNewVo.exportFee && res.data.feeOrderNewVo.entranceFee) {
+                let data = JSON.parse(JSON.stringify(res.data.feeOrderNewVo))
+                this.oldVersionHistory = data;
+                data.exportFee.map((val, index) => {
+                  val.type = "出口费用"
+                  return val;
+                })
+                data.entranceFee.map((val, index) => {
+                  val.type = "入口费用"
+                  return val;
+                })
+                this.feeOrderNewVoList = {
+                  deptManagerFee: data.deptManagerFee,
+                  list: [...data.entranceFee, ...data.exportFee],
+                  retailFee: data.retailFee
                 }
               }
-            });
-            let obj = {
-              carImageList: this.carImageList,
-              ownerImageList: this.ownerImageList,
-              policyImageList: this.policyImageList,
-              insuredImageList: this.insuredImageList,
-              carCheckImageList: this.carCheckImageList
-            }
-            this.$refs.detailsDialog.imageFun(obj);
-          });
-          if (res.data.feeOrderNewVo && res.data.feeOrderNewVo.exportFee && res.data.feeOrderNewVo.entranceFee) {
-            let data = JSON.parse(JSON.stringify(res.data.feeOrderNewVo))
-            this.oldVersionHistory = data;
-            data.exportFee.map((val, index) => {
-              val.type = "出口费用"
-              return val;
-            })
-            data.entranceFee.map((val, index) => {
-              val.type = "入口费用"
-              return val;
-            })
-            this.feeOrderNewVoList = {
-              deptManagerFee: data.deptManagerFee,
-              list: [...data.entranceFee, ...data.exportFee],
-              retailFee: data.retailFee
-            }
-          }
-          res.data.carinfo.carnature = this.natureOfVehicleUseCap(res.data.carinfo.carnature)
-          res.data.carinfo.cartype = this.trafficManagementVehicleTypeCap(res.data.carinfo.cartype)
-          res.data.carinfo.cimodelclass = this.vehicleTypeCap(res.data.carinfo.cimodelclass)
-          res.data.carinfo.energyType = this.energyTypeCap(res.data.carinfo.energyType)
-          res.data.carinfo.vehicleUse = this.outOfBusinessVehicleUseCap(res.data.carinfo.carnature, res.data.carinfo.vehicleUse)
-          res.data.source = dy.managementSource;
-          this.orderInfo = res.data;
-          this.oldfileList = [];
-          let businessList = []
-          let accidentList = []
-          if (res.data.orderstatus == "3") {
-            /**
-            if (res.data.isExternal == 1) {
+              res.data.carinfo.carnature = this.natureOfVehicleUseCap(res.data.carinfo.carnature)
+              res.data.carinfo.cartype = this.trafficManagementVehicleTypeCap(res.data.carinfo.cartype)
+              res.data.carinfo.cimodelclass = this.vehicleTypeCap(res.data.carinfo.cimodelclass)
+              res.data.carinfo.energyType = this.energyTypeCap(res.data.carinfo.energyType)
+              res.data.carinfo.vehicleUse = this.outOfBusinessVehicleUseCap(res.data.carinfo.carnature, res.data.carinfo.vehicleUse)
+              res.data.source = dy.managementSource;
+              this.orderInfo = res.data;
+              this.oldfileList = [];
+              let businessList = []
+              let accidentList = []
+              if (res.data.orderstatus == "3") {
+                /**
+                 if (res.data.isExternal == 1) {
               this.$api.letter
                 .getPolicyPrintexternalOrder(res.data.id).then(res1 => {
                   if (res1.code == 200) {
@@ -970,7 +974,7 @@ export default {
                   }
                 })
             }
-            else {
+                 else {
               switch (res.data.inscompany) {
                 case "永安财险":
                   if (this.orderInfo.jqpolicyno) {
@@ -1631,35 +1635,40 @@ export default {
               }
             }
 
-            let obj = {
+                 let obj = {
               oldfileList: this.oldfileList,
               businessList,
               accidentList
             }
-            this.$refs.detailsDialog.warrantyFun(obj);
-            */
-            this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
-              console.log(res.data)
-              if (res.code == 200) {
-                this.$refs.detailsDialog.warrantyFun(res.data);
-              } else{
-                this.$message.error(res.msg);
+                 this.$refs.detailsDialog.warrantyFun(obj);
+                 */
+                this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
+                  console.log(res.data)
+                  if (res.code == 200) {
+                    this.$refs.detailsDialog.warrantyFun(res.data);
+                  } else{
+                    this.$message.error(res.msg);
+                  }
+                });
+
               }
-            });
+              this.feeDetailInfo = res.data.orderFeeResult;
+              this.oldFeeInfo = res.data.adjustFeeDescVo;
+              this.adjustFeeDescInfo = { ...this.oldFeeInfo }
+              // this.quotedetailsdialogVisible = true;
+              console.log(this.orderInfo)
+              this.$refs.detailsDialog.setBackupVisible(true);
 
-          }
-          this.feeDetailInfo = res.data.orderFeeResult;
-          this.oldFeeInfo = res.data.adjustFeeDescVo;
-          this.adjustFeeDescInfo = { ...this.oldFeeInfo }
-          // this.quotedetailsdialogVisible = true;
-          console.log(this.orderInfo)
-          this.$refs.detailsDialog.setBackupVisible(true);
+            } else {
+              this.$message.error("订单获取失败");
+            }
 
+          });
         } else {
-          this.$message.error("订单获取失败");
+          this.$message.error(res.msg);
         }
+      })
 
-      });
     },
     // 设置每页条数
     applyhandleSizeChange(val) {

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -68,6 +68,7 @@
           <p>内部开户行名称：{{ bankForm.bankName }}</p>
         </div>
         <span slot="footer" class="dialog-footer">
+          <el-button size="small" @click="liftOrder">解除占单</el-button>
           <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
           <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
         </span>
@@ -205,7 +206,10 @@ export default {
         { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
         { prop: "createTime", label: "提现时间" },
-      ]
+      ],
+
+      liftId: ''
+
     };
   },
   created() {
@@ -380,6 +384,17 @@ export default {
         }
       });
     },
+    liftOrder() {
+      this.$api.task.liftOrder({
+        id: this.liftId
+      }).then(res => {
+        if(res.code == 200) {
+          this.$message.success(res.msg)
+        } else {
+          this.$message.warning(res.msg)
+        }
+      })
+    },
     handleSumbit() {
       this.$api.task
         .AmountReview({
@@ -403,14 +418,23 @@ export default {
         });
     },
     handleButton2({ row, index }) {
-      if (row.approval === 1){
-        this.$message.error("线上数据自动审核，无需处理!!");
-        return;
-      }
-      this.dialogVisibleBatch = true;
-      this.rowlist = row;
-      this.picId = "";
-      this.voucherId = "";
+      this.liftId = row.id
+      this.$api.task.occupyTheOrder({
+        id: row.id
+      }).then(res => {
+        if(res.code == 200) {
+          if (row.approval === 1){
+            this.$message.error("线上数据自动审核，无需处理!!");
+            return;
+          }
+          this.dialogVisibleBatch = true;
+          this.rowlist = row;
+          this.picId = "";
+          this.voucherId = "";
+        } else {
+          this.$message.error(res.msg);
+        }
+      })
       // this.$api.task.findById({id:row.id}).then(res => {
       //   if (res.code == 200) {
       //   }