diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index d4ea3c3..7601e7e 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -27,3 +27,11 @@ export const getBMPageBase= data => createAPI(`/technicalSpecification/getBMPage
 export const saveBMRoute= data => createAPI(`/technicalSpecification/saveBMRoute`,'post',data)
 export const searchBMRoute= data => createAPI(`/technicalSpecification/searchBMRoute`,'post',data)
 export const deleteBMRoute= data => createAPI(`/technicalSpecification/deleteBMRoute`,'post',data)
+export const searchBMTPInfoDetail= data => createAPI(`/technicalSpecification/searchBMTPInfoDetail`,'post',data)
+export const updateBMTPInfoDetail= data => createAPI(`/technicalSpecification/updateBMTPInfoDetail`,'post',data)
+export const searchBMTPInfoColor= data => createAPI(`/technicalSpecification/searchBMTPInfoColor`,'post',data)
+export const saveBMTPInfoColor= data => createAPI(`/technicalSpecification/saveBMTPInfoColor`,'post',data)
+export const deleteBMTPInfoColor= data => createAPI(`/technicalSpecification/deleteBMTPInfoColor`,'post',data)
+export const searchBMTPInfoCut= data => createAPI(`/technicalSpecification/searchBMTPInfoCut`,'post',data)
+export const saveBMTPInfoCut= data => createAPI(`/technicalSpecification/saveBMTPInfoCut`,'post',data)
+export const deleteBMTPInfoCut= data => createAPI(`/technicalSpecification/deleteBMTPInfoCut`,'post',data)
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 95f6abb..06e12f4 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -236,7 +236,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
+            columnWidth: 140
           },{
           userId: this.$store.state.user.name,
           functionId: 101002001,
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index a91e367..8a1bb6f 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -144,7 +144,7 @@
             prop="testPartNo"
             header-align="center"
             align="left"
-            min-width="40"
+            min-width="50"
             label="测试料号">
           </el-table-column>
           <el-table-column
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_tpInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_tpInfo.vue
new file mode 100644
index 0000000..7650c11
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_tpInfo.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="mod-config">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'颜色匹配/colourMatch'">
+            <el-input v-model="dataForm.colourMatch" :disabled="ifDisableFlag"  ></el-input>
+          </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.environment" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'如果要标准色差则色彩E范围或透光度D值范围'" >
+            <el-input v-model="dataForm.eordValue" :disabled="ifDisableFlag"  ></el-input>
+          </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.customerFile" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo!='RDC'">
+        <el-form-item >
+          <el-button type="primary" @click="colorSearch()" >刷新</el-button>
+          <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
+        </el-form-item>
+      <el-table
+        height="300"
+        :data="colorTable"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="30"
+          v-if="!ifDisableFlag"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="updateColor(scope.row)">编辑</a>
+            <a type="text" size="small" @click="deleteColor(scope.row)">删除</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="order"
+          header-align="center"
+          align="left"
+          min-width="40"
+          label="色序">
+        </el-table-column>
+        <el-table-column
+          prop="color"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="颜色">
+        </el-table-column>
+        <el-table-column
+          prop="inkType"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="油墨类型">
+        </el-table-column>
+        <el-table-column
+          prop="colorMatch"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="颜色匹配">
+        </el-table-column>
+        <el-table-column
+          prop="color"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="颜色">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="备注">
+        </el-table-column>
+        <el-table-column
+          prop="filmNo"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="菲林编号">
+        </el-table-column>
+        <el-table-column
+          prop="stencilNo"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="网版编号">
+        </el-table-column>
+      </el-table>
+      </el-form>
+      <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'LabelSize/标签尺寸'">
+            <el-input v-model="dataForm.laberSize" :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="'No.of Cross/横排数'">
+            <el-input v-model="dataForm.crossNumber" type="number" :disabled="ifDisableFlag" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'HP/横向跳距'">
+            <el-input v-model="dataForm.hp" 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="'No.of Row/纵列数'" >
+            <el-input v-model="dataForm.rowNumber" type="number" :disabled="ifDisableFlag" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'VP/纵向跳距'">
+            <el-input v-model="dataForm.vp" type="number" :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="'Comments/备注'">
+            <el-input
+              type="textarea"
+              v-model="dataForm.customerRemark "
+              :rows="3"
+              resize='none'
+              maxlength="120"
+              show-word-limit
+              :disabled="ifDisableFlag"
+              style="height: 60px" >
+            </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">
+      <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
+    </el-form>
+
+
+    <el-dialog title="颜色信息" :close-on-click-modal="false" v-drag :visible.sync="colorFlag" width="600px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'色序'">
+          <el-input v-model="colorData.order" type="number" style="width: 130px"  onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'颜色'">
+          <el-input v-model="colorData.color" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'油墨类型'">
+          <el-input v-model="colorData.inkType" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'颜色参考'">
+          <el-input v-model="colorData.colorRet" 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="'颜色匹配'">
+          <el-input v-model="colorData.colorMatch"  style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'备注'">
+          <el-input v-model="colorData.remark" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'菲林编号'">
+          <el-input v-model="colorData.filmNo" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'网版编号'">
+          <el-input v-model="colorData.stencilNo" 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>
+  </div>
+</template>
+
+<script>
+  import {
+    searchBMTPInfoDetail,
+    updateBMTPInfoDetail,
+    searchBMTPInfoColor,
+    saveBMTPInfoColor,
+    deleteBMTPInfoColor,
+    searchBMTPInfoCut,
+    saveBMTPInfoCut,
+    deleteBMTPInfoCut,
+  } 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,
+        dataForm:{
+          site: '',
+          codeNo:'',
+          colourMatch:'',
+          environment:'',
+          eordValue:'',
+          customerFile:'',
+          laberSize:'',
+          crossNumber:'',
+          hp:'',
+          rowNumber:'',
+          vp:'',
+          remark:'',
+
+        },
+        colorTable:[],
+        colorData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          color:'',
+          inkType:'',
+          colorRet:'',
+          colorMatch:'',
+          remark:'',
+          filmNo:'',
+          stencilNo:'',
+          updateBy:'',
+          updateDate:'',
+        },
+        colorFlag:false,
+        cutTable:[],
+      }
+    },
+    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));
+        //刷新表格
+        this.searchTable();
+        this.colorSearch();
+
+      },
+      searchTable(){
+        searchBMTPInfoDetail(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(() => {
+          updateBMTPInfoDetail(this.dataForm).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+          return
+        })
+      },
+
+      newColor(){
+        if(this.searchData.codeNo==''){
+          this.$message.success('数据错误，请关闭页面重试！')
+          return false;
+        }
+        let number=1;
+        for (let i = 0; i <this.colorTable.length ; i++) {
+          if(number<=this.colorTable[i].order){
+            number=Number(this.colorTable[i].order)+1
+          }
+        }
+        this.colorData={
+          id:0,
+          site: this.searchData.site,
+          codeNo:this.searchData.codeNo,
+          order:number,
+          color:'',
+          inkType:'',
+          colorRet:'',
+          colorMatch:'',
+          remark:'',
+          filmNo:'',
+          stencilNo:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.colorFlag=true;
+      },
+      updateColor(row){
+        this.colorData=JSON.parse(JSON.stringify(row))
+        this.colorFlag=true;
+      },
+
+      colorSearch(){
+        searchBMTPInfoColor(this.searchData).then(({data}) => {
+          this.colorTable = data.rows
+        });
+      },
+      colorSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMTPInfoColor(this.colorData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.colorSearch();
+              this.colorFlag=false
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+
+        })
+      },
+      deleteColor(row){
+        this.$confirm(`是否删除这条信息?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteBMTPInfoColor(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.colorSearch();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 644b290..3cf2072 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -13,9 +13,12 @@
         <el-tab-pane label="材料信息"  name="bom" v-if="dataForm.buNo!='RDC'&&dataForm.buNo!='SS'">
           <bom ref="bom"></bom>
         </el-tab-pane>
-        <el-tab-pane label="工艺信息"  name="routing" v-if="">
+        <el-tab-pane label="工艺信息"  name="routing" >
           <routing ref="routing"></routing>
         </el-tab-pane>
+        <el-tab-pane label="TP工程师填写信息"  name="tpInfo" v-if="dataForm.buNo=='SS'">
+          <tpInfo ref="tpInfo"></tpInfo>
+        </el-tab-pane>
         <el-tab-pane label="产品技术要求"  name="technicalRequirement" v-if="getPageIf('technicalRequirement')">
           <technicalRequirement ref="technicalRequirement"></technicalRequirement>
         </el-tab-pane>
@@ -97,6 +100,7 @@
   import queteConfirm from "./com_bm_demoSlot";/*印前*/
   import fai from "./com_bm_demoSlot";/*印前*/
   import cqeComfirm from "./com_bm_demoSlot";/*印前*/
+  import tpInfo from "./com_bm_tpInfo";/*印前*/
   export default {
     name: "technicalSpecificationDetail",
     components: {
@@ -122,6 +126,7 @@
       queteConfirm,
       fai,
       cqeComfirm,
+      tpInfo,
     },
     data() {
       return {
@@ -199,6 +204,8 @@
           this.getFai();
         }else if(this.activeName == 'cqeComfirm'){
           this.getCqeComfirm();
+        }else if(this.activeName == 'tpInfo'){
+          this.getTpInfo();
         }
       },
       getBaseInfoData(){
@@ -284,6 +291,10 @@
         this.dataForm.type='cqeComfirm'
         this.$refs.cqeComfirm.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
+      getTpInfo(){
+        this.dataForm.type='tpInfo'
+        this.$refs.tpInfo.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },