修改

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -73,11 +73,11 @@
             {{dataList.inOutType}}
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+          <el-form-item label="移库任务编号" v-if="dataList.taskTypeKey == 3">
             <div>  {{dataList.moveTaskNo}}</div>
-            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+            <!-- <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div> -->
           </el-form-item>
-           <el-form-item label="合同编号" v-else>
+           <el-form-item label="合同编号" v-if="dataList.taskTypeKey != 3">
             <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
@@ -107,15 +107,15 @@
             <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <el-form-item label="容重（克/升）>=" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
@@ -183,11 +183,11 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-           <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+           <el-form-item label="移库任务编号" v-if="dataList.taskTypeKey == 3">
             <div>  {{dataList.moveTaskNo}}</div>
-            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+            <!-- <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div> -->
           </el-form-item>
-           <el-form-item label="合同编号" v-else>
+           <el-form-item label="合同编号" v-if="dataList.taskTypeKey != 3">
             <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
@@ -215,15 +215,15 @@
             {{dataList1.grade}}
           </el-form-item>
           <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
+          <el-form-item label="容重（克/升）>=" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList1.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList1.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -195,7 +195,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: center; color: #8890b1; font-size: 16px">
+       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
         <span

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -249,7 +249,7 @@ export default {
       taskTypeList: [
         { value: '执行中', type: 4 },
         { value: '已完货', type: 5 },
-        { value: '全部任务', type: 3 },
+        { value: '全部任务', type: 6 },
       ],
       tranTypeList: [
         { value: '汽运', type: 1 },

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -1450,18 +1450,32 @@ export default {
   padding: 0px;
 }
 
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
 .noservice {
   background: #c4cada;
   color: #ffffff;
-  padding: 5px 7px;
-  border-radius: 4px;
 }
-
 .service {
   background: #e5f1f7;
   color: #50cad4;
 }
-
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 .tupian {
   // margin-left: 14%;
   // margin-top: -7%;

src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -828,17 +828,32 @@
     color: #5473e8;
     line-height: 24px;
   }
-
-  .noservice {
-    background: #c4cada;
-    color: #ffffff;
-  }
-
-  .service {
-    background: #e5f1f7;
-    color: #50cad4;
-  }
-
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
   .forlist {
     background-color: #f5f7fa;
     border-radius: 10px;

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -1234,6 +1234,15 @@
     background: #e5f1f7;
     color: #50cad4;
   }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 
   /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
     padding: 0px;

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -830,21 +830,32 @@ export default {
   color: #5473e8;
   line-height: 24px;
 }
-//送达/未送达
-.noservice,
-.service {
+  //送达/未送达
+  .noservice,
+  .service {
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+  }
+
+  .noservice {
+    background: #c4cada;
+    color: #ffffff;
+  }
+
+  .service {
+    background: #e5f1f7;
+    color: #50cad4;
+  }
+.serviced {
   display: inline-block;
   border-radius: 4px;
   border: 1px solid #d8dce6;
   padding: 2px;
   font-size: 12px;
-}
-.noservice {
-  background: #c4cada;
-  color: #ffffff;
-}
-.service {
   background: #e5f1f7;
-  color: #50cad4;
+  color: #2c81cf;
 }
 </style>

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -1283,18 +1283,32 @@ export default {
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   padding: 0px;
 }
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
 .noservice {
   background: #c4cada;
   color: #ffffff;
 }
-.serviced {
-  background: #e5f1f7;
-  color: #5473E8 ;
-}
 .service {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 .center1 {
   width: 100px;
   margin: 0 auto;

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -871,6 +871,15 @@ export default {
   color: #5473e8;
   line-height: 24px;
 }
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
 .noservice {
   background: #c4cada;
   color: #ffffff;
@@ -880,7 +889,12 @@ export default {
   color: #50cad4;
 }
 .serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
   background: #e5f1f7;
-  color: #5473E8 ;
+  color: #2c81cf;
 }
 </style>