前端

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -92,7 +92,11 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="140">
+        <el-table-column prop="processNo" label="运输任务编号/合同编号" width="140">
+        <template scope="scope">
+            <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
+            <span v-else>{{ scope.row.contractNo }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>

src/views/tranManagement/tranManagementthirdpartnarFeedback.vue

@@ -1178,7 +1178,7 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 25%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;

src/views/tranManagement/tranManagementthirdpartnarFeedbackLook.vue

@@ -415,12 +415,15 @@ export default {
             }
             if(this.checkList.indexOf('火运')!=-1){
               this.status1=true
-              if(response.tranCarInfoList2[i].boxNo&&response.tranCarInfoList2[i].boxNo.indexOf(',')!=-1){
+              for (let i = 0; i < response.tranCarInfoList2.length; i++) {
+                if(response.tranCarInfoList2[i].boxNo&&response.tranCarInfoList2[i].boxNo.indexOf(',')!=-1){
                   response.tranCarInfoList2[i].boxNo1=response.tranCarInfoList2[i].boxNo.split(',')[0]
                   response.tranCarInfoList2[i].boxNo2=response.tranCarInfoList2[i].boxNo.split(',')[1]
                 }else{
                   response.tranCarInfoList2[i].boxNo1=response.tranCarInfoList2[i].boxNo
                 }
+              }
+              
               this.freightspace1=response.tranCarInfoList2
             }else{
               this.status1=false
@@ -804,7 +807,7 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 25%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;

src/views/tranManagement/tranManagementthirdpartnarReceiving.vue

@@ -1019,7 +1019,7 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 25%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;

src/views/tranManagement/tranManagementthirdpartnarReceivingLook.vue

@@ -805,7 +805,7 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 25%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;

src/views/warehouse/warehouseManagementGross.vue

@@ -360,14 +360,14 @@
             "
           >
             <ws-input
-              v-if="!carstatus"
+              v-if="options2.length==0"
               v-model="deptBudgetList.carNo"
               placeholder="请输入车牌号"
               maxlength="7"
-              size="small"
+              size="small" 
             />
             <el-select
-              v-if="carstatus"
+              v-if='carstatus&&options2.length>0'
               filterable
               :filter-method="dataFilter2"
               v-model="deptBudgetList.carNo"
@@ -382,6 +382,22 @@
                 :value="item.carNo"
               />
             </el-select>
+            <el-select
+              v-if='!carstatus&&options2.length>0'
+              filterable
+              :filter-method="dataFilter2"
+              v-model="deptBudgetList.carNo"
+              placeholder="请选择车牌号"
+              class="typeselect"
+              @change="carChange"
+            >
+              <el-option
+                v-for="item in options2"
+                :key="item.constKey"
+                :label="item.carNo"
+                :value="item.carNo"
+              />
+            </el-select>
           </ws-form-item>
           <!--船名  -->
           <ws-form-item