Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unatt...

yangan

2024-11-11 4e517dc54e1e3e5e5b543383c321161de351272e

 pages/driver-page/drvier-my/drvier-my.vue

@@ -90,10 +90,11 @@
                        {{ userInfo.weight || '' }}
                     </view>
                  </view>
                  <view class="information-line"
                     @click="modifyPrint">
                     <!-- 由于是自定义icon  非设计图icon 所以要加上这个style="margin-left: 1.5%;"
                       icon 下载格式为18x18-->
                  <!-- <view class="information-line"
                     @click="modifyPrint">
						
                     <view class="line-label"
                        style="margin-left: 1.5%;">
                        <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/printer.png"
@@ -108,7 +109,7 @@
                        <u-icon name="arrow-right"
                           size="36"></u-icon>
                     </view>
                  </view>
                  </view> -->
                  <!-- <view class="information-line"
                     @click="addressManageHandle">
                     <view class="line-label"
@@ -150,7 +151,7 @@
                        <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/score.png"
                           mode="widthFix"
                           style="width: 36rpx;position: relative;left: 8rpx;"></image>
                        <view class="label-text">道路运输证</view>
                        <view class="label-text">剧毒化学品道路运输通行证</view>
                     </view>
                     <view class="information-value">
                        <view class="">
@@ -207,11 +208,11 @@
                  <view class="label-title">
                     <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/cardimg.png"
                        mode="widthFix"></image>
                     <view class="label-text">车辆类型照片</view>
                     <view class="label-text">驾驶证</view>
                  </view>
                  <view class="img-container">
                     <u--image :showLoading="true"
                        :src="userInfo.inventoryImg != null ? BaseUrl + userInfo.drivingImg : ''"
                        :src="userInfo.driverImg != null ? BaseUrl + userInfo.drivingImg : ''"
                        width="80px"
                        height="80px"
                        @click="imageClick(3)">
@@ -227,6 +228,11 @@
         <view class="loginout-main"><u-button text="退出登录"
               type="primary"
               @click="logout"
               shape="circle"
               plain></u-button></view>
         <view class="loginout-main"><u-button text="联系我们"
               type="primary"
               @click="contactUs"
               shape="circle"
               plain></u-button></view>
      </view>
@@ -256,7 +262,7 @@
               <u--form labelPosition="left"
                  :model="editUserInfo"
                  ref="editUserInfo">
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="姓名"
                     prop="name"
                     required>
@@ -264,7 +270,7 @@
                        border="none"
                        inputAlign="left"></u--input>
                  </u-form-item>
                  <!-- <u-form-item labelWidth="20%"
                  <!-- <u-form-item labelWidth="35%"
                     label="密码"
                     prop="password"
                     required>
@@ -272,7 +278,7 @@
                        border="none"
                        inputAlign="left"></u--input>
                  </u-form-item> -->
                  <!-- <u-form-item labelWidth="20%"
                  <!-- <u-form-item labelWidth="35%"
                     label="身份证号"
                     prop="idCard"
                     required>
@@ -280,7 +286,7 @@
                        border="none"
                        inputAlign="left"></u--input>
                  </u-form-item> -->
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="手机号"
                     prop="phone"
                     required>
@@ -289,7 +295,7 @@
                        disabled
                        inputAlign="left"></u--input>
                  </u-form-item>
                  <!-- <u-form-item labelWidth="20%"
                  <!-- <u-form-item labelWidth="35%"
                     label="车牌号"
                     prop="carNo"
                     required>
@@ -297,7 +303,7 @@
                        border="none"
                        inputAlign="left"></u--input>
                  </u-form-item> -->
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="体重"
                     prop="weight"
                     >
@@ -306,7 +312,7 @@
                        inputAlign="left"
                        placeholder="体重以kg作为单位"></u--input>
                  </u-form-item>
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="车轴数"
                     prop="axleNum"
                     >
@@ -314,7 +320,7 @@
                        border="none"
                        inputAlign="left"></u--input>
                  </u-form-item>
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="环保标准"
                     borderBottom
                     required
@@ -332,7 +338,7 @@
                           :name="item.name"></u-radio>
                     </u-radio-group>
                  </u-form-item>
                  <u-form-item labelWidth="20%"
                  <u-form-item labelWidth="35%"
                     label="车辆类型"
                     borderBottom
                     ref="roleRef"
@@ -346,7 +352,7 @@
                  </u-form-item>
                  <u-form-item prop="idCard"
                     label="身份证"
                     labelWidth="20%"
                     labelWidth="35%"
                     borderBottom
                     required
                     >
@@ -355,7 +361,7 @@
                        disabled
                        clearable></u--input>
                  </u-form-item>
                     <view style="margin:0 30vw" >
                     <view style="margin:5vh 30vw" >
                        <u-button text="增加"
                              type="primary"
                              @click="addData"
@@ -413,9 +419,27 @@
               <u--form labelPosition="left"
                  :model="registerFormModel"
                  >
                  <u-form-item prop="carImg"
                     label="车辆照片"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
                     <u-upload :fileList="fileList6"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="6"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="drivingImg"
                     label="行驶证"
                     labelWidth="20%"
                     label="行驶证车头"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
@@ -431,15 +455,33 @@
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="driverImgCw"
                     label="行驶证车尾"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
                     <u-upload :fileList="fileList9"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="9"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="expirationTimeDriving"
                     label="行驶证过期时间"
                     labelWidth="20%"
                     labelWidth="35%"
                     borderBottom>
                     <uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="datetime" :start="minDate" />
                  </u-form-item>
                  <u-form-item prop="driverImg"
                     label="驾驶证"
                     labelWidth="24%"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
@@ -457,13 +499,56 @@
                  </u-form-item>
                  <u-form-item prop="expirationTimeDriver"
                     label="驾驶证过期时间"
                     labelWidth="20%"
                     labelWidth="35%"
                     borderBottom>
                     <uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="datetime"  :start="minDate" />
                  </u-form-item>
                  <u-form-item prop="roadTransportImg"
                     label="道路运输证车头"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
                     <u-upload :fileList="fileList7"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="7"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="roadTransportImgCw"
                     label="道路运输证车尾"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
                     <u-upload :fileList="fileList10"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="10"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="expirationTimeRoadtransport"
                     label="证件过期时间"
                     labelWidth="35%"
                     borderBottom
                     >
                     <uni-datetime-picker v-model="registerFormModel.expirationTimeRoadtransport" type="datetime"  :start="minDate" />
                  </u-form-item>
                  <u-form-item prop="tradeQualificationImg"
                     label="从业资格证"
                     labelWidth="24%"
                     labelWidth="35%"
                     borderBottom
                     required
                     @click="beforeRead">
@@ -479,9 +564,26 @@
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="tradeQualificationImgYyy"
                     label="从业资格证押运员"
                     labelWidth="35%"
                     borderBottom
                     @click="beforeRead">
                     <u-upload :fileList="fileList11"
                        deletable
                        @afterRead="afterRead"
                        @delete="deletePic"
                        name="11"
                        multiple
                        :maxCount="1"
                        width="250"
                        height="150"
                        :previewFullImage="true">
                     </u-upload>
                  </u-form-item>
                  <u-form-item prop="expirationTimeTradequalification"
                     label="从业资格过期时间"
                     labelWidth="20%"
                     labelWidth="35%"
                     borderBottom
                     >
                     <uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime"  :start="minDate" />
@@ -503,8 +605,9 @@
            @confirm="logoutConfirm"
            @cancel="logoutCancel"></u-modal>
      </view>
      <printerStyle ref="printerStyleRef"
         @selectedPrintStyle='selectedPrintStyleHandle' />
      <!-- <printerStyle ref="printerStyleRef"
         v-if="printerVisible"
         @selectedPrintStyle='selectedPrintStyleHandle' /> -->
   </view>
</template>

@@ -513,16 +616,17 @@
   import { BaseUrl } from '@/api/publicInterface.js';
   import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
   import noobTour from '@/components/noobTour/noobTour.vue'
   import printerStyle from '@/subPages/bill-of-lading-details/printerStyle/printerStyle.vue'
   // import printerStyle from '@/subPages/bill-of-lading-details/printerStyle/printerStyle.vue'
   import { mapMutations, mapState } from 'vuex';
   import qianTree from '@/components/qian-tree/qian-tree.vue';
   export default {
      components: { previewImage, noobTour, printerStyle,qianTree },
      components: { previewImage, noobTour,qianTree },
      data() {
         return {
            tablist:[],
            minDate: this.getToday(),
            customerName:"",
            printerVisible:false,
            // 获取的司机详情
            userInfo: {},
            productName:"",
@@ -544,7 +648,10 @@
               tradeQualificationImg: '',
               roadTransportImg: '',
               inventoryImg: '',
               countryNumberCar: 0
               countryNumberCar: 0,
               driverImgCw:'',
               roadTransportImgCw:"",
               tradeQualificationImgYyy:"",
            },
            registerFormModel:{},
            radiolist2: [{
@@ -681,7 +788,7 @@
               roadTransportImg: {
                  type: 'string',
                  required: true,
                  message: '请上传道路运输证照片',
                  message: '请上传剧毒通行证照片',
                  trigger: ['blur', 'change']
               },
               tradeQualificationImg: {
@@ -699,6 +806,9 @@
            fileList6: [],
            fileList7: [],
            fileList8: [],
            fileList9: [],
            fileList10: [],
            fileList11: [],
            // 修改信息弹出框
            editDriverPopupShow: false,
            editDocShow:false,
@@ -710,7 +820,8 @@
            logoutTitle: '提示',
            logoutContent: '是否确认退出',
            BaseUrl,
            selectedPrintStyle: null
            selectedPrintStyle: null,
            phoneList:[]
         };
      },
      computed: {
@@ -762,6 +873,57 @@
         },
         init() {
            this.getUserEntity();
            uni.request({
               url:  `${BaseUrl}/admin/dict/page`,
               method: 'GET',
               data: {
                  dictType:'Setings'
               },
               header: {
                  Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
                  clientToc: 'Y',
                  'CLIENT_TOC': 'Y',
               },
               success: res => {
                  let dictId=res.data.data?.records[0].id
                  uni.request({
                     url:  `${BaseUrl}/admin/dict/item/page`,
                     method: 'GET',
                     data: {
                        dictId:dictId
                     },
                     header: {
                        Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
                        clientToc: 'Y',
                        'CLIENT_TOC': 'Y',
                     },
                     success: res => {
                        res.data.data.records.forEach(item=>{
                           if(item.description.includes('联系')){
                              this.phoneList=item.value.split(',');
                           }
                        })
                     },
                     fail: err => {
                     }
                  })
               },
               fail: err => {
               }
               })
         },
         contactUs(){
            uni.showActionSheet({
               itemList: this.phoneList,
               success: (res) => {
               uni.makePhoneCall({
                  phoneNumber:this.phoneList[res.tapIndex].split(":")[1]
               })
            },
            fail: (err) => {
               console.log('弹窗取消');
            }
            });
         },
         getUserEntity() {
            uni.showLoading({
@@ -799,24 +961,24 @@
               Object.assign(this.editUserInfo, res.data)
               this.registerFormModel={
                  customerid:res.data.userId,
                  idCardImg:res.data.idCardImg,
                  carImg:res.data.carImg,
                  drivingImg:res.data.drivingImg,
                  expirationTimeDriving:res.data.expirationTimeDriving,
                  driverImg:res.data.driverImg,
                  expirationTimeDriver:res.data.expirationTimeDriver,
                  tradeQualificationImg:res.data.tradeQualificationImg,
                  roadTransportImg:res.data.roadTransportImg,
                  expirationTimeRoadtransport:res.data.expirationTimeRoadtransport,
                  expirationTimeTradequalification:res.data.expirationTimeTradequalification,
                  type:res.data.carType
                  type:res.data.carType,
                  driverImgCw:res.data.driverImgCw,
                  roadTransportImgCw:res.data.roadTransportImgCw,
                  tradeQualificationImgYyy:res.data.tradeQualificationImgYyy,
               }
               if(this.registerFormModel.idCardImg){
                  if (this.fileList6.length == 0 && this.registerFormModel.idCardImg.split(",")[0]) {
               if(this.registerFormModel.carImg){
                  if (this.fileList6.length == 0 && this.registerFormModel.carImg.split(",")[0]) {
                     this.fileList6.push({
                        url: `${BaseUrl}${this.registerFormModel.idCardImg.split(",")[0]}`
                     });
                  }
                  if (this.fileList7.length == 0 && this.registerFormModel.idCardImg.split(",")[1]) {
                     this.fileList7.push({
                        url: `${BaseUrl}${this.registerFormModel.idCardImg.split(",")[1]}`
                        url: `${BaseUrl}${this.registerFormModel.carImg}`
                     });
                  }
                  if (this.fileList8.length == 0 && this.userInfo.driverImg) {
@@ -825,6 +987,34 @@
                     });
                  }
                 }
                  if(this.registerFormModel.roadTransportImg){
                     if (this.fileList7.length == 0 && this.userInfo.roadTransportImg) {
                     this.fileList7.push({
                        url: `${BaseUrl}${this.userInfo.roadTransportImg}`
                     });
                  }
               }
               if(this.registerFormModel.driverImgCw){
                     if (this.fileList9.length == 0 && this.userInfo.driverImgCw) {
                     this.fileList9.push({
                        url: `${BaseUrl}${this.userInfo.driverImgCw}`
                     });
                  }
               }
               if(this.registerFormModel.roadTransportImgCw){
                     if (this.fileList10.length == 0 && this.userInfo.roadTransportImgCw) {
                     this.fileList10.push({
                        url: `${BaseUrl}${this.userInfo.roadTransportImgCw}`
                     });
                  }
               }
               if(this.registerFormModel.tradeQualificationImgYyy){
                     if (this.fileList11.length == 0 && this.userInfo.tradeQualificationImgYyy) {
                     this.fileList11.push({
                        url: `${BaseUrl}${this.userInfo.tradeQualificationImgYyy}`
                     });
                  }
               }
               this.editUserInfo.password = ''
            });
         },
@@ -841,7 +1031,7 @@
            } else if (index == 2) {
               this.previewImageSrc = this.userInfo.drivingImg;
            } else {
               this.previewImageSrc = this.userInfo.inventoryImg;
               this.previewImageSrc = this.userInfo.driverImg;
            }
            this.$nextTick(() => {
               this.previewImageShow = true;
@@ -918,8 +1108,28 @@
                        this.editUserInfo.inventoryImg = JSON.parse(res.data).data
                           .url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==6){
                        this.registerFormModel.carImg = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==7){
                        this.registerFormModel.roadTransportImg = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==8){
                        this.registerFormModel.driverImg = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==9){
                        this.registerFormModel.driverImgCw = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==10){
                        this.registerFormModel.roadTransportImgCw = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }else if(num==11){
                        this.registerFormModel.tradeQualificationImgYyy = JSON.parse(res.data)
                           .data.url;
                        resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
                     }
@@ -956,14 +1166,19 @@
         // 修改证件信息
         updateDoc(){
               this.$reqPost('saveDriverDocs', {
                  isRegister:0,
                  userId:this.registerFormModel.customerid,
                  carImg:this.registerFormModel.carImg,
                  drivingImg:this.registerFormModel.drivingImg,
                  expirationTimeDriving:this.registerFormModel.expirationTimeDriving.slice(0,16),
                  driverImg:this.registerFormModel.driverImg,
                  expirationTimeDriver:this.registerFormModel.expirationTimeDriver.slice(0,16),
                  tradeQualificationImg:this.registerFormModel.tradeQualificationImg,
                  roadTransportImg:this.registerFormModel.roadTransportImg,
                  expirationTimeRoadtransport:this.registerFormModel.expirationTimeRoadtransport.slice(0,16),
                  expirationTimeTradequalification:this.registerFormModel.expirationTimeTradequalification.slice(0,16),
                  driverImgCw:this.registerFormModel.driverImgCw,
                  roadTransportImgCw:this.registerFormModel.roadTransportImgCw,
                  tradeQualificationImgYyy:this.registerFormModel.tradeQualificationImgYyy,
               }, 'json').then(res => {
                  if (res.code == 0) {
                     this.$u.toast('修改成功');
@@ -982,9 +1197,7 @@
            this.tablist.push({idCard:""})
         },
         delData(e){
            if(this.tablist.length>2){
               this.tablist.splice(e,1)
            }
            this.tablist.splice(e,1)
         },
         // 修改用户信息
         updateUser() {
@@ -994,6 +1207,7 @@
               drivingImg: uni.getStorageSync('drivingImg'),
               tradeQualificationImg: uni.getStorageSync('tradeQualificationImg')
            };
            this.editUserInfo.otherIdCard=''
            let errorList = ['name','phone','countryNumberCar','carType']
            for(let item in this.editUserInfo){
               if(item ==='bunkerList'){
@@ -1042,7 +1256,6 @@
                  return item.idCard
               }).join(',')
            }
					
            let data={
               name:this.editUserInfo.name,
               phone:this.editUserInfo.phone,
@@ -1085,6 +1298,8 @@
         },
         //修改磅单打印样式
         modifyPrint() {
            this.printerVisible = true;
            console.log(printerStyle,'123')
            this.$nextTick(() => {
               this.$refs.printerStyleRef.init()
            })
@@ -1267,7 +1482,7 @@

            &-block {
               width: 690rpx;
               height: 760rpx;
               height: 700rpx;
               background: #ffffff;
               box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
               border-radius: 20rpx;
@@ -1301,7 +1516,7 @@
                        font-size: 30rpx;
                        font-weight: 400;
                        color: #000000;
                        line-height: 85rpx;
                        line-height: 32rpx;
                        text-align: left;
                     }
                  }
@@ -1398,9 +1613,9 @@

      .loginout {
         width: 100%;
         height: 200rpx;
         height: 240rpx;
         @include flex;
         justify-content: space-around;
         justify-content: space-evenly;
         flex-direction: column;
         align-items: center;
         position: relative;