From f3689f8940e0400459a14cc2bc03e8e712087928 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 17 Jul 2025 16:32:46 +0800
Subject: [PATCH] =?UTF-8?q?2025-07-17=201=E3=80=81=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20-=20=E5=A4=87=E6=B3=A8=E4=B9=9F=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=92=8C=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0=E5=8D=A1?=
 =?UTF-8?q?=E7=9A=84=E5=A4=87=E6=B3=A8=E5=8C=BA=E4=B8=80=E6=A0=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=EF=BC=8C?=
 =?UTF-8?q?=E9=83=BD=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=EF=BC=88=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B9=9F=E8=83=BD=E5=A4=9F=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=89=202=E3=80=81=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=8F=AF=E4=BB=A5=E5=9C=A8=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../technicalSpecificationList.js             |  1 +
 src/api/test/testInformation.js               |  3 +
 .../com_tsd_basicInformation.vue              | 17 ++---
 src/views/modules/test/requestForTest.vue     | 76 +++++++++++++++++--
 .../test/testAttribute/testProperties.vue     |  2 +-
 5 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index b77b884..d513df0 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -173,5 +173,6 @@ export const updateBMCutCutBatch= data => createAPI(`/technicalSpecification/upd
 
 export const updateBMInkMixingColorBatch= data => createAPI(`/technicalSpecification/updateBMInkMixingColorBatch`,'post',data)
 
+export const updateBMBasicInfoEntry= data => createAPI(`/technicalSpecification/updateBMBasicInfoEntry`,'post',data)
 
 
diff --git a/src/api/test/testInformation.js b/src/api/test/testInformation.js
index e3494c5..43b4286 100644
--- a/src/api/test/testInformation.js
+++ b/src/api/test/testInformation.js
@@ -113,3 +113,6 @@ export const submitChange = data => createAPI(`/plm/testInformation/submitChange
  */
 export const testInformationEditStatus = data => createAPI(`/plm/testInformation/testInformationEditStatus`,'post',data)
 
+export const testInfoEditEntry = data => createAPI(`/plm/testInformation/testInfoEditEntry`,'post',data)
+
+export const getTestRemarkEntry = data => createAPI(`/plm/testInformation/getTestRemarkEntry`,'post',data)
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index bdcf66f..5e7b8dc 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -431,6 +431,7 @@
     searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM,
     submitChange, issueChange, // 下达 // 提交
     searchBMUser,
+    updateBMBasicInfoEntry,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import {
     getNodeAuthority, // 获取节点权限
@@ -1404,13 +1405,13 @@
         this.dccVisible = false
       },
 
-      handleDataEntry(){
+      handleDataEntry () {
         this.dataEntryForm.remarkPage = this.dataForm.remarkPage
         this.dataEntryForm.relevancePartNo = this.dataForm.relevancePartNo
         this.dataEntryFlag = true
       },
 
-      refresh1(){
+      refresh1 () {
         this.$clearHighLight()
         tsdBasicInformationSearch(this.searchData).then(({data}) => {
           if (data&&data.code === 0){
@@ -1420,17 +1421,15 @@
         })
       },
 
-      submitDataEntry(){
+      submitDataEntry () {
         let params = {
-          ...this.dataForm,
-          remarkPage: this.dataEntryForm.remarkPage,
-          relevancePartNo: this.dataEntryForm.relevancePartNo,
           site: this.searchData.site,
-          userName: this.$store.state.user.name,
           codeNo: this.searchData.codeNo,
-          menuId: '103002'
+          remarkPage: this.dataEntryForm.remarkPage,
+          relevancePartNo: this.dataEntryForm.relevancePartNo,
+          updateBy: this.$store.state.user.name,
         }
-        updateBMBasicInformation(params).then(({data}) => {
+        updateBMBasicInfoEntry(params).then(({data}) => {
           if (data && data.code === 0) {
             this.$message.success( '操作成功')
             this.$clearHighLight()
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index d82b267..6a8d770 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -192,8 +192,7 @@
     </el-pagination>
 
     <!-- 测试模态框 -->
-    <el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag
-               :visible.sync="modalFlag" top="10vh" width="60%">
+    <el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="60%">
       <el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules">
         <el-row :gutter="15">
           <el-col :span="8">
@@ -360,7 +359,11 @@
         </el-row>
         <el-row :gutter="15">
           <el-col :span="24">
-            <el-form-item label="备注" style="height: 90px">
+            <el-form-item style="height: 90px">
+              <template slot="label">
+                <span>备注</span>
+                <el-button v-if="isAuth('107001:dataEntry')" style="margin-left: 6px;width: 70px;line-height: 0.6;font-size: 11px;" type="primary" @click="handleDataEntry">数据录入</el-button>
+              </template>
               <el-input type="textarea"
                         :disabled="(testInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2') || detailFlag"
                         v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit></el-input>
@@ -369,14 +372,13 @@
         </el-row>
       </el-form>
       <div class="rq">
-        <el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步
-        </el-button>
+        <el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步</el-button>
         <el-tabs v-model="activeTab" @tab-click="dialogTabClick">
           <el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-if="modalData.testNo">
-            <test-properties v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
+            <test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
           </el-tab-pane>
           <el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-else>
-            <test-properties v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
+            <test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties>
           </el-tab-pane>
           <el-tab-pane label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute">
             <el-table
@@ -938,6 +940,21 @@
       </el-footer>
     </el-dialog>
 
+    <el-dialog width="850px" top="25vh" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container>
+      <el-form label-position="top">
+        <el-form-item label="备注" class="auto-form">
+          <el-input type="textarea" v-model="dataEntryForm.technicalConsiderations" :rows="3" resize='none'></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <div style="height:25px;margin-top: 45px">
+          <el-button type="primary" @click="refresh1()">刷新</el-button>
+          <el-button type="primary" @click="submitDataEntry()">保存</el-button>
+          <el-button @click="dataEntryFlag = false" type="primary">取消</el-button>
+        </div>
+      </span>
+    </el-dialog>
+
     <!-- 上传文件的modal -->
     <test-upload-file ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></test-upload-file>
 
@@ -963,6 +980,8 @@ import {
   getCustomerInformation, // 获取客户信息
   submitChange, // 提交
   testInformationEditStatus, // 下达
+  testInfoEditEntry,
+  getTestRemarkEntry,
 } from '@/api/test/testInformation.js'
 import {
   getNodeAuthority, // 获取节点权限
@@ -2346,6 +2365,10 @@ export default {
       partPageSize: 20,
       partPageTotal: 0,
       superAdmin: false,
+      dataEntryForm: {
+        technicalConsiderations: '',
+      },
+      dataEntryFlag: false,
     }
   },
 
@@ -2372,6 +2395,45 @@ export default {
 
   methods: {
 
+    // 数据录入
+    handleDataEntry () {
+      this.dataEntryForm.technicalConsiderations = this.modalData.technicalConsiderations
+      this.dataEntryFlag = true
+    },
+
+    // 刷新
+    refresh1 () {
+      let tempData = {
+        site: this.modalData.site,
+        testNo: this.modalData.testNo
+      }
+      getTestRemarkEntry(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataEntryForm.technicalConsiderations = data.row.technicalConsiderations
+        }
+      })
+    },
+
+    // 保存
+    submitDataEntry () {
+      let params = {
+        site: this.modalData.site,
+        testNo: this.modalData.testNo,
+        technicalConsiderations: this.dataEntryForm.technicalConsiderations,
+        updateBy: this.$store.state.user.name,
+      }
+      testInfoEditEntry(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.getDataList()
+          this.modalData.technicalConsiderations = this.dataEntryForm.technicalConsiderations
+          this.$message.success( '操作成功')
+          this.dataEntryFlag = false
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+
     fetchNodeOptions() {
       getNodeList(this.searchData).then(({ data }) => {
         if (data && data.code === 0) {
diff --git a/src/views/modules/test/testAttribute/testProperties.vue b/src/views/modules/test/testAttribute/testProperties.vue
index bb21ca9..cb4995f 100644
--- a/src/views/modules/test/testAttribute/testProperties.vue
+++ b/src/views/modules/test/testAttribute/testProperties.vue
@@ -240,7 +240,7 @@ export default {
 
 <template>
 <div>
-  <div style="margin-top: 5px">
+  <div style="margin-top: 0px">
     <template v-if="isAuth('107001:tab1:save')">
       <template v-if="testStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && testStatus === '审批中')">
         <el-button type="primary" @click="clickSaveBtn" v-if="testNo && !disabled">新增</el-button>