标签类型

src/views/modules/labelSetting/com_add_update_user_label_printer.vue

@@ -20,9 +20,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item class="customer-item">
-              <span slot="label" v-if="!labelNoReadOnly"  @click="getBaseList(1099)"><a herf="#">{{labels.labelNo}}</a></span>
-              <span slot="label" v-if="labelNoReadOnly">{{labels.labelNo}}</span>
-              <el-input v-model="pageData.labelNo" :disabled="labelNoReadOnly" @blur="checkLabelNoMethod()" style="width: 120px;" ></el-input>
+              <span slot="label" v-if="!labelNoReadOnly"  @click="getBaseList(2099)"><a herf="#">{{labels.labelType}}</a></span>
+              <span slot="label" v-if="labelNoReadOnly">{{labels.labelType}}</span>
+              <el-input v-model="pageData.labelType" :disabled="labelNoReadOnly" @blur="trimLabelType()" style="width: 120px;" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -60,7 +60,6 @@
 import {
   insertUserLabelPrinter,
   updateUserLabelPrinter,
-  checkLabelNo,
   checkUserId,
 } from '@/api/labelSetting/com_add_update_user_label_printer.js';
 
@@ -97,6 +96,7 @@ export default {
         userId: this.$store.state.user.name,
         userDisplay: '',
         labelNo: '',
+        labelType: '',
         labelName: '',
         labelClass: '',
         ipAddress: '',
@@ -121,6 +121,7 @@ export default {
         userDisplay: '用户名:',
         titleCon: '标签打印机维护',
         labelNo: '标签编号:',
+        labelType: '标签类型:',
         labelName: '标签文件名:',
         labelClass: '标签种类:',
         ipAddress: 'IP地址:',
@@ -128,7 +129,7 @@ export default {
         confirmLabel: '确认',
         cancelLabel: '取消',
         tipsLabel: '提示',
-        labelNoCantBeNull: '标签编号不能为空!',
+        labelTypeCantBeNull: '标签类型不能为空!',
         userIdCantBeNull: '用户ID不能为空!',
         printerNameCantBeNull: '打印机不能为空!',
       },
@@ -174,10 +175,9 @@ export default {
       this.checkUserIdMethod();
       //判断是否是修改的操作
       if(this.pageData.addFlag == 'N'){
-        //修改的时候不允许改人名和标签编号
+        //修改的时候不允许改人名和标签类型
         this.readOnlyUserId = true;
         this.labelNoReadOnly = true;
-        this.checkLabelNoMethod();
       }
     },
 
@@ -217,34 +217,20 @@ export default {
       })
     },
 
-    /*检验标签的编码*/
-    checkLabelNoMethod(){
-      checkLabelNo(this.pageData).then(({data}) => {
-        //判断是否查询到了
-        if(data && data.code == 200){
-          //设置参数
-          let labelSetting = data.resultRow;
-          this.pageData.labelType = labelSetting.labelType;
-          this.pageData.labelClass = labelSetting.labelClass;
-          this.pageData.labelName = labelSetting.labelName;
-        }else{
-          this.pageData.labelName = '';
-          this.pageData.labelNo = '';
-          this.pageData.labelType = '';
-          this.pageData.labelClass = '';
-          this.$message.error(data.msg);
-        }
-      })
+    // 统一在失焦时清理空格，避免前后端按标签类型匹配时出现脏数据。
+    trimLabelType() {
+      this.pageData.labelType = (this.pageData.labelType || '').trim();
     },
 
     /*保存标签自定义的信息*/
     saveUserLabelPrinterMethod(){
       //判断标签内容是否为空
-      let labelNo = this.pageData.labelNo.trim();
-      let userId = this.pageData.userId.trim();
-      let ipAddress = this.pageData.ipAddress.trim();
-      if(labelNo == null || labelNo === ''){
-        this.$message.success("标签编号不能为空!");
+      let labelType = (this.pageData.labelType || '').trim();
+      let userId = (this.pageData.userId || '').trim();
+      let ipAddress = (this.pageData.ipAddress || '').trim();
+      this.pageData.labelType = labelType;
+      if(labelType == null || labelType === ''){
+        this.$message.success(this.labels.labelTypeCantBeNull);
         return false;
       }
       if(userId == null || userId === ''){
@@ -312,7 +298,7 @@ export default {
 
     /* 列表方法的回调 */
     getBaseData(val) {
-      if (this.tagNo === 1099) {
+      if (this.tagNo === 2099) {
         //设置参数
         this.pageData.labelNo = val.ReportID;
         this.pageData.labelType = val.ReportFamily;
@@ -326,8 +312,8 @@ export default {
       this.tagNo = val
       this.$nextTick(() => {
         let strVal = ''
-        if (val === 1099) {
-          strVal = this.pageData.labelNo;
+        if (val === 2099) {
+          strVal = this.pageData.labelType;
         }
         this.$refs.baseList.init(val, strVal)
       })
@@ -362,8 +348,9 @@ export default {
     pageData: {
       deep: true,
       handler: function (newV, oldV) {
-        this.pageData.userId = this.pageData.userId.trim().toUpperCase();
-        this.pageData.labelNo = this.pageData.labelNo.trim().toUpperCase();
+        this.pageData.userId = (this.pageData.userId || '').trim().toUpperCase();
+        this.pageData.labelNo = (this.pageData.labelNo || '').trim().toUpperCase();
+        this.pageData.labelType = (this.pageData.labelType || '').trim();
       }
     },
   },

src/views/modules/labelSetting/label_setting_printer.vue

@@ -5,8 +5,8 @@
       <el-form-item :label=labels.userId>
         <el-input v-model="pageData.userId" @keyup.enter.native="refreshPageTables()" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label=labels.labelNo>
-        <el-input v-model="pageData.labelNo" @keyup.enter.native="refreshPageTables()" style="width: 120px"></el-input>
+      <el-form-item :label=labels.labelType>
+        <el-input v-model="pageData.labelType" @keyup.enter.native="refreshPageTables()" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.labelName>
         <el-input v-model="pageData.labelName" @keyup.enter.native="refreshPageTables()" style="width: 120px" ></el-input>
@@ -160,13 +160,13 @@ export default {
         }, {
           userId: this.$store.state.user.name,
           functionId: 100008004,
-          serialNumber: '100008004LabelLabelName',
+          serialNumber: '100008004LabelLabelType',
           tableId: '100008004Label',
           tableName: '标签打印机列表',
-          columnProp: 'labelNo',
+          columnProp: 'labelType',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '标签编号',
+          columnLabel: '标签类型',
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -276,6 +276,7 @@ export default {
          userId: this.$store.state.user.name,
          userDisplay: '',
          labelNo: '',
+         labelType: '',
          labelName: '',
          labelClass: '',
          ipAddress: '',