From f316a4c71f2775cab01d13840260b6ab10e8e8a5 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 22 Mar 2024 18:03:53 +0800
Subject: [PATCH] plm BM

---
 src/store/modules/user.js                     |   4 +-
 .../base/propertiesItem/propertiesItem.vue    |  15 +-
 .../com_bm_bom.vue                            |   8 +-
 .../com_bm_demoSlot.vue                       |  23 +-
 .../com_bm_packageInfo.vue                    | 354 +--------------
 .../com_bm_routing.vue                        |  22 +-
 .../old_com_bm_packageInfo.vue                | 420 ++++++++++++++++++
 7 files changed, 490 insertions(+), 356 deletions(-)
 create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 23c20da..a2fadce 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,8 +10,8 @@ export default {
     multiLanguage: '',
     authControl: '',
     userSite: 0,
-    bmPicUrl:'http://172.19.1.142:80/upload/',
-    // bmPicUrl:'http://192.168.1.83:81/upload/',
+    // bmPicUrl:'http://172.19.1.142:80/upload/',
+    bmPicUrl:'http://192.168.1.83:81/upload/',
   },
   mutations: {
     updateId (state, id) {
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
index 920d712..977b362 100644
--- a/src/views/modules/base/propertiesItem/propertiesItem.vue
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -94,6 +94,7 @@
           <el-select filterable v-model="modalData.valueTypeDb" style="width: 120px">
             <el-option label="文本" value="T"></el-option>
             <el-option label="数字" value="N"></el-option>
+            <el-option label="超链接" value="S" v-if="modalData.itemType==='BM'"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -110,7 +111,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'属性类型'" prop="itemType" :rules="rules.itemType">
-          <el-select filterable v-model="modalData.itemType" :disabled="modalDisableFlag" style="width: 120px">
+          <el-select filterable v-model="modalData.itemType" @change="changeValueTypeDb" :disabled="modalDisableFlag" style="width: 120px">
             <el-option label="A" value="A"></el-option>
             <el-option label="IP" value="IP"></el-option>
             <el-option label="MP" value="MP"></el-option>
@@ -139,6 +140,7 @@
           <el-select filterable v-model="chooseModalData.valueTypeDb" disabled style="width: 120px">
             <el-option label="文本" value="T"></el-option>
             <el-option label="数字" value="N"></el-option>
+            <el-option label="超链接" value="S"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="' '">
@@ -532,7 +534,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 180
+        this.height = window.innerHeight - 200
       })
     },
     created () {
@@ -719,7 +721,7 @@
         }
       },
       addChooseModal(){
-        this.itemFlag = this.chooseModalData.valueTypeDb === 'T'?'text':'number';
+        this.itemFlag = this.chooseModalData.valueTypeDb === 'N'?'number':'text';
         this.itemData = {
           site: this.$store.state.user.site,
             itemNo:this.chooseModalData.itemNo,
@@ -731,7 +733,7 @@
         this.itemModalFlag = true;
       },
       updateChooseModal(row){
-        this.itemFlag= this.chooseModalData.valueTypeDb === 'T'?'text':'number';
+        this.itemFlag= this.chooseModalData.valueTypeDb === 'N'?'number':'text';
         this.itemData={
           site: this.$store.state.user.site,
           itemNo:this.chooseModalData.itemNo,
@@ -797,6 +799,11 @@
         }).catch(() => {
         })
       },
+      changeValueTypeDb(){
+        if(this.modalData.itemType!=='BM'&&this.modalData.valueTypeDb==='S'){
+          this.modalData.valueTypeDb='T'
+        }
+      },
     }
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index 63165fb..6b78108 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -99,14 +99,14 @@
           prop="effPhaseInDate"
           header-align="left"
           align="left"
-          min-width="50"
+          min-width="80"
           label="生效日期">
         </el-table-column>
         <el-table-column
           prop="effPhaseOutDate"
           header-align="left"
           align="left"
-          min-width="50"
+          min-width="80"
           label="失效日期">
         </el-table-column>
       </el-table>
@@ -441,8 +441,8 @@
           })
           return false;
         }
-        if(this.currentRow.status==='Tentative'){
-          this.$alert('Tentative不允许保存！', '错误', {
+        if(this.currentRow.status!='Buildable'){
+          this.$alert('只有Buildable状态的可以保存！', '错误', {
             confirmButtonText: '确定'
           })
           return false;
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 2925430..a578cc6 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -39,7 +39,10 @@
             width="80"
             label="数据类型">
             <template slot-scope="scope">
-              {{scope.row.valueTypeDb=='N'?'数字':'文本'}}
+              <span v-if="scope.row.valueTypeDb === 'N'">数字</span>
+              <span v-else-if="scope.row.valueTypeDb === 'T'">文本</span>
+<!--              <a v-else-if="scope.row.valueTypeDb === 'S'" @click="openNewPage(scope.row.textValue)" >超链接</a>-->
+              <a v-else-if="scope.row.valueTypeDb === 'S'" @click="openNewPage(scope.row.textValue)" >超链接</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -48,8 +51,9 @@
             min-width="400"
             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.numValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create></el-input>
+              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'N'"><el-input  v-model="scope.row.textValue" style="height: 11px;padding: 0px ;width:98%" allow-create></el-input></div>
+              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numValue" type="number" style="height: 11px;padding: 0px;width:98%"  allow-create></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.availableValueList"
@@ -66,6 +70,15 @@
                   :value="item.availableValue">
                 </el-option>
               </el-select>
+              <div v-if="scope.row.valueTypeDb === 'S'&&scope.row.valueChooseFlag === 'Y'"> <el-select v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px ;width:98%" allow-create>
+                <el-option
+                  v-for="item in scope.row.availableValueList"
+                  :key="index"
+                  :label="item.availableValue"
+                  :value="item.availableValue">
+                </el-option>
+              </el-select></div>
+
             </template>
           </el-table-column>
         </el-table>
@@ -178,6 +191,10 @@
           }
         });
       },
+      openNewPage(url){
+        window.open(this.$store.state.user.bmPicUrl +url);
+
+      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
index badbce2..b31ed25 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
@@ -1,285 +1,16 @@
 <template>
   <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='Flexo'">
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'排废/Matrix Stripped'">
-            <el-select clearable v-model="dataForm.matrixStripped" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'使用方式/AppliedType'">
-            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'包装方式/Final Format'" >
-            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'横排数/if Rolls, No. Cross'">
-            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯类型/CoreType'">
-            <el-input v-model="dataForm.coreType" :disabled="ifDisableFlag"></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯直径/Core Diameter'">
-            <el-input v-model="dataForm.coreDiameter" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯宽度/CoreWidth'">
-            <el-input v-model="dataForm.coreWidth" :disabled="ifDisableFlag"></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
-            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否允许接头/Join Allowed'">
-            <el-select clearable v-model="dataForm.joinAllowedFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否允许空缺/MissingAllowed'">
-            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'特殊出纸方向要求/Special Copy Positior'">
-            <el-select clearable v-model="dataForm.specialPositiorFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'出纸方式/Copy Position'">
-            <el-input v-model="dataForm.copyPosition" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'执转移打印/Overprinting'">
-            <el-select clearable v-model="dataForm.overprintingFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top: 0px">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'其他特殊要求/Other Requirement'">
-            <el-input
-              type="textarea"
-              v-model="dataForm.otherRequirement"
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              style="height: 60px" :disabled="ifDisableFlag">
-            </el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
+      <PackageInfo ref="PackageInfo"></PackageInfo>
 
-    </el-form>
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='SS'">
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'包装方式/Final Format'" >
-            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'使用方式/AppliedType'">
-            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'横排数/if Rolls, No. Cross'">
-            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否允许空缺/MissingAllowed'">
-            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
-            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否隔离/底纸/AddingFilm/Linner'">
-            <el-select clearable v-model="dataForm.addingFilmFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯类型/CoreType'">
-            <el-input v-model="dataForm.coreType" :disabled="ifDisableFlag"></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯直径/Core Diameter'">
-            <el-input v-model="dataForm.coreDiameter" type="number" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否允许接头/Join Allowed'">
-            <el-select clearable v-model="dataForm.joinAllowedFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'卷芯宽度/CoreWidth'">
-            <el-input v-model="dataForm.coreWidth" :disabled="ifDisableFlag"></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'特殊出纸方向要求/Special Copy Positior'">
-            <el-select clearable v-model="dataForm.specialPositiorFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top: 0px">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'其他特殊要求/Other Requirement'">
-            <el-input
-              type="textarea"
-              v-model="dataForm.otherRequirement"
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              style="height: 60px" :disabled="ifDisableFlag">
-            </el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-
-    </el-form>
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='DBE'">
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'包装方式/Final Format'" >
-            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'使用方式/AppliedType'">
-            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'横排数/No. of Cross'">
-            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
 
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'纵排数/No. of Column'">
-            <el-input v-model="dataForm.columnCount" :disabled="ifDisableFlag"  ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
 
-      <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否允许空缺/MissingAllowed'">
-            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
-            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'是否隔离/底纸/AddingFilm/Linner'">
-            <el-select clearable v-model="dataForm.addingFilmFlag" :disabled="ifDisableFlag">
-              <el-option label="Yes" value="Y"></el-option>
-              <el-option label="No" value="N"></el-option>
-            </el-select>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'包装要求'">
-            <el-input v-model="dataForm.packageRequest"  :disabled="ifDisableFlag" ></el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top: 0px">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'其他特殊要求/Other Requirement'">
-            <el-input
-              type="textarea"
-              v-model="dataForm.otherRequirement"
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              style="height: 60px" :disabled="ifDisableFlag">
-            </el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-
-    </el-form>
-
-    <el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
-      <div  class="rq-bmPic" v-if="searchData.buNo==='Flexo'||searchData.buNo==='SS'">
+    <el-form label-position="top" style="margin-top: 10px; margin-left: 0px;text-align:center">
+<!--      <div  class="rq-bmPic" v-if="searchData.buNo==='Flexo'||searchData.buNo==='SS'">-->
+      <div  class="rq-bmPic" >
         <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="picUrl">
       </div>
-      <el-button type="primary" style="margin-top: 5px;" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
     </el-form>
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
@@ -287,62 +18,30 @@
 </template>
 
 <script>
+
   import {
     searchBMPackageInfo,
     updateBMPackageInfo,
   } from "@/api/sampleManagement/technicalSpecificationList.js"
   import Chooselist from '@/views/modules/common/Chooselist'
+  import PackageInfo from "./com_bm_demoSlot";/*组件*/
   export default {
     components: {
-      Chooselist
+      Chooselist,PackageInfo
     },
     data() {
       return {
+        pageRole:'',
         searchData: {
           site: '',
           username: this.$store.state.user.name,
           codeNo: '',
           buNo:'',
+          type:'',
         },
         ifDisableFlag:false,
         picUrl:this.$store.state.user.bmPicUrl+'defaultPaperOrientation.png',
-        dataForm:{
-          site: '',
-          codeNo:'',
-          matrixStripped:'',
-          appliedType:'',
-          finalFormat:'',
-          rowCount:'',
-          coreType:'',
-          coreDiameter:'',
-          coreWidth:'',
-          rollPerQty:'',
-          joinAllowedFlag:'',
-          missingAllowedFlag:'',
-          specialPositiorFlag:'',
-          copyPosition:'',
-          overprintingFlag:'',
-          otherRequirement:'',
-          addingFilmFlag:'',
-          packageRequest:'',
-          columnCount:'',
-        },
-        dataRole: {
-          partTypeDesc: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          partName: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-        }
+
       }
     },
     methods: {
@@ -371,46 +70,17 @@
       },
       //初始化组件的参数
       init(inData) {
-        if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){
-          return false;
-        }
         //初始化参数
         this.searchData = JSON.parse(JSON.stringify(inData));
         if(this.searchData.ifDisableFlag){
           this.ifDisableFlag=true
         }
         //刷新表格
-        this.searchTable();
+        this.searchData.type='PackageInfo'
+        this.$refs.PackageInfo.init(JSON.parse(JSON.stringify(this.searchData)))
 
       },
-      searchTable(){
-        searchBMPackageInfo(this.searchData).then(({data}) => {
-          if(data.rows.length>0){
-            this.dataForm = data.rows[0];
-          }else {
-            this.dataForm.site=this.searchData.site;
-            this.dataForm.codeNo=this.searchData.codeNo;
-          }
 
-
-        });
-      },
-      saveData(){
-        this.$confirm("是否保存信息？", '保存提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-        }).then(() => {
-          updateBMPackageInfo(this.dataForm).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success( '操作成功')
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {
-          return
-        })
-      },
     },
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 6e70d47..ada91d5 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -330,7 +330,7 @@
         <cqc ref="cqc" @closeModel="closeModel"></cqc>
       </div>
     </el-dialog>
-    <el-dialog title="变更工艺路线" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="700px">
+    <el-dialog title="变更工艺路线" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="750px">
       <el-table
         :data="routeDetailList"
         height="300"
@@ -382,6 +382,20 @@
           min-width="60"
           label="状态">
         </el-table-column>
+        <el-table-column
+          prop="effPhaseInDate"
+          header-align="left"
+          align="left"
+          min-width="80"
+          label="生效日期">
+        </el-table-column>
+        <el-table-column
+          prop="effPhaseOutDate"
+          header-align="left"
+          align="left"
+          min-width="80"
+          label="失效日期">
+        </el-table-column>
       </el-table>
 
       <el-footer style="height:30px;margin-top:20px;text-align:center">
@@ -1233,6 +1247,12 @@
           })
           return false;
         }
+        if(this.currentRow.status!='Buildable'){
+          this.$alert('只有Buildable状态的可以保存！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         let inData={
           site:this.routeData.site,
           codeNo:this.searchData.codeNo,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue
new file mode 100644
index 0000000..badbce2
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_com_bm_packageInfo.vue
@@ -0,0 +1,420 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='Flexo'">
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'排废/Matrix Stripped'">
+            <el-select clearable v-model="dataForm.matrixStripped" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'使用方式/AppliedType'">
+            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'包装方式/Final Format'" >
+            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'横排数/if Rolls, No. Cross'">
+            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯类型/CoreType'">
+            <el-input v-model="dataForm.coreType" :disabled="ifDisableFlag"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯直径/Core Diameter'">
+            <el-input v-model="dataForm.coreDiameter" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯宽度/CoreWidth'">
+            <el-input v-model="dataForm.coreWidth" :disabled="ifDisableFlag"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
+            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否允许接头/Join Allowed'">
+            <el-select clearable v-model="dataForm.joinAllowedFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否允许空缺/MissingAllowed'">
+            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'特殊出纸方向要求/Special Copy Positior'">
+            <el-select clearable v-model="dataForm.specialPositiorFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'出纸方式/Copy Position'">
+            <el-input v-model="dataForm.copyPosition" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'执转移打印/Overprinting'">
+            <el-select clearable v-model="dataForm.overprintingFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 0px">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'其他特殊要求/Other Requirement'">
+            <el-input
+              type="textarea"
+              v-model="dataForm.otherRequirement"
+              :rows="3"
+              resize='none'
+              maxlength="120"
+              show-word-limit
+              style="height: 60px" :disabled="ifDisableFlag">
+            </el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+    </el-form>
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='SS'">
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'包装方式/Final Format'" >
+            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'使用方式/AppliedType'">
+            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'横排数/if Rolls, No. Cross'">
+            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否允许空缺/MissingAllowed'">
+            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
+            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否隔离/底纸/AddingFilm/Linner'">
+            <el-select clearable v-model="dataForm.addingFilmFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯类型/CoreType'">
+            <el-input v-model="dataForm.coreType" :disabled="ifDisableFlag"></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯直径/Core Diameter'">
+            <el-input v-model="dataForm.coreDiameter" type="number" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否允许接头/Join Allowed'">
+            <el-select clearable v-model="dataForm.joinAllowedFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'卷芯宽度/CoreWidth'">
+            <el-input v-model="dataForm.coreWidth" :disabled="ifDisableFlag"></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'特殊出纸方向要求/Special Copy Positior'">
+            <el-select clearable v-model="dataForm.specialPositiorFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 0px">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'其他特殊要求/Other Requirement'">
+            <el-input
+              type="textarea"
+              v-model="dataForm.otherRequirement"
+              :rows="3"
+              resize='none'
+              maxlength="120"
+              show-word-limit
+              style="height: 60px" :disabled="ifDisableFlag">
+            </el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+    </el-form>
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='DBE'">
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'包装方式/Final Format'" >
+            <el-input v-model="dataForm.finalFormat" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'使用方式/AppliedType'">
+            <el-input v-model="dataForm.appliedType" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'横排数/No. of Cross'">
+            <el-input v-model="dataForm.rowCount" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'纵排数/No. of Column'">
+            <el-input v-model="dataForm.columnCount" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否允许空缺/MissingAllowed'">
+            <el-select clearable v-model="dataForm.missingAllowedFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'每卷/包数量/Qty Per Roll/Pack'">
+            <el-input v-model="dataForm.rollPerQty" type="number" :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否隔离/底纸/AddingFilm/Linner'">
+            <el-select clearable v-model="dataForm.addingFilmFlag" :disabled="ifDisableFlag">
+              <el-option label="Yes" value="Y"></el-option>
+              <el-option label="No" value="N"></el-option>
+            </el-select>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'包装要求'">
+            <el-input v-model="dataForm.packageRequest"  :disabled="ifDisableFlag" ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 0px">
+        <el-col :span="24"><div class="grid-content bg-purple">
+          <el-form-item :label="'其他特殊要求/Other Requirement'">
+            <el-input
+              type="textarea"
+              v-model="dataForm.otherRequirement"
+              :rows="3"
+              resize='none'
+              maxlength="120"
+              show-word-limit
+              style="height: 60px" :disabled="ifDisableFlag">
+            </el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+
+    </el-form>
+
+    <el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
+      <div  class="rq-bmPic" v-if="searchData.buNo==='Flexo'||searchData.buNo==='SS'">
+        <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="picUrl">
+      </div>
+      <el-button type="primary" style="margin-top: 5px;" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
+    </el-form>
+
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    searchBMPackageInfo,
+    updateBMPackageInfo,
+  } from "@/api/sampleManagement/technicalSpecificationList.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  export default {
+    components: {
+      Chooselist
+    },
+    data() {
+      return {
+        searchData: {
+          site: '',
+          username: this.$store.state.user.name,
+          codeNo: '',
+          buNo:'',
+        },
+        ifDisableFlag:false,
+        picUrl:this.$store.state.user.bmPicUrl+'defaultPaperOrientation.png',
+        dataForm:{
+          site: '',
+          codeNo:'',
+          matrixStripped:'',
+          appliedType:'',
+          finalFormat:'',
+          rowCount:'',
+          coreType:'',
+          coreDiameter:'',
+          coreWidth:'',
+          rollPerQty:'',
+          joinAllowedFlag:'',
+          missingAllowedFlag:'',
+          specialPositiorFlag:'',
+          copyPosition:'',
+          overprintingFlag:'',
+          otherRequirement:'',
+          addingFilmFlag:'',
+          packageRequest:'',
+          columnCount:'',
+        },
+        dataRole: {
+          partTypeDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.tagNo1 = type
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1013) {
+            if(type==1) {
+              strVal = this.dataForm.partType
+            }
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1013) {
+          if(this.tagNo1==1) {
+            this.dataForm.partType = val.Base_id
+            this.dataForm.partTypeDesc = val.Base_desc
+          }
+        }
+      },
+      //初始化组件的参数
+      init(inData) {
+        if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){
+          return false;
+        }
+        //初始化参数
+        this.searchData = JSON.parse(JSON.stringify(inData));
+        if(this.searchData.ifDisableFlag){
+          this.ifDisableFlag=true
+        }
+        //刷新表格
+        this.searchTable();
+
+      },
+      searchTable(){
+        searchBMPackageInfo(this.searchData).then(({data}) => {
+          if(data.rows.length>0){
+            this.dataForm = data.rows[0];
+          }else {
+            this.dataForm.site=this.searchData.site;
+            this.dataForm.codeNo=this.searchData.codeNo;
+          }
+
+
+        });
+      },
+      saveData(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          updateBMPackageInfo(this.dataForm).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+          return
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>