story#7552 潜在服务商，服务类型(字段替换)

src/api/mine.js

@@ -111,7 +111,6 @@ export function getOrCodeInfo(data){
     return request({
         url:'/agg-api/wxcp/createContactQrCode',
         method:'POST',
-        contentType:'application/json',
         data
     })
 }

src/views/index/supplierAdd.vue

@@ -65,7 +65,7 @@
                     ref="tree"
                     :highlight-current="true"
                     :expand-on-click-node="false"
-                    :data="supplierServiceList"
+                    :data="bigServiceList"
                     :props="defaultProps">
                   </el-tree>
                 </template>
@@ -81,6 +81,7 @@
                     ref="areaCascader"
                     popper-class="responsive-cascader"
                     :popper-append-to-body="false"
+                    filterable
                     clearable></el-cascader>
                 </template>
               </van-field>
@@ -110,7 +111,7 @@
 <script>
   import {leftCopy} from  "@/utils/common"
   import QRCode from 'qrcode'
-  import { uploadImage, supplierServicePartTree, ocrHandler, unifiedOCRWithCompress, getArea, saveSupplier, getSupplierInfo, getOrCodeInfo, getContactQrCodeResult } from "@/api/mine"
+  import { uploadImage, ocrHandler, unifiedOCRWithCompress, getArea, saveSupplier, getSupplierInfo, getOrCodeInfo, getContactQrCodeResult } from "@/api/mine"
   import {myMixins} from "@/utils/myMixins"
   import {Dialog} from "vant";
   export default {
@@ -143,9 +144,19 @@
         areaShow: false,
         areaList: [],
         supplierServiceList: [],
+        bigServiceList: [{
+          id: 1002,
+          title: '拖车服务'
+        }, {
+          id: 1003,
+          title: '抢修服务'
+        }, {
+          id: 1004,
+          title: '困境救援'
+        }],
         defaultProps: {
           children: 'children',
-          label: 'title'
+          label: 'title',
         },
         areaProps: { multiple: true, checkStrictly: true,  value: 'id',label: 'title', emitPath: false, },
         configId: '',
@@ -160,7 +171,7 @@
         await this.getInfoHandler();
       }
 
-      await this.getSupplierServiceTree();
+      // await this.getSupplierServiceTree();
     },
     methods: {
       async QrCodeHandler() {
@@ -194,8 +205,8 @@
         if(this.companyPhoto) {
           this.companyPhotoList = [{ url : this.companyPhoto }];
         }
-        if( _data.serviceType ) {
+        if( _data.service ) {
-          this.$refs.tree.setCheckedKeys(_data.serviceType.split(','))
+          this.$refs.tree.setCheckedKeys(_data.service.split(','))
         }
         if(_data?.serviceAreaCode) {
           this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item)));
@@ -250,13 +261,23 @@
             _node.map(item => {
               checkArr.push(item.data.id)
             })
+
+           /* let treeArr = this.$refs.tree.getCheckedKeys();
+            let childrenTreeArr = [];
+            treeArr.map(item => {
+              let _arr = this.supplierServiceList.filter(_item => _item.id == item) || []   // 获取对应的大类
+              _arr[0]?.children?.map(childItem => {
+                childrenTreeArr?.push(childItem?.id)
+              })
+            })
+            let allArr = [...treeArr, ...childrenTreeArr]*/
             let res = await saveSupplier({
               id: this.id,
               ...this.form,
               idCardFrontUrl: this.idFrontPhoto,
               idCardBackUrl: this.idBackPhoto,
               businessLicense: this.companyPhoto,
-              serviceType: this.$refs.tree.getCheckedKeys().join(','),
+              service: this.$refs.tree.getCheckedKeys().join(',') ,
               serviceAreaCode: checkArr.join(','),
               wechatId: this.wechatId,
             });
@@ -276,13 +297,18 @@
         let res = await getArea();
         this.areaList = res?.data;
       },
-      async getSupplierServiceTree(){
+      /*async getSupplierServiceTree(){
         let res = await supplierServicePartTree({
-          serviceTypes: '1002,1003',
+          serviceTypes: '1002,1003,1004',
           treeType: 2
         });
         this.supplierServiceList=res.data
-      },
+        this.bigServiceList = [];
+        res.data.map(item => {
+          let obj = {...item, children: null}
+          this.bigServiceList.push(obj)
+        })
+      },*/
       confirmHandle(val){
         this.region=[]
         val?.forEach(item => this.region.push(item.name))
@@ -551,4 +577,6 @@
       font-size: 13px !important;
     }
   }*/
+
+
 </style>

src/views/index/supplierInfo.vue

@@ -74,7 +74,7 @@
           </div>
           <div class="info_item">
             <div class="label">服务能力：</div>
-            <div class="content service_color">{{supplierInfo?.serviceName}}</div>
+            <div class="content service_color">{{supplierInfo?.serviceCategoryName}}</div>
           </div>
           <div class="info_item">
             <div class="label">拖车数量：</div>

src/views/index/vehicleAdd.vue

@@ -256,7 +256,6 @@
         :deletable="!disabledShow"
         max-count="1"
         :preview-size="54"
-        accept="image "
       />
     </div>
     <div class="lineBot"></div>
@@ -365,6 +364,7 @@ export default {
       trailerService: '',//拖车服务
       isJoin:'',//是否参与
       hasLiabilityInsurance: '',   // 有无责任险
+      liabilityInsuranceAudit: '',
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
       // result: [],
@@ -509,7 +509,7 @@ export default {
     },
     disabledShow() {
       if (this.id) {
-        return !this.permissonList.includes('hasInsuranceAudit')
+        return !this.permissonList.includes('hasInsuranceAudit') && [2,3].includes(this.liabilityInsuranceAudit)
       } else {
         return false
       }
@@ -812,6 +812,7 @@ export default {
       this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
       this.hasLiabilityInsurance = result.hasLiabilityInsurance
       this.insuranceCorp = result.insuranceCorp;
+      this.liabilityInsuranceAudit = result.liabilityInsuranceAudit
       if(this.insurancePicturePhoto) {
         this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
       }

src/views/index/workOrderDetail.vue

@@ -46,7 +46,7 @@
         <div class="item">
           <span class="leftTitle fontColor">服务类型:</span><span class="rightContent">{{ orderDetailInfo.taskServiceName }}</span>
         </div>
-        <div class="item">
+        <div class="item" v-if="orderDetailInfo?.userVehicleTypeString">
           <span class="leftTitle fontColor">车辆类型:</span><span class="rightContent">{{ orderDetailInfo.userVehicleTypeString }}<van-icon class="icon" name="question" @click="showCarTypeShow = true" /></span>
         </div>
         <div class="item">