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

.env.production

@@ -22,11 +22,12 @@ ENV = 'production'
 # 叶东旭
 # VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
 
-# 文明东1
-# VUE_APP_BASE_API = 'http://192.168.0.62: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.153:9150/UDI_WMS_MC/'
+
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 

src/views/inout/DialogSelectThrOrder.vue

@@ -52,6 +52,11 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
+              <el-form-item label="往来单位:">
+                <el-input v-model="listQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item class="query-form-item" label="单据日期:">
                 <el-date-picker
@@ -180,6 +185,7 @@ export default {
         limit: 10,
         allocateStatus: 0,
         type: 0,
+        corpName:null,
         customerId: null,
       },
       showSearch: true,

src/views/inout/DialogcChangeNewOrder.vue

@@ -280,7 +280,6 @@ export default {
         this.$message.error("往来单位不能为空");
         return;
       }
-
       if (this.detailList.length == 0) {
         this.$message.error("产品列表不能为空");
         return;

src/views/inout/IoAuditedOrder.vue

@@ -818,7 +818,7 @@ export default {
       this.resultQuery.page = 1;
 
       this.getBizDetailList();
-      this.getCodeDetailList();
+      // this.getCodeDetailList();
       this.getResultDetailList();
     },
     // 清空单据详情数据列表
@@ -959,11 +959,11 @@ export default {
       getBizDetailList(this.bizQuery).then((res) => {
         this.bizDetailLoading = false;
         if (res.code === 20000) {
-          this.bizDetailList = res.data.list || [];
+          this.codeDetailList = res.data.list || [];
           this.bizTotal = res.data.total || 0;
         } else {
           this.$message.error(res.message);
-          this.bizDetailList = [];
+          this.codeDetailList = [];
           this.bizTotal = 0;
         }
       }).catch((error) => {

src/views/inout/uploadManage/uploadOrder.vue

@@ -639,7 +639,7 @@ export default {
     },
     getResultDetailList() {
       this.resultDetailLoading = true;
-      this.resultQuery.orderIdFk = this.currentRow.billNo;
+      this.resultQuery.orderId = this.currentRow.billNo;
       getCodeList(this.resultQuery).then((res) => {
         this.resultDetailLoading = false;
         if (res.code === 20000) {

src/views/thirdSys/order/thrOrder.vue

@@ -3,12 +3,12 @@
     <el-card>
       <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="单据号:">
               <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="外部系统:">
               <el-select v-model="filterQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
                          clearable="true" @change="thirdSysChange">
@@ -22,7 +22,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="单据类型:">
               <el-select v-model="filterQuery.billAction" style="width: 90%" placeholder="请选择第三方系统单据类型"
                          clearable="true">
@@ -43,7 +43,12 @@
 
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
+            <el-form-item label="往来单位:">
+              <el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="单据日期:">
               <el-date-picker
                 :picker-options="pickerOptions"