Merge branch 'master' of http://116.63.33.55/git/read_opc into master

chuanyi_client2/src/api/printConfig.js

@@ -1,5 +1,14 @@
 import request from "@/utils/request";
 
+//查询打印机
+export function getPrint() {
+  return request({
+      url: 'http://localhost:8084/api/getPrintName',
+      // url: 'http://192.168.0.11:8084/api/getPrintName',
+      method: 'get'
+  })
+}
+
 /** 查询所有打印配置 */
 export function getAllPrintConfig(params) {
   return request({

chuanyi_client2/src/views/print_config/index.vue

@@ -32,6 +32,8 @@
         :header-cell-style="{ background: '#E8E8E8' }"
         style="width: 100%"
       >
+        <el-table-column align="center" label="打印机" prop="printName">
+        </el-table-column>
         <el-table-column align="center" label="作业名称" prop="jobName">
         </el-table-column>
         <el-table-column align="center" label="打印方向" prop="orientation">
@@ -91,7 +93,7 @@
               size="mini"
               @click="handleDelete(scope.$index, scope.row)"
               type="text"
-              style="color:red"
+              style="color: red"
               icon="el-icon-delete"
               >删除</el-button
             >
@@ -129,16 +131,32 @@
         :rules="dataModelRules"
         label-width="110px"
       >
-        <el-form-item label="作业名称" prop="jobName">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="打印机" prop="printName">
+          <el-select
+            v-model="dataModelForm.printName"
+            placeholder="请选择打印机"
+            style="width: 250px"
+            :disabled="isDisable"
+          >
+            <el-option v-for="item in printNameData" :label="item" :value="item"> </el-option>
+          </el-select>
+        </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="作业名称" prop="jobName">
           <el-input
             v-model="dataModelForm.jobName"
-            placeholder="请输入名称"
+            placeholder="请输入作业名称"
             maxlength="20"
             style="width: 250px"
             :disabled="isDisable"
           ></el-input>
         </el-form-item>
-        <el-row>
+      </el-col>
+      </el-row>
+      <el-row>
           <el-col :span="12">
             <el-form-item label="打印方向" prop="orientation">
               <el-select
@@ -435,6 +453,7 @@ import {
   getPrintConfigById,
   updatePrintConfigById,
   delPrintConfigById,
+  getPrint
 } from "@/api/printConfig";
 
 export default {
@@ -489,6 +508,9 @@ export default {
         fitToPages: 1,
       },
       dataModelRules: {
+        printName:[
+          { required: true, message: "请选择打印配置", trigger: "change" },
+        ],
         jobName: [
           { required: true, message: "请输入作业名称", trigger: "blur" },
         ],
@@ -538,22 +560,27 @@ export default {
         page: 1,
         limit: 10,
       },
+      // 详情禁用
       isDisable: false,
+      // 打印机集合
+      printNameData:[]
     };
   },
   watch: {},
   beforeDestroy() {},
   created() {
-    this.getAllPrintConfig();
+    this.getPrint()
   },
   methods: {
-    sortChange({ prop, order }) {
-      this.tableData.sort(customCompare(prop, order));
-    },
-    extractNumbers(expr) {
-      const regex = /\d+/g;
-      const numbers = expr.match(regex);
-      return numbers ? numbers.map(Number) : [];
+    /** 获取打印机 */
+    getPrint(){
+      getPrint().then(res=>{
+        console.log(res)
+        if(res.code===200){
+          this.printNameData=res.data
+        }
+        this.getAllPrintConfig();
+      })
     },
     /** 新增打印配置 */
     handleAdd() {
@@ -625,7 +652,6 @@ export default {
     /** 获取所有打印配置 */
     getAllPrintConfig() {
       getAllPrintConfig(this.queryParams).then((res) => {
-        console.log(res);
         if (res.code === 200) {
           this.tableData = res.data.printConfigList;
           this.tableTotal = res.data.count;