diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue
index 4a8e423..ff3b8a9 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue
@@ -88,33 +88,40 @@
         </el-table-column>
         <el-table-column label="UV固化/UV Curing" header-align="center">
           <el-table-column
-            prop="gallus"
+            prop="resourceNo"
             header-align="center"
             align="left"
             min-width="60"
-            label="Gallus(level%)">
-          </el-table-column>
-          <el-table-column
-            prop="markAndy"
-            header-align="center"
-            align="left"
-            min-width="60"
-            label="MarkAndy(level%)">
-          </el-table-column>
-          <el-table-column
-            prop="lp"
-            header-align="center"
-            align="left"
-            min-width="60"
-            label="LP(L/M/H)">
-          </el-table-column>
-          <el-table-column
-            prop="hexiang"
-            header-align="center"
-            align="left"
-            min-width="60"
-            label="Hexiang(L/H)">
+            label="机台">
           </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="gallus"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="60"-->
+<!--            label="Gallus(level%)">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="markAndy"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="60"-->
+<!--            label="MarkAndy(level%)">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="lp"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="60"-->
+<!--            label="LP(L/M/H)">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="hexiang"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="60"-->
+<!--            label="Hexiang(L/H)">-->
+<!--          </el-table-column>-->
         </el-table-column>
       </el-table>
       <div  class="rq-bmPic" >
@@ -148,28 +155,36 @@
         <el-form-item :label="'外干燥'">
           <el-input v-model="colorData.dry" style="width: 130px" ></el-input>
         </el-form-item>
-        <el-form-item :label="'Gallus(level%)'">
-          <el-input v-model="colorData.gallus" style="width: 130px" ></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'MarkAndy(level%)'">
-          <el-input v-model="colorData.markAndy" style="width: 130px" ></el-input>
-        </el-form-item>
-        <el-form-item :label="'LP(L/M/H)'">
-          <el-input v-model="colorData.lp" style="width: 130px" ></el-input>
-        </el-form-item>
-        <el-form-item :label="'Hexiang(L/H)'">
-          <el-input v-model="colorData.hexiang" style="width: 130px" ></el-input>
+        <el-form-item :label="'机台'">
+          <el-select v-model="colorData.resourceNo" style="width: 130px">
+            <el-option label="BOBST" value="BOBST"></el-option>
+            <el-option label="Hyde" value="Hyde"></el-option>
+            <el-option label="Taiyo" value="Taiyo"></el-option>
+            <el-option label="Label Man" value="Label Man"></el-option>
+          </el-select>
         </el-form-item>
+<!--        <el-form-item :label="'Gallus(level%)'">-->
+<!--          <el-input v-model="colorData.gallus" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
       </el-form>
+<!--      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item :label="'MarkAndy(level%)'">-->
+<!--          <el-input v-model="colorData.markAndy" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="'LP(L/M/H)'">-->
+<!--          <el-input v-model="colorData.lp" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="'Hexiang(L/H)'">-->
+<!--          <el-input v-model="colorData.hexiang" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="colorSave()">保存</el-button>
         <el-button type="primary" @click="colorFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
 
-    <Chooselist   ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
@@ -199,7 +214,6 @@
         },
         picUrl:this.$store.state.user.bmPicUrl+'defaultPaperOrientation.png',
         ifDisableFlag:false,
-
         colorTable:[],
         colorData:{
           id:'',
@@ -218,6 +232,7 @@
           hexiang:'',
           updateBy:'',
           updateDate:'',
+          resourceNo: ''
         },
         colorFlag:false,
       }
@@ -296,6 +311,7 @@
           hexiang: '',
           updateBy: '',
           updateDate: '',
+          resourceNo: ''
         }
         this.colorFlag = true
       },
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
index b3f43b9..c4fa37c 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue
@@ -95,26 +95,33 @@
             label="(ON /OFF)">
           </el-table-column>
           <el-table-column
-            prop="gallus"
+            prop="resourceNo"
             header-align="center"
             align="left"
             min-width="100"
-            label="Gallus(level%)">
-          </el-table-column>
-          <el-table-column
-            prop="markAndy"
-            header-align="center"
-            align="left"
-            min-width="100"
-            label="MarkAndy(level%)">
-          </el-table-column>
-          <el-table-column
-            prop="hexiang"
-            header-align="center"
-            align="left"
-            min-width="100"
-            label="Hexiang(L/H)">
+            label="机台">
           </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="gallus"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="100"-->
+<!--            label="Gallus(level%)">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="markAndy"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="100"-->
+<!--            label="MarkAndy(level%)">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="hexiang"-->
+<!--            header-align="center"-->
+<!--            align="left"-->
+<!--            min-width="100"-->
+<!--            label="Hexiang(L/H)">-->
+<!--          </el-table-column>-->
         </el-table-column>
         <el-table-column label="热覆温度" header-align="center">
           <el-table-column
@@ -186,14 +193,22 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'Gallus(level%)'">
-          <el-input v-model="colorData.gallus" style="width: 130px" ></el-input>
-        </el-form-item>
-        <el-form-item :label="'MarkAndy(level%)'">
-          <el-input v-model="colorData.markAndy" style="width: 130px" ></el-input>
-        </el-form-item>
-        <el-form-item :label="'Hexiang(L/H)'">
-          <el-input v-model="colorData.hexiang" style="width: 130px" ></el-input>
+<!--        <el-form-item :label="'Gallus(level%)'">-->
+<!--          <el-input v-model="colorData.gallus" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="'MarkAndy(level%)'">-->
+<!--          <el-input v-model="colorData.markAndy" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="'Hexiang(L/H)'">-->
+<!--          <el-input v-model="colorData.hexiang" style="width: 130px" ></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item :label="'机台'">
+          <el-select v-model="colorData.resourceNo" style="width: 130px">
+            <el-option label="BOBST" value="BOBST"></el-option>
+            <el-option label="Hyde" value="Hyde"></el-option>
+            <el-option label="Taiyo" value="Taiyo"></el-option>
+            <el-option label="Label Man" value="Label Man"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item :label="'temperature'">
           <el-input v-model="colorData.temperature" style="width: 130px" ></el-input>
@@ -204,7 +219,7 @@
           <el-input v-model="colorData.pressure" style="width: 130px" ></el-input>
         </el-form-item>
         <el-form-item :label="'Remark'">
-          <el-input v-model="colorData.remark" style="width: 400px" ></el-input>
+          <el-input v-model="colorData.remark" style="width: 418px" ></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -263,6 +278,7 @@
           remark:'',
           updateBy:'',
           updateDate:'',
+          resourceNo: ''
         },
         colorFlag:false,
       }
@@ -344,6 +360,7 @@
           remark: '',
           updateBy: '',
           updateDate: '',
+          resourceNo: ''
         }
         this.colorFlag = true
       },