From ffdb8a13f47b003dadee92b13fb98924894766a8 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 24 Jan 2025 11:10:36 +0800 Subject: [PATCH] =?UTF-8?q?2025-01-24=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/propertiesItem/propertiesItem.vue | 13 ++-- src/views/modules/common/Chooselist.vue | 2 +- .../modules/part/partCatalogInformation.vue | 76 +++++++++---------- src/views/modules/part/partInformation.vue | 8 +- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue index e04713d..25931d8 100644 --- a/src/views/modules/base/propertiesItem/propertiesItem.vue +++ b/src/views/modules/base/propertiesItem/propertiesItem.vue @@ -653,15 +653,16 @@ this.modalDisableFlag = false; this.modalFlag = true; }, - chooseModal(row){ - this.chooseModalData.itemNo=row.itemNo; - this.chooseModalData.itemDesc=row.itemDesc; - this.chooseModalData.valueTypeDb=row.valueTypeDb; - this.chooseModalData.itemType=row.itemType; + chooseModal (row) { + this.chooseModalData.site = row.site; + this.chooseModalData.itemNo = row.itemNo; + this.chooseModalData.itemDesc = row.itemDesc; + this.chooseModalData.valueTypeDb = row.valueTypeDb; + this.chooseModalData.itemType = row.itemType; searchItemAvailable(this.chooseModalData).then(({data}) => { this.chooseTableData = data.rows }) - this.chooseModalFlag=true; + this.chooseModalFlag = true; }, updateModal(row){ this.modalData = { diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue index 802d869..7c8d97b 100644 --- a/src/views/modules/common/Chooselist.vue +++ b/src/views/modules/common/Chooselist.vue @@ -196,7 +196,7 @@ export default { if (this.param3) { sql += " and active like '%" + this.param3 + "%'" } - let tagNoList = [119, 120, 121, 93, 102] + let tagNoList = [119, 120, 121, 93, 102, 22] if (this.tagNo <1000 && !tagNoList.includes(this.tagNo)) { if (this.param4) { sql += " and site=" + "'" + this.param4 + "'" diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index f9cb385..c69c7c9 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -114,7 +114,7 @@ 属性模板 - + @@ -337,23 +337,23 @@ @selection-change="selectionItem1" highlight-current-row style="width: 100%"> - - + + + + + + @@ -361,7 +361,7 @@
- 添加>> +
删除<< @@ -387,14 +387,14 @@ @@ -680,25 +680,24 @@ fixed: '', columnWidth: 100 }, - - { - userId: this.$store.state.user.name, - functionId: 104001, - serialNumber: '104001Table1GroupName', - tableId: '104001Table1', - tableName: '物料信息表', - columnProp: 'groupName', - headerAlign: 'center', - align: 'center', - columnLabel: '物料分组', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 104001, + // serialNumber: '104001Table1GroupName', + // tableId: '104001Table1', + // tableName: '物料信息表', + // columnProp: 'groupName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '物料分组', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 + // }, { userId: this.$store.state.user.name, functionId: 104001, @@ -1232,6 +1231,7 @@ codeNo: this.partCurrentRow.codeNo, codeDesc: this.partCurrentRow.codeDesc, recordType: 'MP', + updateBy: this.$store.state.user.name, itemList: this.itemSelections1 } addMasterPartItem(inData).then(({data}) => { @@ -1253,10 +1253,8 @@ // 物料项目删除 deleteItem () { if (this.itemSelections2 == null || this.itemSelections2.length === 0) { - this.$alert("请选择已有属性！", '提示', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择已有属性！') + return } let inData = { site: '*', @@ -1264,6 +1262,7 @@ codeNo: this.partCurrentRow.codeNo, codeDesc: this.partCurrentRow.codeDesc, recordType: 'MP', + updateBy: this.$store.state.user.name, itemList: this.itemSelections2 } deleteMasterPartItem(inData).then(({data}) => { @@ -1299,6 +1298,7 @@ // 确认修改物料属性 commitItemValue () { let tempData = { + updateBy: this.$store.state.user.name, itemList: JSON.parse(JSON.stringify(this.updatePartItemList)) } commitItemValue(tempData).then(({data}) => { @@ -1364,7 +1364,8 @@ site: '*', partNo: this.partCurrentRow.partNo, codeNo: this.partCurrentRow.codeNo, - recordType: 'MP' + recordType: 'MP', + updateBy: this.$store.state.user.name, } getMasterPartItem(tempData).then(({data}) => { if (data && data.code === 0) { @@ -1378,7 +1379,6 @@ // ======== 列表数据刷新方法 ======== // 获取数据列表 getDataList () { - this.searchData.site = this.$store.state.user.site this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex masterPartSearch(this.searchData).then(({data}) => { @@ -1396,8 +1396,6 @@ } else { this.partCurrentRow = {} } - // 加载当前的页签的table - this.refreshCurrentTabTable() } }) }, diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 0ab1f92..b1cadc3 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -3690,10 +3690,8 @@ // 物料项目删除 deleteItem () { if (this.itemSelections2 == null || this.itemSelections2.length === 0) { - this.$alert("请选择已有属性！", '提示', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择已有属性！') + return } let inData = { site: this.$store.state.user.site, @@ -3929,8 +3927,6 @@ } else { this.partCurrentRow = {} } - // 加载当前的页签的table - //this.refreshCurrentTabTable() } }) },