Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -40,7 +40,8 @@
           <span style="margin-left: 14px"
             >出货库：{{ shipment1.sendWarehouse }}</span
           >
-          <span style="margin-left: 10px">{{ shipment1.taskStatus }}</span>
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
+          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
         </div>
         <!--出库经办人-->
         <ws-form-item label="出库经办人：" span="1" prop="agent">
@@ -69,7 +70,8 @@
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
           >
-          <span style="margin-left: 10px">{{ enter.taskStatus }}</span>
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
+          <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ enter.taskStatus  }}</span>
         </div>
         <!--入库经办人-->
         <ws-form-item label="入库经办人：" span="1" prop="agent">
@@ -683,4 +685,18 @@ export default {
 /deep/.el-table td{
   text-align: center;
 }
+.status{
+  margin-left: 10px;
+  background: #E6EAF8;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
+}
+.status1{
+   margin-left: 10px;
+background: #E5F1F7;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #50CAD4;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -42,7 +42,7 @@
           />
         </ws-select>
         <ws-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',