diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 171a6b5..00794bd 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -58,6 +58,7 @@ {{ enableMap[scope.row.secCheckEnable] }} + + + + @@ -206,6 +215,15 @@ + + +
取消 @@ -558,7 +576,32 @@ export default { thrWareHouseVisible: false, checkThrWarehouseRow: null, currentSysId: null, - thirdSysVisible: false + thirdSysVisible: false, + userQuery: { + code: null, + page: 1, + limit: 10 + }, + userTotal: 0, + busQuery: { + code: null, + page: 1, + limit: 10 + }, + busTotal: 0, + addUserQuery: { + customerId: this.$store.getters.customerId, + page: 1, + limit: 10 + }, + addUserTotal: 0, + bussinessTypeQuery: { + customerId: this.$store.getters.customerId, + enabled: true, + page: 1, + limit: 10 + }, + bussinessTypeTotal: 0 }; }, methods: { @@ -844,30 +887,47 @@ export default { this.$message.error("单据类型数据加载失败"); }); }, + getAddUserList(val) { + this.addUserQuery.page = val; + getUserList(this.addUserQuery).then((res) => { + this.selectUserList = []; + this.userList = res.data.list || []; + this.addUserTotal = res.data.total || 0; + var that = this; + that.$nextTick(() => { + if (that.$refs.checkUserList) { + that.$refs.checkUserList.clearSelection(); + } + that.userList.forEach(row => { + for (let j in that.userData) { + if (row.id == that.userData[j].userid) { + that.$refs.checkUserList.toggleRowSelection(row, true); + } + } + }); + }); + }); + }, addUser() { if (this.currentCode == null || this.currentCode == "") { this.$message.error("请先选择仓库"); } else { this.userFormVisible = true; - let query = {customerId: this.$store.getters.customerId}; - getUserList(query).then((res) => { - this.selectUserList = []; - this.userList = res.data; - var that = this; - that.$nextTick(() => { - if (that.$refs.checkUserList) { - that.$refs.checkUserList.clearSelection(); - } - that.userList.forEach(row => { - for (let j in that.userData) { - if (row.id == that.userData[j].userid) { - that.$refs.checkUserList.toggleRowSelection(row, true); - } - } - }); - }); - }); + this.getAddUserList(1); + } + }, + + loadUserList(val) { + if (val != null) { + this.userQuery.page = val; } + //加载用户数据 + warehouseUserList(this.userQuery).then((res) => { + this.userData = res.data.list; + this.userTotal = res.data.total; + }).catch((error) => { + this.$message.error("用户数据加载失败") + }); }, handleUserSelectionChange(row) { let _this = this; diff --git a/src/views/sys/bindPlatform.vue b/src/views/sys/bindPlatform.vue index be97863..c712b5b 100644 --- a/src/views/sys/bindPlatform.vue +++ b/src/views/sys/bindPlatform.vue @@ -142,7 +142,7 @@
- + { + this.$refs['editLogin'].resetFields(); + this.$refs["editLogin"].clearValidate(); + }); + }, search() { this.query.page = 1; this.getList(); @@ -405,6 +417,7 @@ export default { this.editType = 0; this.editLoginVisible = true; this.editDialogVisible = false; + this.resetForm(); this.curPlatformId = "", //清空表单数据 this.editLogin = { diff --git a/src/views/userManage/admin/authPermissionRule.vue b/src/views/userManage/admin/authPermissionRule.vue index bc1a9bb..690a359 100644 --- a/src/views/userManage/admin/authPermissionRule.vue +++ b/src/views/userManage/admin/authPermissionRule.vue @@ -129,7 +129,6 @@ export default { data() { return { query: { - name: "", status: "" }, mergeList: [], diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue index 6793efb..f38be33 100644 --- a/src/views/userManage/param/systemPDFModule.vue +++ b/src/views/userManage/param/systemPDFModule.vue @@ -11,7 +11,7 @@ > - + @@ -157,6 +157,15 @@ + + +
- @@ -358,7 +360,7 @@ @@ -423,13 +425,6 @@ const moduleFormJson = { export default { data() { return { - query: { - templateType: null, - moduleId: null, - name: "", - page: 1, - limit: 20 - }, headers: {}, list: [], total: 0, @@ -438,10 +433,18 @@ export default { page: 1, limit: 20 }, + moduleTotal: 0, + detailQuery: { + templateType: null, + moduleId: null, + name: "", + page: 1, + limit: 20 + }, + detailTotal: 0, currentRow: null, moduleList: [], moduleNameList: [], - moduleTotal: 0, selectTemplateQuery: { busRlId: null, name: "", @@ -496,10 +499,7 @@ export default { this.$router.push({ path: "" }); - this.query = { - templateType: null, - moduleId: null, - customerId: this.$store.getters.customerId, + this.moduleQuery = { name: "", page: 1, limit: 20 @@ -507,22 +507,27 @@ export default { this.getModuleList(); }, onSubmit() { - this.query.page = 1; + this.moduleQuery.page = 1; this.getModuleList(); }, handleCurrentChange(val) { - this.query.page = val; + this.detailQuery.page = val; this.getList(); }, moduleHandleCurrentChange(val) { this.moduleQuery.page = val; this.getModuleList(); }, + selectTemplateHandleCurrentChange(val) { + this.selectTemplateQuery.page = val; + this.selectTemplateGetList(); + }, getList() { - moduleDetail(this.query) + moduleDetail(this.detailQuery) .then(response => { this.loading = false; - this.list = response.data || []; + this.list = response.data.list || []; + this.detailTotal = response.data.total || 0; }) .catch(() => { this.loading = false; @@ -531,7 +536,7 @@ export default { }, moduleClick(row) { - this.query = { + this.detailQuery = { templateType: row.templateType, moduleId: row.id, customerId: this.$store.getters.customerId, @@ -641,12 +646,11 @@ export default { type: 1, name: "", page: 1, - limit: 20 + limit: 10 }; this.selectTemplateGetList(); }, - selectTemplateGetList() { this.selectTemplateLoading = true; systemPDFTemplateList(this.selectTemplateQuery) diff --git a/src/views/userManage/param/systemParamConfig.vue b/src/views/userManage/param/systemParamConfig.vue index 56f46d7..ba3fc31 100644 --- a/src/views/userManage/param/systemParamConfig.vue +++ b/src/views/userManage/param/systemParamConfig.vue @@ -249,6 +249,7 @@ export default { // 显示表单 handleForm(index, row) { this.formVisible = true; + this.resetForm(); formJson.customerId = this.$store.getters.customerId; this.formData = JSON.parse(JSON.stringify(formJson)); if (row !== null) { diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue index 8217a1d..b10b082 100644 --- a/src/views/userManage/userAccountManage.vue +++ b/src/views/userManage/userAccountManage.vue @@ -141,6 +141,15 @@
+ + +
+ + + +
+ +
取消 @@ -370,6 +379,7 @@ export default { customerId: this.userInfo.customerId, companyName: this.userInfo.companyName, passWord: this.formData.passWord, + checkPassword: this.formData.checkPassword, userName: this.formData.userName, employeeName: this.formData.employeeName, }; @@ -423,7 +433,7 @@ export default { this.deleteLoading = false; }); }).catch(() => { - }); + }); } }, }, diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue index bdd2b2b..f04642b 100644 --- a/src/views/warehouse/InvProducts.vue +++ b/src/views/warehouse/InvProducts.vue @@ -24,6 +24,17 @@ + + + + {{ item.name }} + + + + @@ -72,6 +84,8 @@ :visible.sync="codeDetailVisible" width="65%" v-if="codeDetailVisible" + :close-on-click-modal="false" + :close-on-press-escape="false" > { + this.storageList = response.data || []; + }) + .catch(() => { + }); + }, deleteOrders(data) { this.loading = true; let query = { @@ -264,6 +296,7 @@ export default { this.filterQuery.limit = parseInt(this.filterQuery.limit); // 加载表格数据 this.getList(); + this.getStorage(); } }; diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue index a988e12..0a460c5 100644 --- a/src/views/warehouse/ioErrorOrder.vue +++ b/src/views/warehouse/ioErrorOrder.vue @@ -244,9 +244,10 @@ export default { limit: 20 }, checkStatus: { - error: "校验异常", - process: "等待校验", - success: "校验成功" + 1: "等待处理", + 2: "正在处理", + 3: "已完成", + 9: "异常" }, curIndex: "", unitquery: {key: "", page: 1, limit: 10}, diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue index 94206c2..2bf373f 100644 --- a/src/views/warehouse/stockOrderDelete.vue +++ b/src/views/warehouse/stockOrderDelete.vue @@ -30,7 +30,6 @@ style="width: 100%" @row-click="getOrderDetailList" highlight-current-row - @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" > @@ -44,11 +43,7 @@ prop="orderId" show-overflow-tooltip="true" > - - - + @@ -67,10 +62,10 @@ {{ scope.row.actDate }} - + @@ -271,9 +266,9 @@ "8": "平衡补录单据", }, erpCheckStatus: { - 1: "已完成", - 0: "已完成", - 2: "已完成", + 1: "已验收", + 0: "未验收", + 2: "无需验收", }, isSp: store.getters.customerId, detailFormData: {},