diff --git a/src/router/index.js b/src/router/index.js index c8ae0ae..c274337 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -477,7 +477,7 @@ export const asyncRouterMap = [ redirect: "/platformManage/platform", icon: "", meta: { - authRule: [""] + authRule: ["platformManage"] }, children: [ { @@ -1060,7 +1060,7 @@ export const asyncRouterMap = [ component: stockOrderRecedLog, name: "单据接收日志", meta: { - authRule: ["busOrderUpload/uploadLog"] + authRule: ["busOrderUpload/RecedLog"] } } @@ -1446,6 +1446,55 @@ export const asyncRouterMap = [ authRule: ["invManage/invGoodsPlacement"] } }, + { + path: "/invMaintenance", + component: Empty, + name: "库存养护", + icon: "", + meta: { + authRule: ["invMaintenance/manage"] + }, + children: [ + { + path: "/maintenanceOrder", + component: Empty, + name: "养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/order"] + }, + children: [ + { + path: "maintenanceOrderNew", + component: invGoodsPlacement, + name: "新增养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/orderNew"] + }, + }, + { + path: "maintenanceOrderAudit", + component: invGoodsPlacement, + name: "审核养护记录", + icon: "", + meta: { + authRule: ["invMaintenance/orderAudit"] + }, + } + ] + }, + { + path: "maintenanceOrderCompleted", + component: invGoodsPlacement, + name: "养护记录查询", + icon: "", + meta: { + authRule: ["invMaintenance/orderCompleted"] + } + } + ] + }, ] }, { 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) => { }); diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 1ee646a..549ba37 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -1214,6 +1214,10 @@ export default { // }); // }, getBusType() { + + if( this.formData.id==null){ + this.formData.billType=null; + } let query = { code: this.formData.invWarehouseCode, enabled: true, @@ -1288,7 +1292,7 @@ export default { this.formData.fromSubInvCode = ''; } // ''; - this.locInChange(); + // this.locInChange(); this.findMethod(); }, locInChange() { @@ -1376,7 +1380,9 @@ export default { // this.generateBillNo(); } this.findMethod(); + if(this.formData.invWarehouseCode!=null){ this.getBusType(); + } this.getStorage(); this.findSubInvByInv(); this.findSubStorageMethod(); diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index ea5a310..f72e0fb 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -76,7 +76,7 @@ show-overflow-tooltip > @@ -193,6 +193,7 @@ export default { erpName: "", keys: [], }, + ids:[], radioCheck: null, dataList: [], pageTotal: 1, @@ -248,20 +249,12 @@ export default { this.$router.push({ path: "", }); - this.listQuery = { - unionCode: null, - udiCode: null, - ylqxzcrbarmc: "", - cpmctymc: "", - thrPiId: null, - nameCode: "", - ggxh: null, - page: 1, - limit: 20, - addType: 1, - billType: this.data.formData.billType, - corpId: this.data.formData.corpId, - }; + this.listQuery.udiCode=null + this.listQuery.unionCode=null + this.listQuery.cpmctymc=null + this.listQuery.ggxh=null + this.listQuery.ylqxzcrbarmc=null + this.listQuery.thrPiId=null this.getList(); }, tableRowClassName({row}) { @@ -352,6 +345,15 @@ export default { this.$message.error('未选择产品'); return; } + + if(this.ids.length>0){ + for(var i=0;i0){ + for(var i=0;i { if (response.code === 20000) { this.idQuery.id = response.data.orderId; @@ -918,6 +920,7 @@ export default { this.$router.go(-1); }, getBusType() { + this.formData.billType=null; let query = { code: this.formData.invWarehouseCode, enabled: true, @@ -927,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); @@ -965,6 +968,7 @@ export default { } , findMethod(query) { + this.fromOptions = []; let cQuery = { key: query, @@ -976,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) { @@ -986,6 +990,7 @@ export default { getBasicUnitMaintains(cQuery) .then((response) => { + debugger this.loading = false; this.fromOptions = response.data.page.list || []; if (this.curAction.corpType == 3) { @@ -1094,6 +1099,7 @@ export default { } , actionChange(item) { + this.curAction = this.getActionItem(item); this.findMethod(); @@ -1221,7 +1227,7 @@ export default { this.formData.code = ''; this.formData.actDate = new Date(); this.codeArray = []; - this.getBusType(); + this.getStorage(this.formData.action); if (this.$isNotBlank(this.idQuery.id)) { @@ -1264,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/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 2f62256..3512578 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -531,7 +531,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10":"手动补单", + "11": "仓库盘点" }, busTypes: [], enableDept: false, diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index f18579f..ea8c2c9 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -436,7 +436,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10":"手动补单" + "10":"手动补单", + "11": "仓库盘点" }, exportQuery: { orderId: "", diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index b326920..def5054 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -333,7 +333,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, storageList: [], subInvList: [], diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 77f73ac..a9865ea 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -448,7 +448,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, //往来单位 unitquery: {key: "", page: 1, limit: 20}, diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index f70a170..b4e5dbd 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -351,7 +351,8 @@ export default { "6": "缺量补录单据", "7": "UDI供应商平台", "8": "平衡补录单据", - "10": "手动补单" + "10": "手动补单", + "11": "仓库盘点" }, deleteData: { id: "", 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/inventory/countOrderCodes.vue b/src/views/inventory/countOrderCodes.vue index 658f453..0a0d762 100644 --- a/src/views/inventory/countOrderCodes.vue +++ b/src/views/inventory/countOrderCodes.vue @@ -22,6 +22,12 @@ width="500" show-overflow-tooltip > + - - + @@ -142,14 +141,6 @@ >详情 - - 删除 - @@ -400,6 +391,7 @@ export default { this.codeQuery = { orderIdFk: row.orderIdFk, productId: row.productId, + batchNo: row.batchNo, edit: false }; this.codesVisible = true; diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue index f841253..a75046a 100644 --- a/src/views/inventory/invCountOrderCompleted.vue +++ b/src/views/inventory/invCountOrderCompleted.vue @@ -98,8 +98,7 @@ - - + @@ -371,6 +370,7 @@ export default { this.codeQuery = { orderIdFk: row.orderIdFk, productId: row.productId, + batchNo: row.batchNo, edit: false }; this.codesVisible = true; diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 509a2c4..53f38c4 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -305,6 +305,18 @@ export default { return; } if (status === '2') { + + if(this.formData.billDate=="" || this.formData.billDate==null){ + return this.$message.error("单据日期不能为空！"); + } + if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){ + return this.$message.error("仓库不能为空！"); + } + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ + return this.$message.error("分库不能为空！"); + } + + for (let i = 0; i < this.codeArray.length; i++) { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue index 91beb0f..eecdae7 100644 --- a/src/views/purchase/purPlan.vue +++ b/src/views/purchase/purPlan.vue @@ -247,7 +247,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue index 4d3c60d..4f17a49 100644 --- a/src/views/purchase/purPlanEditDialog.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -182,7 +182,7 @@ type='number' @change="tableCountChange(scope.row)" :disabled="scope.row.index !== selectedIndex" - oninput="value=value.replace(/[^\d]/g,'')"> + oninput="value=value.replace(/[^d]/g,'')"> diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue index 467c825..5eb6d1d 100644 --- a/src/views/purchase/purPlanSearch.vue +++ b/src/views/purchase/purPlanSearch.vue @@ -245,7 +245,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue index e28b7ef..2249d73 100644 --- a/src/views/purchase/pureApplyAudit.vue +++ b/src/views/purchase/pureApplyAudit.vue @@ -255,7 +255,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue index e647b66..bf8aab8 100644 --- a/src/views/purchase/pureApplySearch.vue +++ b/src/views/purchase/pureApplySearch.vue @@ -255,7 +255,6 @@ export default { listApplyDetail(query) //查找该单号下的所有条码 .then((response) => { this.detailList = response.data.list || []; - this.total = response.data.total || 0; this.loading = false; }) .catch(() => { diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index dfd178a..e85f22d 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -32,7 +32,7 @@ - + @@ -206,7 +206,10 @@ export default { }, formRules: { name: [ - {required: true, message: "电子档名称", trigger: "blur"} + {required: true, message: "请输入证书名称", trigger: "blur"} + ], + code: [ + {required: true, message: "请输入证书编号", trigger: "blur"} ], }, loading: false, @@ -268,6 +271,9 @@ export default { onSubmit() { this.loading = true; this.formData.customerId = this.inputQuery.customerId; + if(this.formData.customerId==null){ + this.formData.customerId=store.getters.customerId + } this.formData.type = this.addType; //证书类型：1:供应商；2.生产企业；3.产品品种 if (this.addType == 2) { diff --git a/src/views/purchase/supCertAudit.vue b/src/views/purchase/supCertAudit.vue index 971f427..cfbf5f3 100644 --- a/src/views/purchase/supCertAudit.vue +++ b/src/views/purchase/supCertAudit.vue @@ -87,6 +87,7 @@ { this.manufacturerLoading = false; this.manufacturerList = response.data.list || []; - this.total = response.data.total || 0; + this.manufacturerTotal = response.data.total || 0; }) .catch(() => { this.manufacturerLoading = false; @@ -575,10 +578,14 @@ export default { this.addInfoVisible = true; }, closeManufacturerDialog(type) { + if(type==true){ this.addInfoVisible = false; this.enterpriseId = null; this.manufacturerList = []; this.getManufacturerList(); + }else{ + this.getManufacturerList(); + } }, handleManuChange(val) { @@ -639,6 +646,7 @@ export default { .then((response) => { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal= response.data.total }) .catch(() => { this.registrationLoading = false; @@ -647,7 +655,7 @@ export default { }, certHandleCurrentChange(val) { this.registrationQuery.page = val; - this.registrationList(); + this.getRegistrationList(); } }, diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue index 75b55a1..5be277c 100644 --- a/src/views/purchase/supCertSet.vue +++ b/src/views/purchase/supCertSet.vue @@ -160,10 +160,10 @@

产品资质设置

-
@@ -305,10 +305,10 @@ @@ -354,7 +354,7 @@
- 产品类型： + 器械类别：
@@ -501,7 +501,7 @@ export default { {required: true, message: "证书名称", trigger: "blur"} ], need: [ - {required: true, message: "请选择是否禁用", trigger: "blur"} + {required: true, message: "请选择产地", trigger: "blur"} ], }, @@ -537,9 +537,7 @@ export default { name: [ {required: true, message: "请输入证书名称", trigger: "blur"} ], - need: [ - {required: true, message: "请选择是否必传", trigger: "blur"} - ], + }, /**--------产品资质设置--------------*/ @@ -618,7 +616,11 @@ export default { this.currentSup.type = 1; addSupCertSet(this.currentSup) .then((response) => { - this.getList(); + if(response.code==20000){ + this.getList(); + }else{ + this.$message.error(response.message); + } }) .catch(() => { }); @@ -628,6 +630,7 @@ export default { this.getList(); this.$message.success("保存成功！"); } else { + this.getList(); this.$message.error(res.message); } }) @@ -638,6 +641,9 @@ export default { }, cancelDialog() { + this.getList(); + this.getManufacturerList(); + this.getProductList(); this.addDialogVisible = false; this.addManufacturerDialogVisible = false; this.addProductDialogVisible = false; @@ -645,6 +651,10 @@ export default { /**--------生产企业资质设置--------------*/ + handleManufacturerChange(val) { + this.manufacturerQuery.page = val; + this.getManufacturerList(); + }, getManufacturerList() { this.manufacturerLoading = true; filterCertSet(this.manufacturerQuery) @@ -690,7 +700,12 @@ export default { this.currentManufacturer.type = 2; addSupCertSet(this.currentManufacturer) .then((response) => { - this.getManufacturerList(); + if(response.code==20000){ + this.getManufacturerList(); + }else{ + this.$message.error(response.message); + } + }) .catch(() => { }); @@ -700,6 +715,7 @@ export default { this.getManufacturerList(); this.$message.success("保存成功！"); } else { + this.getManufacturerList(); this.$message.error(res.message); } }) @@ -711,6 +727,10 @@ export default { /**--------产品资质设置--------------*/ + handleProductChange(val) { + this.productQuery.page = val; + this.getProductList(); + }, getProductList() { this.productLoading = true; filterCertSet(this.productQuery) @@ -757,7 +777,11 @@ export default { this.currentProduct.type = 3; addSupCertSet(this.currentProduct) .then((response) => { - this.getProductList(); + if(response.code==20000){ + this.getProductList(); + }else{ + this.$message.error(response.message); + } }) .catch(() => { }); @@ -767,6 +791,7 @@ export default { this.getProductList(); this.$message.success("保存成功！"); } else { + this.getProductList(); this.$message.error(res.message); } }) diff --git a/src/views/purchase/supCertSetSelectDialog.vue b/src/views/purchase/supCertSetSelectDialog.vue index 5494100..1f1252f 100644 --- a/src/views/purchase/supCertSetSelectDialog.vue +++ b/src/views/purchase/supCertSetSelectDialog.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index 166cfac..fe5af6c 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -22,6 +22,7 @@ + @@ -93,6 +94,7 @@ { this.registrationLoading = false; this.registrationList = response.data.list || []; + this.certTotal = response.data.total; }) .catch(() => { this.registrationLoading = false; @@ -548,7 +556,7 @@ export default { }, certHandleCurrentChange(val) { this.registrationQuery.page = val; - this.registrationList(); + this.getRegistrationList(); } }, diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue index d3c6ac0..f276f19 100644 --- a/src/views/purchase/supCompanyAduditDialog.vue +++ b/src/views/purchase/supCompanyAduditDialog.vue @@ -505,10 +505,13 @@ export default { this.certLoading = true; this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.type = 1; + this.certQuery.auditStatus=25; + filterCompanyCert(this.certQuery) .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue index 6700eee..a957836 100644 --- a/src/views/purchase/supCompanyEditDialog.vue +++ b/src/views/purchase/supCompanyEditDialog.vue @@ -610,6 +610,7 @@ export default { .then((response) => { this.certLoading = false; this.certList = response.data.list || []; + this.certTotal=response.data.total; }) .catch(() => { this.certLoading = false; diff --git a/src/views/purchase/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue index b944684..d48542a 100644 --- a/src/views/purchase/supManufacturerAuditDialog.vue +++ b/src/views/purchase/supManufacturerAuditDialog.vue @@ -197,6 +197,11 @@ + + +