From 616e26bd8e1df2ec872385a30fe35a4a94ee78d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 24 Nov 2022 09:13:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 812584f..cb01c64 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -1543,8 +1543,9 @@ export default { var busQuery = { code: this.currentCode, page: 1, - limit: 10000 + limit: 50 } + warehouseBussinessTypeList(busQuery).then((res) => { this.userBussinessTypeList = res.data.list; }).catch((error) => { @@ -1592,9 +1593,10 @@ export default { var busQuery = { code: this.currentCode, page: 1, - limit: 100000 + limit: 50 } warehouseBussinessTypeList(busQuery).then((res) => { + this.userBussinessTypeList = res.data.list || []; }).catch((error) => { }); From 4b16e6ffca55892f9d30226df5d96dad099c3587 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 24 Nov 2022 11:03:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BussinessTypeLoclModify.vue | 13 +- src/views/basic/BussinessTypeModify.vue | 4 +- src/views/basic/UdIInfoSelect.vue | 2 +- src/views/basic/UdiInfoManage.vue | 69 ++- src/views/basic/UdiInfoManageSp.vue | 2 +- src/views/basic/UdiRlDetailDialog.vue | 2 +- src/views/business/addOrder.vue | 512 -------------------- src/views/business/stockOrder.vue | 2 - src/views/business/stockOrderEdit.vue | 3 - src/views/business/stockOrderEditor.vue | 16 +- src/views/business/stockOrderWaitCheck.vue | 2 - src/views/inout/DialogSelectRl.vue | 2 +- src/views/inout/IONewOrder.vue | 4 +- src/views/inout/editCode.vue | 2 +- src/views/smp/UdiInfoSmpUpload.vue | 2 +- 15 files changed, 86 insertions(+), 551 deletions(-) delete mode 100644 src/views/business/addOrder.vue diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index bf3e71b..5573d2c 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -159,13 +159,10 @@ - - - + - diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue index 8a92e61..9b38d7e 100644 --- a/src/views/basic/UdiRlDetailDialog.vue +++ b/src/views/basic/UdiRlDetailDialog.vue @@ -385,15 +385,15 @@ export default { data() { return { sysList: [], - checked:false, - detailList:[], - loading:false, + checked: false, + detailList: [], + loading: false, } }, methods: { getThirdSysDetail() { let query = { - id: this.editQuery.rlId, + id: this.editQuery.rlId, }; thirdSysDetail(query) diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 9a28e91..ea5a310 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -173,11 +173,16 @@ export default { type: Function, required: true, }, + purType: { + type: Object, + required: true, + }, }, data() { return { listQuery: { + purType: null, billNo: "", page: 1, limit: 10, @@ -368,7 +373,8 @@ export default { let tQuery = { datas: ids, stockOrderLists: this.data.stockOrderLists, - zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh + zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh, + purType: this.purType }; getStockOrderDetailInstrumentById(tQuery).then((response) => { this.loading = false; diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue index 1740a12..b753f6a 100644 --- a/src/views/purchase/purApply.vue +++ b/src/views/purchase/purApply.vue @@ -46,7 +46,7 @@ {{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }} - + @@ -91,9 +91,13 @@ - - + + + + + + diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 7006835..509a2c4 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -62,7 +62,8 @@ - - + @@ -148,7 +149,7 @@ prop="manufactory" show-overflow-tooltip > - + - + + + + - + + @@ -86,9 +87,11 @@ - - + + + + diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 8deb7e4..ba1c5b8 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -87,34 +87,92 @@
- 采购说明： + 审核说明：
- - + +
- 审核说明： + 采购说明：
- + + + + + 是否生成采购入库单 + + + + + + + +
+ 入库仓库： +
+ + + + + + + {{ item.name }} + + + + + + +
+ 入库单据类型： +
+ + + + + + {{ item.localName }} + + + + + + + - + - + @@ -199,6 +257,7 @@ @@ -210,6 +269,7 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct"; import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan"; import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {getLocalJoinByUser} from "@/api/basic/busLocalType"; export default { name: "idQuery", @@ -244,6 +304,10 @@ export default { locStorageCode: null, invWarehouseCode: null, auditRemark: null, + autoPurchase: false, + targetInv: 1000, + targetSubInv: null, + targetBillAction: null, }, formRules: {}, codeArray: [], @@ -275,8 +339,10 @@ export default { thisData: {}, storageList: [], subInvList: [], + tarSubList: [], invQueryData: {}, + }; }, components: { @@ -446,6 +512,38 @@ export default { .catch(() => { }); }, + + findTargetSubInvs() { + this.tarSubList = []; + let query = { + pcode: 1000 + }; + filterSubByInv(query) + .then((response) => { + this.tarSubList = response.data || []; + if (this.tarSubList != null && this.tarSubList.length == 1) { + this.formData.targetSubInv = this.tarSubList[0].code; + this.targetInvChange(); + } + }) + .catch(() => { + }); + }, + targetInvChange() { + let query = { + code: this.formData.targetSubInv, + enabled: true, + spUse: true, + }; + getLocalJoinByUser(query) + .then((response) => { + this.busTypes = response.data.list || []; + // this.formData.targetBillAction = this.busTypes[0].localAction; + }) + .catch(() => { + }); + }, + locInChange(item) { if (this.formData.invWarehouseCode != null) { this.formData.invWarehouseCode = ""; @@ -467,6 +565,7 @@ export default { this.query.limit = 100; this.query.orderIdFk = this.idQuery.id; this.formData = this.idQuery.formData; + this.formData.targetInv = 1000; this.orderEditor = true; this.sValue = this.formData.corpName; this.getStockOrderDetailList(); @@ -479,10 +578,16 @@ export default { deptCode: null, locStorageCode: null, invWarehouseCode: null, + auditRemark: null, + autoPurchase: false, + targetInv: 1000, + targetSubInv: null, + targetBillAction: null, }; this.orderEditor = false; } this.getStorage(); + this.findTargetSubInvs(); this.codeArray = []; }, }; diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index e40729d..4d3c60d 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -55,25 +55,25 @@ - -
- 采购类型： -
- - - - - - {{ item.originName }} - - - - + + + + + + + + + + + + + + + + + + +
@@ -107,9 +107,7 @@ - -
采购说明： @@ -120,34 +118,49 @@ + + +
+ 拒绝原因： +
+ + + + + + + - -
-                            拒绝原因： -                       
-                    -                    -                        -                            -                        -                    + + - - 产品录入 - - + + + + + + 产品录入 + + 选入申购单 + + + + + @@ -162,18 +175,7 @@ prop="spec" show-overflow-tooltip > - - - - + + + + + + + + + + + + - + + @@ -85,9 +86,11 @@ - - + + + + diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue index 473a86d..e28b7ef 100644 --- a/src/views/purchase/pureApplyAudit.vue +++ b/src/views/purchase/pureApplyAudit.vue @@ -52,7 +52,8 @@ {{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }} - + + @@ -95,9 +96,11 @@ - - + + + + diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index e58f9ca..d4afd11 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -89,35 +89,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 当前仓库： + 申购说明：
- - - - - {{ item.name }} - - - - - {{ item.name }} - - + + @@ -128,25 +140,25 @@ - -
- 生成采购计划： -
- - - - - - {{ item.originName }} - - - - + + + + + + + + + + + + + + + + + + +
@@ -159,6 +171,14 @@ autosize> + + + + + + 是否生成采购计划 + + @@ -180,10 +200,11 @@ prop="spec" show-overflow-tooltip > - + + - - + - + + @@ -230,6 +255,7 @@ > @@ -281,7 +307,8 @@ export default { targetInv: null, targetSubInv: null, targetBillType: null, - auditRemark:"", + auditRemark: "", + audtoPlan: false, }, formRules: {}, codeArray: [], diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue index a4e3b7b..e647b66 100644 --- a/src/views/purchase/pureApplySearch.vue +++ b/src/views/purchase/pureApplySearch.vue @@ -52,6 +52,7 @@ + @@ -93,12 +94,15 @@ - - + + + + + Date: Tue, 29 Nov 2022 09:34:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/stockOrderNewDistribution.vue | 5 ++++- src/views/inout/IOAddOrder.vue | 17 +++++++++++------ src/views/inventory/InvPreInProductsDetail.vue | 4 +++- src/views/thrsys/thrOrderNew.vue | 6 +----- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 302eaf1..549ba37 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -1214,7 +1214,10 @@ export default { // }); // }, getBusType() { + + if( this.formData.id==null){ this.formData.billType=null; + } let query = { code: this.formData.invWarehouseCode, enabled: true, @@ -1289,7 +1292,7 @@ export default { this.formData.fromSubInvCode = ''; } // ''; - this.locInChange(); + // this.locInChange(); this.findMethod(); }, locInChange() { diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 6f2fdd2..6d93cca 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -700,6 +700,7 @@ export default { }); }, addCode(event) { + this.originCode = ""; this.sictomText = ""; this.formData.corpOrderId = this.formData.corpOrderId.trim(); @@ -764,6 +765,7 @@ export default { }, addCodeSubmit(tQuery) { + addOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.idQuery.id = response.data.orderId; @@ -928,7 +930,7 @@ export default { } getLocalJoinByUser(query) .then((response) => { - + this.busTypes = response.data.list || []; if (this.formData.action != null) { this.curAction = this.getActionItem(this.formData.action); @@ -966,6 +968,7 @@ export default { } , findMethod(query) { + this.fromOptions = []; let cQuery = { key: query, @@ -977,7 +980,7 @@ export default { this.formData.fromCorpId = this.curAction.defaultUnit; } else if (this.curAction.corpType == 2)//客户 { - cQuery.corpType = 4; + cQuery.corpType = 1; cQuery.outType = 2; } else if (this.curAction.corpType == 0) { @@ -987,6 +990,7 @@ export default { getBasicUnitMaintains(cQuery) .then((response) => { + debugger this.loading = false; this.fromOptions = response.data.page.list || []; if (this.curAction.corpType == 3) { @@ -1095,6 +1099,7 @@ export default { } , actionChange(item) { + this.curAction = this.getActionItem(item); this.findMethod(); @@ -1222,9 +1227,7 @@ export default { this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; - if(this.formData.invWarehouseCode!=null){ - this.getBusType(); - } + this.getStorage(this.formData.action); if (this.$isNotBlank(this.idQuery.id)) { @@ -1267,7 +1270,9 @@ export default { } } this.findSubInvByInv(this.formData.locStorageCode); - + if(this.formData.invWarehouseCode!=null){ + this.getBusType(); + } //查询是否启用多级仓库，判断是否启用部门 selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { if (res.code === 20000) { diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index c8f40f5..707241a 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -185,8 +185,10 @@ export default { getCodeList() { this.loading = true; this.query.orderIdFk = this.idQuery.orderIdFk; + debugger let query = { - orderIdFk: this.idQuery.orderIdFk + orderIdFk: this.idQuery.orderIdFk, + code:this.query.code } filterDetailProducts(query) //查找该单号下的所有条码 .then((response) => { diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 7a9c134..a98bd8f 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -476,11 +476,7 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); - } - - + } } if (status === '0') { From 70fff6cff4d6ff4bc5d4d32ea7e70dd85589795a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 29 Nov 2022 11:41:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 7b10ae7..4a9394a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -467,7 +467,7 @@ export const asyncRouterMap = [ redirect: "/platformManage/platform", icon: "", meta: { - authRule: [""] + authRule: ["platformManage"] }, children: [ { @@ -1050,7 +1050,7 @@ export const asyncRouterMap = [ component: stockOrderRecedLog, name: "单据接收日志", meta: { - authRule: ["busOrderUpload/uploadLog"] + authRule: ["busOrderUpload/RecedLog"] } }