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

(cherry picked from commit e768f9c8f8)

.gitignore

@@ -6,7 +6,7 @@ node_modules
 # local env files
 .env.local
 .env.*.local
-/http.js
+src/http.js
 http.js
 # Log files
 npm-debug.log*

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">
@@ -29,5 +30,39 @@
         }
     </script>
     <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
+
+    <script>
+        // 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;
+                if (!clientWidth) return;
+                if (clientWidth < 400) {
+                    clientWidth = 400;
+                }
+                docEl.style.fontSize = 18 * (clientWidth / 650) + 'px';
+            };
+            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("走着了这种饿 ")
+                }*/
+            }
+        })(document, window);
+
+    </script>
+
   </body>
 </html>

src/api/kpi.js

@@ -4,7 +4,7 @@ export function getStatisticsKpiByMonth(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierStatisticsKpiByMonth',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -13,7 +13,7 @@ export function getStatisticsKpi(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierStatisticsKpi',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -23,7 +23,7 @@ export function getDriverStatisticsKpi(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierDriverStatisticsKpi',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -32,7 +32,27 @@ export function getKpiDetailsData(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierKpiDetailsData',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
+// 关键词搜索服务商名称
+export function getSupplierId(key) {
+  return request({
+    url: '/supplier/select/supplier',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}
+// supplier/select/driver 关键词搜索司机名称
+export function getDriverName(key) {
+  return request({
+    url: '/supplier/select/driver',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}

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/reporting.vue

@@ -111,7 +111,7 @@ export default {
   padding: 13px 24px 0;
   width: 100%;
   height: 100%;
-  //overflow-y: auto;
+  overflow-y: auto;
 }
 
 .title {

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/circleChar.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="wrap">
-  <div id="supplierScore" ref="supplierScore" style="width: 100%;height: 125px" @click="handle"></div>
+  <div  id="supplierScore" ref="supplierScore" class="chart" @click="handle"></div>
 </div>
 </template>
 
@@ -14,14 +14,25 @@ export default {
     }
   },
   mounted() {
-    this.drawHandle();
+  /*  if(this.data){
+      this.drawHandle();
+    }*/
+    setTimeout(()=>{
+      this.drawHandle();
+    },500)
+
   },
   methods:{
+    initCircle(){
+      // setTimeout(()=>{
+        this.drawHandle();
+      // },500)
+    },
     handle(){
       if(this.titleText == '投诉率'){
-        console.log(this.titleText)
+        this.$emit('clickComplain')
       }else if(this.titleText == '使用率'){
-        console.log(this.titleText)
+        this.$emit('clickUse')
       }
     },
     // 绘制 总分图表
@@ -95,4 +106,8 @@ export default {
 .img{
   @include whMarLe(12px,10px,4px);
 }
+.chart{
+  width: 100%;
+  height: 125px;
+}
 </style>

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/components/noFit-table.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="wrap">
+    <el-table :data="tableData"
+              stripe
+              border
+              style="width: 100%"
+              height="100%"
+              v-loading="loading"
+              :cell-style="setTableCellStyle"
+              class="custom-table">
+      <template v-if="active===1">
+        <el-table-column v-for="item in labelList" :key="item.prop" :label="item.label" :prop="item.prop" align="center">
+          <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
+        </el-table-column>
+      </template>
+      <template v-else>
+        <el-table-column v-for="column in labelList" :key="column.prop" :prop="column.prop" :label="column.label"
+                         align="center"  min-width="100" :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
+        </el-table-column>
+      </template>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "noFit-table",
+  props: ['tableData', 'labelList', 'loading', 'isMobile','active'],
+  data() {
+    return {}
+  },
+  mounted() {
+  },
+  methods: {
+    setTableCellStyle({ row, column,columnIndex }) {
+      // 月总表格被转置，原始方法失效，重新定义对比
+      if(this.active===1){
+        if(row.month == '3′接单率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 95){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '接单时效(分)'){
+          if(columnIndex){
+            let res=row[column.property]
+            if(res > 5){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '到达时效(分)'){
+          if(columnIndex){
+            let res=row[column.property]
+            if(res > 40){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '总聚合成功率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 80){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '使用率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate < 95){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+        if(row.month == '投诉率(%)'){
+          if(columnIndex){
+            let res=row[column.property]
+            const rate = parseFloat(res && res.replace('%', ''));
+            if(rate > 0.1){
+              return {backgroundColor: '#F1B289'}
+            }
+          }
+        }
+      }
+      // 接单率
+      if(column.property=='threeMinutesReceivingRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.threeMinutesReceivingRate && row.threeMinutesReceivingRate.replace('%', ''));
+          if(rate < 95){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //师傅接单时效》5
+      if(column.property=='receiving'){
+        if(columnIndex){
+          if(row.receiving > 5){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //到达时效》40
+      if(column.property=='arriving'){
+        if(columnIndex){
+          if(row.arriving > 40){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //聚合成功率《80
+      if(column.property=='polymerizationSuccessRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.polymerizationSuccessRate && row.polymerizationSuccessRate.replace('%', ''));
+          if(rate < 80){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //app使用率《95
+      if(column.property=='appRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.appRate && row.appRate.replace('%', ''));
+          if(rate < 95){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //催促率》3
+      if(column.property=='urgeRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.urgeRate && row.urgeRate.replace('%', ''));
+          if(rate > 3){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+      //投诉率》0.1
+      if(column.property=='complainOrderRate'){
+        if(columnIndex){
+          const rate = parseFloat(row.complainOrderRate.replace('%', ''));
+          if(rate > 0.1){
+            return {backgroundColor: '#F1B289'}
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+::v-deep .el-table{
+  font-size: 11px;
+}
+::v-deep .el-table thead{
+  color: #1D2129;
+  font-weight: bold;
+}
+::v-deep .el-table th.el-table__cell.is-leaf {
+  background-color: #E5E6EB;
+}
+::v-deep .el-table .el-table__cell{
+  padding: 4px 0 !important;
+}
+</style>

src/views/vehicle-maintenance/maintenance-application.vue

@@ -24,7 +24,7 @@
       <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
       <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
 <!--      审批中，通过，终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3-->
-      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span>{{detailInfo.repairPoint || ''}}</span></div>
+      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span class="textarea">{{detailInfo.repairPoint || ''}}</span></div>
       <div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)">
         <template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
@@ -40,7 +40,7 @@
       <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ parseInt(detailInfo.mileage) || '' }}km</span></div>
       <div v-if="noPassStatus"><span class="opa">结算类型:</span><span>{{ detailInfo.paymentType?.label || '' }}</span></div>
       <div v-if="noPassStatus && detailInfo.paymentType?.code !=2"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}元</span></div>
-      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}</span></div>
+      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project textarea">{{ detailInfo.information ||'' }}</span></div>
     </div>
 <!--   不通过-->
     <div class="detailInfo"  v-if="noPassStatus  && detailInfo.paymentType?.code !=2">
@@ -335,13 +335,16 @@ export default {
     line-height: 27px;
   }
   .shopName{
-    //width: 100%;
+    width: 100%;
     display: flex;
     align-items: baseline;
+    .textarea{
+      width: calc(100% - 60px);
+    }
   }
   .project{
     color: #E8A524;
-    width: calc(100% -  60px);
+    //width: calc(100% -  60px);
   }
   .shopImgList{
     margin-top: 6px;

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>