Merge remote-tracking branch 'origin/dev' into dev

.env.production

@@ -23,16 +23,16 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
 
 # 文明东2
-VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 
 # 东旭
 VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
-
 刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
+#
+ VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

src/views/inout/InvoiceRegByFp.vue

@@ -203,7 +203,7 @@
           </el-table-column>
           <el-table-column label="确认状态" prop="checkStatus" width="100">
             <template slot-scope="scope">
-              <el-tag :type="statusFilterType(scope.row.checkStatus)">{{
+              <el-tag :type="statusCheckType(scope.row.checkStatus)">{{
                   checkDateStatus[scope.row.checkStatus]
                 }}
               </el-tag>
@@ -477,6 +477,13 @@ export default {
         }
         return statusMap[status]
       },
+      statusCheckType(status) {
+        const statusMap = {
+          0: 'warning',
+          1: 'success',
+        }
+        return statusMap[status]
+      },
       checkStatus: {
         1: '草稿',
         2: '等待处理',
@@ -489,7 +496,7 @@ export default {
         9: '正在处理', 10: '待审核'
       },
       checkDateStatus: {
-        1: '确认',
+        1: '已确认',
         0: '未确认'
       },
 

src/views/inout/InvoiceRegByOrder.vue

@@ -106,7 +106,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="确认状态：" prop="confirmStatus">
-              <el-select v-model="filterQuery.confirmStatus" placeholder="请选择确认状态" clearable="true" style="width: 90%" @change="invChange">
+              <el-select v-model="filterQuery.confirmStatus" placeholder="请选择确认状态" clearable="true" style="width: 90%"
+                         @change="invChange">
                 <el-option label="确认" :value="1"></el-option>
                 <el-option label="未确认" :value="0"></el-option>
               </el-select>
@@ -114,7 +115,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="备注:">
-              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input>
+              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -194,7 +196,7 @@
         </el-table-column>
         <el-table-column label="确认状态" prop="checkStatus" width="100">
           <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.checkStatus)">{{
+            <el-tag :type="statusCheckType(scope.row.checkStatus)">{{
                 checkDateStatus[scope.row.checkStatus]
               }}
             </el-tag>
@@ -515,7 +517,7 @@
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList,getUserBean
+  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList, getUserBean
 } from '../../api/inout/order'
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -604,8 +606,9 @@ export default {
       },
 
       checkDateStatus: {
-        1: "确认",
+        1: "已确认",
         0: "未确认",
+        null:"未确认"
       },
       storageList: [],
       invList: [],
@@ -1174,15 +1177,22 @@ export default {
       };
       return statusMap[status];
     },
-    getUser(){
+    statusCheckType(status) {
+      const statusMap = {
+        0: 'warning',
+        1: 'success',
+      }
+      return statusMap[status]
+    },
+    getUser() {
       getUserBean()
-          .then((res) => {
-            if(res.code == 20000){
-              if ( res.data.customerId == "110") {
-                this.showSup = true;
-              }
+        .then((res) => {
+          if (res.code == 20000) {
+            if (res.data.customerId == "110") {
+              this.showSup = true;
             }
-          })
+          }
+        })
     },
   }
   ,

src/views/inout/IoUploadOrder.vue

@@ -472,6 +472,10 @@ export default {
         8: "审核拒绝",
         9: "正在处理", 10: "待审核", 11: "待配货",
       },
+      checkDateStatus: {
+        1: '已确认',
+        0: '未确认'
+      },
       invList: [],
       list: [],
       total: 0,
@@ -1040,6 +1044,13 @@ export default {
       };
       return statusMap[status];
     },
+    statusCheckType(status) {
+      const statusMap = {
+        0: 'warning',
+        1: 'success',
+      }
+      return statusMap[status]
+    },
   },
   filters: {},
   mounted() {

src/views/inout/uploadManage/uploadOrder.vue

@@ -152,6 +152,14 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="确认状态" prop="checkStatus" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusCheckType(scope.row.checkStatus)">{{
+                checkDateStatus[scope.row.checkStatus]
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
@@ -461,6 +469,10 @@ export default {
         1: "已提交",
         2: "提交失败"
       },
+      checkDateStatus: {
+        1: '已确认',
+        0: '未确认'
+      },
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -687,6 +699,13 @@ export default {
       };
       return statusMap[status];
     },
+    statusCheckType(status) {
+      const statusMap = {
+        0: 'warning',
+        1: 'success',
+      }
+      return statusMap[status]
+    },
   },
   filters: {
     statusFilterType(status) {