diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue index c07833d..e04713d 100644 --- a/src/views/modules/base/propertiesItem/propertiesItem.vue +++ b/src/views/modules/base/propertiesItem/propertiesItem.vue @@ -666,7 +666,7 @@ updateModal(row){ this.modalData = { flag: '2', - site: this.$store.state.user.site, + site: row.site, itemNo: row.itemNo, itemDesc: row.itemDesc, valueTypeDb: row.valueTypeDb, diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue index 020d73b..c0a92cd 100644 --- a/src/views/modules/base/propertiesItem/propertiesModel.vue +++ b/src/views/modules/base/propertiesItem/propertiesModel.vue @@ -1100,7 +1100,7 @@ export default { updateModal(row) { this.modalData = { - site: this.$store.state.user.site, + site: row.site, flag: '2', codeNo: row.codeNo, codeDesc: row.codeDesc, @@ -1211,6 +1211,7 @@ export default { }, //打开属性清单 detailModal(row) { + this.detailData.site = row.site this.detailData.codeNo = row.codeNo this.detailData.codeDesc = row.codeDesc this.detailData.functionType = row.functionType diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index 6228c7d..f9cb385 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -44,7 +44,6 @@ type="selection" header-align="center" align="center" - :selectable="selectFlag" width="50"> { if (data && data.code === 0) { this.modalData = { flag: '1', + site: '*', title: '物料新增', partNo: data.partNo, partDesc: '', @@ -1462,12 +1439,9 @@ this.$message.error(data.msg) } }) - }, - /** - * 物料信息编辑模态框 - * @param row - */ + + // 物料信息编辑模态框 updateModal (row) { this.modalData = { flag: '2', @@ -1498,20 +1472,9 @@ this.modalDisableFlag = true this.modalFlag = true }, - /** - * 返回列表唯一值 - * @param row - * @returns {string|[{trigger: string, message: string, required: boolean}]|*} - */ - getRowKeys (row) { - // 唯一值,一般都为id - return row.agentId - }, // ======== 新增/编辑/删除方法 ======== - /** - * 物料信息新增/编辑 - */ + // 物料信息新增/编辑 saveData () { if (this.modalData.partNo === '' || this.modalData.partNo == null) { this.$message.warning('请填写物料编码!') @@ -1525,10 +1488,6 @@ this.$message.warning('请选择计量单位!') return } - // if (this.modalData.codeNo === '' || this.modalData.codeNo == null) { - // this.$message.warning('请选择属性模板!') - // return - // } if (this.modalData.flag === '1') { masterPartInformationSave(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -1565,9 +1524,8 @@ }) } }, - /** - * 物料信息删除 - */ + + // 物料信息删除 delModal () { if (this.partSelections.length === 0) { this.$message.warning('请勾选要删除的物料信息!') @@ -1597,23 +1555,17 @@ }) } }) - }).catch(() => { }) }, // ======== 列表操作方法 ======== - /** - * 单机选中物料信息 - * @param row - */ + // 单机选中物料信息 partClickRow (row) { // this.$refs.partTable.toggleRowSelection(row) this.partCurrentRow = JSON.parse(JSON.stringify(row)) }, - /** - * 复选物料信息 - * @param val - */ + + // 复选物料信息 selectionPart (val) { this.partSelections = val this.$refs.selectDiv.setLengthselected(this.partSelections.length) @@ -1640,11 +1592,7 @@ }, // ======== chooseList相关方法 ======== - /** - * 获取基础数据列表S - * @param val - * @param type - */ + // 获取基础数据列表S getBaseList (val, type) { this.tagNo = val this.tempCodeNo = this.modalData.codeNo @@ -1660,10 +1608,8 @@ this.$refs.baseList.init(val, strVal) }) }, - /** - * 列表方法的回调 - * @param val - */ + + // 列表方法的回调 getBaseData (val) { if (this.tagNo === 1007) { this.modalData.umId = val.um_id @@ -1751,11 +1697,8 @@ this.modalData.codeDesc = '' }, - // ======== 导出相关方法 ======== - /** - * 导出excel - */ + // 导出excel async createExportData () { this.searchData.limit = -1 this.searchData.page = 1