diff --git a/dist.zip b/dist.zip index 5467d6e..c49f2e6 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue index aac8954..621177b 100644 --- a/src/components/workorderSelect/single.vue +++ b/src/components/workorderSelect/single.vue @@ -202,6 +202,8 @@ export default { open: false, // 查询参数 queryParams: { + pageNum: 1, + pageSize: 10, workorderCode: null, workorderName: null, workorderType: null, @@ -237,17 +239,43 @@ export default { //2024 12 19 需求五 // console.log("response.rows 新增 炉号和班组两个字段 ⬇️"); // console.log(response.rows); - + this.total = response.total; this.workorderList = response.rows; this.loading = false; }); }, /** 搜索按钮操作 */ handleQuery() { + this.queryParams.pageNum = 1; this.getList(); }, /** 重置按钮操作 */ resetQuery() { + this.queryParams = { + pageNum: 1, + pageSize: 10, + workorderCode: null, + workorderName: null, + workorderType: null, + orderSource: null, + sourceCode: null, + productId: null, + productCode: null, + productName: null, + productSpc: null, + unitOfMeasure: null, + quantity: null, + quantityProduced: null, + quantityChanged: null, + quantityScheduled: null, + clientId: null, + clientCode: null, + clientName: null, + requestDate: null, + parentId: null, + ancestors: null, + status: "CONFIRMED", + }; this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue index 1ad1e69..e3879d5 100644 --- a/src/views/mes/wm/issue/index.vue +++ b/src/views/mes/wm/issue/index.vue @@ -136,6 +136,7 @@ /> --> + diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index 22a258a..61ea9e1 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -49,6 +49,16 @@ @keyup.enter.native="handleQuery" /> + + + + +
- + - + - + - + - + - + + + + + + - + - 搜索 + 搜索 重置 - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 - + - - + + @@ -69,9 +167,7 @@ @@ -86,24 +182,64 @@ - + @@ -116,8 +252,13 @@ - + @@ -130,10 +271,21 @@ - - + + - + @@ -143,7 +295,13 @@ - + @@ -168,16 +326,25 @@ - + - + @@ -199,25 +366,52 @@ - 物料信息 + 物料信息 - +
- 返回 - 保 - 存 + 返回 + 保 存 取 消
- + - + @@ -239,22 +433,26 @@
-

当前单据部分产品物料已出库，相关单据：

+

当前单据部分产品物料已出库，相关单据：

{{ WithdrawnErrorObjMap[name].CNName }}： - - {{ item - }} + + {{ item }}

-

请溯源后撤销该单据。

+

请溯源后撤销该单据。
@@ -268,7 +466,7 @@ import { addProductrecpt, updateProductrecpt, execute, - cancelFn + cancelFn, } from "@/api/mes/wm/productrecpt"; import { getMdItem } from "@/api/mes/md/mdItem"; import WorkorderSelect from "@/components/workorderSelect/single.vue"; @@ -354,15 +552,9 @@ export default { form: {}, // 表单校验 rules: { - recptCode: [ - { required: true, message: "入库单编号不能为空", trigger: "blur" }, - ], - recptDate: [ - { required: true, message: "请选择入库日期", trigger: "blur" }, - ], - workorderCode: [ - { required: true, message: "请选择生产工单", trigger: "blur" }, - ], + recptCode: [{ required: true, message: "入库单编号不能为空", trigger: "blur" }], + recptDate: [{ required: true, message: "请选择入库日期", trigger: "blur" }], + workorderCode: [{ required: true, message: "请选择生产工单", trigger: "blur" }], }, item: {}, // 单据撤销 对话框 开关 @@ -370,13 +562,11 @@ export default { // 单据撤销 对话框 表单参数 WithdrawnForm: { recptId: null, - cancelRemark: null + cancelRemark: null, }, // 撤销单 表单校验 WithdrawnRules: { - cancelRemark: [ - { required: true, message: "撤销原因不能为空", trigger: "blur" } - ] + cancelRemark: [{ required: true, message: "撤销原因不能为空", trigger: "blur" }], }, // 查看撤销原因 以及 开关 LookWithdrawnFlag: false, @@ -414,13 +604,13 @@ export default { /** 查询产品入库录列表 */ getList() { this.loading = true; - listProductrecpt( - this.addDateRange(this.queryParams, this.dateRange) - ).then((response) => { - this.productrecptList = response.rows; - this.total = response.total; - this.loading = false; - }); + listProductrecpt(this.addDateRange(this.queryParams, this.dateRange)).then( + (response) => { + this.productrecptList = response.rows; + this.total = response.total; + this.loading = false; + } + ); }, getWarehouseList() { getTreeList().then((response) => { @@ -523,10 +713,7 @@ export default { this.reset(); const recptId = row.recptId || this.ids; - localStorage.setItem( - "productrecpt-handleUpdate-recptId", - JSON.stringify(recptId) - ); + localStorage.setItem("productrecpt-handleUpdate-recptId", JSON.stringify(recptId)); getProductrecpt(recptId).then((response) => { console.log("打印目标-回显入库仓库➡️", response.data); this.warehouseInfo = [ @@ -553,7 +740,7 @@ export default { this.getList(); this.$modal.msgSuccess("入库成功"); }) - .catch(() => { }); + .catch(() => {}); }, /** 提交按钮 */ submitForm() { @@ -587,7 +774,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => { }); + .catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -647,10 +834,7 @@ export default { // 效果待确认 重要标记 2024 12 13 需求二 点击“查看” this.reset(); const recptIds = row.recptId; - localStorage.setItem( - "productrecpt-handleUpdate-recptId", - JSON.stringify(recptIds) - ); + localStorage.setItem("productrecpt-handleUpdate-recptId", JSON.stringify(recptIds)); getProductrecpt(recptIds).then((response) => { console.log("打印目标-回显入库仓库➡️", response.data); this.warehouseInfo = [ @@ -687,27 +871,29 @@ export default { }, // 撤销原因 提交 handleWithdrawnSubmit(formName) { - this.$refs['WithdrawnForm'].validate((valid) => { + this.$refs["WithdrawnForm"].validate((valid) => { if (valid) { - cancelFn(this.WithdrawnForm).then((res) => { - console.log(res); - if (res.code == 200) { - this.$modal.msgSuccess(res.msg); - } - }).catch((res) => { - console.log(res.data); - // 错误提示 对象 （内容） - this.WithdrawnErrorObj = res.data; - // 打开错误提示 对话框 - this.WithdrawnErrorFlag = true; - - }).finally(() => { - this.WithdrawnFlag = false; - this.$refs['WithdrawnForm'].resetFields(); - this.getList(); - }); + cancelFn(this.WithdrawnForm) + .then((res) => { + console.log(res); + if (res.code == 200) { + this.$modal.msgSuccess(res.msg); + } + }) + .catch((res) => { + console.log(res.data); + // 错误提示 对象 （内容） + this.WithdrawnErrorObj = res.data; + // 打开错误提示 对话框 + this.WithdrawnErrorFlag = true; + }) + .finally(() => { + this.WithdrawnFlag = false; + this.$refs["WithdrawnForm"].resetFields(); + this.getList(); + }); } else { - console.log('error submit!!'); + console.log("error submit!!"); return false; } }); diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue index 8cc3aaa..a545aa6 100644 --- a/src/views/mes/wm/rtissue/index.vue +++ b/src/views/mes/wm/rtissue/index.vue @@ -33,6 +33,16 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + { - this.rtvendorList = response.rows; - this.total = response.total; - this.loading = false; - }); + listRtvendor(this.addDateRange(this.queryParams, this.dateRange)).then( + (response) => { + this.rtvendorList = response.rows; + this.total = response.total; + this.loading = false; + } + ); }, // 取消按钮 cancel() { @@ -487,7 +499,7 @@ export default { updateBy: null, updateTime: null, }; - this.dateRange = []; + this.dateRange = []; this.resetForm("form"); }, /** 搜索按钮操作 */ diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue index 5f6733a..d8799bc 100644 --- a/src/views/mes/wm/transfer/index.vue +++ b/src/views/mes/wm/transfer/index.vue @@ -1,6 +1,13 @@ - - + + @@ -211,7 +253,8 @@ v-for="dict in dict.type.mes_transfer_type" :key="dict.value" :label="dict.value" - >{{dict.label}} + >{{ dict.label }} @@ -241,7 +284,11 @@ - + - + - + placeholder="请选择转移日期" + > @@ -281,15 +334,32 @@ - - 物料信息 - - - + 物料信息 + + +
- 返回 - 确 定 + 返回 + 确 定 取 消
@@ -297,18 +367,25 @@ diff --git a/vue.config.js b/vue.config.js index 7866076..da6c697 100644 --- a/vue.config.js +++ b/vue.config.js @@ -41,8 +41,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://172.16.10.97:8002`, - target: `http://172.16.10.97:8002`, + // target: `https://www.sdhuixinjituan.com:8001/prod-api/`, + target: `http://172.16.10.13:8002/`, changeOrigin: true, pathRewrite: {