plm字段权限

src/api/sampleManagement/technicalSpecificationList.js

@@ -68,3 +68,16 @@ export const updateBMLaminationDetail= data => createAPI(`/technicalSpecificatio
 export const searchBMLaminationCut= data => createAPI(`/technicalSpecification/searchBMLaminationCut`,'post',data)
 export const saveBMLaminationCut= data => createAPI(`/technicalSpecification/saveBMLaminationCut`,'post',data)
 export const deleteBMLaminationCut= data => createAPI(`/technicalSpecification/deleteBMLaminationCut`,'post',data)
+
+export const searchBMCncDetail= data => createAPI(`/technicalSpecification/searchBMCncDetail`,'post',data)
+export const updateBMCncDetail= data => createAPI(`/technicalSpecification/updateBMCncDetail`,'post',data)
+export const searchBMCncCut= data => createAPI(`/technicalSpecification/searchBMCncCut`,'post',data)
+export const saveBMCncCut= data => createAPI(`/technicalSpecification/saveBMCncCut`,'post',data)
+export const deleteBMCncCut= data => createAPI(`/technicalSpecification/deleteBMCncCut`,'post',data)
+
+export const searchBMCutDetail= data => createAPI(`/technicalSpecification/searchBMCutDetail`,'post',data)
+export const updateBMCutDetail= data => createAPI(`/technicalSpecification/updateBMCutDetail`,'post',data)
+export const searchBMCutCut= data => createAPI(`/technicalSpecification/searchBMCutCut`,'post',data)
+export const saveBMCutCut= data => createAPI(`/technicalSpecification/saveBMCutCut`,'post',data)
+export const deleteBMCutCut= data => createAPI(`/technicalSpecification/deleteBMCutCut`,'post',data)
+

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

@@ -0,0 +1,347 @@
+<template>
+  <div class="mod-config">
+      <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="200"
+        :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
+          v-for="(item,index) in columnList" :key="index"
+          :prop="item.columnProp"
+          header-align="center"
+          :align="item.align"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+        </el-table-column>
+
+      </el-table>
+        <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:60px; 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="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.programName" style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'刀的进给速度及转速'">
+          <el-input v-model="cutData.cuttingSpeed" 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.spec"  style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'P2P公差'">
+          <el-input v-model="cutData.p2c"  style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'C2C公差'" >
+          <el-input v-model="cutData.c2c"  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.remarks"  style="width: 570px" ></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>
+
+<script>
+  import {
+    searchBMCncDetail,
+    updateBMCncDetail,
+    searchBMCncCut,
+    saveBMCncCut,
+    deleteBMCncCut,
+  } 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:'',
+          action:'',
+
+        },
+        cutTable:[],
+        cutData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          cuttingMachine:'',
+          programName:'',
+          cuttingSpeed:'',
+          spec:'',
+          p2c:'',
+          c2c:'',
+          remarks:'',
+          updateBy:'',
+          updateDate:'',
+        },
+        columnList:[
+          {
+            columnProp: "order",
+            align: "right",
+            columnLabel: "次序",
+            columnWidth: 30
+          },
+          {
+            columnProp: "cuttingMachine",
+            align: "left",
+            columnLabel: "机器类别",
+            columnWidth: 60
+          },
+          {
+            columnProp: "programName",
+            align: "left",
+            columnLabel: "程序名称和路径",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cuttingSpeed",
+            align: "left",
+            columnLabel: "刀的进给速度及转速",
+            columnWidth: 60
+          },
+          {
+            columnProp: "spec",
+            align: "left",
+            columnLabel: "刀模参数",
+            columnWidth: 60
+          },
+          {
+            columnProp: "p2c",
+            align: "left",
+            columnLabel: "P2P公差",
+            columnWidth: 60
+          },
+          {
+            columnProp: "c2c",
+            align: "left",
+            columnLabel: "C2C公差",
+            columnWidth: 60
+          },
+          {
+            columnProp: "remarks",
+            align: "left",
+            columnLabel: "备注",
+            columnWidth: 60
+          },
+        ],
+
+        cutFlag: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.cutSearch();
+      },
+      searchTable(){
+        searchBMCncDetail(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(() => {
+          updateBMCncDetail(this.dataForm).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+          return
+        })
+      },
+
+      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:'',
+          programName:'',
+          cuttingSpeed:'',
+          spec:'',
+          p2c:'',
+          c2c:'',
+          remarks:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.cutFlag=true;
+      },
+      updateCut(row){
+        this.cutData=JSON.parse(JSON.stringify(row))
+        this.cutFlag=true;
+      },
+
+      cutSearch(){
+        searchBMCncCut(this.searchData).then(({data}) => {
+          this.cutTable = data.rows
+        });
+      },
+      cutSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMCncCut(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(() => {
+          deleteBMCncCut(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>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,398 @@
+<template>
+  <div class="mod-config">
+      <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="200"
+        :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
+          v-for="(item,index) in columnList" :key="index"
+          :prop="item.columnProp"
+          header-align="center"
+          :align="item.align"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+        </el-table-column>
+
+      </el-table>
+        <el-row :gutter="20" >
+          <el-col :span="24"><div class="grid-content bg-purple">
+            <el-form-item :label="'备注'">
+              <el-input
+                type="textarea"
+                v-model="dataForm.remarks "
+                :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()" >保存</el-button>
+    </el-form>
+
+
+    <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.cuttingTooling" 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-item :label="'刀模排位'">
+          <el-input v-model="cutData.cutterLayout"  style="width: 130px" ></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="'程序名称'" >
+          <el-input v-model="cutData.programName"  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.programPath"  style="width: 570px" ></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="'P2P公差'">
+          <el-input v-model="cutData.p2c"  style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item :label="'C2C公差'">
+          <el-input v-model="cutData.c2c"  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>
+
+<script>
+  import {
+    searchBMCutDetail,
+    updateBMCutDetail,
+    searchBMCutCut,
+    saveBMCutCut,
+    deleteBMCutCut,
+  } 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:'',
+          action:'',
+          remarks:'',
+        },
+        cutTable:[],
+        cutData:{
+          id:'',
+          site: '',
+          codeNo:'',
+          order:'',
+          cuttingMachine:'',
+          cuttingType:'',
+          cuttingTooling:'',
+          cutterNo:'',
+          cutterLayout:'',
+          cutterCost:'',
+          programName:'',
+          p2c:'',
+          c2c:'',
+          programPath:'',
+          updateBy:'',
+          updateDate:'',
+        },
+        columnList:[
+          {
+            columnProp: "order",
+            align: "right",
+            columnLabel: "次序",
+            columnWidth: 30
+          },
+          {
+            columnProp: "cuttingMachine",
+            align: "left",
+            columnLabel: "机器类别",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cuttingType",
+            align: "left",
+            columnLabel: "碑切方式",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cuttingTooling",
+            align: "left",
+            columnLabel: "碑切工具",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cutterNo",
+            align: "left",
+            columnLabel: "刀模编号",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cutterLayout",
+            align: "left",
+            columnLabel: "刀模排位",
+            columnWidth: 60
+          },
+          {
+            columnProp: "cutterCost",
+            align: "left",
+            columnLabel: "刀模成本",
+            columnWidth: 60
+          },
+          {
+            columnProp: "programName",
+            align: "left",
+            columnLabel: "程序名称",
+            columnWidth: 60
+          },
+          {
+            columnProp: "programPath",
+            align: "left",
+            columnLabel: "程序路径",
+            columnWidth: 60
+          },
+          {
+            columnProp: "p2c",
+            align: "left",
+            columnLabel: "P2P公差",
+            columnWidth: 60
+          },
+          {
+            columnProp: "c2c",
+            align: "left",
+            columnLabel: "C2C公差",
+            columnWidth: 60
+          },
+        ],
+
+        cutFlag: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.cutSearch();
+      },
+      searchTable(){
+        searchBMCutDetail(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(() => {
+          updateBMCutDetail(this.dataForm).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message.success( '操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {
+          return
+        })
+      },
+
+      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:'',
+          cuttingTooling:'',
+          cutterNo:'',
+          cutterLayout:'',
+          cutterCost:'',
+          programName:'',
+          p2c:'',
+          c2c:'',
+          programPath:'',
+          updateBy:'',
+          updateDate:'',
+        }
+        this.cutFlag=true;
+      },
+      updateCut(row){
+        this.cutData=JSON.parse(JSON.stringify(row))
+        this.cutFlag=true;
+      },
+
+      cutSearch(){
+        searchBMCutCut(this.searchData).then(({data}) => {
+          this.cutTable = data.rows
+        });
+      },
+      cutSave(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          saveBMCutCut(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(() => {
+          deleteBMCutCut(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>
+
+<style scoped>
+
+</style>

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

@@ -58,6 +58,12 @@
         <el-tab-pane label="覆膜"  name="lamination" v-if="getPageIf('Lamination')">
           <lamination ref="lamination"></lamination>
         </el-tab-pane>
+        <el-tab-pane label="CNC"  name="CNC" v-if="getPageIf('CNC')">
+          <CNC ref="CNC"></CNC>
+        </el-tab-pane>
+        <el-tab-pane label="切割"  name="Cut" v-if="getPageIf('Cut')">
+          <Cut ref="Cut"></Cut>
+        </el-tab-pane>
         <el-tab-pane label="包装"  name="packagePage" v-if="getPageIf('packagePage')">
           <packagePage ref="packagePage"></packagePage>
         </el-tab-pane>
@@ -120,6 +126,8 @@
   import InkMixing from "./com_bm_inkMixing";/*组件*/
   import InkFormulation from "./com_bm_inkFormulation";/*组件*/
   import lamination from "./com_bm_lamination";/*组件*/
+  import CNC from "./com_bm_cnc";
+  import Cut from "./com_bm_cut";
   export default {
     name: "technicalSpecificationDetail",
     components: {
@@ -150,6 +158,8 @@
       InkMixing,
       InkFormulation,
       lamination,
+      CNC,
+      Cut,
     },
     data() {
       return {
@@ -242,6 +252,10 @@
           this.getInkFormulation();
         }else if(this.activeName == 'lamination'){
           this.getLamination();
+        }else if(this.activeName == 'CNC'){
+          this.getCNC();
+        }else if(this.activeName == 'Cut'){
+          this.getCut();
         }
 
       },
@@ -348,6 +362,14 @@
         this.dataForm.type='lamination'
         this.$refs.lamination.init(JSON.parse(JSON.stringify(this.dataForm)))
       },
+      getCNC(){
+        this.dataForm.type='CNC'
+        this.$refs.CNC.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
+      getCut(){
+        this.dataForm.type='Cut'
+        this.$refs.Cut.init(JSON.parse(JSON.stringify(this.dataForm)))
+      },
 
    //看有没有这个页面的权限
       getPageRole(){
@@ -358,7 +380,7 @@
         })
       },
       getPageIf(key){
-        return this.pageRole.indexOf(key) !== -1 || false
+        return this.pageRole.indexOf(key+';') !== -1 || false
       },
 
       changeHeight(height){