From edb7d4943a531944693abf51b59c54842041c26a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 7 Jul 2026 10:00:09 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-07=20RoHS=E5=A2=9E=E5=8A=A0=E6=9D=90?=
=?UTF-8?q?=E6=96=99=E6=8F=8F=E8=BF=B0=E3=80=90=E7=BC=96=E8=BE=91=E3=80=91?=
=?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/rohs/rohs.js | 3 +
src/views/modules/rohs/rohsRecord.vue | 92 ++++++++++++++++++++++++++-
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/src/api/rohs/rohs.js b/src/api/rohs/rohs.js
index 310a30f..e21f769 100644
--- a/src/api/rohs/rohs.js
+++ b/src/api/rohs/rohs.js
@@ -21,6 +21,9 @@ export const updateRohs = data => createAPI(`/rohs/update`, 'post', data);
// 仅更新备注说明（不受流程节点和状态限制）
export const updateRohsRemark = data => createAPI(`/rohs/updateRemark`, 'post', data);
+// 仅更新材料描述（不受流程节点和状态限制）
+export const updateRohsMaterialDesc = data => createAPI(`/rohs/updateMaterialDesc`, 'post', data);
+
// 仅保存材料明细（编辑时即时保存）
export const updateRohsMaterials = data => createAPI(`/rohs/updateMaterials`, 'post', data);
diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index b9436c1..ec8f072 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -374,7 +374,15 @@
-
+
+
+ 材料描述/Material Desc.
+ 编辑
+
@@ -1280,6 +1288,26 @@
+
+
+
+
+
+
+
+
+ 刷新
+ 保存
+ 取消
+
+
+
@@ -1635,6 +1663,7 @@ export default {
authFileRemove: false,
authFilePreview: false,
authDataEntry: false,
+ authMaterialDescRemark: false,
authDelete: false,
superAdmin: false,
createBy2: this.$store.state.user.name,
@@ -2102,11 +2131,15 @@ export default {
showModalFlag: false,
submitModalFlag: false,
rohsRemarkFlag: false,
+ rohsMaterialDescFlag: false,
rejectOpinion: '',
submitLoading: false,
rohsRemarkForm: {
remark: ''
},
+ rohsMaterialDescForm: {
+ materialDesc: ''
+ },
hsfStandardDefaultText: 'With the follow environmental specification: Macallan regulated Substances specification(069-0135) /Macallan sustainable fiber specification(099-00532)',
modalData: {
site: 'DEFAULT',
@@ -2971,6 +3004,57 @@ export default {
this.$message.error('保存失败')
})
},
+ openRohsMaterialDescDialog () {
+ this.$set(this.rohsMaterialDescForm, 'materialDesc', this.modalData.materialDesc || '')
+ this.rohsMaterialDescFlag = true
+ },
+ refreshRohsMaterialDesc () {
+ if (!this.hasPersistedRohsRecord()) {
+ this.$set(this.rohsMaterialDescForm, 'materialDesc', this.modalData.materialDesc || '')
+ return
+ }
+ api.getRohsDetail(this.modalData.site, this.modalData.referenceNo).then(({data}) => {
+ if (data && data.code === 0 && data.data) {
+ this.$set(this.rohsMaterialDescForm, 'materialDesc', data.data.materialDesc || '')
+ } else {
+ this.$message.error((data && data.msg) || '刷新失败')
+ }
+ }).catch(() => {
+ this.$message.error('刷新失败')
+ })
+ },
+ saveRohsMaterialDesc () {
+ const materialDesc = this.rohsMaterialDescForm.materialDesc || ''
+ if (!this.hasPersistedRohsRecord()) {
+ this.$set(this.modalData, 'materialDesc', materialDesc)
+ this.rohsMaterialDescFlag = false
+ this.$message.success('暂存成功，保存单据后写入数据库')
+ return
+ }
+ const params = {
+ site: this.modalData.site,
+ referenceNo: this.modalData.referenceNo,
+ materialDesc: materialDesc
+ }
+ api.updateRohsMaterialDesc(params).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$set(this.modalData, 'materialDesc', materialDesc)
+ if (this.currentRow && this.currentRow.site === this.modalData.site && this.currentRow.referenceNo === this.modalData.referenceNo) {
+ this.$set(this.currentRow, 'materialDesc', materialDesc)
+ }
+ const target = (this.dataList || []).find(item => item.site === this.modalData.site && item.referenceNo === this.modalData.referenceNo)
+ if (target) {
+ this.$set(target, 'materialDesc', materialDesc)
+ }
+ this.rohsMaterialDescFlag = false
+ this.$message.success('操作成功')
+ } else {
+ this.$message.error((data && data.msg) || '保存失败')
+ }
+ }).catch(() => {
+ this.$message.error('保存失败')
+ })
+ },
loadModalButtonCondition () {
if (!this.modalData.site || !this.modalData.referenceNo || this.modalData.status !== '审批中') {
this.$set(this.modalData, 'createBy2', '')
@@ -3020,6 +3104,7 @@ export default {
this.authFileRemove = this.isAuth(this.menuId+":fileRemove")
this.authFilePreview = this.isAuth(this.menuId+":filePreview")
this.authDataEntry = this.isAuth(this.menuId+":dataEntry")
+ this.authMaterialDescRemark = this.isAuth(this.menuId + ":materialDescRemark")
this.authDelete = this.isAuth(this.menuId+":delete")
},
// 校验是否为超级管理员
@@ -3119,6 +3204,7 @@ export default {
this.modalFlag = false
this.rohsCreatePartDialogFlag = false
this.rohsCharacteristicDialogFlag = false
+ this.rohsMaterialDescFlag = false
this.rohsCreatePartTab = 'General'
this.$nextTick(() => {
this.refreshAttachmentPanels()
@@ -3439,10 +3525,14 @@ export default {
this.activeName = 'basicInfo'
this.submitModalFlag = false
this.rohsRemarkFlag = false
+ this.rohsMaterialDescFlag = false
this.rejectOpinion = ''
this.rohsRemarkForm = {
remark: ''
}
+ this.rohsMaterialDescForm = {
+ materialDesc: ''
+ }
this.projectMaterialDialogFlag = false
this.rohsCreatePartDialogFlag = false
this.rohsCreatePartLoading = false