diff --git a/public/测试环境打包配置 b/public/测试环境打包配置 new file mode 100644 index 0000000..4d84444 --- /dev/null +++ b/public/测试环境打包配置 @@ -0,0 +1,4 @@ +{ + "BASE_URL":"http://192.168.0.66:8500/UDIC_UDI_Server", + "Download_URL": "https://www.udims.com/UDI_DL_Server_test" +} diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue index 41402d4..a988e12 100644 --- a/src/views/warehouse/ioErrorOrder.vue +++ b/src/views/warehouse/ioErrorOrder.vue @@ -121,6 +121,13 @@ + {{ errorDetail }} @@ -134,6 +141,8 @@ title="选择往来单位" :visible.sync="dialogTableVisible" width="70%" + :close-on-click-modal="false" + :close-on-press-escape="false" > @@ -179,6 +188,14 @@ + + - @@ -239,7 +249,8 @@ export default { success: "校验成功" }, curIndex: "", - unitquery: {key: "", page: 1, limit: 20}, + unitquery: {key: "", page: 1, limit: 10}, + unitTotal: 0, unitlist: [], unitUpdateQuery: { id: "", @@ -287,6 +298,11 @@ export default { path: "" }); this.filterQuery = { + id: "", + mainAction: null, + action: null, + status: 9, + receiveStatus: 0, page: 1, limit: 20 }; @@ -305,10 +321,20 @@ export default { this.filterQuery.page = val; this.getList(); }, + loadUnitList(val) { + this.unitquery.page = val; + this.getUnitList(); + }, handleUnitClick(row) { this.curIndex = row.id; this.dialogTableVisible = true; this.curOrderId = row.orderId; + this.unitquery = { + key: "", + page: 1, + limit: 10 + } + this.getUnitList(); }, closeDetailDialog(val) { this.codeDetailVisible = false; @@ -326,6 +352,7 @@ export default { .then((response) => { this.loading = false; this.unitlist = response.data.list || []; + this.unitTotal = response.data.total || 0; }) .catch(() => { this.loading = false; @@ -367,11 +394,15 @@ export default { this.deleteData.orderId = data; deleteByOrderId(this.deleteData) .then((response) => { - this.getList(); - this.$message({ - type: "success", - message: "删除成功!" - }); + if (response.code === 20000) { + this.getList(); + this.$message({ + type: "success", + message: "删除成功!" + }); + } else { + this.$message.error(response.message); + } }) .catch(() => { }); diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 5feea74..0b9209a 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -172,25 +172,25 @@ @@ -665,6 +665,7 @@ export default { if (this.$isNotBlank(row)) { this.detailQuery.orderId = row.orderId; } + this.currentCheckIndex = -1; this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index cc0898d..02d75d3 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -10,16 +10,16 @@ > - + - + - {{ item.localName }} + :key="item.name" + :label="item.name" + :value="item.action"> + {{ item.name }} @@ -454,12 +454,12 @@ export default { data() { return { query: { - billType: null, + action: null, corpName: null, locStorageCode: null, startTime: "", endTime: "", - billNo: "", + orderId: "", status: 3, page: 1, limit: 10 @@ -562,10 +562,13 @@ export default { path: "" }); this.query = { - billNo: "", - status: 4, + action: null, + corpName: null, + locStorageCode: null, startTime: "", endTime: "", + orderId: "", + status: 3, page: 1, limit: 10 };