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

src/views/documentView/docmentList.vue

@@ -154,7 +154,7 @@ export default {
       this.isLoading = false
     },
     initShow(){
-      this.keyword= ''
+      this.keyword= '',
       this.getNormalList()
     }
 }

src/views/workOrder/accounting.vue

@@ -54,11 +54,6 @@
         <span
             class="content">{{ orderInfo.carClothingToolAmount }}</span>
       </div>
-      <div class="item">
-        <span class="titleLeft">免拖：</span>
-        <span
-            class="content">{{ orderInfo.customerDistanceLimit }} {{orderInfo.hedgingMileage && orderInfo.hedgingMileage > 0 ? '(超限对冲，只结免拖)' : ''}}</span>
-      </div>
       <div class="item">
         <span class="titleLeft">换电瓶费用：</span>
         <span
@@ -77,35 +72,35 @@
       <div class="inpInfo">
         <div class="titleContent">
           <div class="flex-between" v-show="abState">
-            <div><span style="color: red;">*</span> 到事发地距离:</div>
+            <div> 到事发地距离:</div>
             <div class="halfOpcity"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
           </div>
           <div class="flex-between" v-show="bcState">
-            <div><span style="color: red;">*</span> 拖车里程:</div>
+            <div> 拖车里程:</div>
             <div class="halfOpcity"><input class="ipt"    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
           </div>
           <div class="flex-between" v-show="caState">
-            <div><span style="color: red;">*</span>返程里程:</div>
+            <div>返程里程:</div>
             <div class="halfOpcity"><input  class="ipt"   type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
           </div>
           <div class="flex-between" v-show="bridgeAbState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>ab路桥费:</div>
+            <div>ab路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeBcState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>bc路桥费:</div>
+            <div>bc路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeCaState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>ca路桥费:</div>
+            <div>ca路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle" type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
           </div>
           <div class="flex-between" v-show="waitAmountState">
-            <div><span style="color: red;">*</span>等候费:</div>
+            <div>等候费:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>小轮个数:</div>
+            <div>小轮个数:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"   type="number" v-model="form.tyreNumber"/>个</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
@@ -113,11 +108,11 @@
             <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  disabled  type="number" v-model="form.supplierTyreAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
-            <div><span style="color: red;">*</span>困境费:</div>
+            <div>困境费:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="basementFeeState">
-            <div><span v-show="isBasementSettle && !isUnsuccessfulSettle" style="color: red;">*</span>地库费:</div>
+            <div>地库费:</div>
             <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
           </div>
           <div class="flex-between">
@@ -125,7 +120,7 @@
             <div class="halfOpcity inputContent"><input type="number" class="ipt"  v-model="form.supplierCustomerAmount"/>元</div>
           </div>
           <div class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } ">
-            <div><span v-show="!basePriceDisabled && !isBasementSettle" style="color: red;">*</span>基本费用:</div>
+            <div>基本费用:</div>
             <div class="halfOpcity inputContent "><input class="disable" type="number" :readonly="basePriceDisabled || isBasementSettle"
                                                          v-model="form.supplierBasePrice"/><span>元</span></div>
           </div>
@@ -507,7 +502,6 @@ export default {
       })
     },
     async compute() {
-      alert(11111)
       if(this.orderInfo.contractSettleTypeString == '车主现收'){
         this.form.supplierBasePrice = 0
         this.form.supplierExtraPrice = 0
@@ -663,49 +657,6 @@ export default {
       this.goback()
     },
     async save() {
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
-      if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
-        this.$toast('请填写到事发地距离'); return;
-      }
-      if (this.bcState && isBlank(this.form.supplierSettleMileageBc)) {
-        this.$toast('请填写拖车里程'); return;
-      }
-      if (this.caState && isBlank(this.form.supplierSettleMileageCa)) {
-        this.$toast('请填写返程里程'); return;
-      }
-      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountAb)) {
-        this.$toast('请填写ab路桥费'); return;
-      }
-      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountBc)) {
-        this.$toast('请填写bc路桥费'); return;
-      }
-      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountCa)) {
-        this.$toast('请填写ca路桥费'); return;
-      }
-      if (this.waitAmountState && isBlank(this.form.supplierWaitAmount)) {
-        this.$toast('请填写等候费'); return;
-      }
-      if (!this.auditFormShow && this.tyreAmountState && !this.isUnsuccessfulSettle && isBlank(this.form.tyreNumber)) {
-        this.$toast('请填写小轮个数'); return;
-      }
-      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.supplierDilemmaAmount)) {
-        this.$toast('请填写困境费'); return;
-      }
-      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBasementFee)) {
-        this.$toast('请填写地库费'); return;
-      }
-      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.supplierBasePrice)) {
-        this.$toast('请填写基本费用'); return;
-      }
-      if (
-        this.orderInfo.customerDistanceLimit &&
-        parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
-      ) {
-        if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
-          this.$toast('拖车里程超出免拖范围，请填写收取客户金额');
-          return;
-        }
-      }
       if (this.form.supplierOtherAmount > 0) {
         if (this.form.supplierOtherAmountRemark == '') {
           this.$toast('请填写其他费用说明');
@@ -743,7 +694,6 @@ export default {
       await this.compute();
       const formData = new FormData();
       let obj = this.form;
-      console.log('obj',obj)
       Object.keys(obj).forEach((key) => {
         formData.append(key, obj[key]);
       });
@@ -754,7 +704,7 @@ export default {
       formData.append('state', 0);
       formData.append('postfix', this.postfix);
       formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
-      /*let res = await updateAccountRecordInfo(formData);
+      let res = await updateAccountRecordInfo(formData);
       if (res.code === 200) {
         this.$toast('操作成功')
         setTimeout(() => {
@@ -767,7 +717,7 @@ export default {
             }
           })
         }, 2000)
-      }*/
+      }
       this.loading = false;
     },
     async confirmAudit() {
@@ -775,45 +725,6 @@ export default {
         this.$toast('已进入后续流程，不允许操作');
         return;
       }
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
-      if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
-        this.$toast('请填写到事发地距离'); return;
-      }
-      if (this.bcState && isBlank(this.form.supplierSettleMileageBc)) {
-        this.$toast('请填写拖车里程'); return;
-      }
-      if (this.caState && isBlank(this.form.supplierSettleMileageCa)) {
-        this.$toast('请填写返程里程'); return;
-      }
-      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountAb)) {
-        this.$toast('请填写ab路桥费'); return;
-      }
-      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountBc)) {
-        this.$toast('请填写bc路桥费'); return;
-      }
-      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountCa)) {
-        this.$toast('请填写ca路桥费'); return;
-      }
-      if (this.waitAmountState && isBlank(this.form.supplierWaitAmount)) {
-        this.$toast('请填写等候费'); return;
-      }
-      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.supplierDilemmaAmount)) {
-        this.$toast('请填写困境费'); return;
-      }
-      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBasementFee)) {
-        this.$toast('请填写地库费'); return;
-      }
-      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.supplierBasePrice)) {
-        this.$toast('请填写基本费用'); return;
-      }
-      if (
-        this.orderInfo.customerDistanceLimit &&
-        parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
-      ) {
-        if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
-          this.$toast('拖车里程超出免拖范围，请填写收取客户金额'); return;
-        }
-      }
       this.loading1 = true;
       this.form.supplierExtraPrice = this.form.extraPrice || 0
       this.form.supplierBasePrice = this.form.basePrice || 0
@@ -849,7 +760,7 @@ export default {
       formData.append('state', 0);
       formData.append('postfix', this.postfix);
       formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
-      /*let res = await updateAccountRecordInfo(formData);
+      let res = await updateAccountRecordInfo(formData);
       if (res.code === 200) {
         this.$toast('操作成功')
         setTimeout(() => {
@@ -862,7 +773,7 @@ export default {
             }
           })
         }, 2000)
-      }*/
+      }
       this.loading1 = false;
     },
 
@@ -1031,7 +942,7 @@ img {
 }
 
 .baseInfo {
-  width: 100%;
+  @include wh(100%, 344px);
 
 }