Merge pull request '打印机定义新增字段' (#156) from feature_supplier into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/156

src/views/system/printer/printertab.vue

@@ -26,6 +26,8 @@
           <span v-if="item === 'Printer-PlantNr'">{{ getValue(scope.row['Printer-PlantNr']) }}</span>
           <span v-else-if="item === 'Printer-LastModify'"> {{ parseTime(scope.row[item]) }} </span>
           <span v-else-if="item === 'Printer-CreateTime'"> {{ parseTime(scope.row[item]) }} </span>
+          <span v-else-if="item === 'Printer-PrinterType'"> {{ typeArrayTrans(scope.row[item]) }} </span>
+          <span v-else-if="item === 'Printer-PrintMode'"> {{ modeArrayTrans(scope.row[item]) }} </span>
           <span v-else-if="item === 'Printer-Active'"> {{ scope.row[item] === 1 ? '是' : '否' }} </span>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
@@ -55,8 +57,8 @@
       :limit.sync="queryParams['_pageSize']"
       @pagination="getList"
     />
-    <el-dialog :title="title" :visible.sync="open" width="800px" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-col :span="12">
           <el-form-item :label="getColumnName('Printer-PlantNr')" prop="Printer-PlantNr">
             <el-select v-model="form['Printer-PlantNr']" placeholder="请选择车间" :disabled="!isAdd">
@@ -96,6 +98,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item :label="getColumnName('Printer-PrintMode')" prop="Printer-PrintMode">
+            <el-select v-model="form['Printer-PrintMode']" placeholder="请选择">
+              <el-option
+                v-for="item in modeArray"
+                :key="item['stdeftab-stdeftyp']"
+								:label="item['stdeftab-bez']"
+								:value="item['stdeftab-stdeftyp']"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item :label="getColumnName('Printer-PrinterName')">
             <el-input v-model="form['Printer-PrinterName']" placeholder="请输入" />
@@ -150,6 +164,7 @@ export default {
       isAdd: false,
       // 打印类型
       typeArray: [],
+      modeArray: [],
       // 遍历表头
       headers: [],
       // 遮罩层
@@ -182,9 +197,34 @@ export default {
     this.getStanderOne({ statid: 'Printer-PrinterType' }).then(res => {
       this.typeArray = res.data
     })
+    this.getStanderOne({ statid: 'Printer-PrintMode' }).then(res => {
+      this.modeArray = res.data
+    })
     this.getList()
   },
   methods: {
+    modeArrayTrans(value) {
+      if (this.modeArray.length > 0) {
+        let fieldValue = ''
+        this.modeArray.forEach((el) => {
+          if (value === el['stdeftab-stdeftyp']) {
+            fieldValue = el['stdeftab-bez']
+          }
+        })
+        return fieldValue
+      }
+    },
+    typeArrayTrans(value) {
+      if (this.typeArray.length > 0) {
+        let fieldValue = ''
+        this.typeArray.forEach((el) => {
+          if (value === el['stdeftab-stdeftyp']) {
+            fieldValue = el['stdeftab-bez']
+          }
+        })
+        return fieldValue
+      }
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true
@@ -198,6 +238,7 @@ export default {
             'Printer-PrinterId',
             'Printer-Descr',
             'Printer-PrinterType',
+            'Printer-PrintMode',
             'Printer-PrinterName',
             'Printer-IP',
             'Printer-Active',