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/api/secondHandCar.js

@@ -94,3 +94,12 @@ export function saveRecord(data){
     data
   })
 }
+// 审核不通过再次提交
+export function auditCarInfoAgain(data){
+  return request({
+    url: '/toc-user/car-app/auditCarInfoAgain',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}

src/router/second-hand-router.js

@@ -55,5 +55,13 @@ const secondHandCar = [
             title: '免责声明',
         }
     },
+    {
+        path: '/sellingInfo',
+        name: 'sellingInfo',
+        component: () => import('@/views/secondHandCar/sellingInfo.vue'),
+        meta:{
+            title: '售出信息',
+        }
+    },
 ]
 export default secondHandCar

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

@@ -268,7 +268,6 @@ export default {
    if( this.form.vehicleRearPhoto ) {
      this.vehicleRearPhotoList = [{url: this.form.vehicleRearPhoto}]
    }
-    // console.log("carSourceFormInfo",carSourceFormInfo)
    if(carSourceFormInfo.otherImgSrc0){
      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc0)
      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc0})
@@ -293,7 +292,6 @@ export default {
       this.otherImgSrc.push(carSourceFormInfo.otherImgSrc5)
       this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc5})
     }
-    // console.log("--",this.vehicleLicensePhotoList,this.vehicleAnglePhotoList,this.otherImgSrcList)
   },
   methods:{
     validatePrice(value) {
@@ -480,21 +478,6 @@ export default {
           otherPhoto:this.otherImgSrc?.join(',')
         })
         this.clearStorageFormInfo()
-        if(res.code == 200 && !res.msg){
-          this.$toast('发布成功')
-          if(this.isWebFunc()){
-            setTimeout(()=>{
-              this.closeParentDialog()
-            },1000)
-          }else{
-            setTimeout(()=>{
-              this.$router.push({ name: "mineRelease"})
-              sessionStorage.setItem('mineActiveTab',String(1) )
-            },1000)
-          }
-        }else{
-          this.$toast(res.msg)
-        }
         console.log("车源发布publishCarInfo",res)
       } catch (e){
         console.log('e',e)
@@ -605,7 +588,6 @@ export default {
 }
 .navBar{
   margin-bottom: 46px;
-
 }
 .noContentAudit{
   height: calc(100% - 42px);

src/views/secondHandCar/components/upload-common.vue

@@ -8,10 +8,11 @@
       :preview-full-image="false"
       :max-count="multiple ? 6 : 1"
       @click-preview="handlePreviewClick"
+      :deletable="showDel"
   >
     <div class="upload">
       <img class="icon" src="@/assets/secondHandCar/upload.png"/>
-      <span class="text">{{ displayText }}</span>
+      <span class="text" v-show="!['交易合同','回收证明'].includes(displayText)">{{ displayText }}</span>
     </div>
     <template v-if="text.includes('其他照片')" #preview-cover="{ index }">
       <div class="preview-cover van-ellipsis">{{ index + 1 }}/6</div>
@@ -36,6 +37,10 @@ export default {
     files: {
       type: Array,
       default: () => []
+    },
+    showDel:{
+      type: Boolean,
+      default: true
     }
   },
   data() {

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/secondHandCar/mineRelease.vue

@@ -32,7 +32,7 @@
               <div class="right">
                 <div class="title">
                   <span>{{item.vehicleType}}</span>
-                  <img class="titleImg"  :src="getStatus(item.status?.code)" />
+                  <img :class="{'titleImg':true,bigImg:[8,9].includes(item.status?.code)}"  :src="getStatus(item.status?.code)" />
                 </div>
 
                                 <div v-if="activeTab==0" class="type">{{ item.boardType?.label  ? item.boardType?.label+' | ' : ''}}  {{ item.licenseType?.label }} |
@@ -50,8 +50,10 @@
                 <div class="btnWrap">
                   <img v-if="(activeTab==1 && item.status?.code==3) || activeTab==2"  @click.stop="noMultipleClicks(reviseHandle,item)" class="revise"  src="@/assets/secondHandCar/revise.png" />
                   <img v-if="(activeTab==1 && (item.status?.code==1 || item.status?.code==3)) || activeTab==2"  @click.stop="noMultipleClicks(xiajiaHandle,item)" class="xiajia"  src="@/assets/secondHandCar/xiajia.png" />
+                  <img v-if="(activeTab==1 && item.status?.code==9)"  @click.stop="noMultipleClicks(reviseXiajiaHandle,item)" class="reshangjia"  src="@/assets/secondHandCar/reviseXiajia.png" />
                   <img v-if="((activeTab==3 && item.status?.code==7) || activeTab==2) && !isToday(item.wapTime)"  @click.stop="noMultipleClicks(polishHandle,item)" class="polish"  src="@/assets/secondHandCar/polish.png" />
                   <img v-if="activeTab==3 && item.type==1 && item.downReason=='不卖了' "  @click.stop="noMultipleClicks(reShangJiaHandle,item)" class="reshangjia"  src="@/assets/secondHandCar/reshangjia.png" />
+                  <img v-if="(activeTab==3 &&  [10,11].includes(item.status?.code)) || (activeTab==1 && [8,9].includes(item.status?.code))"  @click.stop="noMultipleClicks(viewXiajiaHandle,item)" class="reshangjia"  src="@/assets/secondHandCar/viewXiajia.png" />
                 </div>
                 <div class="line"></div>
               </div>
@@ -63,13 +65,14 @@
     <div class="empty" v-show="show">
       <img src="@/assets/empty.png" />
     </div>
-    <van-popup v-model="poupShow" closeable round  :style="{ width: '70%',height:'18%' }"  class="poupWrap">
+    <van-popup v-model="poupShow" closeable round  :style="{ width: '70%',height:xiajiaInfo.proprietary==1 && xiajiaInfo?.type==1 && radio==1 ? '20%' : '18%' }"  class="poupWrap">
       <span class="title">下架原因</span>
       <div class="poupContent">
         <van-radio-group v-model="radio" class="radioWrap">
           <van-radio name="1">{{xiajiaInfo?.type==1 ? '已售出' : '已买到'}}</van-radio>
           <van-radio name="2">{{xiajiaInfo?.type==1 ? '不卖了' : '不买了'}}</van-radio>
         </van-radio-group>
+        <div v-show="xiajiaInfo.proprietary==1 && xiajiaInfo?.type==1 && radio==1" class="tip">注：已售出需前往完善售出信息</div>
         <div class="btnWrap">
           <div class="btn" @click="noMultipleClicks(submitHandle)">确认</div>
         </div>
@@ -121,7 +124,9 @@ export default {
     },
     onRefresh() {
       this.pageNum=1
-      setTimeout(() => {
+      setTimeout(async () => {
+        // this.pageList=[]
+        await this.getList()
         this.$toast('刷新成功');
         this.isLoading = false;
       }, 1000);
@@ -158,13 +163,19 @@ export default {
         this.$toast('下架原因不能为空')
         return
       }
-      await usedCarRemove({
+      if(this.xiajiaInfo.proprietary==1 && this.xiajiaInfo?.type==1 && this.radio==1){
-        id:this.xiajiaInfo.id,
+        this.poupShow=false
-        downReason:this.radio==1 ? (this.xiajiaInfo?.type==1 ? '已售出' : '已买到') : (this.xiajiaInfo?.type==1 ? '不卖了' : '不买了')
+        this.radio = ''
-      })
+        this.$router.push({ name: "sellingInfo", query: {id:this.xiajiaInfo.id,type:'revise'}})
-      this.poupShow=false
+      }else{
-      this.radio = ''
+        await usedCarRemove({
-      await this.getList()
+          id:this.xiajiaInfo.id,
+          downReason:this.radio==1 ? (this.xiajiaInfo?.type==1 ? '已售出' : '已买到') : (this.xiajiaInfo?.type==1 ? '不卖了' : '不买了')
+        })
+        this.poupShow=false
+        this.radio = ''
+        await this.getList()
+      }
     },
     reviseHandle(item){//修改
       this.$router.push({
@@ -191,8 +202,17 @@ export default {
         console.log('reShangJiaHandle',e)
       }
     },
+    reviseXiajiaHandle(item){//修改下架
+      console.log("修改下架",item)
+      this.$router.push({ name: "sellingInfo", query: {id:item.id,type:'revise'}})
+    },
+    viewXiajiaHandle(item){//查看下架
+      console.log("查看下架",item)
+      this.$router.push({ name: "sellingInfo", query: {id:item.id,type:'view'}})
+    },
     xiajiaHandle(item){//下架
       this.poupShow=true
+      this.radio = ''
       this.xiajiaInfo=item
     },
     isToday(time) {
@@ -214,14 +234,24 @@ export default {
     },
     getStatus(i){
       switch (i){
+        case 1://待审核
+          return require('@/assets/secondHandCar/wait_verify.png')
+        case 3://审核不通过
+          return require('@/assets/secondHandCar/nopass.png')
         case 5://已发布
           return require('@/assets/secondHandCar/fabuing.png')
         case 6://已下架
           return require('@/assets/secondHandCar/alreayXiajia.png')
         case 7://信息过期
           return require('@/assets/secondHandCar/expire.png')
-        case 1://待审核
+        case 8://下架待审核
-          return require('@/assets/secondHandCar/wait_verify.png')
+          return require('@/assets/secondHandCar/xiajia_warting.png')
+        case 9://下架不通过
+          return require('@/assets/secondHandCar/xiajia_nopass.png')
+        case 10://下架售出
+          return require('@/assets/secondHandCar/xiajia_saled.png')
+        case 11://下架报废
+          return require('@/assets/secondHandCar/xiajia_scrap.png')
         default://未通过
           return require('@/assets/secondHandCar/nopass.png')
       }
@@ -364,6 +394,10 @@ export default {
         width: 43px;
         height: 14px;
       }
+      .bigImg{
+        width: 60px;
+        height: 16px;
+      }
     }
     .type{
       font-weight: 400;
@@ -477,6 +511,11 @@ export default {
       }
     }
   }
+  .tip{
+    color: red;
+    margin-left: 25px;
+    margin-bottom: 6px;
+  }
 }
 .empty{
   @include flexTwoCenter;

src/views/secondHandCar/sellingInfo.vue

@@ -0,0 +1,489 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <img class="bg" src="@/assets/secondHandCar/bg.png" />
+      <div class="navWrap">
+        <div v-if="isWebFunc()" style="opacity: 0;" class="back"></div>
+        <img v-else class="back" @click="h5GoBack" src="@/assets/secondHandCar/back.png" />
+        <img class="navIcon" src="@/assets/secondHandCar/sellingInfo.png" />
+<!--        <span class="title">售出信息</span>-->
+        <div style="opacity: 0;" class="back"></div>
+      </div>
+      <div class="audit" v-if="type=='revise' && status==9 && auditRemark">
+        <span><img class="noAudit" src="@/assets/secondHandCar/noAudit.png" />审核不通过：</span>
+        <span>{{auditRemark }}</span>
+      </div>
+    </div>
+    <div class="contentWrap" :class="[!(status==9 && auditRemark) ? 'noReasonWrap': 'hasReasonWrap']">
+      <div  class="content">
+        <div class="item" style="align-items: center">
+          <span> <span class="star">*</span>售出渠道 </span>
+          <van-radio-group v-model="form.salesChannel" direction="horizontal" class="radioWrap"  :disabled="type !== 'revise'">
+            <van-radio name="1" :class="{'checked':form.salesChannel==1,'salesChannelRadio':true,'radio':true}">中道二手拖车</van-radio>
+            <van-radio name="2" :class="{'checked':form.salesChannel==2,'salesChannelRadio':true}">本地线下</van-radio>
+            <van-radio name="3" :class="{'checked':form.salesChannel==3,'salesChannelRadio':true}">报废</van-radio>
+          </van-radio-group>
+        </div>
+        <template v-if="form.salesChannel==3">
+          <div class="item" style="margin-top: 8px">
+            <span style="line-height: 0.5rem"> <span class="star">*</span>报废机动车回收证明 </span>
+            <upload-common  @success3="getRecyclePhoto"   @delete3="deleteImgRecycle" :show-del="type == 'revise'"
+                            :text="'回收证明'" :multiple="false"  :files.sync="recyclePathList"/>
+          </div>
+          <div class="item">
+            <span> <span class="star">*</span>报废年月</span>
+            <van-field
+                :disabled="type !== 'revise'"
+                @focus="showDatetime = true"
+                class="radioWrap"
+                readonly
+                v-model="scrapTimeFormatShow"
+                input-align="right"
+            >
+            </van-field>
+          </div>
+        </template>
+        <template v-else>
+          <div class="item">
+            <span> <span class="star">*</span>购买方 </span>
+            <van-field
+                :disabled="type !== 'revise'"
+                class="radioWrap"
+                v-model="form.purchaser"
+                input-align="right"
+            > </van-field>
+          </div>
+          <div class="item">
+            <span> <span class="star">*</span>售出价格 </span>
+            <van-field
+                :disabled="type !== 'revise'"
+                type="number"
+                class="radioWrap"
+                v-model="form.sellPrice"
+                input-align="right"
+            >
+              <template slot="right-icon" >
+                <span style="white-space: nowrap;  margin-left: 8px;"> 元 </span>
+              </template>
+            </van-field>
+          </div>
+          <div class="item"  style="margin-top: 8px">
+            <span> <span class="star">*</span>交易合同 </span>
+            <upload-common @success3="getTradePhoto"   @delete3="deleteImgTrade" :show-del="type == 'revise'"
+                           :text="'交易合同'" :multiple="false"  :files.sync="tradeContractPathList"/>
+          </div>
+          <div class="item">
+            <span> <span class="star">*</span>交易年月</span>
+            <van-field
+                :disabled="type !== 'revise'"
+                @focus="showDatetime = true"
+                class="radioWrap"
+                readonly
+                v-model="tradeTimeFormatShow"
+                input-align="right"
+            > </van-field>
+          </div>
+        </template>
+      </div>
+      <div class="btnWrap" v-if="type !== 'view'">
+        <div v-if="type == 'revise'" class="btn commonBtn"  @click="noMultipleClicks(submitHandle)">确认售出</div>
+        <template  v-else-if="type=='audit'">
+          <div style="margin: 10px">不通过原因</div>
+          <el-input style="margin-bottom: 10px;margin-left: 10px"  class="ipt" v-model.trim="auditReason" type="textarea"  :autosize="{ minRows: 2, maxRows: 6 }"
+                    maxlength="200" show-word-limit placeholder="请填写不通过原因"></el-input>
+          <div  class="auditBtn">
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,0)">审核不通过</div>
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,1)"><span style="margin-right: 6px">✔</span>审核通过</div>
+          </div>
+        </template>
+      </div>
+    </div>
+    <van-popup v-model="showDatetime" round position="bottom">
+      <van-datetime-picker
+          class="dataTime"
+          v-if="showDatetime"
+          v-model="time"
+          type="date"
+          :min-date="minDate"
+          @confirm="onConfirm"
+          @cancel="showDatetime = false"
+      />
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {auditCarInfo, usedCarRemove,carInfoDetail,auditCarInfoAgain} from "@/api/secondHandCar"
+import uploadCommon from "@/views/secondHandCar/components/upload-common.vue";
+import {timeFormat} from "@/utils/common";
+export default {
+  name: "sellingInfo",
+  mixins:[myMixins],
+  data(){
+    return{
+      noClick:true,
+      form:{
+        id:'',
+        downReason: '已售出',
+        salesChannel:'',
+        purchaser:'',
+        sellPrice:'',
+        tradeContractPath:'',
+        tradeTime:'',
+        recyclePath:'',
+        scrapTime:'',
+      },
+      tradeContractPathList:[],
+      recyclePathList:[],
+      otherImgSrc:[],
+      otherImgSrcList:[],
+      type:'',
+      auditRemark:'',
+      auditReason:'',
+      status:'' ,
+      time:'',
+      showDatetime:false,
+      minDate: new Date(),
+    }
+  },
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.form.id=this.$route.query.id ||  urlParams.get('id');
+    this.type=this.$route.query.type || urlParams.get('type');
+    if( this.form.id){
+      let res = await carInfoDetail({
+        id:this.form.id,
+        queryType:4,
+      })
+      this.form={...res.data}
+      this.form.downReason='已售出'
+      this.auditRemark=res.data?.auditRemark
+      this.status=res.data?.status?.code
+      if(res.data?.tradeContractPath){
+        this.tradeContractPathList=[{url:res.data?.tradeContractPath}]
+      }
+      if(res.data?.recyclePath){
+        this.recyclePathList=[{url:res.data?.recyclePath}]
+      }
+    }
+  },
+  methods:{
+    onConfirm(data) {
+      this.time = timeFormat(new Date(data))
+      if(this.form.salesChannel==3){
+        this.form.scrapTime = timeFormat(new Date(data))
+      }else {
+        this.form.tradeTime = timeFormat(new Date(data))
+      }
+      this.showDatetime = false;
+    },
+    // 审核操作
+    async auditHandle(type){
+      if (!type && !this.auditReason){
+        this.$toast('请填写不通过原因')
+        return
+      }
+      try {
+        await auditCarInfo({
+          id: this.form.id,
+          auditResult: type  ? 1 : 0 ,
+          auditReason: this.auditReason,
+          ...this.form,
+          licenseType:this.form?.licenseType?.code,
+          boardType:this.form?.boardType?.code,
+          emissionStandard:this.form?.emissionStandard?.code,
+        })
+        setTimeout(()=>{
+          this.closeParentDialog()
+        },1000)
+      } finally {
+        console.log(type)
+      }
+    },
+    async submitHandle(){
+      let rule = this.validationRules.find(item =>
+          item.required && (item.value === null || item.value === undefined || item.value === ''))
+      if(rule){
+        this.$toast(rule.name)
+        return
+      }
+      try {
+        // 清除原本选择的信息
+        if(this.form.salesChannel==3){
+          this.form.purchaser=''
+          this.form.sellPrice=''
+          this.form.tradeContractPath=''
+          this.form.tradeTime=''
+        }else{
+          this.form.recyclePath=''
+          this.form.scrapTime=''
+        }
+        let res=''
+        if(this.status == 9){
+          res=await auditCarInfoAgain({// 审核不通过再次提交
+            ...this.form,
+            salesChannel:Number(this.form.salesChannel)
+          })
+        }else {
+          res=await usedCarRemove({
+            ...this.form,
+            salesChannel:Number(this.form.salesChannel)
+          })
+        }
+        if(res.code == 200 && !res.msg){
+          this.$toast('操作成功')
+          if(this.isWebFunc()){
+            setTimeout(()=>{
+              this.closeParentDialog()
+            },1000)
+          }else{
+            setTimeout(()=>{
+              this.h5GoBack()
+            },1000)
+          }
+        }else{
+          this.$toast(res.msg)
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    getTradePhoto(data) {
+      this.form.tradeContractPath = data.url
+    },
+    deleteImgTrade() {
+      this.form.tradeContractPath = '';
+    },
+    getRecyclePhoto(data) {
+      this.form.recyclePath = data.url
+    },
+    deleteImgRecycle() {
+      this.form.recyclePath = '';
+    },
+  },
+  computed: {
+    tradeTimeFormatShow(){
+      return this.form.tradeTime ? this.form.tradeTime?.substring(0,10) :  '';
+    },
+    scrapTimeFormatShow(){
+      return this.form.scrapTime ? this.form.scrapTime?.substring(0,10) :  '';
+    },
+    validationRules() {
+      return [
+        {required:true, value: this.form.salesChannel, name: '售出渠道不能为空' },
+        {required:this.form.salesChannel==3 ? false : true, value: this.form.purchaser, name: '购买方不能为空' },
+        {required:this.form.salesChannel==3 ? false : true, value: this.form.sellPrice, name: '售出价格不能为空' },
+        {required:this.form.salesChannel==3 ? false : true, value: this.form.tradeContractPath, name: '交易合同文件不能为空' },
+        {required:this.form.salesChannel==3 ? false : true, value: this.form.tradeTime, name: '交易年月不能为空' },
+        {required:this.form.salesChannel==3 ? true : false, value: this.form.recyclePath, name: '报废机动车回收证明不能为空' },
+        {required:this.form.salesChannel==3 ? true : false, value: this.form.scrapTime, name: '报废年月不能为空' },
+      ];
+    },
+  },
+  components:{uploadCommon}
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  position: relative;
+  .navWrap{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 16px 10px;
+  }
+  .bg {
+    position: absolute;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    top: 0;
+    left: 0;
+    opacity: 0.5;
+    z-index: -1;
+  }
+  .back{
+    @include wh(15px,15px);
+  }
+  .title{
+    font-weight: bold;
+    font-size: 16px;
+    color: #203152;
+  }
+  .navIcon{
+    @include wh(84px,21px);
+  }
+  .audit{
+    @include wh(100%,43px);
+    background: #FFF7F4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 11px;
+    color: #FF6B3B;
+    .noAudit{
+      @include wh(13px,12px);
+      margin-right: 5px;
+      vertical-align: bottom;
+    }
+    span:first-child{
+      font-weight: 600;
+    }
+  }
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.noReasonWrap{
+  height: calc(100% - 42px);
+}
+.hasReasonWrap{
+  height: calc(100% - 85px);
+}
+.contentWrap{
+  width: 100%;
+  overflow-y: auto;
+  @include sizingPadding(15px,15px);
+  @include flexBetween;
+  .btnWrap{
+    padding-bottom: 20px;
+    padding-top: 15px;
+  }
+  .commonBtn{
+    height: 46px;
+    line-height: 46px;
+    text-align: center;
+    font-weight: bold;
+    border-radius: 5px;
+    color: #FFFFFF;
+    cursor: pointer;
+  }
+  .btn{
+    width: 296px;
+    background: #4A7FEB;
+    margin: 0 auto;
+    font-size: 15px;
+  }
+  .auditBtn{
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    box-sizing: border-box;
+    padding: 0 6px;
+    div:first-child{
+      width: 100px;
+      opacity: 0.79;
+      background: #1C2C49;
+    }
+    div:last-child{
+      width: 200px;
+      background: #4A7FEB;
+    }
+  }
+}
+
+.content{
+  width: 100%;
+  .item{
+    display: flex;
+    font-weight: 400;
+    font-size: 13px;
+    color: #2C3D54;
+    line-height: 44px;
+    width: 100%;
+    box-sizing: border-box;
+    padding-left: 21px;
+    padding-right: 9px;
+    span:first-child{
+      display: inline-block;
+      width:70px;
+      font-size: 13px;
+      color: rgba(44, 61, 84, 0.59);
+    }
+    span:last-child{
+      display: inline-block;
+      width:calc(100% - 70px);
+      border-bottom: 1px solid #E9E9EA;
+    }
+    .orc{
+      box-sizing: border-box;
+      padding-left: 6px;
+    }
+  }
+  .star{
+    color: #FF4B4B !important;
+    opacity: 1 !important;
+    font-weight: bold;
+    font-size: 12px;
+    margin-right: 6px;
+    margin-left: -6px;
+  }
+  .radioWrap{
+    width:calc(100% - 70px);
+    border-bottom: 1px solid #E9E9EA;
+  }
+}
+.lastLine{
+  margin-top: 3px !important;
+}
+::v-deep .van-icon-success{
+  display: none !important;
+}
+::v-deep .van-radio__label{
+  margin-left: 0;
+  width: 54px;
+  height: 23px;
+  border-radius: 13px;
+  border: 1px solid #9F9F9F;
+  opacity: 0.5;
+  text-align: center;
+  line-height: 23px;
+  font-size: 12px;
+  color: #323233;
+  opacity: 1;
+}
+::v-deep .van-radio--horizontal{
+  margin-right: 4px;
+}
+::v-deep .van-radio--horizontal:last-child{
+  margin-right: 0;
+}
+::v-deep  .checked .van-radio__label{
+  background: #FFF1EC !important;
+  border: 1px solid #FF5C26 !important;
+  color: #FE5006 !important;
+  border-radius: 13px !important;
+}
+::v-deep  .van-field__right-icon{
+  margin-right: 0;
+  padding: 0;
+}
+::v-deep .ipt .el-textarea__inner{
+  background: #F5F7F9;
+  border-radius: 4px;
+  font-size: 12px;
+  border: none;
+}
+::v-deep .van-popup__close-icon--top-right{
+  display: none;
+}
+::v-deep .salesChannelRadio .van-radio__label{
+  margin-bottom: 8px !important;
+}
+::v-deep .radio .van-radio__label{
+  width: 80px !important;
+}
+</style>

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

@@ -29,7 +29,7 @@
           <div class="label">报警通道:</div>
           <div class="content content_flex">
             <span>{{ info.plateNumber + '_' + (info?.channel || '') }} <!--浙A7H1M2_1--></span>
-            <span class="btn">查看监控</span>
+            <span class="btn" @click="goAlarmMonitoring">查看监控</span>
           </div>
         </div>
       </div>
@@ -110,6 +110,31 @@
       this.initMap();
     },
     methods: {
+      // 新增方法：重置弹窗状态
+      resetPopupState() {
+        this.radio = '';
+        this.remark = '';
+        // 重置radioList状态
+        this.radioList = [
+          { name: '开始处理', value: 3, disabled: false },
+          { name: '处理完成', value: 5, disabled: false }
+        ];
+      },
+      goAlarmMonitoring() {
+        let data = {
+          "action":"goMonitoring",
+          "params": {
+            "code": this.code
+          }
+        };
+        let u = navigator.userAgent;
+        let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+        if(isiOS){
+          window.webkit.messageHandlers.nativeObject.postMessage(data);
+        }else {
+          window.android.sendMessage("code=" + this.code);
+        }
+      },
       async operatorHandle() {
         try {
           await dealWithAlarm({
@@ -118,8 +143,9 @@
             remark: this.remark
           })
           this.$toast('操作成功')
+          this.resetPopupState();
         } finally {
-          this.dealWithShow = false;
+           this.dealWithShow = false;
            await this.getAlarmDetail();
         }
       },
@@ -133,10 +159,19 @@
         if(!res.data) {
           this.$router.push({
             name: 'vehicleAlarmList',
+            params: {
+              token: localStorage.getItem('token')
+            },
             replace: true  // 关键：替换当前路由，而不是新增历史记录
           });
+          return
         }
         this.info = res?.data;
+        // 每次获取详情时重置radioList
+        this.radioList = [
+          { name: '开始处理', value: 3, disabled: false },
+          { name: '处理完成', value: 5, disabled: false }
+        ];
         if( this.info.handStatus == 0 && ['1', '2', '3'].includes(String(this.info.alarmType))) {    // 未处理，且需要技术处理
           this.radio =  this.radioList[0].value
           this.radioList[1].disabled = true
@@ -144,7 +179,6 @@
         if(this.info.handStatus == 3) {
           this.radioList[0].disabled = true
         }
-
       },
       initMap() {
         this.map = new AMap.Map('container',{

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

@@ -25,19 +25,19 @@
               <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>
       </van-list>
     </van-pull-refresh>
     <div class="bgEmptyImg" v-show="show" >
-      <img src="@/assets/empty.png" />
+      <img src="@/assets/emptyData.png" />
     </div>
   </div>
 </template>
@@ -87,10 +87,16 @@
         await this.getList()
       },
       async getList() {
+        let handleStatus;
+        if( this.activeIndex == 2 ) {
+          handleStatus = 3
+        } else {
+          handleStatus = this.activeIndex
+        }
         let res = await getAlarmList({
           pageNum:this.pageNum,
           pageSize:this.pageSize,
-          handStatus: this.activeIndex
+          handStatus: handleStatus
         })
         this.total = res.total
         if(this.pageNum == 1){// 第一页直接赋值
@@ -194,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;