From 52e91151b83f8f938483b167d9d77a3212602f67 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 10 Feb 2023 15:38:42 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/code.js | 20 + src/views/inout/DialogEditCode.vue | 162 +++++ src/views/inout/DialogSelectRl.vue | 891 +++++++++++++++++++++++++ src/views/inout/DialogSelectUnit.vue | 146 ++++ src/views/inout/IoCreateOrder.vue | 70 +- src/views/inout/IoCreateOrderCodes.vue | 313 ++++++--- 6 files changed, 1463 insertions(+), 139 deletions(-) create mode 100644 src/api/inout/code.js create mode 100644 src/views/inout/DialogEditCode.vue create mode 100644 src/views/inout/DialogSelectRl.vue create mode 100644 src/views/inout/DialogSelectUnit.vue diff --git a/src/api/inout/code.js b/src/api/inout/code.js new file mode 100644 index 00000000..b1b2a86b --- /dev/null +++ b/src/api/inout/code.js @@ -0,0 +1,20 @@ +import axios from '@/utils/request' + +export function saveCode(query) { + return axios({ + url: "/warehouse/inout/saveTempCode", + method: "post", + data: query + }); +} +export function findByCode(query) { + return axios( + { + url: "/udiwms/basic/findByCode", + method: "get", + params: query + } + ); +} + + diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue new file mode 100644 index 00000000..2d05e763 --- /dev/null +++ b/src/views/inout/DialogEditCode.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue new file mode 100644 index 00000000..f82dde29 --- /dev/null +++ b/src/views/inout/DialogSelectRl.vue @@ -0,0 +1,891 @@ + + + + diff --git a/src/views/inout/DialogSelectUnit.vue b/src/views/inout/DialogSelectUnit.vue new file mode 100644 index 00000000..df5d5d24 --- /dev/null +++ b/src/views/inout/DialogSelectUnit.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 43a205a2..2ee823df 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -188,7 +188,12 @@ v-if="isCodeDetailAlive"> - + @@ -208,22 +213,7 @@ - - - - - - - - - - - - - - - - + @@ -630,11 +620,7 @@ export default { this.loading = false; }); }, - closeCodeDialog() { - this.editCodeVisible = false; - this.editOriginCodeVisible = false; - this.getCodeList(); - }, + // 刷新表单 resetForm() { @@ -700,16 +686,6 @@ export default { }, - repeatAddCode(editData) { - let tQuery = editData; - tQuery.orderId = this.orderFormData.id; - tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}'); - tQuery.action = this.orderFormData.action; - this.closeCodeDialog(); - this.addCodeSubmit(tQuery); - - }, - getInputFocus(event) { event.currentTarget.select(); @@ -751,36 +727,6 @@ export default { }, - selectBindRl(row) { - let query = { - id: this.curRow.id, - relId: row.id, - mySupId: row.unitFk, - }; - updateCodeBindSup(query).then((response) => { - if (response.code == 20000) { - this.$message.success("绑定成功"); - this.orderFormData.id = this.curRow.orderId; - this.getCodeList(); - } else { - if (response.code == 503) { - this.curRow = response.data; - this.orderFormData.id = this.curRow.orderId; - this.getCodeList(); - this.selectUnitTitle = response.message; - this.handleUnitClick(response.data); - } else - this.$message.error(response.message); - } - }).catch(() => { - - }); - }, - closeBindDialog(val) { - this.selectRlVisible = false; - this.dialogTableVisible = false; - }, - }, filters: {}, mounted() { diff --git a/src/views/inout/IoCreateOrderCodes.vue b/src/views/inout/IoCreateOrderCodes.vue index 45728476..581f32e2 100644 --- a/src/views/inout/IoCreateOrderCodes.vue +++ b/src/views/inout/IoCreateOrderCodes.vue @@ -5,85 +5,85 @@ border ref="multipleTable"> + type="selection" + width="55"> From d84215d844593fa7abe93ffa540f58f8a7ce3535 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 10 Feb 2023 15:44:14 +0800 Subject: [PATCH 02/14] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IoCheckErrorOrder.vue | 13 ++++++++++--- src/views/inout/IoCheckSuccessOrder.vue | 2 +- src/views/inout/IoNewOrder.vue | 12 ++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index fb27162e..a42d6b48 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -449,7 +449,6 @@ + + + diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue new file mode 100644 index 00000000..e1ba217c --- /dev/null +++ b/src/views/inventory/InvPreProductsDetail.vue @@ -0,0 +1,211 @@ + + + + + + diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index 717682cb..9e598ed0 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -173,7 +173,7 @@ @@ -715,44 +718,44 @@ export default { .el-table .cell.el-tooltip { - white-space: pre-wrap; + white-space: pre-wrap; } .itemTag { - float: left; - text-align: left; - margin-top: 10px; - width: 25%; + float: left; + text-align: left; + margin-top: 10px; + width: 25%; } .text { - font-size: 13px; - font-family: "Microsoft YaHei"; + font-size: 13px; + font-family: "Microsoft YaHei"; } .query-form-item { - display: block !important; - margin-right: 10px; - margin-bottom: 5px; + display: block !important; + margin-right: 10px; + margin-bottom: 5px; } .el-row { - display: flex; - flex-wrap: wrap; + display: flex; + flex-wrap: wrap; } .el-col { - border-radius: 4px; - flex-wrap: wrap; + border-radius: 4px; + flex-wrap: wrap; } .form-title { - font-size: 16px; - font-family: Noto Sans SC; - font-weight: bold; - color: #303133; - padding-bottom: 17px; - padding-top: 17px; + font-size: 16px; + font-family: Noto Sans SC; + font-weight: bold; + color: #303133; + padding-bottom: 17px; + padding-top: 17px; } diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index 43701127..3da0e751 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -140,8 +140,8 @@ 校验单据 + @click.native.stop="reviewOrder(scope.row)" + >验收单据 @@ -444,6 +444,22 @@ + + + + + @@ -459,6 +475,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getResultDetailList} from "@/api/inout/orderDetailResult"; +import AcceptOrder from "@/views/inout/IoReviewOrder"; const formJson = { site_id: "", @@ -468,7 +485,7 @@ const formJson = { }; export default { - name: "IoUnCheckedOrder", + name: "IoCheckSuccessOrder", data() { return { showSearch: true, @@ -581,9 +598,11 @@ export default { resultTotal: 0, resultDetailLoading: false, resultDetailList: [], + acceptQuery: null, + acceptOrderVisible: false, }; }, - components: {}, + components: {AcceptOrder}, methods: { onReset() { this.$router.push({ @@ -841,6 +860,22 @@ export default { editResultDialog(row) { }, + + + //验收结束 + closeAcceptDialog() { + this.acceptOrderVisible = false; + }, + + //开始验收 + reviewOrder(row) { + this.acceptQuery = row; + this.acceptOrderVisible = true; + }, + + parentByFn: function (childValue) { + this.getList(); + }, }, filters: { statusFilterType(status) { diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 2ee823df..624a4f7d 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -394,6 +394,26 @@ export default { }); }, + initBusType() { + + let query = { + code: this.orderFormData.invCode, + }; + findByInvUser(query) + .then((response) => { + this.busTypeOptions = response.data || []; + this.curAction = this.getActionItem(this.orderFormData.action); + if (this.curAction.checkEnable && this.curAction.checkWebNew) { + this.bizShow = true; + } else + this.bizShow = false; + }) + .catch(() => { + }); + + + }, + //获取往来单位候选列表 findMethod(query) { this.fromOptions = []; @@ -686,7 +706,6 @@ export default { }, - getInputFocus(event) { event.currentTarget.select(); }, @@ -766,7 +785,7 @@ export default { this.refreshCodesPanel(); //选择框候选数据 this.findInvListByUser(); - this.getBusTypeByInv(); + this.initBusType(); this.findMethod(this.orderFormData.fromCorp); this.findFromInvList(); } else { diff --git a/src/views/inout/IoReviewOrder.vue b/src/views/inout/IoReviewOrder.vue index c9a38bbb..d8db591b 100644 --- a/src/views/inout/IoReviewOrder.vue +++ b/src/views/inout/IoReviewOrder.vue @@ -288,7 +288,7 @@ export default { type: 'warning' }).then(() => { let query = { - stockOrderId: this.orderQuery.billNo, + orderId: this.orderQuery.billNo, }; updateStatus(query) .then((response) => { From 775b2e486ebcbcd2cdff1b5d1f08c817012f10f5 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 13 Feb 2023 09:40:55 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/device/phoneRegisterManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/device/phoneRegisterManage.vue b/src/views/system/device/phoneRegisterManage.vue index eae3255c..e45b4826 100644 --- a/src/views/system/device/phoneRegisterManage.vue +++ b/src/views/system/device/phoneRegisterManage.vue @@ -259,6 +259,7 @@ export default { }, onSubmit() { + this.filterQuery.page=1; this.getList(); }, closeDialogVisible(){ From 224b6320bc89ddc63264eca5c10bd0568ee9ebde Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 13 Feb 2023 10:34:01 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/param/busTypePreModify.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue index c9f94032..53f02b1f 100644 --- a/src/views/system/param/busTypePreModify.vue +++ b/src/views/system/param/busTypePreModify.vue @@ -54,7 +54,7 @@ - From 4c62b03bbcf2e58baefe3c212e389fbb59f4e12d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 13 Feb 2023 10:39:45 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/param/busTypePreModify.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue index 53f02b1f..9293ab94 100644 --- a/src/views/system/param/busTypePreModify.vue +++ b/src/views/system/param/busTypePreModify.vue @@ -230,6 +230,7 @@ export default { } this.getOriginBusType(); this.getLocInv(); + this.getFromInv(); } } From 4b134770444e6165df57611efebe43bec7e588f2 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 13 Feb 2023 13:43:18 +0800 Subject: [PATCH 10/14] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=AD=89=E9=A1=B5=E9=9D=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/authDept.vue | 1 + src/views/system/dept/invWarehouse.vue | 7 ------- src/views/system/param/busTypePre.vue | 22 +++++++++------------ src/views/system/param/busTypePreModify.vue | 22 +++++++++++++++------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index 943f114e..5b88f104 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -542,6 +542,7 @@ export default { this.formVisible = false; // 刷新表单 this.$refs["dataForm"].resetFields(); + this.getList(); }, deleteDialog(row) { this.$confirm("是否删除该部门?", "提示", { diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 7605e5b0..817816fb 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -9,13 +9,6 @@ placeholder="仓库名称" > - - - - - - - 重置 diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue index 7f9ca058..0487efae 100644 --- a/src/views/system/param/busTypePre.vue +++ b/src/views/system/param/busTypePre.vue @@ -6,12 +6,14 @@ @@ -128,10 +130,9 @@ export default { loading: false, formMap: { add: "新增单据流转设置", - update: "编辑单据流转设置", + edit: "编辑单据流转设置", }, formName: null, - }; }, @@ -178,7 +179,6 @@ export default { this.filterQuery.page = val; this.getList(); }, - onAddSubmit() { if (isBlank(this.inputQuery.originAction)) { this.$message.error("原单据类型不能为空！"); @@ -192,10 +192,10 @@ export default { this.$message.error("目标所在仓库不能为空！") return; } - // if (isBlank(this.inputQuery.defaultInvCode)) { - // this.$message.error("目标往来仓库不能为空"); - // return; - // } + if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) { + this.$message.error("推移时间不能小于0！"); + return; + } if (this.formName === "add") { let numRegExp = '^[0-9]*$'; @@ -210,13 +210,8 @@ export default { this.loading = false; this.cancelDialog(); this.getList(); - } else { - this.$message.error(res.message); } - }).catch((error) => { - this.loading = false; - this.$message.error(error.message); - this.cancelDialog(); + }).catch(() => { }); } else { updateBusTypePre(this.inputQuery).then((res) => { @@ -252,6 +247,7 @@ export default { }, handleModifyClick(row) { + this.formName = 'edit'; this.inputQuery = row; this.modifyDialogVisible = true; }, diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue index 9293ab94..6cea57ca 100644 --- a/src/views/system/param/busTypePreModify.vue +++ b/src/views/system/param/busTypePreModify.vue @@ -74,8 +74,12 @@ + type="number" + placeholder="请输入内容" + v-model="inputQuery.beforeTime" + onkeyup="this.value=this.value.replace(/\D/g,'')" + onafterpaste="this.value=this.value.replace(/\D/g,'')" + > @@ -107,7 +111,8 @@ + From 0d5813714facc1e12328f638759292fd3c3778d8 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 13 Feb 2023 17:43:37 +0800 Subject: [PATCH 13/14] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=91=86=E6=94=BE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvPlace.vue | 265 +++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) create mode 100644 src/views/inventory/InvPlace.vue diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue new file mode 100644 index 00000000..6e5319ca --- /dev/null +++ b/src/views/inventory/InvPlace.vue @@ -0,0 +1,265 @@ + + + + + + From 30cb048a8c55dcd2ddd5606b8c5291467a50a4f8 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 14 Feb 2023 15:03:00 +0800 Subject: [PATCH 14/14] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=91=86=E6=94=BE=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invPlace.js | 25 ++ src/views/inventory/InvPlace.vue | 319 ++++++++++++++++++-------- src/views/inventory/InvStatistics.vue | 64 +----- 3 files changed, 249 insertions(+), 159 deletions(-) create mode 100644 src/api/inventory/invPlace.js diff --git a/src/api/inventory/invPlace.js b/src/api/inventory/invPlace.js new file mode 100644 index 00000000..9c9cf58e --- /dev/null +++ b/src/api/inventory/invPlace.js @@ -0,0 +1,25 @@ +import axios from "../../utils/request"; + +export function getPlaceDetailList(params) { + return axios({ + url: "/spms/inv/product/getPlaceDetailList", + method: "get", + params: params + }); +} + +export function bindInvSpace(data) { + return axios({ + url: "/spms/inv/product/bindInvSpace", + method: "post", + data: data + }); +} + +export function checkCodeSpace(data) { + return axios({ + url: "/spms/inv/product/checkCodeSpace", + method: "post", + data: data + }); +} diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue index 6e5319ca..62cec8e7 100644 --- a/src/views/inventory/InvPlace.vue +++ b/src/views/inventory/InvPlace.vue @@ -31,7 +31,7 @@ 重置 查询 - 摆放 + 摆放 @@ -61,8 +61,112 @@ > + + + + + 提交 + + + + + + + + {{ item.name }} + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + 添加 + + + + + + + + + + + + + + @@ -70,8 +174,7 @@ diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue index 54512f3c..5d6e48d9 100644 --- a/src/views/inventory/InvStatistics.vue +++ b/src/views/inventory/InvStatistics.vue @@ -127,17 +127,6 @@ show-overflow-tooltip width="120"> - - - - - - - - @@ -173,7 +147,7 @@ import {isBlank} from "@/utils/strUtil"; import invProductsDetail from "@/views/inventory/InvProductsDetail.vue"; export default { - name: "InvProducts", + name: "InvStatistics", data() { return { showSearch: true, @@ -193,26 +167,9 @@ export default { total: 0, invList: [], loading: false, - deleteData: { - id: "", - status: 10, - }, corpLoading: false, - dialogVisible: false, fromOptions: [], showSup: false, - detailDialogVisible: false, - inputQuery: { - cpmctymc: null, - nameCode: null, - batchNo: null, - ggxh: null, - productionDate: null, - expireDate: null, - supId: null, - deptCode: null, - invCode: null - } }; }, methods: { @@ -308,27 +265,8 @@ export default { this.findMethod(value); } }, - detailDialog(row) { - this.detailDialogVisible = true; - this.inputQuery = { - relId: row.relIdFk, - cpmctymc: row.cpmctymc, - nameCode: row.nameCode, - batchNo: row.batchNo, - ggxh: row.ggxh, - productionDate: row.productionDate, - expireDate: row.expireDate, - supId: row.supId, - deptCode: row.deptCode, - invCode: row.invCode - } - }, - closeDetailDialog() { - this.detailDialogVisible = false; - }, }, components: { - invProductsDetail }, mounted() { document.body.ondrop = function (event) {