task#14504,删除首页默认服务商id

(cherry picked from commit a7cf0a837e)

package-lock.json

@@ -1713,9 +1713,9 @@
       }
     },
     "@vant/icons": {
-      "version": "3.0.2",
+      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
-      "integrity": "sha512-4OlRVMd0uiDtD9hgSISZW8hB95vU0fFtc41tQchRIyiXkR0tS+DydZOLb8/bQkithrNWhW7Uud38MbKjlJ9lJw=="
+      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
     },
     "@vant/popperjs": {
       "version": "1.3.0",
@@ -2030,49 +2030,6 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.11.1",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-          "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2237,6 +2194,47 @@
         }
       }
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.11.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -3544,16 +3542,10 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
-    "dayjs": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="
-      "dev": true
     },
     "debug": {
       "version": "4.3.4",
@@ -4888,8 +4880,7 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-      "dev": true
     },
     "highlight.js": {
       "version": "10.7.3",
@@ -5517,8 +5508,7 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-      "dev": true
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -8035,12 +8025,12 @@
       }
     },
     "vant": {
-      "version": "2.13.2",
+      "version": "2.12.54",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.13.2.tgz",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
-      "integrity": "sha512-anZbbLqXCq+rUJk10D67mn+V/1/i9tfOTdoR+64B0e+0BzV3KFgpHBF76noLa+yX9i/L+8DeL560WMk0GEN38g==",
+      "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "^3.0.2",
+        "@vant/icons": "^1.7.1",
         "@vant/popperjs": "^1.1.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
@@ -8255,7 +8245,6 @@
       "version": "2.7.14",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
       "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
-      "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"

package.json

@@ -18,7 +18,7 @@
     "qs": "^6.11.2",
     "sass": "^1.65.1",
     "sass-loader": "^13.3.2",
-    "vant": "^2.13.2",
+    "vant": "^2.12.54",
     "vue": "^2.6.14",
     "vue-router": "^3.0.7",
     "vuex": "^3.6.2",

public/index.html

@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<!--      <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover,user-scalable=no">
     <meta name="format-detection" content="telephone=yes"/>
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
@@ -35,11 +34,11 @@
         // VConsole 默认会挂载到 `window.VConsole` 上
         // let vConsole = new window.VConsole();
         (function (doc, win) {
-            console.log("==window.location.pathname===",window.location.pathname)
             let docEl = doc.documentElement
             let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
             recalc = function () {
                 var clientWidth = docEl.clientWidth;
+                // console.log("clientWidth",clientWidth)
                 if (!clientWidth) return;
                 if (clientWidth < 400) {
                     clientWidth = 400;
@@ -49,20 +48,13 @@
             if (!doc.addEventListener) return;
             var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
             if (isMobile) {// 是移动端不变
-                // console.log("是移动端不变")
+
             }else{
-                if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
-                    // console.log("执行了执行了")
                 win.addEventListener(resizeEvt, recalc, false);
                 doc.addEventListener('DOMContentLoaded', recalc, false);
             }
-                /*else{
+            // console.log("isMobile",isMobile)
-                    console.log("走着了这种饿 ")
-                }*/
-            }
         })(document, window);
-
     </script>
-
   </body>
 </html>

src/api/mine.js

@@ -132,7 +132,7 @@ export function deleteImage(data){
     })
 }
 //新增记账图片 form-data
-/*export function insertRecordPicture(data){
+export function insertRecordPicture(data){
     return request({
         url:'/supplierAppV2/dispatchApp/accountRecord/insertRecordPicture',
         method:'POST',
@@ -142,7 +142,7 @@ export function deleteImage(data){
         //     'Content-Type': 'multipart/form-data',
         // },
     })
-}*/
+}
 
 //开票通知列表
 export function notifyInvoiceList(data){

src/views/index/supplySettlement.vue

@@ -42,7 +42,7 @@
       <div class="metersWrap">
         <div class="item"  >
           <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber"/>个</div>
         </div>
         <div class="item">
           <div class="leftKiloMeters">等候费</div>
@@ -82,7 +82,7 @@ export default {
         bridgeAmountAb:'',
         bridgeAmountBc:'',
         bridgeAmountCa:'',
-        tyreNumber:0,
+        tyreNumber:'',
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
@@ -98,15 +98,6 @@ export default {
       await this.getDetail()
   },
   methods:{
-    handleInput(event) {
-      const newValue = parseInt(event.target.value, 10);
-      if (!isNaN(newValue) && newValue >= 0 && newValue <= 4) {
-        this.form.tyreNumber = newValue;
-      } else {
-        this.$toast('请输入0到4之间的数字')
-        this.form.tyreNumber = null; // 或者上一个有效值
-      }
-    },
     submit() {
       this.updatSettlement()
     },

src/views/workOrder/accounting.vue

@@ -46,18 +46,7 @@
     </div>
     <div class="item">
       <span class="titleLeft">扣除责任险费：</span>
-        <span
+      <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount==1 ? '是' : (orderInfo.cutInsuranceAmount==0 ? '否' : ' ')}}</span>
-            class="content">{{ orderInfo.policyAmount }}</span>
-      </div>
-      <div class="item">
-        <span class="titleLeft">车衣费用：</span>
-        <span
-            class="content">{{ orderInfo.carClothingToolAmount }}</span>
-      </div>
-      <div class="item">
-        <span class="titleLeft">换电瓶费用：</span>
-        <span
-            class="content">{{ orderInfo.replaceBatteryAmount }}</span>
     </div>
     <div class="item">
       <span class="leftTitle fontColor">工单照片:</span>
@@ -73,7 +62,7 @@
       <div class="titleContent">
         <div  class="flex-between" v-show="abState">
           <div>  到事发地距离:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
+          <div  class="halfOpcity"><input type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
         </div>
         <div  class="flex-between" v-show="bcState" >
             <div>   拖车里程:</div>
@@ -85,31 +74,31 @@
         </div>
         <div  class="flex-between" v-show="bridgeAbState">
             <div>ab路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
+             <div  class="halfOpcity"><input type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
         </div>
         <div  class="flex-between"  v-show="bridgeBcState">
             <div>bc路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
+            <div class="halfOpcity"><input type="number"  v-model="form.supplierBridgeAmountBc"/>元</div>
         </div>
         <div  class="flex-between" v-show="bridgeCaState">
             <div>ca路桥费:</div>
-            <div class="halfOpcity"><input  @input="validateIntegerInput"  type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
+            <div  class="halfOpcity"><input type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
         </div>
         <div  class="flex-between" v-show="waitAmountState">
           <div>等候费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
+          <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierWaitAmount"/>元</div>
         </div>
         <div  class="flex-between" v-show="tyreAmountState">
           <div>小轮费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierTyreAmount"/>元</div>
+          <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierTyreAmount"/>元</div>
         </div>
         <div  class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
           <div>困境费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
+          <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierDilemmaAmount"/>元</div>
         </div>
         <div  class="flex-between" v-show="basementFeeState">
           <div>地库费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle" />元</div>
+          <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierBasementFee"/>元</div>
         </div>
         <div  class="flex-between">
             <div>收取客户金额:</div>
@@ -117,18 +106,15 @@
         </div>
         <div  class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } " >
           <div>基本费用:</div>
-            <div class="halfOpcity inputContent "><input class="disable" type="number" :readonly="basePriceDisabled || isBasementSettle"
+          <div class="halfOpcity inputContent "  ><input  class="disable" type="number" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/><span >元</span></div>
-                                                         v-model="form.supplierBasePrice"/><span>元</span></div>
         </div>
         <div  class="flex-between bgDisable" >
           <div>额外费用总计:</div>
-            <div class="halfOpcity inputContent "><input class="disable" type="number" :readonly="true"
+          <div class="halfOpcity inputContent " ><input class="disable" type="number"  :readonly="true" v-model="form.supplierExtraPrice"/><span>元</span></div>
-                                                         v-model="form.supplierExtraPrice"/><span>元</span></div>
         </div>
         <div  class="flex-between bgDisable ">
             <div>费用总计: </div>
-            <div class="halfOpcity inputContent "><input class="disable" type="number" :readonly="true"
+          <div class="halfOpcity inputContent " ><input class="disable" type="number" :readonly="true" v-model="form.supplierSettleAmount"/><span >元</span></div>
-                                                         v-model="form.supplierSettleAmount"/><span>元</span></div>
         </div>
         <div  class="flex-between">
           <div> &nbsp;</div>
@@ -141,9 +127,7 @@
 <!--    <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="save" />-->
     <div class="btn">
       <button class="cancel"  @click="noMultipleClicks(cancelBtn )">取消</button>
-        <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}"
+      <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}" @click="noMultipleClicks(save)" >提交</button>
-                @click="noMultipleClicks(save)">提交
-        </button>
     </div>
 
   </div>
@@ -155,54 +139,51 @@
       </tr>
       <tr v-show="abState">
         <td class="col1">到事发地距离:{{orderInfo.settleMileageAb + '公里'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入到事发地距离" v-model="form.supplierSettleMileageAb"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入到事发地距离"  v-model="form.supplierSettleMileageAb"/></td>
       </tr>
       <tr v-show="bcState">
         <td class="col1">拖车里程:{{orderInfo.settleMileageBc + '公里'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入拖车公里" v-model="form.supplierSettleMileageBc"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入拖车公里"  v-model="form.supplierSettleMileageBc"/></td>
       </tr>
       <tr v-show="caState">
         <td class="col1">返程里程:{{orderInfo.settleMileageCa + '公里'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入返程里程" v-model="form.supplierSettleMileageCa"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入返程里程"  v-model="form.supplierSettleMileageCa"/></td>
       </tr>
       <tr  v-show="bridgeAbState">
         <td class="col1">ab路桥费:{{orderInfo.bridgeAmountAb +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入ab路桥费" v-model="form.supplierBridgeAmountAb"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入ab路桥费"  v-model="form.supplierBridgeAmountAb"/></td>
       </tr>
       <tr  v-show="bridgeBcState">
         <td class="col1">bc路桥费:{{orderInfo.bridgeAmountBc +'元'}}</td>
-          <td class="col2 halfOpc"><input     @input="validateIntegerInput"   placeholder="输入bc路桥费" v-model="form.supplierBridgeAmountBc"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入bc路桥费"  v-model="form.supplierBridgeAmountBc"/></td>
       </tr>
       <tr  v-show="bridgeCaState">
         <td class="col1">ca路桥费:{{orderInfo.bridgeAmountCa +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入ca路桥费" v-model="form.supplierBridgeAmountCa"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入ca路桥费"  v-model="form.supplierBridgeAmountCa"/></td>
       </tr>
       <tr  v-show="tyreAmountState">
         <td class="col1">小轮费:{{orderInfo.bridgeAmount +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入小轮费" v-model="form.supplierTyreAmount"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入小轮费" v-model="form.supplierTyreAmount"/></td>
       </tr>
       <tr v-show="dilemmaAmountState && basePriceDisabled">
         <td class="col1">困境费:{{orderInfo.dilemmaAmount +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入困境费" v-model="form.supplierDilemmaAmount"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入困境费" v-model="form.supplierDilemmaAmount"/></td>
       </tr>
       <tr v-show="waitAmountState">
         <td class="col1">等候费:{{orderInfo.waitAmount +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入等候费" v-model="form.supplierWaitAmount"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入等候费" v-model="form.supplierWaitAmount"/></td>
       </tr>
       <tr v-show="basementFeeState">
         <td class="col1">地库费:{{orderInfo.basementFee +'元'}}</td>
-          <td class="col2 halfOpc"><input  @input="validateIntegerInput"   placeholder="输入地库费" v-model="form.supplierBasementFee"/></td>
+        <td  class="col2 halfOpc"><input placeholder="输入地库费" v-model="form.supplierBasementFee"/></td>
       </tr>
       <tr>
         <td class="col1">基本费用:{{orderInfo.basePrice +'元'}}</td>
-          <td class="col2 halfOpc" :style="{ opacity: basePriceDisabled ? '1' : '0.5' }"><input
+        <td  class="col2 halfOpc"  :style="{ opacity: basePriceDisabled ? '1' : '0.5' }"><input   :class="basePriceDisabled ? 'supplierdisable' : ''" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/></td>
-              :class="basePriceDisabled ? 'supplierdisable' : ''" :readonly="basePriceDisabled"
-              v-model="form.supplierBasePrice"/></td>
       </tr>
       <tr>
         <td class="col1">额外费用总计:{{orderInfo.extraPrice +'元'}}</td>
-          <td class="col2 halfOpc" style="opacity: 1;"><input class="supplierdisable" :readonly="true"
+        <td  class="col2 halfOpc" style="opacity: 1;"><input  class="supplierdisable"  :readonly="true" v-model="form.supplierExtraPrice"/></td>
-                                                              v-model="form.supplierExtraPrice"/></td>
       </tr>
       <tr>
         <td class="col1">收取客户:{{orderInfo.customerAmount +'元'}}</td>
@@ -220,8 +201,7 @@
           <div class="title col1" style="white-space: nowrap;">审核失败原因</div>
           <div class="reason">{{orderInfo.auditRemark}}</div>
           <div  v-show="orderInfo.auditPhoto"  style="display: flex;flex-wrap: wrap">
-              <van-image class="camerImg" v-for="(item,index) in auditPhotoList" :key="index" :src="item.url"
+            <van-image class="camerImg" v-for="(item,index) in auditPhotoList" :key="index" :src="item.url" @click="previewPhoto(index)" />
-                         @click="previewPhoto(index)"/>
           </div>
         </td>
         <td  class="col2 alignLeft"  style="border-bottom-right-radius: 3px">
@@ -229,8 +209,7 @@
           <div class="title" style="margin-bottom: 8px"> 本次补充说明:</div>
           <div  style="display: flex;margin-bottom: 5px">
             <!--          @click="delSupplierPhoto(item)  -->
-              <img v-for="(item,index) in supplierPhotoList" :key="index" class="supplierImg" :src="item.url"
+            <img v-for="(item,index) in supplierPhotoList"  :key="index" class="supplierImg" :src="item.url" @click="viewHandle(item)">
-                   @click="viewHandle(item)">
           </div>
           <div  style="display: flex"  >
             <van-uploader
@@ -247,12 +226,8 @@
   </div>
   <van-dialog v-model="show" title="确定删除此照片吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
   <div class="btn" v-show="auditFormShow">
-      <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}"
+    <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}"  @click="noMultipleClicks(save)">提交</button>
-              @click="noMultipleClicks(save)">提交
+    <button v-if="accountStatus == 2 || accountStatus == 3" :class="{'submit' : true,'loading1' : loading1}" @click="noMultipleClicks(confirmAudit)" >确定审核</button>
-      </button>
-      <button v-if="accountStatus == 2 || accountStatus == 3" :class="{'submit' : true,'loading1' : loading1}"
-              @click="noMultipleClicks(confirmAudit)">确定审核
-      </button>
   </div>
 </div>
 </template>
@@ -267,7 +242,6 @@ import {
 } from "@/api/mine"
 import { ImagePreview } from "vant";
 import {orderReportingList} from "@/api/order";
-
 export default {
   name: "accountingView",
   mixins:[myMixins],
@@ -376,11 +350,7 @@ export default {
         exceptionApprovalStatus:'',
         exceptionApprovalRemark:'',
         auditSuccessRemark:'',
-        accountStatus: '',
+        accountStatus: ''
-        carClothingToolAmount: '',
-        replaceBatteryAmount: '',
-        supplierSettleRatio:{},
-        contractSettleTypeString:'',
       },
       noClick:true,
       loading: false,
@@ -404,24 +374,15 @@ export default {
       return !(this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
           || (this.fixedPrice && parseFloat(this.fixedPrice) > 0 && this.fixedPriceType) || this.supplierId == 500921)
     },
-    isBasementSettle(){
-      return (this.form?.supplierSettleRatio?.code == 5)
-    },
     //保险实拖案件，剔除人保和太平事故
     isCPICDrag(){
-      return this.settleType == '实拖' && this.orderInfo?.contractType == 1 && !['PICC10101', 'PICCSHANGQI', 'PICC101099', 'SAIPCC2021', ''].includes(this.appCode) && !(this.appCode.indexOf("TAIPING") != -1 && this.orderInfo?.malfunctionReason == 2)
+      return this.settleType == '实拖' &&  !['PICC10101','PICCSHANGQI','PICC101099','SAIPCC2021',''].includes(this.appCode)
     },
     isBasement(){
       return this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
     },
   },
   methods:{
-    validateIntegerInput(event) {
-      const regex = /^\d*$/;
-      if (!regex.test(event.target.value)) {
-        event.target.value = event.target.value.replace(/[^\d]/g, '');
-      }
-    },
     viewSettlementDoc(){//查看结算单
       this.$router.push({
         name:"settlementDetail",
@@ -492,18 +453,19 @@ export default {
       })
     },
     async compute() {
-      if(this.orderInfo.contractSettleTypeString == '车主现收'){
+      //现金业务置为0
-        this.form.supplierBasePrice = 0
+      // if(this.form.contractSettleTypeString == '车主现收'){
-        this.form.supplierExtraPrice = 0
+      //   this.form.supplierBasePrice = 0
-        this.form.supplierSettleAmount = 0
+      //   this.form.supplierExtraPrice = 0
-      }else {
+      //   this.form.supplierSettleAmount = 0
+      // } else {
         if (this.form.supplierOtherAmount > 0) {
           if (this.form.supplierOtherAmountRemark == '') {
             this.$alert('请填写其他费用说明');
             return;
           }
         }
-        if (!this.basePriceDisabled && !this.isBasementSettle) {
+        if (!this.basePriceDisabled) {
           //困境的案件，或者一口价案件，基本费用可以输入
           let dilemmaBasePrice = parseFloat(this.form.supplierBasePrice) || 0
           this.form.supplierBasePrice = dilemmaBasePrice
@@ -519,23 +481,12 @@ export default {
           this.form.supplierSettleAmount = data.data.totalPrice
         }
       // }
-        /*if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){
+      if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){
         this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) - parseFloat(this.form.policyAmount || 0)).toFixed(2)
-        }*/
-      }
-      if (this.form.policyAmount && this.form.policyAmount > 0) {
-        this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) - parseFloat(this.form.policyAmount || 0)).toFixed(2)
-      }
-      if (this.form.carClothingToolAmount) {
-        this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) + parseFloat(this.form.carClothingToolAmount || 0)).toFixed(2)
-      }
-      if (this.form.replaceBatteryAmount) {
-        this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) - parseFloat(this.form.replaceBatteryAmount || 0)).toFixed(2)
       }
     },
     async pictureList(){
       let res = await selectRecordPictureList({
-        userOrderId:this.orderInfo.userOrderId,
         taskOrderCostRecordId:this.id,
         state:0,
         postfix:this.postfix
@@ -566,11 +517,10 @@ export default {
       if(res.code === 200){
         this.orderInfo=res.data
         console.log("this.orderInfo",this.orderInfo)
-        this.accountStatus = this.orderInfo.accountStatus?.code
-
         this.serviceType=this.orderInfo.serviceName
         this.taskFlowId=this.orderInfo.taskFlowId
         this.settleType=this.orderInfo.settleType?.label
+        this.accountStatus = this.orderInfo.accountStatus?.code
         this.appCode=this.orderInfo.appCode
         this.fixedPrice = this.orderInfo.fixedPrice
         this.fixedPriceType=this.orderInfo.fixedPriceType
@@ -585,12 +535,11 @@ export default {
         leftCopy(this.form, {...res.data})
         this.auditFormShow = true;//是否显示审核数据
       }
-      console.log("this.form",this.form)
+      if(this.settleType == '实拖'  && this.basePriceDisabled){
-      if (this.settleType == '实拖' && this.basePriceDisabled && !this.isBasementSettle) {
         this.bcState = true
         this.form.supplierSettleMileageAb = 0
         this.form.supplierSettleMileageCa = 0
-      } else if (this.settleType == '单程' && this.basePriceDisabled && !this.isBasementSettle) {
+      }else if(this.settleType == '单程' && this.basePriceDisabled){
         this.abState = true
         this.bcState = true
         this.form.supplierSettleMileageCa = 0
@@ -598,43 +547,25 @@ export default {
           this.bcState = false
           this.form.supplierSettleMileageBc = 0
         }
-      } else if (this.settleType == '全程' && this.basePriceDisabled && !this.isBasementSettle) {
+      }else if(this.settleType == '全程'  && this.basePriceDisabled){
         this.abState = true
         this.bcState = true
         this.caState = true
-      } else if (this.settleType == '全程减半' && this.basePriceDisabled && !this.isBasementSettle) {
+      }else if(this.settleType == '全程减半'  && this.basePriceDisabled){
         this.abState = true
         this.bcState = true
         this.caState = true
       }
-      if (this.form.supplierSettleRatio && this.form.supplierSettleRatio?.code == 5){
-        this.basementFeeState = true
-        this.form.supplierSettleMileageAb = 0
-        this.form.supplierSettleMileageBc = 0
-        this.form.supplierSettleMileageCa = 0
-        this.form.supplierBridgeAmountAb = 0
-        this.form.supplierBridgeAmountBc = 0
-        this.form.supplierBridgeAmountCa = 0
-        this.form.supplierBridgeAmount = 0
-        this.form.supplierDilemmaAmount = 0
-        this.form.supplierOtherAmount = 0
-        this.form.supplierTyreAmount = 0
-        this.form.supplierWaitAmount = 0
-      }else {
       if(this.orderInfo.refBridgeAmountAB > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeAbState = true
       if(this.orderInfo.refBridgeAmountBC > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeBcState = true
       if(this.orderInfo.refBridgeAmountCA > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeCaState = true
       if(this.orderInfo.refWaitFee > 0) this.waitAmountState = true
       if(this.orderInfo.refDilemmaFee > 0) this.dilemmaAmountState = true
       if(this.orderInfo.refTyreNumber > 0 && this.taskFlowId != '1') this.tyreAmountState = true
-      }
       if(this.orderInfo.refBasementFee > 0 && this.taskFlowId != '1' ){
         this.basementFeeState = true
         this.form.supplierBasementFee = this.orderInfo.refBasementFee
       }
-      if (this.form.supplierSettleRatio?.code != 5 && (this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障')){
-        await this.$alert("该案件为困境案件，需确认填写基本费用")
-      }
     },
     cancelBtn(){
       this.goback()
@@ -679,7 +610,6 @@ export default {
       this.files.forEach((file) => {
         formData.append('file', file.file);
       });
-      formData.append('userOrderId', this.orderInfo.userOrderId);
       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));
@@ -735,7 +665,6 @@ export default {
         formData.append('file', file.file);
       });
       // formData.append('accountStatus', accountStatus);
-      formData.append('userOrderId', this.orderInfo.userOrderId);
       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));
@@ -778,7 +707,6 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
-
 .loading,.loading1 {
   position: relative;
 }
@@ -805,57 +733,46 @@ export default {
     transform: translate(-50%, -50%) rotate(360deg);
   }
 }
-
 .btn{
   @include flexColBet;
-
   button{
     @include whLin(152px,39px);
     border-radius: 5px;
     color: #FFFFFF;
     @include fontWeightSize(bold,14px)
   }
-
   .cancel{
     background: #9EA7C0;
   }
-
   .submit{
     background-color: #354D93;
   }
 }
-
 .wrap{
   @include wh(100%,100%);
   background-color: #F4F5F7;
   overflow-y: auto;
 }
-
 .disable{
   background-color: transparent;
   border: none;
   opacity: 1 !important;
 }
-
 .supplierdisable{
   color:  #999999;;
   border: none;
   opacity: 1 !important;
 }
-
 .bgDisable{
   background: rgba(204, 204, 204, .3);
 }
-
 .navBar{
   margin-bottom: 46px;
 }
-
 .title{
   @include fontWeightSize(bold,14px);
   @include colorOpa(#323643,0.66);
 }
-
 .line{
   @include wh(100%,2px);
   opacity: 0.16;
@@ -863,39 +780,32 @@ export default {
   margin-top: 7px;
   border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
 }
-
 .item{
   @include flexCenter;
   font-size: 12px !important;
   font-weight: 400 !important;
-
   .titleLeft{
     opacity: .5;
     line-height: 27px;
   }
-
   .leftTitle{
     opacity: .5;
     @include wh(60px,189px);
   }
-
   .rightContent{
     height: 189px;
     width: calc(100% - 60px);
   }
-
   .fontColor{
     @include fontWeightSize(400,12px);
     color: #000000;
     line-height: 24px;
   }
-
   .rightContent{
     width: calc(100% - 90px);
     @include fontWeightSize(bold,12px);
 
   }
-
   .driverPoiBtn{
     display: inline-block;
     padding: 3px 8px;
@@ -907,58 +817,47 @@ export default {
     cursor: pointer;
   }
 }
-
 img{
   @include wh(35px,15px);
   margin-left: 21px;
 }
-
 .common{
   background-color: #FFFFFF;
   padding: 11px 24px 14px;
   box-sizing: border-box;
   margin-bottom: 10px;
 }
-
 .baseInfo{
-  @include wh(100%, 344px);
+  @include wh(100%,286px);
 
 }
-
 .supplierData{
   width: 100%;
   margin-bottom: 0;
-
   .inpInfo{
     margin: 0 5px;
     color: #323643;
     line-height: 32px;
-
     input{
       border: none;
       text-align: right;
       padding-right: 3px;
       margin-right: 0;
     }
-
     .titleContent{
       @include fontWeightSize(bold,13px);
     }
-
     .flex-between{
       width: 100%;
         @include flexBetCen
     }
-
     .halfOpcity{
       opacity: .5;
     }
-
     .inputContent{
       text-align: right;
     }
   }
-
   .btnComputed{
     width: 48px;
     @include all-height(18px);
@@ -966,7 +865,6 @@ img {
     @include bgFontColor(#FFFFFF,#354D93);
     border-radius: 3px;
   }
-
   .multipleTxt{
     @include wh(100%,87px);
     background: #FAFAFA;
@@ -974,81 +872,67 @@ img {
     border: 1px solid #E6E6E6;
     backdrop-filter: blur(10px);
   }
-
   .btn{
     margin-top: 28px;
   }
 }
-
 .dataType{
   padding: 0 8px;
-
   table {
     width: 100%;
     border-collapse: separate;
     border-spacing: 0;
   }
-
   td {
     padding: 10px;
     border: 1px solid #ccc;
     text-align: center;
   }
-
   .alignLeft{
     text-align: left !important;
     opacity: 1 !important;
-
     .reason{
       @include fontWeightSize(400,11px);
       @include colorOpa(#FF8F37,1);
       //color: #FF8F37;
       //opacity: 1 !important;
     }
-
     .camerImg{
       @include widHeiMar(54px,42px,5px);
       margin-top: 15px;
     }
-
     .supplierImg{
       @include widHeiMar(54px,42px,8px);
       margin-top: 0;
       margin-left: 0;
     }
-
     .title{
       @include fontWeightSize(400,11px);
       opacity: .5;
     }
   }
-
   .col1{
     width: 41%;
     background-color: #E9E9EA;
     @include fontWeightSize(400,12px);
     opacity: 0.55;
   }
-
   .col2{
     width: 58%;
     background-color: #EAEFF6;
     @include fontWeightSize(400,12px);
     color: #0434D0;
-
     input{
       width: 72px;
       border: none;
       background-color:#EAEFF6;
       text-align: center;
     }
-
     input::placeholder {
       color: #0434D0; /* 设置提示内容文字颜色 */
     }
 
   }
-
   .btnCom{
     border: none;
     padding: 4px 7px;
@@ -1061,31 +945,25 @@ img {
     color: #FFFFFF;
     @include fontWeightSize(bold,12px)
   }
-
   .checkData,.supplierShuju{
     color: #323643;
   }
-
   .checkData{
     border-top-left-radius: 3px;
     opacity: 0.66;
   }
-
   .supplierShuju{
     border-top-right-radius: 3px;
   }
-
   .halfOpc{
     opacity: .5;
   }
 }
-
 .twoBtn{
   margin-top: 28px;
   margin-bottom: 30px;
   @include flexColBet;
   @include sizingPadding(0 ,15px);
-
   button{
     @include whLin(152px,39px);
     @include fontWeightSize(bold,14px);
@@ -1093,13 +971,11 @@ img {
     border-radius: 5px;
   }
 }
-
 .btn{
   margin-top: 31px;
   margin-bottom: 31px;
   @include flexColAround;
   box-sizing: border-box;
-
   button{
     line-height: 39px;
     border-radius: 5px;
@@ -1108,7 +984,6 @@ img {
     @include fontWeightSize(bold,14px);
     border: none;
   }
-
   .submit{
     background: #354D93;
   }

src/views/workOrder/aduitCompleteDetail.vue

@@ -11,7 +11,7 @@
         @click-left="goback"
     />
   </div>
-  <div class="baseInfo common" style="height: 344px">
+  <div class="baseInfo common">
     <div class="title">基本信息:</div>
     <div class="line"></div>
     <div class="item">
@@ -47,16 +47,9 @@
     </div>
     <div class="item">
       <span class="titleLeft">扣除责任险费：</span>
-      <span class="content">{{orderInfo.policyAmount}}</span>
+      <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}</span>
-    </div>
-    <div class="item">
-      <span class="titleLeft">车衣费用：</span>
-      <span class="content">{{orderInfo.carClothingToolAmount}}</span>
-    </div>
-    <div class="item">
-      <span class="titleLeft">换电瓶费用：</span>
-      <span class="content">{{orderInfo.replaceBatteryAmount}}</span>
     </div>
+
   </div>
   <div class="baseInfo common">
     <div class="title">审核数据:</div>