diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue similarity index 100% rename from src/views/inout/IoCreateOrder.vue rename to src/views/inout/DialogCreateOrder.vue diff --git a/src/views/inout/IoReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue similarity index 100% rename from src/views/inout/IoReviewOrder.vue rename to src/views/inout/DialogReviewOrder.vue diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index c2372720..d0ab4bcc 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -100,7 +100,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -153,7 +153,7 @@ - 单据 {{ currentRow.billNo }}-业务详情 + 单据 {{ currentRow.billNo }}-单据详情 - - - - 单据 {{ currentRow.billNo }}-扫码详情 - - - - - - - - 重置 - - 查询 - - - - - - - - - - - - - - - - - - - - - 单据 {{ currentRow.billNo }}-扫码明细 @@ -420,7 +328,7 @@ import {getLocalJoinByUser} from "@/api/basic/busType"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {isBlank} from "@/utils/strUtil"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; -import {getBizDetailList} from "@/api/inout/orderDetailBiz"; +import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeList} from "@/api/inout/code"; @@ -591,7 +499,6 @@ export default { getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; }) .catch(() => { }); @@ -711,7 +618,7 @@ export default { } this.bizDetailLoading = true; this.bizQuery.orderIdFk = this.currentRow.billNo; - getBizDetailList(this.bizQuery).then((res) => { + getResultDetailList(this.bizQuery).then((res) => { this.bizDetailLoading = false; if (res.code === 20000) { this.bizDetailList = res.data.list || []; @@ -831,9 +738,6 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { @@ -841,6 +745,7 @@ export default { } } }) + this.getList(); }, }; diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index 2694eecf..6cf29549 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -192,7 +192,6 @@ - + @@ -238,7 +237,6 @@ @pagination="getBizDetailList" /> - 单据 {{ currentRow.billNo }}-扫码详情 @@ -296,7 +294,7 @@ > @@ -326,7 +324,6 @@ @pagination="getCodeDetailList" /> - 单据 {{ currentRow.billNo }}-扫码明细 @@ -378,7 +375,6 @@ + { if (res.code === 20000) { if (res.data.paramValue === "0") { this.enableDept = true; } } - }) + }); + this.getList(); }, }; diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index ede92f6d..2652b075 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -100,7 +100,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -214,14 +214,14 @@ label="失效日期" prop="expireDate" > - + - 单据 {{ currentRow.billNo }}-扫码详情 @@ -303,7 +302,7 @@ > - 单据 {{ currentRow.billNo }}-扫码明细 @@ -396,7 +394,7 @@ > { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; }) .catch(() => { }); @@ -868,9 +865,6 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue index 575555d9..fe3c3551 100644 --- a/src/views/inout/IoCreateBusOrder.vue +++ b/src/views/inout/IoCreateBusOrder.vue @@ -112,7 +112,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -221,7 +221,7 @@ import { submitOrderWeb, getOrderList, submitBiz } from "../../api/inout/order"; -import addOrder from "./IoCreateOrder"; +import addOrder from "./DialogCreateOrder"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busType"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; @@ -381,7 +381,6 @@ export default { getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; this.getList(); }) .catch(() => { @@ -519,9 +518,7 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); + this.getList(); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue index 17cd79a2..fa40c83b 100644 --- a/src/views/inout/IoCreateErrorOrder.vue +++ b/src/views/inout/IoCreateErrorOrder.vue @@ -100,7 +100,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -179,7 +179,7 @@ import { deleteByOrderId, getOrderList, submitCodes } from "../../api/inout/order"; -import addOrder from "./IoCreateOrder"; +import addOrder from "./DialogCreateOrder"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busType"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; @@ -332,7 +332,6 @@ export default { getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; this.getList(); }) .catch(() => { @@ -460,9 +459,7 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); + this.getList(); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index b8565e9f..6b729a16 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -101,7 +101,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -180,7 +180,7 @@ import { deleteByOrderId, getOrderList, submitCodes } from "../../api/inout/order"; -import addOrder from "./IoCreateOrder"; +import addOrder from "./DialogCreateOrder"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busType"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; @@ -333,7 +333,6 @@ export default { getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; this.getList(); }) .catch(() => { @@ -462,9 +461,7 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); + this.getList(); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index 99b1a729..dd035815 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -101,7 +101,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + @@ -197,7 +197,7 @@ import { } from "../../api/inout/order"; import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import draggable from "vuedraggable"; -import addOrder from "./IoCreateOrder"; +import addOrder from "./DialogCreateOrder"; import store from "../../store"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busType"; @@ -362,7 +362,6 @@ export default { getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; - this.filterQuery.action = this.busTypes[0].action; this.getList(); }) .catch(() => { @@ -482,9 +481,6 @@ export default { created() { this.getInvList(); this.getBusType(); - let query = this.$route.query; - this.filterQuery = Object.assign(this.filterQuery, query); - this.filterQuery.limit = parseInt(this.filterQuery.limit); selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { if (res.data.paramValue === "0") { diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue index 06eba9a8..d974758c 100644 --- a/src/views/inout/IoEditOrder.vue +++ b/src/views/inout/IoEditOrder.vue @@ -29,7 +29,7 @@ {{ fromTypeMap[scope.row.fromType] }} - + diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue index 1761c809..78d90a75 100644 --- a/src/views/inout/IoUnCheckedOrder.vue +++ b/src/views/inout/IoUnCheckedOrder.vue @@ -187,6 +187,7 @@ - + - 单据 {{ currentRow.billNo }}-扫码详情 @@ -269,14 +272,17 @@ - 单据 {{ currentRow.billNo }}-扫码明细 @@ -350,54 +358,42 @@ > - - - - + - { if (res.code === 20000) { if (res.data.paramValue === "0") {