Merge branch 'fencang' into busUser

src/views/basic/BasicEntrutsReceModify.vue

@@ -324,7 +324,6 @@ export default {
         },
 
         entrustSubInvChange() {
-
             let query = {
                 code: this.inputQuery.entrustSubInv,
             }
@@ -358,6 +357,7 @@ export default {
 
         this.getList();
         this.getStorage();
+
         // if (this.$isNotBlank(this.inputQuery.entrustInv)) {
         //     this.findEntrustSubInvByInv();
         // }

src/views/basic/BussinessTypeThird.vue

@@ -41,10 +41,9 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%">
         <el-table-column label="序号" type="index" width="55"></el-table-column>
-
         <el-table-column label="单据类型名称" prop="name"></el-table-column>
         <el-table-column label="单据类型代码" prop="action"></el-table-column>
-        <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
+        <el-table-column label="第三方系统" prop="thirdSysName"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
@@ -195,6 +194,15 @@ export default {
           .then((response) => {
             this.loading = false;
             this.list = response.data.list || [];
+              if (this.list.length > 0) {
+                  this.list.forEach(item => {
+                      this.thirdSys.forEach(third => {
+                          if (item.thirdSys === third.thirdId) {
+                              item.thirdSysName = third.thirdName;
+                          }
+                      })
+                  })
+              }
             this.total = response.data.total || 0;
           })
           .catch(() => {

src/views/basic/invWarehouse.vue

@@ -668,7 +668,7 @@
             <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="thirdSubQuery.key"
+                        v-model="thirdSubQuery.name"
                         clearable
                         placeholder="分库名称"
                         style="width: 400px"
@@ -864,7 +864,7 @@ export default {
             },
             thirdSubQuery: {
                 parentId: null,
-                key: null,
+                name: null,
                 page: 1,
                 limit: 10,
                 thirdSysFk: "thirdId",
@@ -1611,10 +1611,11 @@ export default {
         },
 
         intentSubSelect(row) {
-
             if (row != null) {
                 this.thirdSubQuery.parentId = this.superRow.code;
-                this.thirdSubQuery.thirdSysFk = row.sysId;
+                if (row.sysId != null && row.sysId != undefined) {
+                    this.thirdSubQuery.thirdSysFk = row.sysId;
+                }
             }
             this.thrSubWarehouseData = [];
             this.thrSubWareHouseVisible = true;

src/views/inventory/InvPreInProductsDetail.vue

@@ -48,7 +48,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -180,7 +180,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;

src/views/inventory/InvProducts.vue

@@ -143,6 +143,8 @@
             :visible.sync="codeDetailVisible"
             width="85%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -241,6 +243,7 @@ export default {
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {

src/views/inventory/InvProductsDetail.vue

@@ -82,7 +82,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -220,7 +220,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;

src/views/inventory/invPreInProducts.vue

@@ -121,6 +121,8 @@
             :visible.sync="codeDetailVisible"
             width="85%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -205,6 +207,7 @@ export default {
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -231,7 +234,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.showSup = response.data.showSup;
                     this.list = response.data.list || [];
@@ -309,7 +311,6 @@ export default {
                 });
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,

src/views/inventory/supInvProducts.vue

@@ -157,6 +157,7 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      this.filterQuery.page = 1;
       this.getList();
     },
     handleSizeChange(val) {

src/views/thrsys/ThrProductsCheck.vue

@@ -208,7 +208,7 @@ export default {
                 registerNo: null,
                 manufactory: null,
                 name: "",
-                thirdSys: null,
+                thirdSys: this.thirdSys[0].thirdId,
                 page: 1,
                 limit: 20,
             };

src/views/userManage/customerManage.vue

@@ -6,7 +6,7 @@
                     <el-input
                         style="width: 400px"
                         v-model="filterQuery.companyName"
-                        placeholder="客户名称"
+                        placeholder="企业名称"
                     ></el-input>
                 </el-form-item>
 

src/views/userManage/userAccountManage.vue

@@ -96,6 +96,8 @@
             :before-close="hideForm"
             width="70%"
             top="5vh"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
                 <el-row :gutter="20" class="el-row" type="flex">
@@ -363,13 +365,6 @@ export default {
             }
         },
         formSubmit() {
-            console.log(
-                this.formData.userName +
-                "--222---" +
-                this.formData.employeeName +
-                this.formData.userFlag +
-                this.formData.id
-            );
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
                     this.formLoading = true;
@@ -388,7 +383,6 @@ export default {
                         userName: this.formData.userName,
                         employeeName: this.formData.employeeName,
                     };
-                    console.log(savequery.id + "---");
                     authAdminSave(savequery, this.formName).then((response) => {
                         this.formLoading = false;
                         if (response.code !== 20000) {
@@ -410,7 +404,6 @@ export default {
                         this.resetForm();
                     });
                 } else {
-                    console.log("参数错误");
                 }
             });
         },

src/views/warehouse/IOCheckErrOrder.vue

@@ -308,13 +308,13 @@
                 ></el-table-column>
                 <el-table-column
                     label="单据数量"
-                    prop="reCount"
+                    prop="erpCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                     label="实际数量"
-                    prop="erpCount"
+                    prop="reCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>

src/views/warehouse/addHosOrder.vue

@@ -677,6 +677,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
+                        this.originCode =this.formData.code ;
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
@@ -1082,6 +1083,9 @@ export default {
             this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
 
+            this.formData.fromCorp = null;
+            this.formData.fromSubInvCode = null;
+
             // this.formData.vailIn = this.curAction.vailInv;
             // this.formData.preCheck = this.curAction.scanPreIn;
             // this.formData.outChangeEnable = this.curAction.ullageFill;

src/views/warehouse/addOrder.vue

@@ -431,6 +431,7 @@ export default {
                 action: this.formData.billType,
                 locStorageCode: this.formData.locStorageCode,
                 preCheck: this.formData.preCheck,
+                fromCorp: this.formData.fromCorp
             }
 
             submitOrderWeb(tQuery)
@@ -541,6 +542,7 @@ export default {
                     } else if (response.code == 508) {
                         this.originCode = "";
                         this.formData.code = "01" + response.data.nameCode;
+                        this.originCode =this.formData.code ;
                         // this.$confirm("当前商品条码对应产品信息：\n" +
                         //     "DI标识:" + response.data.nameCode + "\n" +
                         //     "产品名称：" + response.data.cpmctymc + "\n" +
@@ -833,6 +835,7 @@ export default {
             this.curAction = this.getActionItem(item);
             this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
             // this.formData.locStorageCode = this.curAction.storageCode;
+            // this.formData.fromCorp = null;
         },
         //绑定数据
         bindRl(val) {

src/views/warehouse/errorCode.vue

@@ -232,6 +232,7 @@ export default {
                 path: "",
                 query: this.query,
             });
+            this.query.page = 1;
             this.getCodeList();
         },
         handleSizeChange(val) {
@@ -280,7 +281,6 @@ export default {
         getCodeList() {
             this.loading = true;
             this.query.orderId = this.idQuery.id;
-            console.log(this.idQuery.id)
             errorCodeList(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;

src/views/warehouse/stockOrderDelSearch.vue

@@ -689,9 +689,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
-                    /*this.detailList.forEach(data => {
+                    this.detailTotal = response.data.total;
-                       data['edit'] = false;
-                    });*/
                 })
                 .catch(() => {
                     this.detailLoading = false;

src/views/warehouse/stockOrderNew.vue

@@ -600,6 +600,7 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
+            this.query.page = 1;
             this.getList();
             if (this.query.status === "502") {
                 this.haveNewDistributionVisible = true;
@@ -702,6 +703,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;

src/views/warehouse/stockOrderSearch.vue

@@ -618,7 +618,6 @@ export default {
         },
         handleEdit(index, row) {
             this.currentCheckIndex = index;
-            console.log(this.currentCheckIndex)
         },
         handleSave(index, row) {
             this.currentCheckIndex = -1;
@@ -635,7 +634,6 @@ export default {
             row.forEach((item) => {
                 _this.multipId.push(item.id);
             })
-            console.log(this.multipId);
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
@@ -807,9 +805,9 @@ export default {
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;