From 5a398a803760d9489057cc824c423cd6e6f3e8e1 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 30 Nov 2023 18:10:42 +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             |  2 +
 .../base/propertiesItem/bmPropertiesModel.vue | 15 +++-
 .../base/propertiesItem/propertiesItem.vue    |  2 +-
 .../com_bm_bom.vue                            |  2 +-
 ...om_bm_prepress.vue => com_bm_demoSlot.vue} | 70 +++++++++++++++----
 .../com_bm_routing.vue                        |  2 +-
 .../technicalSpecificationDetail.vue          | 20 +++++-
 .../technicalSpecificationList.vue            | 18 ++++-
 8 files changed, 109 insertions(+), 22 deletions(-)
 rename src/views/modules/sampleManagement/technicalSpecificationDetail/{com_bm_prepress.vue => com_bm_demoSlot.vue} (56%)

diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 7ef8a0d..f6766cc 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -21,3 +21,5 @@ export const deleteBMBom= data => createAPI(`/technicalSpecification/deleteBMBom
 export const searchBMRoutingDetail= data => createAPI(`/technicalSpecification/searchBMRoutingDetail`,'post',data)
 export const updateBMRoutingDetail= data => createAPI(`/technicalSpecification/updateBMRoutingDetail`,'post',data)
 export const searchBMPropertiesValue= data => createAPI(`/technicalSpecification/searchBMPropertiesValue`,'post',data)
+export const saveBMPropertiesValue= data => createAPI(`/technicalSpecification/saveBMPropertiesValue`,'post',data)
+export const refreshBMPageModal= data => createAPI(`/technicalSpecification/refreshBMPageModal`,'post',data)
diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
index a5e0904..2c36ede 100644
--- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
@@ -95,6 +95,17 @@
         border
         v-loading="dataListLoading"
         style="width: 100%;">
+        <el-table-column
+          fixed="left"
+          header-align="center"
+          align="center"
+          width="70"
+          label="排序">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="goUp(scope.row)">上移</a>
+            <a type="text" size="small" @click="goDown(scope.row)">  下移</a>
+          </template>
+        </el-table-column>
         <el-table-column
           v-for="(item,index) in columnDetailList" :key="index"
           :sortable="item.columnSortable"
@@ -114,11 +125,9 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="180"
+          width="110"
           label="操作">
           <template slot-scope="scope">
-            <a type="text" size="small" @click="goUp(scope.row)">上移</a>
-            <a type="text" size="small" @click="goDown(scope.row)">下移</a>
             <a type="text" size="small" v-if="scope.row.valueChooseFlag === 'Y'" @click="chooseModal(scope.row)">可选值</a>
             <a type="text" size="small" @click="deleteModalDetailForBM(scope.row)">删除属性</a>
           </template>
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
index 2125bdb..171c132 100644
--- a/src/views/modules/base/propertiesItem/propertiesItem.vue
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -605,7 +605,7 @@
           createdBy:this.$store.state.user.name,
           maxValue:'',
           minValue:'',
-          itemType:'A',
+          itemType:this.searchData.itemType!=''?JSON.parse(JSON.stringify(this.searchData.itemType)):'A',
           updateBy: this.$store.state.user.name,
         };
         this.modalDisableFlag = false;
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index e201d30..03b3517 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -342,7 +342,7 @@
       },
       //初始化组件的参数
       init(inData) {
-        if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){
+        if(this.searchData.codeNo!=null&&this.searchData.codeNo!=''){
           return false;
         }
         //初始化参数
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
similarity index 56%
rename from src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
rename to src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 18c611c..dae7744 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -2,9 +2,9 @@
   <div class="mod-config">
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" >
       <el-form-item >
-        <el-button type="primary" @click="refreshModal()" >更新模板</el-button>
+        <el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag">更新模板</el-button>
         <el-button type="primary" @click="searchTable()" >刷新数据</el-button>
-        <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>
+        <el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag">保存数据</el-button>
       </el-form-item>
       <div class="rq ">
         <el-table
@@ -13,17 +13,17 @@
           border
           style="width: 100%">
           <el-table-column
-            prop="itemNo"
+            prop="propertiesItemNo"
             header-align="center"
             align="left"
-            width="60"
+            width="100"
             label="属性编码">
           </el-table-column>
           <el-table-column
             prop="itemDesc"
             header-align="center"
             align="left"
-            width="100"
+            width="120"
             label="属性名称">
           </el-table-column>
           <el-table-column
@@ -33,18 +33,18 @@
             label="值">
             <template slot-scope="scope">
               <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
               <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
                 <el-option
-                  v-for="item in scope.row.availableList"
+                  v-for="item in scope.row.availableValueList"
                   :key="index"
                   :label="item.availableValue"
                   :value="item.availableValue">
                 </el-option>
               </el-select>
-              <el-select v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+              <el-select v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
                 <el-option
-                  v-for="item in scope.row.availableList"
+                  v-for="item in scope.row.availableValueList"
                   :key="index"
                   :label="item.availableValue"
                   :value="item.availableValue">
@@ -61,7 +61,9 @@
 
 <script>
   import {
-    searchBMPropertiesValue
+    searchBMPropertiesValue,
+    saveBMPropertiesValue,
+    refreshBMPageModal,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
 
   export default {
@@ -92,12 +94,12 @@
     methods: {
       //初始化组件的参数
       init(inData) {
-        if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){
+        if(this.searchData.codeNo!=null&&this.searchData.codeNo!=''){
           return false;
         }
         //初始化参数
         this.searchData = JSON.parse(JSON.stringify(inData));
-        this.searchData.type= JSON.parse(JSON.stringify(this.type));
+        //this.searchData.type= JSON.parse(JSON.stringify(this.type));
         //刷新表格
         this.searchTable();
 
@@ -105,10 +107,50 @@
       searchTable(){
         searchBMPropertiesValue(this.searchData).then(({data}) => {
           this.tableData = data.rows;
-
         });
       },
-
+      refreshBMPageModal(){
+        this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          refreshBMPageModal(this.searchData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      saveTable(){
+        saveBMPropertiesValue(this.tableData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        });
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index e67b147..9843a3e 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo!='DBE'">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo!='RDC'">
       <el-row :gutter="20" >
         <el-col :span="24"><div class="grid-content bg-purple">
           <el-form-item :label="'过程及过程控制/Process and Production Control'">
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 49af439..f388688 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -16,6 +16,9 @@
         <el-tab-pane label="工艺信息"  name="routing">
           <routing ref="routing"></routing>
         </el-tab-pane>
+        <el-tab-pane label="产品技术要求"  name="technicalRequirement">
+          <technicalRequirement ref="technicalRequirement"></technicalRequirement>
+        </el-tab-pane>
         <el-tab-pane label="印前"  name="prepress">
           <prepress ref="prepress"></prepress>
         </el-tab-pane>
@@ -29,7 +32,8 @@
   import packageInfo from "./com_bm_packageInfo";/*包装信息*/
   import bom from "./com_bm_bom";/*BOM*/
   import routing from "./com_bm_routing";/*工艺*/
-  import prepress from "./com_bm_prepress";/*印前*/
+  import prepress from "./com_bm_demoSlot";/*印前*/
+  import technicalRequirement from "./com_bm_demoSlot";/*印前*/
   export default {
     name: "technicalSpecificationDetail",
     components: {
@@ -39,6 +43,7 @@
       bom,
       routing,
       prepress,
+      technicalRequirement,
     },
     data() {
       return {
@@ -47,6 +52,7 @@
           codeNo:'',
           buNo:'',
           username:this.$store.state.user.name,
+          type:'',
         },
         activeName:'baseInfo',
 
@@ -79,6 +85,10 @@
           this.getBom();
         }else if(this.activeName == 'routing'){
           this.getRouting();
+        }else if(this.activeName == 'prepress'){
+          this.getPrepress();
+        }else if(this.activeName == 'technicalRequirement'){
+          this.getTechnicalRequirement();
         }
       },
       getBaseInfoData(){
@@ -96,6 +106,14 @@
       getRouting(){
         this.$refs.routing.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
+      getPrepress(){
+        this.dataForm.type='prepress'
+        this.$refs.prepress.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
+      getTechnicalRequirement(){
+        this.dataForm.type='technicalRequirement'
+        this.$refs.technicalRequirement.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 91c0639..50e930b 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -333,7 +333,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
-
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 103002,
+            serialNumber: '103002Table1BuNo',
+            tableId: "103002Table1",
+            tableName: "技术参数卡列表",
+            columnProp: "buNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "部门编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
           },{
             userId: this.$store.state.user.name,
             functionId: 103002,