diff --git a/src/views/modules/srmPart/com_part_BasicInfo.vue b/src/views/modules/srmPart/com_part_BasicInfo.vue index 9f9d920..933c338 100644 --- a/src/views/modules/srmPart/com_part_BasicInfo.vue +++ b/src/views/modules/srmPart/com_part_BasicInfo.vue @@ -16,22 +16,22 @@ - + - + - + - + @@ -39,12 +39,12 @@ - + - + @@ -54,25 +54,22 @@ - + - + - + - - - - - + + @@ -84,6 +81,7 @@ \ No newline at end of file + diff --git a/src/views/modules/srmPart/com_part_Suppliers.vue b/src/views/modules/srmPart/com_part_Suppliers.vue index 34246c4..7100cec 100644 --- a/src/views/modules/srmPart/com_part_Suppliers.vue +++ b/src/views/modules/srmPart/com_part_Suppliers.vue @@ -4,13 +4,13 @@ - + 查询 新增 - + - +
@@ -61,7 +61,7 @@ --> - + @@ -71,7 +71,7 @@ - + @@ -80,22 +80,22 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -242,42 +242,42 @@ export default { fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 811001, - serialNumber: '811001Table5SecondarySupplierCode', - tableId: '811001Table5', - tableName: '供应商合同', - columnProp: 'secondarySupplierCode', - headerAlign: 'center', - align: 'left', - columnLabel: '二级供应商编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 150 - }, - { - userId: this.$store.state.user.name, - functionId: 811001, - serialNumber: '811001Table5SecondarySupplierName', - tableId: '811001Table5', - tableName: '供应商合同', - columnProp: 'secondarySupplierName', - headerAlign: 'center', - align: 'left', - columnLabel: '二级供应商名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 150 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 811001, + // serialNumber: '811001Table5SecondarySupplierCode', + // tableId: '811001Table5', + // tableName: '供应商合同', + // columnProp: 'secondarySupplierCode', + // headerAlign: 'center', + // align: 'left', + // columnLabel: '二级供应商编码', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 150 + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 811001, + // serialNumber: '811001Table5SecondarySupplierName', + // tableId: '811001Table5', + // tableName: '供应商合同', + // columnProp: 'secondarySupplierName', + // headerAlign: 'center', + // align: 'left', + // columnLabel: '二级供应商名称', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 150 + // }, { userId: this.$store.state.user.name, functionId: 811001, @@ -327,7 +327,7 @@ export default { getBaseData (val) { if (this.tagNo === 520) { this.partSuppliersData.supplierCode = val.supplier_no - + } }, //初始化组件的参数 @@ -355,7 +355,7 @@ export default { site:this.$store.state.user.site, partNo:this.searchData.partNo, supplierCode:'', - supplierName:'', + supplierName:'', priceWithTax:'', deliveryTime:'', secondarySupplierCode:'', @@ -364,18 +364,18 @@ export default { isMainSupplier:'', createBy:this.$store.state.user.name, } - + this.contractModelFlag=true; }, - + submitData(){ - + if(this.partSuppliersData.supplierCode==''||this.partSuppliersData.supplierCode==null){ this.$message.warning('未输入supplierCode！') return false } - + createPartSupplierRelation( this.partSuppliersData).then(({data})=>{ if (data && data.code === 0){ @@ -390,7 +390,7 @@ export default { }) }, - + editModel(row){ this.partSuppliersData=JSON.parse(JSON.stringify(row)); this.contractModelFlag=true; @@ -442,4 +442,4 @@ export default { } - \ No newline at end of file + diff --git a/src/views/modules/srmPart/partApprovalList.vue b/src/views/modules/srmPart/partApprovalList.vue index e8d3faf..197d59d 100644 --- a/src/views/modules/srmPart/partApprovalList.vue +++ b/src/views/modules/srmPart/partApprovalList.vue @@ -74,7 +74,11 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -89,7 +93,7 @@ @@ -157,7 +161,7 @@ --> - + @@ -397,7 +401,7 @@ export default { columnProp: 'status', headerAlign: 'center', align: 'center', - columnLabel: '状态', + columnLabel: '是否在用', columnWidth: '80', columnHidden: false, columnImage: false, @@ -498,7 +502,7 @@ export default { // } ], exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss') - + } }, /* 组件 */ @@ -520,7 +524,7 @@ export default { this.height = (window.innerHeight - 280) / 2 }) }, - + methods: { getBaseList (val, type) { @@ -539,9 +543,9 @@ export default { // if (this.tagNo === 1100) { // this.searchData.partNo = val.part_no // } - + }, - + getMainData () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex @@ -563,11 +567,11 @@ export default { this.dataListLoading = false }) }, - + tabClick (tab, event) { this.refreshCurrentTabTable() }, - + // 每页数 sizeChangeHandle (val) { this.pageSize = val @@ -580,12 +584,12 @@ export default { this.pageIndex = val this.getMainData() }, - + changeData (row) { this.currentRow = JSON.parse(JSON.stringify(row)) this.refreshCurrentTabTable() }, - + refreshCurrentTabTable () { if (this.currentRow === '' || this.currentRow === null) { this.currentRow = {site: '', partNo: ''} @@ -606,7 +610,7 @@ export default { this.refreshAttachments() } }, - + async exportExcel () { this.searchData.limit = -1 this.searchData.page = 1 @@ -621,7 +625,7 @@ export default { dropColumns: [] }) }, - + refreshBasicInfo () { let inData = { site: this.currentRow.site, @@ -631,7 +635,7 @@ export default { } this.$refs.basicInfo.init(inData) }, - + refreshSpecParams () { let inData = { site: this.currentRow.site, @@ -642,7 +646,7 @@ export default { } this.$refs.specParams.init(inData) }, - + refreshSuppliers () { let inData = { site: this.currentRow.site, @@ -651,7 +655,7 @@ export default { } this.$refs.suppliers.init(inData) }, - + refreshApproval () { let inData = { site: this.currentRow.site, @@ -661,7 +665,7 @@ export default { } this.$refs.approval.init(inData) }, - + refreshAttachments () { let inData = { orderRef1: this.currentRow.site, @@ -671,8 +675,8 @@ export default { } this.$refs.attachments.init(inData) }, - - + + // 打开审批对话框 openApproveDialog(row) { this.approveData = { @@ -682,8 +686,9 @@ export default { flowCode: row.flowCode, flowVersion: row.flowVersion, nodeCode: row.nodeCode, + specialRelease: 'N', comment: '' - + } this.approveDialogVisible = true }, @@ -737,7 +742,7 @@ export default { }) }).catch(() => {}) } - + } } @@ -860,4 +865,4 @@ export default { height: 28px; } } - \ No newline at end of file + diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index f9cb810..3e96ec9 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -42,7 +42,11 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -137,7 +141,7 @@ - +
@@ -162,10 +166,10 @@ - + - - + + @@ -466,7 +470,7 @@ export default { columnProp: 'status', headerAlign: 'center', align: 'center', - columnLabel: '状态', + columnLabel: '是否在用', columnWidth: '80', columnHidden: false, columnImage: false, @@ -579,7 +583,7 @@ export default { sourcingName: '', category: '', unit: '', - status: 'N', + status: 'Y', codeNo: '', createBy: '', remark: '', @@ -598,8 +602,8 @@ export default { partSpec: [ { required: true, message: ' ', trigger: 'blur' } ] - - + + } } }, @@ -622,7 +626,7 @@ export default { this.height = (window.innerHeight - 280) / 2 }) }, - + methods: { getBaseList (val, type) { @@ -645,7 +649,7 @@ export default { if (val === 528) { strVal = this.currentpart.sourcingName } - + if (val === 527) { strVal = this.currentpart.codeNo } @@ -672,12 +676,12 @@ export default { if (this.tagNo === 528) { this.currentpart.sourcingName = val.UserName } - + if (this.tagNo === 527) { this.currentpart.codeNo = val.code_no } }, - + getMainData () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex @@ -689,16 +693,16 @@ export default { if (item.flowNodeInstanceData) { item.departmentName = item.flowNodeInstanceData.departmentName; item.assigneeName = item.flowNodeInstanceData.assigneeName; - + } else { item.departmentName = ''; item.assigneeName = ''; - + } return item; }); - + // this.mainDataList = data.page.list this.pageIndex = data.page.currPage this.pageSize = data.page.pageSize @@ -715,11 +719,11 @@ export default { this.dataListLoading = false }) }, - + tabClick (tab, event) { this.refreshCurrentTabTable() }, - + // 每页数 sizeChangeHandle (val) { this.pageSize = val @@ -732,12 +736,12 @@ export default { this.pageIndex = val this.getMainData() }, - + changeData (row) { this.currentRow = JSON.parse(JSON.stringify(row)) this.refreshCurrentTabTable() }, - + refreshCurrentTabTable () { if (this.currentRow === '' || this.currentRow === null) { this.currentRow = {site: '', partNo: ''} @@ -758,7 +762,7 @@ export default { this.refreshAttachments() } }, - + async exportExcel () { this.searchData.limit = -1 this.searchData.page = 1 @@ -773,7 +777,7 @@ export default { dropColumns: [] }) }, - + refreshBasicInfo () { let inData = { site: this.currentRow.site, @@ -783,7 +787,7 @@ export default { } this.$refs.basicInfo.init(inData) }, - + refreshSpecParams () { let inData = { site: this.currentRow.site, @@ -794,7 +798,7 @@ export default { } this.$refs.specParams.init(inData) }, - + refreshSuppliers () { let inData = { site: this.currentRow.site, @@ -803,7 +807,7 @@ export default { } this.$refs.suppliers.init(inData) }, - + refreshApproval () { let inData = { site: this.currentRow.site, @@ -813,18 +817,18 @@ export default { } this.$refs.approval.init(inData) }, - + refreshAttachments () { let inData = { orderRef1: this.currentRow.site, orderRef2: this.currentRow.partNo, orderRef3: this.currentRow.partDesc, - orderReftype: 'part', + orderReftype: 'part', height: Number(this.height) - 20 } this.$refs.attachments.init(inData) }, - + // 新增产品 addPart() { this.isAdd = true @@ -837,7 +841,7 @@ export default { sourcingName: '', category: '', unit: '', - status: 'N', + status: 'Y', codeNo: '', createBy: this.$store.state.user.name, remark: '', @@ -845,7 +849,7 @@ export default { } this.partDialogVisible = true }, - + // 编辑产品 editPart(row) { if (!row) { @@ -856,7 +860,7 @@ export default { this.currentpart = {...row} this.partDialogVisible = true }, - + // 保存产品 savePart() { this.$refs.partForm.validate((valid) => { @@ -909,7 +913,7 @@ export default { // flowVersion: row.flowNodeInstanceData.flowVersion, // nodeCode: row.flowNodeInstanceData.nodeCode, // comment: '' - + // } // this.approveDialogVisible = true // }, @@ -963,7 +967,7 @@ export default { // }) // }).catch(() => {}) // } - + } } @@ -1086,4 +1090,4 @@ export default { height: 28px; } } - \ No newline at end of file + diff --git a/src/views/modules/srmSupplier/supplierShare.vue b/src/views/modules/srmSupplier/supplierShare.vue index a183064..32803f8 100644 --- a/src/views/modules/srmSupplier/supplierShare.vue +++ b/src/views/modules/srmSupplier/supplierShare.vue @@ -83,9 +83,9 @@ - + @@ -127,7 +127,7 @@ export default { tagNo:'', mainDataList:[], dataListLoading: false, - activeName: 'share', + activeName: 'vendorList', columnArray1: [ { userId: this.$store.state.user.name, @@ -244,9 +244,9 @@ export default { if(this.currentRow===''||this.currentRow===null){ this.currentRow={site:'',supplierNo:''} } - if(this.activeName==='share'){ - this.refreshShareTable(); - } + // if(this.activeName==='share'){ + // this.refreshShareTable(); + // } if(this.activeName==='vendorList'){ this.refreshVendorListTable(); } diff --git a/src/views/modules/supplier/purHeaderList.vue b/src/views/modules/supplier/purHeaderList.vue index 05366c6..9545ed2 100644 --- a/src/views/modules/supplier/purHeaderList.vue +++ b/src/views/modules/supplier/purHeaderList.vue @@ -55,11 +55,11 @@ - + - +
- 物料明细列表 + 物料明细列表 新增物料
- -