plm字段权限

src/api/sampleManagement/technicalSpecificationList.js

@@ -35,3 +35,16 @@ export const deleteBMTPInfoColor= data => createAPI(`/technicalSpecification/del
 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)
+
+
+export const searchBMPrepressDetail= data => createAPI(`/technicalSpecification/searchBMPrepressDetail`,'post',data)
+export const updateBMPrepressDetail= data => createAPI(`/technicalSpecification/updateBMPrepressDetail`,'post',data)
+export const searchBMPrepressColor= data => createAPI(`/technicalSpecification/searchBMPrepressColor`,'post',data)
+export const saveBMPrepressColor= data => createAPI(`/technicalSpecification/saveBMPrepressColor`,'post',data)
+export const deleteBMPrepressColor= data => createAPI(`/technicalSpecification/deleteBMPrepressColor`,'post',data)
+
+export const searchBMPrintOtherDetail= data => createAPI(`/technicalSpecification/searchBMPrintOtherDetail`,'post',data)
+export const updateBMPrintOtherDetail= data => createAPI(`/technicalSpecification/updateBMPrintOtherDetail`,'post',data)
+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)

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue

@@ -0,0 +1,415 @@
+<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="'印版编号/PlateNo'">
+            <el-input v-model="dataForm.plateNo" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'刀模编号/CutterNumber'">
+            <el-input v-model="dataForm.cutterNumber" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'刀模排位/CutterLayout'" >
+            <el-input v-model="dataForm.cutterLayout" :disabled="ifDisableFlag" type="number"  onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"></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="'材料准备阶段/Action'">
+            <el-input
+              type="textarea"
+              v-model="dataForm.action "
+              :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: 1px; margin-left: 0px;"   v-if="searchData.buNo==='SS'||searchData.buNo==='DBE'">
+        <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="400"
+        :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="meshModel"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="类型">
+        </el-table-column>
+        <el-table-column
+          prop="meshSize"
+          header-align="center"
+          align="right"
+          min-width="60"
+          label="目数">
+        </el-table-column>
+        <el-table-column
+          prop="angle"
+          header-align="center"
+          align="right"
+          min-width="60"
+          label="角度">
+        </el-table-column>
+        <el-table-column
+          prop="coatingType"
+          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-row :gutter="20">
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'备注/Remarks'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.remark "
+                :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-row :gutter="20" style="margin-top: 60px">
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'问题反馈'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.feedback "
+                :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-row :gutter="20" style="margin-top: 60px">
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'Action'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.action "
+                :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&&searchData.buNo==='Flexo'||searchData.buNo==='SS'||searchData.buNo==='DBE'" >保存</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.meshModel" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'目数'">
+          <el-input v-model="colorData.meshSize" type="number" 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.angle" type="number" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'涂膜种类'">
+          <el-input v-model="colorData.coatingType" 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 {
+    searchBMPrepressDetail,
+    updateBMPrepressDetail,
+    searchBMPrepressColor,
+    saveBMPrepressColor,
+    deleteBMPrepressColor,
+  } 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:'',
+          plateNo:'',
+          cutterNumber:'',
+          cutterLayout:'',
+          action:'',
+          feedback:'',
+          remark:'',
+
+        },
+        colorTable:[],
+        colorData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          color:'',
+          meshModel:'',
+          meshSize:'',
+          angle:'',
+          coatingType:'',
+          filmNo:'',
+          stencilNo:'',
+          updateBy:'',
+          updateDate:'',
+        },
+        colorFlag:false,
+      }
+    },
+    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(){
+        searchBMPrepressDetail(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(() => {
+          updateBMPrepressDetail(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:'',
+          meshModel:'',
+          meshSize:'',
+          angle:'',
+          coatingType:'',
+          filmNo:'',
+          stencilNo:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.colorFlag=true;
+      },
+      updateColor(row){
+        this.colorData=JSON.parse(JSON.stringify(row))
+        this.colorFlag=true;
+      },
+
+      colorSearch(){
+        searchBMPrepressColor(this.searchData).then(({data}) => {
+          this.colorTable = data.rows
+        });
+      },
+      colorSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMPrepressColor(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(() => {
+          deleteBMPrepressColor(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>

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printOther.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="mod-config">
+
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='Flexo'">
+        <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="400"
+        :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="center"
+          min-width="40"
+          label="色序">
+        </el-table-column>
+        <el-table-column
+          prop="seqNo"
+          header-align="center"
+          align="center"
+          min-width="60"
+          label="序号">
+        </el-table-column>
+        <el-table-column
+          prop="ink"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="Ink">
+        </el-table-column>
+        <el-table-column
+          prop="type"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="Type">
+        </el-table-column>
+        <el-table-column
+          prop="otherRef"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="%G">
+        </el-table-column>
+
+      </el-table>
+        <el-row :gutter="20">
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'备注/Remarks'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.remark "
+                :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-row :gutter="20" style="margin-top: 60px">
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'Action'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.action "
+                :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&&searchData.buNo==='Flexo'" >保存</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.seqNo" type="number" style="width: 130px"  onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"  ></el-input>
+        </el-form-item>
+        <el-form-item :label="'Ink'">
+          <el-input v-model="colorData.ink" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'Type'">
+          <el-input v-model="colorData.type"  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="'%G'">
+          <el-input v-model="colorData.otherRef" 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 {
+    searchBMPrintOtherDetail,
+    updateBMPrintOtherDetail,
+    searchBMPrintOtherColor,
+    saveBMPrintOtherColor,
+    deleteBMPrintOtherColor,
+  } 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:'',
+          plateNo:'',
+          cutterNumber:'',
+          cutterLayout:'',
+          action:'',
+          feedback:'',
+          remark:'',
+
+        },
+        colorTable:[],
+        colorData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          seqNo:'',
+          ink:'',
+          type:'',
+          otherRef:'',
+        },
+        colorFlag:false,
+      }
+    },
+    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(){
+        searchBMPrintOtherDetail(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(() => {
+          updateBMPrintOtherDetail(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:'',
+          meshModel:'',
+          meshSize:'',
+          angle:'',
+          coatingType:'',
+          filmNo:'',
+          stencilNo:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.colorFlag=true;
+      },
+      updateColor(row){
+        this.colorData=JSON.parse(JSON.stringify(row))
+        this.colorFlag=true;
+      },
+
+      colorSearch(){
+        searchBMPrintOtherColor(this.searchData).then(({data}) => {
+          this.colorTable = data.rows
+        });
+      },
+      colorSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMPrintOtherColor(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(() => {
+          deleteBMPrintOtherColor(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>

src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_tpInfo.vue

@@ -23,7 +23,7 @@
           </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 label-position="top" style="margin-top: 1px; margin-left: 0px;" >
         <el-form-item >
           <el-button type="primary" @click="colorSearch()" >刷新</el-button>
           <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
@@ -132,12 +132,99 @@
           </el-form-item>
         </div></el-col>
       </el-row>
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" >
+        <el-form-item >
+          <el-button type="primary" @click="cutSearch()" >刷新</el-button>
+          <el-button type="primary" @click="newCut()" v-if="!ifDisableFlag">新增</el-button>
+        </el-form-item>
+        <el-table
+          height="128"
+          :data="cutTable"
+          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="updateCut(scope.row)">编辑</a>
+              <a type="text" size="small" @click="deleteCut(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="cuttingMachine"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="机器类别">
+          </el-table-column>
+          <el-table-column
+            prop="cuttingType"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="碑切方式">
+          </el-table-column>
+          <el-table-column
+            prop="cutterTooling"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="碑切工具">
+          </el-table-column>
+          <el-table-column
+            prop="cutterLayout"
+            header-align="center"
+            align="right"
+            min-width="60"
+            label="刀模排位">
+          </el-table-column>
+          <el-table-column
+            prop="cutterCost"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="刀模成本">
+          </el-table-column>
+          <el-table-column
+            prop="p2c"
+            header-align="center"
+            align="right"
+            min-width="60"
+            label="p2c公差(+/-)">
+          </el-table-column>
+          <el-table-column
+            prop="c2c"
+            header-align="center"
+            align="right"
+            min-width="60"
+            label="c2c公差(+/-)">
+          </el-table-column>
+          <el-table-column
+            prop="cutterNo"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="刀模编号">
+          </el-table-column>
+        </el-table>
+      </el-form>
       <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 "
+              v-model="dataForm.remark "
               :rows="3"
               resize='none'
               maxlength="120"
@@ -188,7 +275,45 @@
         <el-button type="primary" @click="colorFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
-
+    <el-dialog title="切割信息" :close-on-click-modal="false" v-drag :visible.sync="cutFlag" width="600px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item :label="'切割顺序'">
+          <el-input v-model="cutData.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="cutData.cuttingMachine" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'碑切方式'">
+          <el-input v-model="cutData.cuttingType" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'碑切工具'">
+          <el-input v-model="cutData.cutterTooling" 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="cutData.cutterLayout"  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="cutData.cutterCost" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'p2c公差(+/-)'">
+          <el-input v-model="cutData.p2c" type="number" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'c2c公差(+/-)'">
+          <el-input v-model="cutData.c2c" type="number" 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="cutData.cutterNo" 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="cutSave()">保存</el-button>
+        <el-button type="primary" @click="cutFlag = false">取消</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -251,6 +376,23 @@
         },
         colorFlag:false,
         cutTable:[],
+        cutData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          cuttingMachine:'',
+          cuttingType:'',
+          cutterTooling:'',
+          cutterLayout:'',
+          cutterCost:'',
+          p2c:'',
+          c2c:'',
+          cutterNo:'',
+          updateBy:'',
+          updateDate:'',
+        },
+        cutFlag:false,
       }
     },
     methods: {
@@ -287,7 +429,7 @@
         //刷新表格
         this.searchTable();
         this.colorSearch();
-
+        this.cutSearch();
       },
       searchTable(){
         searchBMTPInfoDetail(this.searchData).then(({data}) => {
@@ -396,6 +538,89 @@
         }).catch(() => {
         })
       },
+
+
+      newCut(){
+        if(this.searchData.codeNo==''){
+          this.$message.success('数据错误，请关闭页面重试！')
+          return false;
+        }
+        let number=1;
+        for (let i = 0; i <this.cutTable.length ; i++) {
+          if(number<=this.cutTable[i].order){
+            number=Number(this.cutTable[i].order)+1
+          }
+        }
+        this.cutData={
+          id:0,
+          site: this.searchData.site,
+          codeNo:this.searchData.codeNo,
+          order:number,
+          cuttingMachine:'',
+          cuttingType:'',
+          cutterTooling:'',
+          cutterLayout:'',
+          cutterCost:'',
+          p2c:'',
+          c2c:'',
+          cutterNo:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.cutFlag=true;
+      },
+      updateCut(row){
+        this.cutData=JSON.parse(JSON.stringify(row))
+        this.cutFlag=true;
+      },
+
+      cutSearch(){
+        searchBMTPInfoCut(this.searchData).then(({data}) => {
+          this.cutTable = data.rows
+        });
+      },
+      cutSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMTPInfoCut(this.cutData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.cutSearch();
+              this.cutFlag=false
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+
+        })
+      },
+      deleteCut(row){
+        this.$confirm(`是否删除这条信息?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteBMTPInfoCut(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.cutSearch();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
     },
   }
 </script>

src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue

@@ -7,16 +7,16 @@
         <el-tab-pane label="客户信息"  name="customerInfo" >
           <customerInfo ref="customerInfo"  ></customerInfo>
         </el-tab-pane>
-        <el-tab-pane label="包装信息"  name="packageInfo" v-if="dataForm.buNo!='RDC'">
+        <el-tab-pane label="包装信息"  name="packageInfo" v-if="dataForm.buNo!=='RDC'">
           <packageInfo ref="packageInfo"></packageInfo>
         </el-tab-pane>
-        <el-tab-pane label="材料信息"  name="bom" v-if="dataForm.buNo!='RDC'&&dataForm.buNo!='SS'">
+        <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" >
           <routing ref="routing"></routing>
         </el-tab-pane>
-        <el-tab-pane label="TP工程师填写信息"  name="tpInfo" v-if="dataForm.buNo=='SS'">
+        <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')">
@@ -28,9 +28,12 @@
           <el-tab-pane label="PE确认信息"  name="PEConfirm" v-if="getPageIf('PEConfirm')">
           <PEConfirm ref="PEConfirm"></PEConfirm>
         </el-tab-pane>
-<!--        <el-tab-pane label="印前"  name="prepress" v-if="getPageIf('prepress')">-->
-<!--          <prepress ref="prepress"></prepress>-->
-<!--        </el-tab-pane>-->
+        <el-tab-pane label="印前"  name="prepress" v-if="dataForm.buNo!=='RDC'">
+          <prepress ref="prepress"></prepress>
+        </el-tab-pane>
+        <el-tab-pane label="印刷:油墨房&&其他"  name="printOther" v-if="dataForm.buNo==='Flexo'">
+          <printOther ref="printOther"></printOther>
+        </el-tab-pane>
         <el-tab-pane label="热转移打印"  name="overprinting" v-if="getPageIf('overprinting')">
           <overprinting ref="overprinting"></overprinting>
         </el-tab-pane>
@@ -83,24 +86,25 @@
   import packageInfo from "./com_bm_packageInfo";/*包装信息*/
   import bom from "./com_bm_bom";/*BOM*/
   import routing from "./com_bm_routing";/*工艺*/
-  import prepress from "./com_bm_demoSlot";/*印前*/
-  import technicalRequirement from "./com_bm_demoSlot";/*印前*/
-  import drawing from "./com_bm_demoSlot";/*印前*/
-  import PEConfirm from "./com_bm_demoSlot";/*印前*/
-  import overprinting from "./com_bm_demoSlot";/*印前*/
-  import slitting from "./com_bm_demoSlot";/*印前*/
-  import lamTemperature from "./com_bm_demoSlot";/*印前*/
-  import cutting from "./com_bm_demoSlot";/*印前*/
-  import packagePage from "./com_bm_demoSlot";/*印前*/
-  import fqc from "./com_bm_demoSlot";/*印前*/
-  import cqc from "./com_bm_demoSlot";/*印前*/
-  import qualityDocument from "./com_bm_demoSlot";/*印前*/
-  import documentControl from "./com_bm_demoSlot";/*印前*/
-  import peReviewed from "./com_bm_demoSlot";/*印前*/
-  import queteConfirm from "./com_bm_demoSlot";/*印前*/
-  import fai from "./com_bm_demoSlot";/*印前*/
-  import cqeComfirm from "./com_bm_demoSlot";/*印前*/
-  import tpInfo from "./com_bm_tpInfo";/*印前*/
+  import prepress from "./com_bm_prepress";/*组件*/
+  import technicalRequirement from "./com_bm_demoSlot";/*组件*/
+  import drawing from "./com_bm_demoSlot";/*组件*/
+  import PEConfirm from "./com_bm_demoSlot";/*组件*/
+  import overprinting from "./com_bm_demoSlot";/*组件*/
+  import slitting from "./com_bm_demoSlot";/*组件*/
+  import lamTemperature from "./com_bm_demoSlot";/*组件*/
+  import cutting from "./com_bm_demoSlot";/*组件*/
+  import packagePage from "./com_bm_demoSlot";/*组件*/
+  import fqc from "./com_bm_demoSlot";/*组件*/
+  import cqc from "./com_bm_demoSlot";/*组件*/
+  import qualityDocument from "./com_bm_demoSlot";/*组件*/
+  import documentControl from "./com_bm_demoSlot";/*组件*/
+  import peReviewed from "./com_bm_demoSlot";/*组件*/
+  import queteConfirm from "./com_bm_demoSlot";/*组件*/
+  import fai from "./com_bm_demoSlot";/*组件*/
+  import cqeComfirm from "./com_bm_demoSlot";/*组件*/
+  import tpInfo from "./com_bm_tpInfo";/*组件*/
+  import printOther from "./com_bm_printOther";/*组件*/
   export default {
     name: "technicalSpecificationDetail",
     components: {
@@ -127,6 +131,7 @@
       fai,
       cqeComfirm,
       tpInfo,
+      printOther,
     },
     data() {
       return {
@@ -206,7 +211,13 @@
           this.getCqeComfirm();
         }else if(this.activeName == 'tpInfo'){
           this.getTpInfo();
+        }else if(this.activeName == 'printOther'){
+          this.getPrintOther();
         }
+
+      },
+      getPrintOther(){
+        this.$refs.printOther.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
       getBaseInfoData(){
         this.$refs.basicInformation.init(JSON.parse(JSON.stringify(this.dataForm)))