feat：外销退外购退显示问题

wk

2024-06-25 0bcfaae99500c3d995e82fd236bc8730388de97d

 pages/driver-page/driver-index/driver-index.vue

@@ -30,9 +30,9 @@
                        <view class="sign">装</view>
                        <view class="filedname exceedHide">
                           <text
                              v-if="item.orderType == '外销' || item.orderType == '内销'  ">{{ item.deptName|| ''  }}</text>
                              v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退'  ">{{ item.deptName|| ''  }}</text>
                           <text
                              v-else-if="item.orderType == '外购' || item.orderType == '内购' ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
                              v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退'  ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
                           <text v-else-if="item.orderType == '转出'|| item.orderType == '转入'">{{item.filedName}}

                           </text>
@@ -47,11 +47,11 @@
                     <view class="main-information">
                        <view class="sign">卸</view>
                        <view class="filedname exceedHide">
                           <text v-if="item.orderType == '外销' || item.orderType == '内销' ">
                           <text v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退' ">
                              {{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| ''  }}
                           </text>
                           <text
                              v-else-if="item.orderType == '外购' || item.orderType == '内购' ">{{ item.deptName|| ''  }}</text>
                              v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退'  ">{{ item.deptName|| ''  }}</text>
                           <text
                              v-else-if="item.orderType == '转出'|| item.orderType == '转入'">{{item.toFiledName}}

@@ -109,9 +109,9 @@
                           <view class="sign">装</view>
                           <view class="filedname exceedHide">
                              <text
                                 v-if="item.orderType == '外销' || item.orderType == '内销' ">{{ item.deptName }}</text>
                                 v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退' ">{{ item.deptName }}</text>
                              <text
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购' ">{{ item.customerName }}</text>
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退' ">{{ item.customerName }}</text>
                              <text
                                 v-else-if="item.orderType == '转出'|| item.orderType == '转入'">{{item.filedName}}
                              </text>
@@ -129,9 +129,9 @@
                           <view class="sign">卸</view>
                           <view class="filedname exceedHide">
                              <text
                                 v-if="item.orderType == '外销' || item.orderType == '内销' ">{{ item.customerName }}</text>
                                 v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退' ">{{ item.customerName }}</text>
                              <text
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购' ">{{ item.deptName }}</text>
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退'  ">{{ item.deptName }}</text>
                              <text
                                 v-else-if="item.orderType == '转出'|| item.orderType == '转入'">{{item.toFiledName}}</text>
                           </view>
@@ -157,8 +157,9 @@
                     </view>
                     <view class="fifth-line">
                        <view class="button-img"
                            v-if="item.isDanger === 1"
                           @click.stop="cancelCerifCate(item)">
                           添加押运员
                           道路运输证
                        </view>
                        <view class="button-img"
                           @click.stop="cancelAppoint(item)">
@@ -191,6 +192,23 @@
                  @cancel="insideConnectCancel"></u-modal>
            </view>
            <!-- 已预约提煤单 -->
            <!-- 填写集装箱号 -->
               <view class="">
               <u-modal :show="enterCode"
                  title="集装箱号"
                  showCancelButton
                  content="请填写集装箱号"
                  @confirm="cancelCodeEnter"
                  @cancel="cancelCodeCancel">
                  <view style="    display: flex; align-items: center;">
                      <text>请输入：</text>   <u--input 
                  style="border: 1px solid black"
                  v-model="enterCodeStr"
                        placeholder="请输入集装箱号"></u--input>
                  </view>
					
                  </u-modal>
            </view>
            <view class="Reserved">
               <combined-title title="已预约提煤单"></combined-title>
               <u-empty mode="data"
@@ -210,9 +228,9 @@
                           <view class="sign">装</view>
                           <view class="filedname exceedHide">
                              <text
                                 v-if="item.orderType == '外销' || item.orderType == '内销' ">{{ item.deptName }}</text>
                                 v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退' ">{{ item.deptName }}</text>
                              <text
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购' ">{{ item.customerName }}</text>
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退'  ">{{ item.customerName }}</text>
                              <text v-else-if="item.orderType == '转出'||item.orderType == '转入'">
                                 {{item.filedName}}

@@ -231,9 +249,9 @@
                           <view class="sign">卸</view>
                           <view class="filedname exceedHide">
                              <text
                                 v-if="item.orderType == '外销' || item.orderType == '内销' ">{{ item.customerName }}</text>
                                 v-if="item.orderType == '外销' || item.orderType == '内销'||item.orderType == '外销退' ">{{ item.customerName }}</text>
                              <text
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购'">{{ item.deptName }}</text>
                                 v-else-if="item.orderType == '外购' || item.orderType == '内购'||item.orderType == '外购退' ">{{ item.deptName }}</text>
                              <text v-else-if="item.orderType == '转出'||item.orderType == '转入'">
                                 {{item.toFiledName}}

@@ -263,7 +281,7 @@
                        v-if="item.isDanger === 1">
                           <view class="button-img"
                              @click.stop="cancelCerifCate(item)">
                              添加押运员                                                                                            押运员
                              道路运输证
                           </view>
                        <view class="button-img"
                           @click.stop="cancelAppoint(item)">
@@ -282,19 +300,36 @@
         mode="center"
         round="10">
         <view class="receiverPopup">
            <uni-table border
               stripe
               type="selection" 
               @selection-change="selectionChange"
               emptyText="暂无更多数据">
               <uni-tr>
                  <uni-th align="center">押运员</uni-th>
               </uni-tr>
               <uni-tr v-for="(item, index) in inspectData"
                  :key="item.id">
                  <uni-td align="center">{{ item.name.split("|")[0]  }}</uni-td>
               </uni-tr>
            </uni-table>
            <view class="image">
               <u--image 
                  :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
                  width="80px"
                  height="80px"
                  >
                  <view slot="error"
                     style="font-size: 24rpx;">加载失败</view>
               </u--image>
            </view>
            <view class="tables">
               <uni-table border
                  stripe
                  type="selection" 
                  @selection-change="selectionChange"
                  emptyText="暂无更多数据">
                  <uni-tr>
                     <uni-th align="center">押运员</uni-th>
                     <uni-th align="center">身份证号</uni-th>
                     <uni-th align="center">手机号</uni-th>
                  </uni-tr>
                  <uni-tr v-for="(item, index) in inspectData"
                     :key="item.id">
                     <uni-td align="center">{{ item.name.split("|")[0]  }}</uni-td>
                     <uni-td align="center">{{ item.name.split("|")[1]  }}</uni-td>
                     <uni-td align="center">{{ item.name.split("|")[2]  }}</uni-td>
                  </uni-tr>
               </uni-table>
            </view>
				
            <view class="receiverPopup__btn"><u-button text="确定"
                  type="primary"
                  @click="popClick"
@@ -341,8 +376,10 @@
      data() {
         return {
            show: false,
            BaseUrl,
            yaList:[],
            inspectData:[],
            activeObj:{},
            driverBillOfLoadingData: {
               list1: [],
               list2: [],
@@ -350,6 +387,8 @@
            },
            // 接单模态框
            qiangDanShow: false,
            enterCode:false,
            enterCodeStr:'',
            qiangDanTitle: '接单提示',
            qiangDanContent: '',
            qiangDanOrderPlanId: null,
@@ -364,6 +403,7 @@
            customerId: '',
            xsUserId: '',
            filedId: '',
            previewImageSrc:"",
         };
      },
      onShow() {
@@ -420,6 +460,7 @@
         },
         // 接单按钮
         qiangDanBtn(value) {
            this.activeObj = value;
            //是否可以场内接单，1 可以2不可以
            if (value.isInsideConnect === 1) {
               this.insideConnectShow = true
@@ -466,6 +507,13 @@
                  uni.hideLoading()
                  if (res.code == 0) {
                     this.$u.toast('接单成功');
                     //判断是不是集装箱 是否需要输入
                     if(this.activeObj.isContainerNum){
                        this.enterCode = true;
                     }else{
                        this.enterCode = false;
                     }
							
                  } else {
                     this.$u.toast(res.msg ? res.msg : '接单失败');
                  }
@@ -521,6 +569,7 @@
            this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => {
               this.inspectData=[]
               if (res.code == 0) {
                  this.previewImageSrc=res.data.certificateImg
                  this.inspectData=res.data.persons.map(item=>{
                     return {name:item,roadTransportId:res.data.id,Id: value.id}
                  })
@@ -586,6 +635,25 @@
            uni.navigateTo({
               url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
            })
         },
         cancelCodeEnter(){
            this.activeObj.containerNumber = this.enterCodeStr;
             this.$reqPut('addContainer',{
               id:this.activeObj.tmId,
               containerNumber:this.activeObj.containerNumber
            }).then(res=>{
               this.$u.toast('操作成功');
               this.enterCodeStr = '';
               this.enterCode = false;

            }).catch(err=>{

            })
         },
         cancelCodeCancel(){
            this.activeObj = {};
            this.enterCode = false;
            this.enterCodeStr = '';
         }
      }
   };
@@ -671,9 +739,18 @@
      }
   }
   .receiverPopup {
      height: vww(110);
      width: 300rpx;
		
      height: vww(220);
      width: 700rpx;
      .image{
         width: 100%;
         height: vww(110);
         display: flex;
         align-items: center;
         justify-content: center;
      }
      .tables{
         width: 100%;
      }
      .receiverPopup__title {
         margin: vww(10) auto 0;
         width: 80%;