前端

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -21,9 +21,13 @@
       <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '3'||dataList1.taskTypeKey == '3'"> 移库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '4'||dataList1.taskTypeKey == '4'"> 退库并出库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '1'||dataList1.taskTypeKey == '1'"> 出库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '2'||dataList1.taskTypeKey == '2'"> 入库任务</h1>
+          <!-- <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
           <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1> -->
         </span>
       </div>
       <div class="nav2"></div>
@@ -190,8 +194,8 @@
               :label="item.contractNo"
               :value="item.contractNo"
             ></el-option> -->
-               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
-            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+               <div v-if="dataList1.inOutType == '移库入库' || dataList1.inOutType == '移库出库'">  {{dataList1.moveTaskNo}}</div>
+            <div v-if="dataList1.inOutType != '移库入库' || dataList1.inOutType != '移库出库'">  {{dataList1.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -853,7 +857,7 @@ export default {
   line-height: 20px;
   margin-left: 381px;
   margin-top: -21px;
-  width: 100px;
+  width: 116px;
 }
 .winseaview-view {
   padding: 0 0 20px;

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -121,7 +121,7 @@
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
-      <div class="liaison">
+      <div class="liaison" v-if="this.deptBudgetList.tranCarInfoList.length>0">
         <div
           style="width: 100%"
           class="flex position"
@@ -234,7 +234,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div class="yd-bottom">
+      <div v-if="this.deptBudgetList.tranCarInfoList.length>0" class="yd-bottom">
        
         <ws-form-item label="运单：" span="1" prop="loadPoundImg" class="yd-bottom-left" v-if="freightspace[0].status == '已装车'">
           <!-- slot-scope="scope" -->
@@ -266,7 +266,7 @@
           </template>
         </ws-form-item>
 
-        <div style="text-align: right; color: #8890b1; font-size: 16px">
+        <div style="text-align: right; color: #8890b1; font-size: 16px;width:100%;">
           合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
           <!--阶段状态-->
           <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
@@ -276,7 +276,9 @@
           >{{ deptBudgetList.feedbackStatus }}</span>
         </div>
       </div>
-
+      <div v-if="this.deptBudgetList.tranCarInfoList.length==0">
+          暂无船次
+      </div>
       <!--运单-->
       <!-- <div
           style="width: 100%"
@@ -756,7 +758,9 @@ export default {
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
             this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
             //上传附件计数
-            this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            if(this.deptBudgetList.tranCarInfoList[0].loadPoundImg){
+              this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            }
             this.freightspace = response.tranCarInfoList
           }