Merge branch 'langfang-develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into langfang-test

src/views/plant/resource/workline.vue

@@ -239,6 +239,23 @@
                             placeholder="请输入" />
                 </el-form-item>
               </el-col>
+
+              <el-col :span="12">
+                <!-- 位置 -->
+                <el-form-item :label="getColumnName('WorkLine-PrintAddress')">
+                  <el-input v-model="form['WorkLine-PrintAddress']"
+														clearable
+                            placeholder="请输入" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <!-- 位置 -->
+                <el-form-item :label="getColumnName('WorkLine-PrintTemplate')">
+                  <el-input v-model="form['WorkLine-PrintTemplate']"
+														clearable
+                            placeholder="请输入" />
+                </el-form-item>
+              </el-col>
             </el-tab-pane>
             <!-- <el-tab-pane label="计划设置" name="second">计划设置</el-tab-pane> -->
             <el-tab-pane label="工位分配"

src/views/system/printer/printertab.vue

@@ -125,6 +125,16 @@
           <el-form-item :label="getColumnName('Printer-PrinterSpec')">
             <el-input v-model="form['Printer-PrinterSpec']" placeholder="请输入" />
           </el-form-item>
+        </el-col>
+				<el-col :span="12">
+          <el-form-item :label="getColumnName('Printer-SerialName')">
+            <el-input v-model="form['Printer-SerialName']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+				<el-col :span="12">
+          <el-form-item :label="getColumnName('Printer-SerialPort')">
+            <el-input v-model="form['Printer-SerialPort']" placeholder="请输入" />
+          </el-form-item>
         </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -205,6 +215,8 @@ export default {
             'Printer-PageSize',
             'Printer-Port',
             'Printer-PrintInterval',
+						'Printer-SerialName',
+						'Printer-SerialPort',
             'Printer-LastModify',
             'Printer-LastUser',
             'Printer-CreateTime'
@@ -237,6 +249,8 @@ export default {
         'Printer-Active': 0,
         'Printer-PrinterSpec': undefined,
         'Printer-PageSize': undefined,
+				'Printer-SerialName': undefined,
+				'Printer-SerialPort': undefined,
         'Printer-Port': null,
         'Printer-PrintInterval': undefined
       }
@@ -265,6 +279,7 @@ export default {
         this.form['Printer-Active'] = this.form['Printer-Active'] ? 1 : 0
 				this.form['Printer-Port'] = parseInt(this.form['Printer-Port'])
 				this.form['Printer-PrintInterval'] = parseInt(this.form['Printer-PrintInterval'])
+				this.form['Printer-SerialPort'] = parseInt(this.form['Printer-SerialPort'])
         if (valid) {
           if (!this.isAdd) {
             updatePrinter(this.form).then(response => {