story#7062,供应商培训和财务发票上传挂钩--曹智龙

src/api/mine.js

@@ -317,3 +317,12 @@ export function unifiedOCRWithCompress(data){
         data
     })
 }
+
+// 服务商是否培训
+export function jumpPage(data){
+    return request({
+        url:'/supplierAppV2/dispatchApp/user/jumpPage',
+        method:'POST',
+        data
+    })
+}

src/views/index/uploadInvoice.vue

@@ -76,7 +76,7 @@
   import { Decimal } from 'decimal.js';
   import { Dialog } from "vant";
   import { myMixins } from "@/utils/myMixins"
-  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
+  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch, jumpPage} from "@/api/mine"
   export default {
     name: "uploadInvoice",
     mixins:[ myMixins ],
@@ -132,6 +132,10 @@
       }
     },
     methods: {
+      async getJumpHandler() {
+        let res = await jumpPage();
+        return res
+      },
       async initData() {
         this.list = JSON.parse(localStorage.getItem('list'));
         this.batchIds = [];
@@ -230,7 +234,12 @@
         }).catch(() => {
         });
       },
-      beforeRead (file) {
+      async beforeRead (file) {
+        let res = await this.getJumpHandler();
+        if(res?.data?.jump) {
+          this.$message.warning("您有没有完成的培训，请在中道调度APP上完成培训，再进行发票上传")
+          return false
+        }
         const FileExt = file.name.replace(/.+\./, "");
         if (['jpg', 'png', 'jpeg', 'pdf', 'ofd'].indexOf(FileExt.toLowerCase()) === -1) {
           this.$toast('请上传后缀名为jpg、jpeg、png、pdf、ofd的文件！')

src/views/index/vehicleAdd.vue

@@ -308,7 +308,7 @@ export default {
       }else{
         this.supplierServiceList = this.oldSupplierServiceList
       }
-
+      this.setDefault();
     },
   },
 
@@ -321,6 +321,23 @@ export default {
     }
   },
   methods:{
+    setDefault() {
+      if( this.vehicleLicenseInfo?.vehicleType?.includes('小型') || this.vehicleLicenseInfo?.vehicleType?.includes('微型') || this.vehicleLicenseInfo?.vehicleType?.includes('普通') || this.vehicleLicenseInfo?.vehicleType?.includes('摩托') ) {
+        this.vehicleTypes.map(item => {
+          if( item.value == 1 || item.value == 9 ) {
+            item.disabled = false;
+          } else {
+            item.disabled = true;
+          }
+        })
+        this.$forceUpdate();
+      } else {
+        this.vehicleTypes.map(item => {
+          item.disabled = false;
+        })
+        this.$forceUpdate();
+      }
+    },
     getVehicleLicense(color) {
       if( color == '蓝' ) {
         this.vehicleLicense = 1
@@ -402,6 +419,7 @@ export default {
         this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
         this.vehicleLicenseInfo.issueAuthority = frontInfo?.seal;
+        this.setDefault();
       }
     },
     async vehicleBackOcrHandler() {     // 行驶证副页 ocr 识别

src/views/secondHandCar/forSale.vue

@@ -16,7 +16,6 @@
             :preview-src-list="[item]"
             class="swipeImg"
           />
-<!--          <img v-if="item" class="swipeImg" :src="item" />-->
         </el-carousel-item>
       </el-carousel>
       <van-swipe v-else  @change="onChange" :autoplay="3000">
@@ -34,8 +33,9 @@
             <span>{{ detailInfo.boardType?.label }}</span>
             <span>{{ detailInfo.licenseType?.label }}</span>
             <span>{{detailInfo.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '')}}</span>
-            <span>{{  formatToWan(detailInfo.mileage) }}公里</span>
             <span>{{ detailInfo.emissionStandard?.label }}</span>
+            <span>{{ detailInfo.underpanBrand }}</span>
+            <span>{{  formatToWan(detailInfo.mileage) }}公里</span>
           </div>
           <div class="time">
             <span>{{ detailInfo.createTime?.substring(0,10) }}</span><span>{{ detailInfo.areaName }}</span><span>发布</span>

src/views/secondHandCar/indexList.vue

@@ -119,7 +119,7 @@
               <div class="right">
                 <div class="title">{{item.vehicleType}}</div>
                 <div v-if="activeTab==0" class="type">{{ item.boardType?.label ? item.boardType?.label+' | ' : ''}}  {{ item.licenseType?.label }} |
-                  {{ item.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '') }} | {{item.emissionStandard?.label}} | {{ formatToWan(item.mileage) }}公里</div>
+                  {{ item.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '') }} | {{item.emissionStandard?.label}}  | {{item.underpanBrand}} | {{ formatToWan(item.mileage) }}公里</div>
                 <div v-else class="type">{{ item.boardType?.label ? item.boardType?.label+' | ' : ''}} {{item.emissionStandard?.label}}</div>
                 <div class="date" v-show="activeTab==0 && item.registerDate">注册日期： {{item.registerDate?.substring(0,10)}}</div>
                 <div class="priceWrap" v-if="activeTab==0" >
@@ -354,6 +354,8 @@ export default {
       sessionStorage.setItem('areaCode',String(this.areaCode));
       sessionStorage.setItem('areaName',this.areaName);
       sessionStorage.setItem('dateVal',this.dateVal);
+      sessionStorage.setItem('brandModel',this.brandModel);
+      sessionStorage.setItem('underpanBrand',this.underpanBrand);
     },
     getSearchVal(){
       this.activeTab = Number(sessionStorage.getItem('indexActiveTab')) || 0;
@@ -367,6 +369,8 @@ export default {
       this.areaCode=Number(sessionStorage.getItem('areaCode')) || '';
       this.areaName=sessionStorage.getItem('areaName') || '';
       this.dateVal=sessionStorage.getItem('dateVal') || '';
+      this.brandModel=sessionStorage.getItem('brandModel') || '';
+      this.underpanBrand=sessionStorage.getItem('underpanBrand') || '';
     },
     goMine(){//我的发布
       this.$router.push({ name: "mineRelease"})
@@ -428,6 +432,8 @@ export default {
         areaCode:this.areaCode,
         startTime:this.startTime,
         endTime:this.endTime,
+        brandModel:this.brandModel,
+        underpanBrand:this.underpanBrand,
       })
       this.total=res.total
       if(this.pageNum == 1){// 第一页直接赋值
@@ -686,9 +692,9 @@ export default {
         color: #282828;
         line-height: 23px;
         width: 200px;
-        white-space: nowrap; /* 强制文本在一行显示 */
+       /* white-space: nowrap; !* 强制文本在一行显示 *!
-        overflow: hidden; /* 隐藏超出部分 */
+        overflow: hidden; !* 隐藏超出部分 *!
-        text-overflow: ellipsis; /* 超出部分显示省略号 */
+        text-overflow: ellipsis; !* 超出部分显示省略号 *!*/
       }
       .date{
         font-weight: 400;

src/views/vehicle-maintenance/vehicle-alarm-list.vue

@@ -25,12 +25,12 @@
               <div class="label">{{item.startTime}}</div>
             </div>
             <div class="alarm_content">
-              <div class="label">车辆名称:</div>
+              <div class="label flexLabel">车辆名称:</div>
-              <div class="content">{{item.vehicleName}}</div>
+              <div class="content flexContent">{{item.vehicleName}}</div>
             </div>
             <div class="alarm_content">
-              <div class="label">报警详情:</div>
+              <div class="label flexLabel">报警详情:</div>
-              <div class="content">{{item.alarmRemark}}</div>
+              <div class="content flexContent">{{item.alarmRemark}}</div>
             </div>
           </div>
         </div>
@@ -200,6 +200,14 @@
       .label {
         color: rgba(0, 0, 0, 0.5);
       }
+      .flexLabel {
+        min-width: 50px;
+        flex-shrink: 0;
+      }
+      .flexContent {
+        flex: 1;
+        word-break: break-all;
+      }
       .title_left {
         display: flex;
         align-items: center;