CRM_26-04-22#story#8495,潜在供应商H5页面提交信息，信息审核，提交补充信息与退回理由的优化与修复(跳转详情修改2)

src/views/index/supplierAdd.vue

@@ -202,14 +202,15 @@
       }
     },
     async mounted() {
+      const urlParams = new URLSearchParams(window.location.search);
       const lastRoute = localStorage.getItem('lastRoute');
-      if (lastRoute) {
+      this.id = this.$route.query.id || urlParams.get('id');
+      if (lastRoute && !this.id) {
         const { name, query } = JSON.parse(lastRoute);
         this.$router.replace({ name, query });
         return;
       }
-      const urlParams = new URLSearchParams(window.location.search);
+
-      this.id = this.$route.query.id || urlParams.get('id');
       await this.getAreaTree();
       if(this.id) {
         await this.getInfoHandler();

src/views/workOrder/accounting.vue

@@ -662,7 +662,7 @@ export default {
       this.goback()
     },
     async save() {
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) <= 0
+      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
       if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
         this.$toast('请填写到事发地距离'); return;
       }
@@ -700,7 +700,6 @@ export default {
         this.orderInfo.customerDistanceLimit &&
         parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
       ) {
-        console.log(11111111)
         if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
           this.$toast('拖车里程超出免拖范围，请填写收取客户金额');
           return;
@@ -775,47 +774,43 @@ export default {
         this.$toast('已进入后续流程，不允许操作');
         return;
       }
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) <= 0
+      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
-      if (this.abState && isBlank(this.form.settleMileageAb)) {
+      if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
         this.$toast('请填写到事发地距离'); return;
       }
-      if (this.bcState && isBlank(this.form.settleMileageBc)) {
+      if (this.bcState && isBlank(this.form.supplierSettleMileageBc)) {
         this.$toast('请填写拖车里程'); return;
       }
-      if (this.caState && isBlank(this.form.settleMileageCa)) {
+      if (this.caState && isBlank(this.form.supplierSettleMileageCa)) {
         this.$toast('请填写返程里程'); return;
       }
-      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.bridgeAmountAb)) {
+      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountAb)) {
         this.$toast('请填写ab路桥费'); return;
       }
-      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.bridgeAmountBc)) {
+      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountBc)) {
         this.$toast('请填写bc路桥费'); return;
       }
-      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.bridgeAmountCa)) {
+      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountCa)) {
         this.$toast('请填写ca路桥费'); return;
       }
-      if (this.waitAmountState && isBlank(this.form.waitAmount)) {
+      if (this.waitAmountState && isBlank(this.form.supplierWaitAmount)) {
         this.$toast('请填写等候费'); return;
       }
-      if (!this.auditFormShow && this.tyreAmountState && !this.isUnsuccessfulSettle && isBlank(this.form.tyreNumber)) {
+      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.supplierDilemmaAmount)) {
-        this.$toast('请填写小轮个数'); return;
-      }
-      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.dilemmaAmount)) {
         this.$toast('请填写困境费'); return;
       }
-      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.basementFee)) {
+      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBasementFee)) {
         this.$toast('请填写地库费'); return;
       }
-      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.basePrice)) {
+      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.supplierBasePrice)) {
         this.$toast('请填写基本费用'); return;
       }
       if (
         this.orderInfo.customerDistanceLimit &&
-        parseFloat(this.form.settleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
+        parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
       ) {
-        if (!this.form.customerAmount || parseFloat(this.form.customerAmount) == 0) {
+        if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
-          this.$toast('拖车里程超出免拖范围，请填写收取客户金额');
+          this.$toast('拖车里程超出免拖范围，请填写收取客户金额'); return;
-          return;
         }
       }
       this.loading1 = true;