From cfc8942cbb52548f78e5889db592881595e640a2 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 8 Jan 2024 13:30:47 +0800
Subject: [PATCH] plm BM

---
 .../technicalSpecificationList.js             |   5 +
 src/assets/scss/rq.scss                       |  11 +
 src/store/modules/user.js                     |   1 +
 .../com_bm_inkMixing.vue                      |   6 +-
 .../com_bm_packageInfo.vue                    |   6 +-
 .../com_bm_printing.vue                       | 483 ++++++++++++++++++
 .../technicalSpecificationDetail.vue          |  19 +-
 7 files changed, 522 insertions(+), 9 deletions(-)
 create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue

diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index a812ff4..89f184a 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -81,3 +81,8 @@ export const searchBMCutCut= data => createAPI(`/technicalSpecification/searchBM
 export const saveBMCutCut= data => createAPI(`/technicalSpecification/saveBMCutCut`,'post',data)
 export const deleteBMCutCut= data => createAPI(`/technicalSpecification/deleteBMCutCut`,'post',data)
 
+export const searchBMPrintingDetail= data => createAPI(`/technicalSpecification/searchBMPrintingDetail`,'post',data)
+export const updateBMPrintingDetail= data => createAPI(`/technicalSpecification/updateBMPrintingDetail`,'post',data)
+export const searchBMPrintingColor= data => createAPI(`/technicalSpecification/searchBMPrintingColor`,'post',data)
+export const saveBMPrintingColor= data => createAPI(`/technicalSpecification/saveBMPrintingColor`,'post',data)
+export const deleteBMPrintingColor= data => createAPI(`/technicalSpecification/deleteBMPrintingColor`,'post',data)
diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 76732f1..dd4e45a 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -55,3 +55,14 @@
 .el-table thead.is-group th {
   background: #17B3A3;
 }
+.rq-bmPic {
+  position: relative;
+  width: 100%;
+  height: 100px;
+  float: top;
+  margin-top: 0%;
+  margin-left: 0%;
+  overflow: hidden;
+  display: flex;
+  justify-content: center; /* 水平居中 */
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5387d4c..7496188 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,6 +10,7 @@ export default {
     multiLanguage: '',
     authControl: '',
     userSite: 0,
+    bmPicUrl:'http://192.168.1.83:81/upload/',
   },
   mutations: {
     updateId (state, id) {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue
index f614c2a..a60a992 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='DBE'">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"  >
       <el-row :gutter="20">
         <el-col :span="6"><div class="grid-content bg-purple">
           <el-form-item :label="'颜色匹配/Colour Match'">
@@ -25,7 +25,7 @@
       </el-row>
     </el-form>
 
-      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"   v-if="searchData.buNo==='DBE'">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"    >
         <el-form-item >
           <el-button type="primary" @click="colorSearch()" >刷新</el-button>
           <el-button type="primary" @click="newColor()" v-if="!ifDisableFlag">新增</el-button>
@@ -146,7 +146,7 @@
       </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="searchData.buNo==='DBE'" >保存</el-button>
+      <el-button type="primary" @click="saveData()"   >保存</el-button>
     </el-form>
 
 
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
index 876f038..2c06c1d 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
@@ -276,7 +276,10 @@
     </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>
+      <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>
@@ -302,6 +305,7 @@
           buNo:'',
         },
         ifDisableFlag:false,
+        picUrl:this.$store.state.user.bmPicUrl+'默认出纸方向.png',
         dataForm:{
           site: '',
           codeNo:'',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue
new file mode 100644
index 0000000..a819f2b
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue
@@ -0,0 +1,483 @@
+<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="'颜色匹配'">
+            <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.conditions" :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公差'" >
+            <el-input v-model="dataForm.colourIndicat" :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-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <el-form-item :label="'是否光泽度要求'">
+            <el-input v-model="dataForm.glossinessRequirement" :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.comments" :disabled="ifDisableFlag"  ></el-input>
+          </el-form-item>
+        </div></el-col>
+      </el-row>
+    </el-form>
+
+    <el-form label-position="top" style="margin-top: 5px; 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>
+        </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 label="油墨类型" header-align="center">
+          <el-table-column
+            prop="inkType"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="Ink Type">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="颜色参考" header-align="center">
+          <el-table-column
+            prop="colorReference"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="Color Reference">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="颜色匹配" header-align="center">
+          <el-table-column
+            prop="colorMatch"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="Color Match">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="容积" header-align="center">
+          <el-table-column
+            prop="bcm"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="BCM">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="印刷速度" header-align="center">
+          <el-table-column
+            prop="speed"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="Speed">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="外干燥" header-align="center">
+          <el-table-column
+            prop="dry"
+            header-align="center"
+            align="left"
+            min-width="60"
+            label="Dry">
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="UV固化/UV Curing" header-align="center">
+          <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>
+        <el-row :gutter="20">
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'印刷排位 Print Layout'">
+              <el-input v-model="dataForm.printLayout" :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="'Repeat/周长'">
+              <el-input v-model="dataForm.repeat" :disabled="ifDisableFlag"  ></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" :disabled="ifDisableFlag"  ></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'LabelSize/尺寸标签'" >
+              <el-input v-model="dataForm.labelSize" :disabled="ifDisableFlag" ></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'Down/竖排数'" >
+              <el-input v-model="dataForm.down" :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="'Plate Distortion Rate/柔板压缩'">
+              <el-input v-model="dataForm.plateDistortionRate" :disabled="ifDisableFlag"  ></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'Actual Number/实际数目'">
+              <el-input v-model="dataForm.actualNumber" :disabled="ifDisableFlag"  ></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'Print Copy Position/印刷出纸方向'" >
+              <el-input v-model="dataForm.printPosition" :disabled="ifDisableFlag" ></el-input>
+            </el-form-item>
+          </div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">
+            <el-form-item :label="'Goods Roll Width/成品卷边宽度'" >
+              <el-input v-model="dataForm.goodsRollWidth" :disabled="ifDisableFlag" ></el-input>
+            </el-form-item>
+          </div></el-col>
+        </el-row>
+      <div  class="rq-bmPic" >
+        <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="picUrl">
+      </div>
+      </el-form>
+
+    <el-form label-position="top" style="margin-top:10px; margin-left: 0px;text-align:center">
+      <el-button type="primary" @click="saveData()"   >保存</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.inkType" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'颜色参考'">
+          <el-input v-model="colorData.colorReference" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'颜色匹配'">
+          <el-input v-model="colorData.colorMatch"  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.bcm"  style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'印刷速度'">
+          <el-input v-model="colorData.speed" style="width: 130px" ></el-input>
+        </el-form-item>
+        <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>
+      </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 {
+    searchBMPrintingDetail,
+    updateBMPrintingDetail,
+    searchBMPrintingColor,
+    saveBMPrintingColor,
+    deleteBMPrintingColor,
+  } 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:'',
+        },
+        picUrl:this.$store.state.user.bmPicUrl+'默认出纸方向.png',
+        ifDisableFlag:false,
+        dataForm:{
+          site: '',
+          codeNo:'',
+          colourMatch:'',
+          conditions:'',
+          colourIndicat:'',
+          customerFile:'',
+          glossinessRequirement:'',
+          comments:'',
+          printLayout:'',
+          repeat:'',
+          vp:'',
+          labelSize:'',
+          down:'',
+          plateDistortionRate:'',
+          actualNumber:'',
+          printPosition:'',
+          goodsRollWidth:'',
+        },
+        colorTable:[],
+        colorData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          inkType:'',
+          colorReference:'',
+          colorMatch:'',
+          bcm:'',
+          speed:'',
+          dry:'',
+          gallus:'',
+          markAndy:'',
+          lp:'',
+          hexiang:'',
+          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(){
+        searchBMPrintingDetail(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(() => {
+          updateBMPrintingDetail(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,
+          inkType:'',
+          colorReference:'',
+          colorMatch:'',
+          bcm:'',
+          speed:'',
+          dry:'',
+          gallus:'',
+          markAndy:'',
+          lp:'',
+          hexiang:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.colorFlag=true;
+      },
+      updateColor(row){
+        this.colorData=JSON.parse(JSON.stringify(row))
+        this.colorFlag=true;
+      },
+
+      colorSearch(){
+        searchBMPrintingColor(this.searchData).then(({data}) => {
+          this.colorTable = data.rows
+        });
+      },
+      colorSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMPrintingColor(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(() => {
+          deleteBMPrintingColor(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 b701b42..df66423 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -31,9 +31,9 @@
         <el-tab-pane label="印前"  name="prepress" v-if="getPageIf('prepress')">
           <prepress ref="prepress"></prepress>
         </el-tab-pane>
-<!--        <el-tab-pane label="印刷"  name="printing" v-if="getPageIf('printing')">-->
-<!--          <prepress ref="printing"></prepress>-->
-<!--        </el-tab-pane>-->
+        <el-tab-pane label="印刷"  name="printing" v-if="getPageIf('printing')">
+          <printing ref="printing"></printing>
+        </el-tab-pane>
         <el-tab-pane label="印刷:油墨房&&其他"  name="printOther" v-if="getPageIf('printOther')">
           <printOther ref="printOther"></printOther>
         </el-tab-pane>
@@ -126,6 +126,8 @@
   import InkMixing from "./com_bm_inkMixing";/*组件*/
   import InkFormulation from "./com_bm_inkFormulation";/*组件*/
   import lamination from "./com_bm_lamination";/*组件*/
+  import printing from "./com_bm_printing";/*组件*/
+
   import CNC from "./com_bm_cnc";
   import Cut from "./com_bm_cut";
   export default {
@@ -160,6 +162,7 @@
       lamination,
       CNC,
       Cut,
+      printing,
     },
     data() {
       return {
@@ -256,8 +259,10 @@
           this.getCNC();
         }else if(this.activeName == 'Cut'){
           this.getCut();
+        }else if(this.activeName == 'printing') {
+          this.changeHeight(800);
+          this.getPrinting();
         }
-
       },
       getPrintOther(){
         this.$refs.printOther.init(JSON.parse(JSON.stringify(this.dataForm)))
@@ -370,6 +375,10 @@
         this.dataForm.type='Cut'
         this.$refs.Cut.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
+      getPrinting(){
+        this.dataForm.type='printing'
+        this.$refs.printing.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
 
    //看有没有这个页面的权限
       getPageRole(){
@@ -380,7 +389,7 @@
         })
       },
       getPageIf(key){
-        return this.pageRole.indexOf(key+';') !== -1 || false
+        return this.pageRole.indexOf(';'+key+';') !== -1 || false
       },
 
       changeHeight(height){