feat(打印)：打印机注册修改

src/views/mes/print/masterData/index.vue

@@ -384,6 +384,9 @@ export default {
         let operation = record.operation || "";
         let fabNo = record.fabNo || "";
         let key = customerCode + operation + fabNo;
+        if(isBlank(operation)) {
+          return me.$message.error("第" + (i + 1) + "行工序不能为空");
+        }
         if(isBlank(key)) {
           return me.$message.error("第" + (i + 1) + "行客户代码,工厂代码,工序不能同时为空");
         }

src/views/mes/print/printer/index.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="execution">
+    <input-select-dialog
+      :modal-obj="operationDialogObj"
+      :modal-fetch-fun="operationDialogFetchFun"
+      :modal-show.sync="operationDialogVisible"
+      @inputDialogSelected="operationSelected"
+    ></input-select-dialog>
     <input-select-dialog :modal-obj="printerIdDialogObj" :modal-fetch-fun='printerIdDialogFetchFun' :modal-show.sync="printerIdDialogVisible"  @inputDialogSelected="printerIdSelected"></input-select-dialog>
     <!-- 关联资源弹出框 -->
     <input-multiple-select-checkbox-dialog
@@ -28,17 +34,10 @@
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24"><hr class="el-hr" /></el-col>
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-            <el-form-item label="工序类型:" prop="operationType">
-              <el-select placeHolder="请选择" v-model="formObj.operationType">
-                <el-option key="基膜-JM" label="基膜" value="基膜-JM"/>
-                <el-option key="大分切-DFQ" label="大分切" value="大分切-DFQ"/>
-                <el-option key="涂覆-TF" label="涂覆" value="涂覆-TF"/>
-                <el-option key="小分切-XFQ" label="小分切" value="小分切-XFQ"/>
-                <el-option key="浆料-JL" label="浆料" value="浆料-JL"/>
-                <el-option key="包装-BZ" label="包装" value="包装-BZ"/>
-                <el-option key="发货-FH" label="发货" value="发货-FH"/>
-                <el-option key="发货组托-ZT" label="发货组托" value="发货组托-ZT"/>
-              </el-select>
+            <el-form-item label="工序:" prop="operation">
+              <el-input v-model="formObj.operation">
+                <i slot="suffix" class="el-input__icon el-icon-search" @click.stop="showOperationDialog()"></i>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
@@ -89,6 +88,7 @@
   import {
     mapGetters
   } from 'vuex'
+  import {findOperationList as fetchOperationList} from "@/api/mes/prd/operation";
 
   export default {
     name: "storage-bin_maintain",
@@ -106,7 +106,7 @@
           handle: "",
           site: "",
           printerId: "",
-          operationType: "",
+          operation: "",
           printScenario: "",
           locationDesc: "",
           resource: "",
@@ -123,7 +123,7 @@
           condition: "searchText",
           tableColumn: [
             {prop: "printerId", label: "打印机编码"},
-            {prop: "operationType", label: "工序类型"},
+            {prop: "operation", label: "工序类型"},
             {prop: "printScenario", label: "打印场景"},
             {prop: "locationDesc", label: "位置说明"},
           ]
@@ -136,6 +136,16 @@
             {prop: "description", label: "描述"}
           ]
         },
+        operationDialogObj: {
+          condition: 'operation',
+          tableColumn: [
+            {prop: 'operation', label: 'mes.process', width: '200'},
+            {prop: 'description', label: 'mes.description'},
+          ],
+          title: 'mes.process',
+        },
+        operationDialogFetchFun: fetchOperationList,
+        operationDialogVisible: false,
       }
     },
     created() {
@@ -153,6 +163,14 @@
       }
     },
     methods:{
+      //显示操作弹窗框
+      showOperationDialog(row) {
+        this.operationDialogVisible = true
+      },
+      operationSelected(row) {
+        let me = this
+        me.formObj.operation =  row.operation
+      },
       //显示操作弹窗框
       showPrinterIdDialog() {
         this.printerIdDialogVisible = true