From 1aa909a82bd9e370856358e69267a81f775dd61d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 20 Dec 2023 11:04:38 +0800
Subject: [PATCH] =?UTF-8?q?plm=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../technicalSpecificationList.js             |  1 +
 .../base/propertiesItem/bmPropertiesModel.vue | 53 +++++++++----------
 .../com_bm_demoSlot.vue                       |  9 +++-
 .../technicalSpecificationDetail.vue          |  9 ++--
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index fc72033..abfabe2 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -48,4 +48,5 @@ export const updateBMPrintOtherDetail= data => createAPI(`/technicalSpecificatio
 export const searchBMPrintOtherColor= data => createAPI(`/technicalSpecification/searchBMPrintOtherColor`,'post',data)
 export const saveBMPrintOtherColor= data => createAPI(`/technicalSpecification/saveBMPrintOtherColor`,'post',data)
 export const deleteBMPrintOtherColor= data => createAPI(`/technicalSpecification/deleteBMPrintOtherColor`,'post',data)
+export const searchBMPropertiesHeaderForBM= data => createAPI(`/technicalSpecification/searchBMPropertiesHeaderForBM`,'post',data)
 
diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
index db90a12..27551cc 100644
--- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'BM模块编码'">
-        <el-input v-model="searchData.codeNo" style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'BM模块名称'">
         <el-input v-model="searchData.codeDesc" style="width: 120px"></el-input>
       </el-form-item>
@@ -94,9 +91,6 @@
         <el-form-item :label="'BU编码'">
           <el-input v-model="detailData.buNo" readonly style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item :label="'BM模块编码'">
-          <el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item :label="'BM模块名称'">
           <el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>
         </el-form-item>
@@ -146,8 +140,8 @@
             <el-form-item label="BU编码:">
               <el-input v-model="editData.buNo" readonly style="width: 120px"></el-input>
             </el-form-item>
-            <el-form-item label="BM模块编码:">
-              <el-input v-model="editData.codeNo" readonly style="width: 120px"></el-input>
+            <el-form-item label="BM模块名称:">
+              <el-input v-model="editData.codeDesc" readonly style="width: 120px"></el-input>
             </el-form-item>
             <el-form-item label="是否可编辑:">
               <el-input v-model="editData.editFlag" readonly style="width: 120px"></el-input>
@@ -323,24 +317,24 @@
             fixed: '',
             columnWidth: 70
           },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 100003001,
-            serialNumber: '100003001TableCodeNo',
-            tableId: "100003001Table",
-            tableName: "BM模板表",
-            columnProp: 'codeNo',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: 'BM模块编码',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 90
-          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 100003001,
+          //   serialNumber: '100003001TableCodeNo',
+          //   tableId: "100003001Table",
+          //   tableName: "BM模板表",
+          //   columnProp: 'codeNo',
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: 'BM模块编码',
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 90
+          // },
           {
             userId: this.$store.state.user.name,
             functionId: 100003001,
@@ -609,7 +603,10 @@
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 21) {
+          if (val === 21 ) {
+            if(this.editData.editFlag==='N'){
+              return false;
+            }
             strVal = this.editData.propertiesCodeNo
           }
           this.$refs.baseList.init(val, strVal)
@@ -826,7 +823,7 @@
         this.editData={
           site:row.site,
           buNo:row.buNo,
-          codeNo:row.codeNo,
+          codeDesc:row.codeDesc,
           editFlag:row.editFlag,
           active:row.active,
           propertiesCodeNo:row.propertiesCodeNo,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index be9f5ca..1fcffa1 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -4,8 +4,8 @@
       <el-form-item :label="'技术参数卡编码'">
         <el-input v-model="searchData.codeNo" readonly style="width: 150px"  ></el-input>
       </el-form-item>
-      <el-form-item :label="'模板编码'">
-        <el-input v-model="searchData.type" readonly style="width: 150px"  ></el-input>
+      <el-form-item :label="'属性模板编码'">
+        <el-input v-model="searchData.propertiesCodeNo" readonly style="width: 150px"  ></el-input>
       </el-form-item>
       <el-form-item  label=" ">
         <el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag">更新模板</el-button>
@@ -80,6 +80,7 @@
     searchBMPropertiesValue,
     saveBMPropertiesValue,
     refreshBMPageModal,
+    searchBMPropertiesHeaderForBM,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
 
   export default {
@@ -96,6 +97,7 @@
           codeNo: '',
           buNo:'',
           type:'',
+          propertiesCodeNo:'',
         },
         type:'prepress',
         ifDisableFlag:false,
@@ -124,6 +126,9 @@
         searchBMPropertiesValue(this.searchData).then(({data}) => {
           this.tableData = data.rows;
         });
+        searchBMPropertiesHeaderForBM(this.searchData).then(({data}) => {
+            this.searchData.propertiesCodeNo = data.row.propertiesCodeNo;
+        });
       },
       refreshBMPageModal(){
         this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 43735bd..950f2b8 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -46,8 +46,8 @@
         <el-tab-pane label="模切"  name="cutting" v-if="getPageIf('cutting')">
           <cutting ref="cutting"></cutting>
         </el-tab-pane>
-        <el-tab-pane label="包装"  name="package" v-if="getPageIf('package')">
-          <packagePage ref="package"></packagePage>
+        <el-tab-pane label="包装"  name="packagePage" v-if="getPageIf('packagePage')">
+          <packagePage ref="packagePage"></packagePage>
         </el-tab-pane>
         <el-tab-pane label="FQC"  name="fqc" v-if="getPageIf('fqc')">
           <fqc ref="fqc"></fqc>
@@ -268,10 +268,11 @@
         this.$refs.lamTemperature.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
       getCutting(){
-        this.dataForm.type='overprinting'
-        this.$refs.overprinting.init(JSON.parse(JSON.stringify(this.dataForm)))
+        this.dataForm.type='cutting'
+        this.$refs.cutting.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
       getPackagePage(){
+        // 这个有点特殊  是package
         this.dataForm.type='packagePage'
         this.$refs.packagePage.init(JSON.parse(JSON.stringify(this.dataForm)))
       },