task#，师傅相关还原

.gitignore

@@ -22,4 +22,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/yarn.lock

src/utils/myMixins.js

@@ -72,6 +72,7 @@ export const myMixins = {
           methods();
         }
         setTimeout(() => {
+          console.log("shengxiaoxi")
           that.noClick = true;
         }, 3000)
       } else {

src/views/index/supplySettlement.vue

@@ -6,15 +6,15 @@
       <div class="metersWrap">
         <div class="item"  v-show="supplierSettlementType != 1">
           <div class="leftKiloMeters">AB段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageAb"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageAb"/>公里</div>
         </div>
         <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">BC段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageBc"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageBc"/>公里</div>
         </div>
         <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">CA段公里数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageCa"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageCa"/>公里</div>
         </div>
       </div>
     </div>
@@ -24,15 +24,15 @@
       <div class="metersWrap">
         <div class="item"  v-show="supplierSettlementType != 1">
           <div class="leftKiloMeters">AB段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountAb"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountAb"/>元</div>
         </div>
         <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">BC段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountBc"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountBc"/>元</div>
         </div>
         <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">CA段路桥费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountCa"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountCa"/>元</div>
         </div>
       </div>
     </div >
@@ -42,23 +42,23 @@
       <div class="metersWrap">
         <div class="item"  >
           <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.tyreNumber" @input="handleInput"/>个</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
         </div>
         <div class="item">
           <div class="leftKiloMeters">等候费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.waitAmount"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.waitAmount"/>元</div>
         </div>
         <div class="item"  >
           <div class="leftKiloMeters">困境费</div>
-          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.dilemmaFee"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.dilemmaFee"/>元</div>
         </div>
         <div class="item blueColor" >
           <div class="leftKiloMeters">收取客户金额</div>
-          <div class="rightInput blueColor"><input class="blueColor" type="number" :disabled="!taskCostShow" v-model="form.customerAmount"/>元</div>
+          <div class="rightInput blueColor"><input class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
         </div>
       </div>
     </div>
-    <div class="btn" v-if="taskCostShow || finishLt7">
+    <div class="btn">
       <button @click="submit">提交</button>
     </div>
   </div>
@@ -86,9 +86,7 @@ export default {
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
-        taskFlowId:'',
+        taskFlowId:''
-        auditStatus:'',
-        finishTime:'',
       }
     }
   },
@@ -99,14 +97,6 @@ export default {
       this.orderCode = urlParams.get('orderCode')
       await this.getDetail()
   },
-  computed:{
-    taskCostShow() {
-      return this.form.auditStatus?.code && !([3, 4, 6].includes(this.form.auditStatus.code))
-    },
-    finishLt7(){
-      return  !this.form.finishTime || (this.form.finishTime && new Date().getTime() - new Date(this.form.finishTime).getTime() <= 7 * 24 * 60 * 60 * 1000)
-    },
-  },
   methods:{
     handleInput(event) {
       const newValue = parseInt(event.target.value, 10);
@@ -128,6 +118,7 @@ export default {
       })
       leftCopy(this.form,{...res.data});
       this.supplierSettlementType= res.data.supplierSettlementType?.code
+      // this.form.taskFlowId =1
     },
     async updatSettlement(){
       let result =await updateOrderSettlement({

src/views/index/uploadInvoice.vue

@@ -73,7 +73,6 @@
 </template>
 
 <script>
-  import { Decimal } from 'decimal.js';
   import { Dialog } from "vant";
   import { myMixins } from "@/utils/myMixins"
   import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
@@ -121,7 +120,7 @@
       invoiceTotal () {
         let total = 0;
         this.list?.map(item => {
-          total = new Decimal(total).plus(new Decimal(item.invoiceMoney)).toNumber()
+          total += item.invoiceMoney
         })
         return total
       }
@@ -279,15 +278,6 @@
               if(ocrName != billName && diffNumber > 2 && !res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局")){
                 errorStr = errorStr + "上传发票抬头与服务商配置不一致，设置抬头为：" + (this.billInfo.unitName || '未设置') + "，识别抬头为：" + res.data.ocrInvoiceRes.data.sellerName + ";如发票确认无误，请联系结算部：021-53682525";
               }
-              let conList = res.data.ocrInvoiceRes.data.invoiceDetails.filter(a => a.itemName.includes("*"))
-              if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
-                conList.every(a => {
-                  let items = a.itemName.split("*")
-                  return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
-                })
-              ){
-                errorStr = errorStr + "分类必须包含：现代服务/运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
-              }
 
               if( !flag ) {
                 Dialog.alert({

src/views/index/vehicleAdd.vue

@@ -74,64 +74,9 @@
       <img class="startImg" src="@/assets/start.png" />
       <span>车辆类型</span>
     </div>
-<!--
+    <select id="mySelect"  class="mySelect"  v-model="selectedOption">
-    <select
+      <option v-for="(item,index) in typeList" :key="index" :value="index">{{item}}</option>
-        id="mySelect"
-        class="mySelect"
-        v-model="selectedOption"
-        multiple
-    >
-      <option
-          v-for="item in typeList"
-          :key="item"
-          :value="item"
-          :disabled="isOptionDisabled(item)"
-      >
-        {{ item }}
-      </option>
     </select>
--->
-    <el-select
-        multiple
-        :multiple-limit="isMultiple ? 2 : 1"
-        v-model="selectedOption"
-        value-key="name"
-        class="elSelect"
-        collapse-tags="collapse-tags"
-        placeholder="请选择"  style="width: 55%"
-    >
-      <el-option
-          v-for="item in vehicleTypes"
-          :key="item.name"
-          :label="item.name"
-          :value="item.value"
-          :disabled="!item.disabled ? false : true"
-      >
-      </el-option>
-    </el-select>
-
-  </div>
-  <div class="itemContent">
-    <div class="titleType">
-      <span>牌照</span>
-    </div>
-    <el-select
-      v-model="vehicleLicense"
-      disabled
-      value-key="name"
-      class="elSelect"
-      collapse-tags="collapse-tags"
-      placeholder="请选择"  style="width: 55%"
-    >
-      <el-option
-        v-for="item in vehicleLicenseOptions"
-        :key="item.name"
-        :label="item.name"
-        :value="item.value"
-      >
-      </el-option>
-    </el-select>
-
   </div>
   <div class="lineBot"></div>
   <div class="itemContent">
@@ -176,7 +121,7 @@
         <span class="line"></span>
       </div>
       <div :ref="'checkboxGroup' + index"  class="checkbox-group">
-        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap">
+        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap" >
           <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
         </van-checkbox-group>
       </div>
@@ -207,11 +152,10 @@ export default {
       checked: true,
       carNum:"",//车牌号
       typeList:[],//车辆类型列表
-      selectedOption:[],//车辆类型
+      selectedOption:'1',//车辆类型
       id:'',//车辆Id
       serviceIds:[],//车辆服务种类,
       supplierServiceList:[],
-      oldSupplierServiceList:[],
       show:false,
       imageUrl: require('@/assets/arr_right.png'),
       vehicleLicenseFrontList: [],
@@ -224,116 +168,21 @@ export default {
       vehicleFrontPhoto: '',    // 车头照
       vehicleLicenseInfo: {},
       vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
-      isMultiple: false,     // 是否支持多选
-      vehicleLicense:'',//牌照
-      vehicleFrontLicensePlate:'',//车头照车牌号码
-      vehicleTypes:[{
-        name: '小修车',
-        value: 1
-      },{
-        name: '一般平板车',
-        value: 2
-      },{
-        name: '落地平板车',
-        value: 3
-      },{
-        name: '地库车',
-        value: 4
-      },
-        {
-          name:'牵引车',
-          value: 5 },
-        {
-          name:'大力神',
-          value:6},
-        {
-          name:'充电车',
-          value: 7 },
-        {
-          name:'吊车',
-          value: 8 },
-        {
-          name:'公车',
-          value: 9 },
-        {
-          name:'箱式拖车',
-          value: 10 },
-
-      ],
-      vehicleLicenseOptions: [{
-        name: '蓝牌',
-        value: 1
-      }, {
-        name: '黄牌',
-        value: 2
-      }, {
-        name: '新能源',
-        value: 3
-      }, {
-        name: '临牌',
-        value: 4
-      }, {
-        name: '其他',
-        value: 5
-      }]
     }
   },
-  watch:{
-    selectedOption(newVal){
-      if(newVal == 4){
-        this.isMultiple = true
-        this.vehicleTypes[2].disabled=true
-        this.vehicleTypes[5].disabled=true
-        this.vehicleTypes[6].disabled=true
-        this.vehicleTypes[7].disabled=true
-        this.vehicleTypes[8].disabled=true
-        this.vehicleTypes[9].disabled=true
-      }else{
-        this.isMultiple = false
-        this.vehicleTypes[2].disabled=false
-        this.vehicleTypes[5].disabled=false
-        this.vehicleTypes[6].disabled=false
-        this.vehicleTypes[7].disabled=false
-        this.vehicleTypes[8].disabled=false
-        this.vehicleTypes[9].disabled=false
-      }
-      if (newVal == 1 || newVal == 7){
-        let arr = []
-        this.supplierServiceList.forEach((item)=>{
-          if(!(item.name == '拖车服务' || item.name == '大型车救援')){
-            arr.push(item)
-          }
-        })
-        this.supplierServiceList = arr
-      }else{
-        this.supplierServiceList = this.oldSupplierServiceList
-      }
-
-    },
-  },
-
   async mounted() {
     this.id=this.$route.params?.id
-    await this.getSupplierServiceTree();
+    const selectElement = document.getElementById('mySelect');
+    selectElement.addEventListener('change', function() {
+     this.selectedOption=selectElement.value;
+    });
     await this.getTypeList();
     if( this.id){
       await this.vehicleInfo()
     }
+    await this.getSupplierServiceTree();
   },
   methods:{
-    getVehicleLicense(color) {
-      if( color == '蓝' ) {
-        this.vehicleLicense = 1
-      } else if(color == '黄') {
-        this.vehicleLicense = 2
-      } else if(color == '临牌') {
-        this.vehicleLicense = 4
-      } else if(color.includes('绿')) {
-        this.vehicleLicense = 3
-      } else {
-        this.vehicleLicense = 5
-      }
-    },
     async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
       const formData = new FormData();
       formData.append("file" , file.file);
@@ -360,16 +209,6 @@ export default {
       formData.append("file" , file.file);
       let res = await uploadImage(formData);
       this.vehicleFrontPhoto = res.data;
-      await this.ocrCarFrontHandler()
-    },
-    async ocrCarFrontHandler() {     // 车辆正面 orc 识别
-      let res = await ocrHandler({
-        ocrType: 10,
-        imageUrl: this.vehicleFrontPhoto,
-        cardSide: 'FRONT'
-      });
-      this.vehicleFrontLicensePlate=res.data?.number
-      this.getVehicleLicense(res.data.color)
     },
     async vehicleOcrHandler() {     // 行驶证首页 ocr 识别
       this.vehicleLicenseInfo.licensePlateNumber = '';
@@ -448,41 +287,29 @@ export default {
     },
     async getTypeList() {
         let result=await vehicleTypeList();
-        this.typeList=[]
         if(result.code === 200){
-          for (const key in result.data){
+          this.typeList=result.data
-            // console.log("keys",result.data[key])
-            this.typeList.push({name:result.data[key],disabled:false,value:(key+1)})
-            // this.typeList.push(result.data[key])
-
-          }
         }
     },
     async getSupplierServiceTree(){
       let res = await supplierServiceTree();
       this.supplierServiceList=res.data
-      this.oldSupplierServiceList=this.supplierServiceList
     },
     async vehicleInfo(){
       let res= await  getInfoById({
         vehicleId:this.id
       })
       let result=res.data;
-      console.log("result",result)
       this.id=result.vehicleId
       this.carNum=result.plateNumber
       this.isJoin=result.hasPolymerization.code
-      this.selectedOption=result.vehicleType?.split(',').map((item)=>{
+      this.selectedOption=result.vehicleType;
-        return Number(item);
-      });
       this.serviceIds=result.serviceIds
       this.vehicleLicenseFront = result.vehicleLicenseFront;
       this.vehicleLicenseBack = result.vehicleLicenseBack;
       this.vehicleFrontPhoto = result.vehicleFrontPhoto;
       this.vehicleLicenseInfo = result.vehicleLicenseInfo;
       this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
-      this.vehicleLicense = result.vehicleLicense;
-      this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
       if( this.vehicleLicenseFront ) {
         this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
       }
@@ -512,7 +339,7 @@ export default {
         this.$toast('行驶证车辆照片页不能为空')
         return
       }
-      if( !this.vehicleFrontPhoto ) {
+      if( !this.vehicleLicenseBack ) {
         this.$toast('车头照片不能为空')
         return
       }
@@ -524,18 +351,10 @@ export default {
         this.$toast('行驶证副页识别失败')
         return
       }
-      if(!(this.selectedOption.length > 0)){
-        this.$toast('车辆类型不能为空')
-        return
-      }
-      if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
-        let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
-        this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
-      }
         await saveVehicle({
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
-          vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
+          vehicleType:this.selectedOption ? this.selectedOption : '',
           hasPolymerization:this.isJoin,
           serviceIds:this.serviceIds ? this.serviceIds : [],
           vehicleLicenseFront: this.vehicleLicenseFront,
@@ -543,8 +362,6 @@ export default {
           vehicleFrontPhoto: this.vehicleFrontPhoto,
           vehicleLicenseInfo: this.vehicleLicenseInfo,
           vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
-          vehicleLicense: this.vehicleLicense,
-          vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -663,8 +480,4 @@ export default {
     margin: 40px 0 30px 8px;
   }
 }
-.elSelect ::v-deep .el-input__inner{
-  border: none !important;
-  text-align: right !important;
-}
 </style>

src/views/kpi/kpiIndex.vue

@@ -1054,9 +1054,8 @@ export default {
           this.loading = false
           this.detailList?.map(item => {
             this.xAxisArr.push(item.month)
-            this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
           })
-          console.log(" this.xAxisArr", this.xAxisArr)
+          // console.log(" this.xAxisArr", this.xAxisArr)
           // this.xAxisArr[this.xAxisArr.length - 1] = '本月'
           await this.twoTabHanldeData()
         }else if (this.active === 3) {

src/views/workOrder/accounting.vue

@@ -897,11 +897,11 @@ export default {
 
   .leftTitle {
     opacity: .5;
-    width: 60px;
+    @include wh(60px, 189px);
   }
 
   .rightContent {
-    /*height: 189px;*/
+    height: 189px;
     width: calc(100% - 60px);
   }
 
@@ -980,7 +980,6 @@ img {
 
     .inputContent {
       text-align: right;
-      flex: 1;
     }
   }