2026-05-26

【RoHs备注】优化

src/api/rohs/rohs.js

@@ -15,7 +15,7 @@ export const saveRohs = data => createAPI(`/rohs/save`, 'post', data);
 // 修改
 export const updateRohs = data => createAPI(`/rohs/update`, 'post', data);
 
-// 仅更新RoHs备注（不受流程节点和状态限制）
+// 仅更新备注说明（不受流程节点和状态限制）
 export const updateRohsRemark = data => createAPI(`/rohs/updateRemark`, 'post', data);
 
 // 仅保存材料明细（编辑时即时保存）

src/views/modules/rohs/rohsRecord.vue

@@ -255,9 +255,6 @@
               <el-form-item label="报告时间(月)/Expect Report Time">
                 <el-input class="inlineNumber numInput" v-model="modalData.expectReportTime" :disabled="isRohsFieldDisabled('expectReportTime')" type="number" style="width: 190px"></el-input>
               </el-form-item>
-              <el-form-item label=" " style="margin-top: -2px;">
-                <el-button type="primary" icon="el-icon-edit-outline" v-if="authDataEntry" @click="openRohsRemarkDialog">RoHs备注</el-button>
-              </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
               <el-form-item>
@@ -282,7 +279,15 @@
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData">
-              <el-form-item label="备注说明/Remark" style="display: block;">
+              <el-form-item style="display: block;">
+                <template slot="label">
+                  <span>备注说明/Remark</span>
+                  <el-button
+                    v-if="authDataEntry"
+                    style="margin-left: 2px;width: 83px;line-height: 0.5;font-size: 10px;"
+                    type="primary"
+                    @click="openRohsRemarkDialog">RoHs备注</el-button>
+                </template>
                 <el-input type="textarea" :rows="3" v-model="modalData.remark" :disabled="isRohsFieldDisabled('remark')" resize="none" style="width: 802px;height: 30px"></el-input>
               </el-form-item>
             </el-form>
@@ -614,10 +619,10 @@
 
     <el-dialog width="700px" title="RoHs备注" :close-on-click-modal="false" :visible.sync="rohsRemarkFlag" v-drag>
       <el-form label-position="top">
-        <el-form-item label="RoHs备注">
+        <el-form-item label="备注说明/Remark">
           <el-input
             type="textarea"
-            v-model="rohsRemarkForm.rohsRemark"
+            v-model="rohsRemarkForm.remark"
             :rows="6"
             maxlength="255"
             show-word-limit
@@ -1118,7 +1123,7 @@ export default {
       rejectOpinion: '',
       submitLoading: false,
       rohsRemarkForm: {
-        rohsRemark: ''
+        remark: ''
       },
       modalData: {
         site: 'DEFAULT',
@@ -1159,7 +1164,6 @@ export default {
         testReportIncludingItems: '',
         testReportIncludingItemsList: [],
         remark: '',
-        rohsRemark: '',
         status: '',
         sgsReportNumber: '',
         expiredDate: '',
@@ -1575,17 +1579,17 @@ export default {
       return !!(this.modalData && this.modalData.site && this.modalData.referenceNo && !String(this.modalData.referenceNo).startsWith('TEMP-'))
     },
     openRohsRemarkDialog () {
-      this.$set(this.rohsRemarkForm, 'rohsRemark', this.modalData.rohsRemark || '')
+      this.$set(this.rohsRemarkForm, 'remark', this.modalData.remark || '')
       this.rohsRemarkFlag = true
     },
     refreshRohsRemark () {
       if (!this.hasPersistedRohsRecord()) {
-        this.$set(this.rohsRemarkForm, 'rohsRemark', this.modalData.rohsRemark || '')
+        this.$set(this.rohsRemarkForm, 'remark', this.modalData.remark || '')
         return
       }
       api.getRohsDetail(this.modalData.site, this.modalData.referenceNo).then(({data}) => {
         if (data && data.code === 0 && data.data) {
-          this.$set(this.rohsRemarkForm, 'rohsRemark', data.data.rohsRemark || '')
+          this.$set(this.rohsRemarkForm, 'remark', data.data.remark || '')
         } else {
           this.$message.error((data && data.msg) || '刷新失败')
         }
@@ -1594,9 +1598,9 @@ export default {
       })
     },
     saveRohsRemark () {
-      const rohsRemark = this.rohsRemarkForm.rohsRemark || ''
+      const remark = this.rohsRemarkForm.remark || ''
       if (!this.hasPersistedRohsRecord()) {
-        this.$set(this.modalData, 'rohsRemark', rohsRemark)
+        this.$set(this.modalData, 'remark', remark)
         this.rohsRemarkFlag = false
         this.$message.success('暂存成功，保存单据后写入数据库')
         return
@@ -1604,17 +1608,17 @@ export default {
       const params = {
         site: this.modalData.site,
         referenceNo: this.modalData.referenceNo,
-        rohsRemark: rohsRemark
+        remark: remark
       }
       api.updateRohsRemark(params).then(({data}) => {
         if (data && data.code === 0) {
-          this.$set(this.modalData, 'rohsRemark', rohsRemark)
+          this.$set(this.modalData, 'remark', remark)
           if (this.currentRow && this.currentRow.site === this.modalData.site && this.currentRow.referenceNo === this.modalData.referenceNo) {
-            this.$set(this.currentRow, 'rohsRemark', rohsRemark)
+            this.$set(this.currentRow, 'remark', remark)
           }
           const target = (this.dataList || []).find(item => item.site === this.modalData.site && item.referenceNo === this.modalData.referenceNo)
           if (target) {
-            this.$set(target, 'rohsRemark', rohsRemark)
+            this.$set(target, 'remark', remark)
           }
           this.rohsRemarkFlag = false
           this.$message.success('操作成功')
@@ -1867,7 +1871,7 @@ export default {
       this.rohsRemarkFlag = false
       this.rejectOpinion = ''
       this.rohsRemarkForm = {
-        rohsRemark: ''
+        remark: ''
       }
       this.projectMaterialDialogFlag = false
       this.projectMaterialSelections = []
@@ -1973,7 +1977,6 @@ export default {
           testReportIncludingItems: '',
           testReportIncludingItemsList: [],
           remark: '',
-          rohsRemark: '',
           status: '草稿',
           sgsReportNumber: '',
           expiredDate: '',