From a58a8335dc099a164dc487311fb97a5d28598c6e Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 5 Jul 2022 17:57:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8A=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/invWarehouse.js | 9 + src/api/warehouse/order.js | 26 +- src/api/warehouse/stockOrder.js | 8 + src/router/index.js | 11 +- src/views/basic/BussinessType.vue | 3 +- src/views/basic/BussinessTypeModify.vue | 18 +- src/views/userManage/register.vue | 13 +- src/views/warehouse/DialogChangeNewOrder.vue | 446 ++++++++++++++ src/views/warehouse/codeReplace.vue | 411 +++++++++++++ src/views/warehouse/stockOrderDelSearch.vue | 32 +- src/views/warehouse/stockOrderDelete.vue | 604 +++++++++++++++++++ 11 files changed, 1570 insertions(+), 11 deletions(-) create mode 100644 src/views/warehouse/DialogChangeNewOrder.vue create mode 100644 src/views/warehouse/codeReplace.vue create mode 100644 src/views/warehouse/stockOrderDelete.vue diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index ac37778..3de55e8 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -151,3 +151,12 @@ export function getThrsysDetail(params) { params: params }); } + +//替换单据条码 +export function replaceCodes(data) { + return axios({ + url: "/warehouse/inout/replaceCodes", + method: "post", + data: data + }) +} diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index d5269bc..43b4479 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -214,7 +214,7 @@ export function orderDetail(query) { method: "get", params: query } - ); + ) } export function updateBind(query) { @@ -333,3 +333,27 @@ export function updateCodeBindSup(query) { ) } +export function filterOrderForDelete(params) { + return axios({ + url: "/udiwms/inout/order/filterOrderForDelete", + method: "get", + params: params + }); +} + +export function getOrderById(params) { + return axios({ + url: "/udiwms/inout/order/getOrderById", + method: "get", + params: params + }) +} + +export function updateOrderInfo(data) { + return axios({ + url: "/udiwms/inout/order/updateOrderInfo", + method: "post", + data: data + }) +} + diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js index 49c29a9..9a06adb 100644 --- a/src/api/warehouse/stockOrder.js +++ b/src/api/warehouse/stockOrder.js @@ -255,3 +255,11 @@ export function updateReceiveStatus(params) { data: params }) } + +export function stockOrderChange(query) { + return axios({ + url: "/udiwms/stock/order/change", + method: "post", + data: query + }); +} diff --git a/src/router/index.js b/src/router/index.js index 026a5bd..3d1d7c1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -25,6 +25,7 @@ import userAccountManage from "@/views/userManage/userAccountManage"; //单据 import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch"; import stockOrderSearch from "../views/warehouse/stockOrderSearch"; +import stockOrderDelete from "../views/warehouse/stockOrderDelete"; //往来单位字典 import UnitManage from "@/views/product/UnitManage"; @@ -385,7 +386,15 @@ export const asyncRouterMap = [ meta: { authRule: ["stock/stockOrderDelSearch"] } - } + }, + { + path: "stockOrderEdit", + component: stockOrderDelete, + name: "单据编辑", + meta: { + authRule: ["stock/stockOrderDelete"] + } + }, ] }, diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index f48d054..28f3361 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -327,7 +327,8 @@ export default { supplementOrderType: row.supplementOrderType, checkBalacne: row.checkBalacne, secCheckBalacne: row.secCheckBalacne, - defaultUnit: row.defaultUnit + defaultUnit: row.defaultUnit, + prefix: row.prefix }; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index f845d0c..b014089 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -100,20 +100,32 @@ - + +
+
+ 单据前缀  +
+ +
+ + +
备注 
- diff --git a/src/views/userManage/register.vue b/src/views/userManage/register.vue index 874ba77..3c074ca 100644 --- a/src/views/userManage/register.vue +++ b/src/views/userManage/register.vue @@ -538,7 +538,6 @@ export default { }, methods: { onSubmit(formName) { - // this.formVisible = true; this.$refs[formName].validate((valid) => { if (valid) { this.loading = true; @@ -621,9 +620,15 @@ export default { }, 1000); }, handleChange(value) { - this.inputQuery.area = - CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]]; - console.log(value + "\n" + this.inputQuery.area); + this.inputQuery.area = CodeToText[value[0]]; + if (CodeToText[value[1]] != null && CodeToText[value[1]] != "" + && CodeToText[value[1]] != "undefined") { + this.inputQuery.area += CodeToText[value[1]]; + } + if (CodeToText[value[2]] != null && CodeToText[value[2]] != "" + && CodeToText[value[2]] != "undefined") { + this.inputQuery.area += CodeToText[value[2]]; + } this.inputQuery.areaCode = value.toString(); }, copy() { diff --git a/src/views/warehouse/DialogChangeNewOrder.vue b/src/views/warehouse/DialogChangeNewOrder.vue new file mode 100644 index 0000000..e329f14 --- /dev/null +++ b/src/views/warehouse/DialogChangeNewOrder.vue @@ -0,0 +1,446 @@ + + + + + diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue new file mode 100644 index 0000000..5e60725 --- /dev/null +++ b/src/views/warehouse/codeReplace.vue @@ -0,0 +1,411 @@ + + + + + + + + + diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 9247e55..e54a578 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -116,6 +116,13 @@ >提交 + 复制 + + + + + @@ -304,6 +326,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse"; import StockOrderEdit from "@/views/warehouse/stockOrderEdit"; import {updateSpms} from "@/api/warehouse/order"; import codeDetail from "./code"; +import DialogChangeNewOrder from "@/views/warehouse/DialogChangeNewOrder"; export default { name: "stockOrderDelSearch", @@ -379,6 +402,8 @@ export default { haveDistributionVisible: true, qrcodeDetailVisible: false, qrcodeExportVisible: false, + stockChangeVisible: false, + curRow: null, actDateRange: [], pickerOptions: { shortcuts: [ @@ -460,6 +485,10 @@ export default { } }); }, + generOrder(row) { + this.stockChangeVisible = true; + this.curRow = row; + }, changeFun(row) { let _this = this; _this.multipId = []; //每次改动重置ID @@ -876,7 +905,8 @@ export default { stockOrderDistribution, stockOrderQRCodeDetail, stockQRCodeExport, - StockOrderEdit + StockOrderEdit, + DialogChangeNewOrder }, filters: { statusFilterType(status) { diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue new file mode 100644 index 0000000..165cceb --- /dev/null +++ b/src/views/warehouse/stockOrderDelete.vue @@ -0,0 +1,604 @@ + + + + + +