查询工单记账图片和修改服务商记账信息 接口添加参数

(cherry picked from commit e768f9c8f8)

package-lock.json

@@ -1713,9 +1713,9 @@
       }
     },
     "@vant/icons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
-      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-3.0.2.tgz",
+      "integrity": "sha512-4OlRVMd0uiDtD9hgSISZW8hB95vU0fFtc41tQchRIyiXkR0tS+DydZOLb8/bQkithrNWhW7Uud38MbKjlJ9lJw=="
     },
     "@vant/popperjs": {
       "version": "1.3.0",
@@ -2030,6 +2030,49 @@
         "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": {
@@ -2194,47 +2237,6 @@
         }
       }
     },
-    "@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",
@@ -3542,10 +3544,16 @@
       "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",
@@ -4880,7 +4888,8 @@
     "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",
@@ -5508,7 +5517,8 @@
     "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",
@@ -8025,12 +8035,12 @@
       }
     },
     "vant": {
-      "version": "2.12.54",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
-      "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.13.2.tgz",
+      "integrity": "sha512-anZbbLqXCq+rUJk10D67mn+V/1/i9tfOTdoR+64B0e+0BzV3KFgpHBF76noLa+yX9i/L+8DeL560WMk0GEN38g==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "^1.7.1",
+        "@vant/icons": "^3.0.2",
         "@vant/popperjs": "^1.1.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
@@ -8245,6 +8255,7 @@
       "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.12.54",
+    "vant": "^2.13.2",
     "vue": "^2.6.14",
     "vue-router": "^3.0.7",
     "vuex": "^3.6.2",

public/index.html

@@ -3,6 +3,7 @@
   <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">
@@ -34,11 +35,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;
@@ -48,13 +49,20 @@
             if (!doc.addEventListener) return;
             var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
             if (isMobile) {// 是移动端不变
-
+                // console.log("是移动端不变")
             }else{
-                win.addEventListener(resizeEvt, recalc, false);
-                doc.addEventListener('DOMContentLoaded', recalc, false);
+                if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
+                    // console.log("执行了执行了")
+                    win.addEventListener(resizeEvt, recalc, false);
+                    doc.addEventListener('DOMContentLoaded', recalc, false);
+                }
+                /*else{
+                    console.log("走着了这种饿 ")
+                }*/
             }
-            // console.log("isMobile",isMobile)
         })(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 insertRecordPicture(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"/>个</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
         </div>
         <div class="item">
           <div class="leftKiloMeters">等候费</div>
@@ -82,7 +82,7 @@ export default {
         bridgeAmountAb:'',
         bridgeAmountBc:'',
         bridgeAmountCa:'',
-        tyreNumber:'',
+        tyreNumber:0,
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
@@ -98,6 +98,15 @@ 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/kpi/components/common-table.vue

@@ -1,45 +0,0 @@
-<template>
-  <div class="wrap">
-    <el-table :data="tableData"
-              stripe
-              border
-              style="width: 100%"
-              class="custom-table">
-      <el-table-column
-          v-for="(column,i) in tableData"
-          :key="i"
-          :prop="column.prop"
-          :label="column.label"
-          :fixed="i===0"
-          :width="i===0 ? '40' :'80'"
-          align="center"
-      >
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "commonTable",
-  props: ['tableData'],
-  data() {
-    return {}
-  },
-  mounted() {
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="scss">
-@import "@/styles/mixin.scss";
-::v-deep .el-table thead{
-  font-size: 11px;
-  color: #1D2129;
-  font-weight: bold;
-}
-::v-deep .el-table th.el-table__cell.is-leaf {
-  background-color: #E5E6EB;
-}
-</style>

src/views/kpi/kpiIndex.vue

@@ -210,7 +210,7 @@
               v-for="item in driverselectOption"
               :key="item.id"
               :label="item.name"
-              :value="item.id">
+              :value="item.name">
           </el-option>
         </el-select>
       </div>
@@ -238,7 +238,7 @@
     <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
       <div :class="{'comTab':true,'detailTable':isMobile}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
-                     :loading="loading"></noFit-table>
+                     ></noFit-table>
       </div>
 <!--      <el-pagination
           small
@@ -250,6 +250,7 @@
           :total="total">
       </el-pagination>-->
       <el-pagination
+          v-if="active !== 9"
           small
           :page-sizes="[20, 50, 100]"
           :current-page.sync="pageNum"
@@ -323,7 +324,7 @@ export default {
       pageSize: 20,
       total: 0,
       swithVal: true,
-      supplierId:'',//1128
+      supplierId:'',
       selectLoading: false,
       selectOption: [],
       driverId:'',//68517
@@ -351,7 +352,6 @@ export default {
   },
   methods: {
     async selectSupplierNameHanldle(){
-      console.log("supplierId",this.supplierId)
       await this.getData()
       setTimeout(()=>{
         this.$refs.Doughnut1.initCircle()
@@ -361,7 +361,7 @@ export default {
         this.$refs.Doughnut5.initCircle()
         this.$refs.Doughnut6.initCircle()
         this.$refs.Doughnut7.initCircle()
-      },1000)
+      },1500)
     },
     async remoteMethod(query) {
       if (query !== '') {
@@ -398,6 +398,8 @@ export default {
       console.log("搜索按钮")
     },
     async changeHandle() {
+      this.v1=[]
+      this.v2=[]
       await this.twoTabHanldeData();
       await this.drawLine();
     },
@@ -435,6 +437,7 @@ export default {
       this.activeIndex = 0;
       this.detailList = [];
       this.labelList = [];
+      this.driverName=''
       this.getData();
       if (this.active === 1) {
         setTimeout(() => {
@@ -507,6 +510,7 @@ export default {
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
+          formatter: '{c}%'
         }
       },
         {
@@ -854,19 +858,37 @@ export default {
           this.indexData = res.data;
           this.supplierName=res.data?.supplierName
           this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100
-          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
           if (this.indexData.refuseOrderRate % 1 !== 0) {
             this.indexData.refuseOrderRate = this.indexData.refuseOrderRate.toFixed(2);
           }
+          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
           if (this.indexData.timeoutOrderRate % 1 !== 0) {
             this.indexData.timeoutOrderRate = this.indexData.timeoutOrderRate.toFixed(2);
           }
           this.indexData.complainOrderRate=this.indexData.complainOrderRate*100
+          if (this.indexData.complainOrderRate % 1 !== 0) {
+            this.indexData.complainOrderRate = this.indexData.complainOrderRate.toFixed(2);
+          }
           this.indexData.customerSatisfaction=this.indexData.customerSatisfaction*100
+          if (this.indexData.customerSatisfaction % 1 !== 0) {
+            this.indexData.customerSatisfaction = this.indexData.customerSatisfaction.toFixed(2);
+          }
           this.indexData.threeMinutesContactRate=this.indexData.threeMinutesContactRate*100
+          if (this.indexData.threeMinutesContactRate % 1 !== 0) {
+            this.indexData.threeMinutesContactRate = this.indexData.threeMinutesContactRate.toFixed(2);
+          }
           this.indexData.urgeRate=this.indexData.urgeRate*100
+          if (this.indexData.urgeRate % 1 !== 0) {
+            this.indexData.urgeRate = this.indexData.urgeRate.toFixed(2);
+          }
           this.indexData.appRate=this.indexData.appRate*100
+          if (this.indexData.appRate % 1 !== 0) {
+            this.indexData.appRate = this.indexData.appRate.toFixed(2);
+          }
           this.indexData.polymerizationSuccessRate=this.indexData.polymerizationSuccessRate*100
+          if (this.indexData.polymerizationSuccessRate % 1 !== 0) {
+            this.indexData.polymerizationSuccessRate = this.indexData.polymerizationSuccessRate.toFixed(2);
+          }
         } else if ([1, 2].includes(this.active)) {
           let res = await getStatisticsKpi({
             startTime: this.active === 1 ? this.startMonthTime : this.startTime,
@@ -953,7 +975,7 @@ export default {
           });
           this.total = result.total
           this.detailList = result.data?.map(item => {
-            let formatVal = dayjs(item.createTime).format('DD');
+            let formatVal =item.createTime ? dayjs(item.createTime).format('DD') : '';
             return {...item, date: formatVal};
           });
           this.loading = false
@@ -1178,11 +1200,13 @@ export default {
                 this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
               })
             } else {
+              console.log(" this.detailList师傅接单时效", this.detailList)
               this.detailList?.map(item => {
                 this.v1.push(item.arriving)
                 this.v2.push(item.polymerizationSuccessArriving)
                 this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
               })
+              console.log("this.v1",this.v1,this.v2,this.v3)
             }
             this.detailList?.map((item,index) => {
               const columnObj = {}
@@ -1202,7 +1226,7 @@ export default {
             if (this.swithVal) {
               this.detailList?.map(item => {
                 this.v3.push(item.trailArriving)
-                this.v4.push(item.trailPolymerizationSuccessArriving)
+                this.v4.push(item.trailPolymerizationSuccessArsriving)
                 this.v5.push(item.trailFortyMinutesArrivalRate  ? item.trailFortyMinutesArrivalRate.replace('%', '') : item.trailFortyMinutesArrivalRate)
               })
             } else {
@@ -1694,6 +1718,10 @@ export default {
   ::v-deep .el-input__inner{
     height: 30px;
   }
+  ::v-deep .el-input__suffix {
+    top: 4px; /* 给清除按钮预留空间 */
+  }
+
 }
 .comTab {
   width: 100%;

src/views/workOrder/aduitCompleteDetail.vue

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