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

src/views/basic/BussinessType.vue

@@ -465,11 +465,9 @@ export default {
                 });
         },
         handleChange(response, files, fileList) {
-            console.log(response);
             if (response.code != 20000) {
                 this.$message.error(response.message);
             } else {
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                 this.$message.success(response.data);
                 this.getList();
             }

src/views/basic/BussinessTypeLocl.vue

@@ -19,7 +19,7 @@
                 <el-form-item>
                     <el-button-group>
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="search">查询</el-button>
                         <el-button type="primary" icon="search" @click="handleAddClick"
                                    :disabled="!configParms.typeBus"
                         >新增
@@ -117,6 +117,13 @@
                     >
                 </div>
             </el-dialog>
+
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
         </el-card>
     </div>
 </template>
@@ -184,7 +191,14 @@ export default {
             this.modifyDialogVisible = false;
             this.addDialogVisible = false;
         },
-
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         getList() {
             this.loading = true;
             getLocalBusType(this.filterQuery)

src/views/business/stockOrderNewSelectProduct.vue

@@ -241,7 +241,6 @@ export default {
       this.getList();
     },
     handleChange(val) {
-      console.log(val);
       this.currentRow = val;
     },
     handleDetailClick(row) {
@@ -263,7 +262,6 @@ export default {
       this.listQuery.customerId = store.getters.customerId;
       stockOrderDetailFilterProduct(this.listQuery)
           .then((response) => {
-            console.log(response)
             this.loading = false;
             if (response.code === 20000) {
               this.dataList = response.data.list || [];
@@ -292,7 +290,6 @@ export default {
       let ids = [];
 
       selection.forEach((obj, index) => {
-        console.log("obj:===" + obj + "==" + obj.relIdFk)
         let data = {
           relId: obj.rlId,
         }

src/views/inout/IOAddOrder.vue

@@ -545,7 +545,6 @@ export default {
             }
             submitOrderWeb(tQuery)
                 .then((response) => {
-                    console.log(response)
                     if (response.code === 20000) {
                         this.$message.success("提交成功");
                         this.closeDialog();
@@ -698,7 +697,6 @@ export default {
                 this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
             }
             this.formData.code = this.formData.code.trim();
-            console.log(this.formData.code);
             if (this.$isBlank(this.formData.code)) return;
             this.loading = true;
 
@@ -796,7 +794,6 @@ export default {
         },
 
         unitChange(row) {
-            console.log(row);
             this.formData.fromCorpId = row.erpId;
             this.formData.fromCorp = row.name;
             this.curRow = row;
@@ -809,7 +806,6 @@ export default {
         },
 
         deleteCode(index, row) {
-            console.log(row.id)
             this.$confirm("是否确定移除一个条码?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -915,7 +911,6 @@ export default {
         }
         ,
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -1022,9 +1017,7 @@ export default {
         }
         ,
         getActionItem(action) {
-            console.log("-----")
             for (let i = 0; i < this.busTypes.length; i++) {
-                console.log(this.busTypes[i].action + "--" + action)
                 if (this.busTypes[i].action == action) {
                     return this.busTypes[i];
                 }
@@ -1045,13 +1038,11 @@ export default {
 
 //绑定数据
         bindRl(val) {
-            console.log("curRow.erpId = " + val.id);
             this.curRow = val;
             this.selectRlVisible = true;
         }
         ,
         handleUnitClick(row) {
-            console.log("curRow.erpId = " + row.id);
             this.curRow = row;
             this.dialogTableVisible = true;
         }
@@ -1061,7 +1052,6 @@ export default {
                 id: this.curRow.id,
                 supId: row.erpId,
             };
-            console.log("row.erpId = " + row.erpId);
             updateCodeBindSup(query).then((response) => {
                 if (response.code == 20000) {
                     this.$message.success("绑定成功");
@@ -1083,7 +1073,6 @@ export default {
                 relId: row.id,
                 mySupId: row.unitFk,
             };
-            console.log("row.relId = " + row.id);
             updateCodeBindSup(query).then((response) => {
                 if (response.code == 20000) {
                     this.$message.success("绑定成功");
@@ -1105,7 +1094,6 @@ export default {
         }
         ,
         closeBindDialog(val) {
-            console.log("closeBindDialog" + val);
             this.selectRlVisible = false;
             this.dialogTableVisible = false;
         }
@@ -1150,7 +1138,6 @@ export default {
             } else {
 
                 that.formData.code = text;
-                console.log(" that.formData.code  = " + that.formData.code);
                 // setTimeout(function(){  that.formData.code = text; }, 3000);
 
 

src/views/thrsys/ThrInvWarehouse.vue

@@ -321,6 +321,7 @@ export default {
                 isDefault: null,
                 page: 1,
                 limit: 20,
+                parentId: null,
                 thirdSysFk: null,
             },
             mergeList: [],
@@ -464,7 +465,6 @@ export default {
                 this.$refs["dataForm"].clearValidate();
                 // 刷新表单
                 this.$refs["dataForm"].resetFields();
-                this.getList();
             }
         },
         // 隐藏表单
@@ -530,7 +530,11 @@ export default {
                                     return false;
                                 }
                                 this.$message.success("删除成功");
-                                this.loadSubData(row.parentId);
+                                let param = {
+                                    code: row.parentId,
+                                    thirdSysFk: row.thirdSysFk
+                                }
+                                this.loadSubData(param);
                             })
                             .catch(() => {
                                 this.deleteLoading = false;
@@ -551,7 +555,11 @@ export default {
             }
             saveSubWarehouse(this.subData, this.subFromName).then((response) => {
                 if (response.code == 20000) {
-                    this.loadSubData(this.subData.parentId);
+                    let row = {
+                        code: this.subData.parentId,
+                        thirdSysFk: this.subData.thirdSysFk
+                    }
+                    this.loadSubData(row);
                     this.subFormVisible = false;
                 } else {
                     this.$message.error(response.message);