diff --git a/src/api/labelSetting/com_add_update_customer_label.js b/src/api/labelSetting/com_add_update_customer_label.js
new file mode 100644
index 0000000..f6ab8d6
--- /dev/null
+++ b/src/api/labelSetting/com_add_update_customer_label.js
@@ -0,0 +1,11 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 插入打印标签的信息数据
+export const insertLabelSetting = data => createAPI('/label/setting/insertCustomerLabelSetting','post',data)
+
+// 修改打印标签的信息数据
+export const updateLabelSetting = data => createAPI('/label/setting/updateCustomerLabelSetting','post',data)
+
+// 修改打印标签的信息数据
+export const checkLabelNo = data => createAPI('/label/setting/checkLabelNo','post',data)
+
diff --git a/src/api/labelSetting/com_add_update_user_label_printer.js b/src/api/labelSetting/com_add_update_user_label_printer.js
new file mode 100644
index 0000000..8ce5d8b
--- /dev/null
+++ b/src/api/labelSetting/com_add_update_user_label_printer.js
@@ -0,0 +1,15 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 插入打印标签的信息数据
+export const insertUserLabelPrinter = data => createAPI('/label/setting/insertUserLabelPrinter','post',data)
+
+// 修改打印标签的信息数据
+export const updateUserLabelPrinter = data => createAPI('/label/setting/updateUserLabelPrinter','post',data)
+
+// 修改打印标签的信息数据
+export const checkLabelNo = data => createAPI('/label/setting/checkLabelNo','post',data)
+
+// 修改打印标签的信息数据
+export const checkUserId = data => createAPI('/label/setting/checkUserId','post',data)
+
+
diff --git a/src/api/labelSetting/customer_label_setting.js b/src/api/labelSetting/customer_label_setting.js
index 1116069..22c73b9 100644
--- a/src/api/labelSetting/customer_label_setting.js
+++ b/src/api/labelSetting/customer_label_setting.js
@@ -7,4 +7,4 @@ export const checkLabelNo = data => createAPI('/label/setting/checkLabelNo','pos
 export const getLabelSettingList = data => createAPI('/label/setting/getCustomerLabelSettingList','post',data)
 
 // 删除标签的信息
-export const deleteLabelSetting = data => createAPI('/label/setting/deleteDefaultLabelSetting','post',data)
+export const deleteLabelSetting = data => createAPI('/label/setting/deleteCustomerLabelSetting','post',data)
diff --git a/src/api/labelSetting/label_setting_printer.js b/src/api/labelSetting/label_setting_printer.js
index ad8780f..89ea96f 100644
--- a/src/api/labelSetting/label_setting_printer.js
+++ b/src/api/labelSetting/label_setting_printer.js
@@ -1,7 +1,7 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
-// 获取打印标签的信息数据
-export const getLabelSettingList = data => createAPI('/label/setting/getLabelSettingList','post',data)
+// 获取用户标签的打印机信息
+export const getUserLabelPrinters = data => createAPI('/label/setting/getUserLabelPrinters','post',data)
 
-// 删除标签的信息
-export const deleteLabelSetting = data => createAPI('/label/setting/deleteLabelSetting','post',data)
+// 删除用户标签的打印机信息
+export const deleteUserLabelPrinter = data => createAPI('/label/setting/deleteUserLabelPrinter','post',data)
diff --git a/src/views/modules/labelSetting/com_add_update_customer_label.vue b/src/views/modules/labelSetting/com_add_update_customer_label.vue
index 7ae2e29..f730390 100644
--- a/src/views/modules/labelSetting/com_add_update_customer_label.vue
+++ b/src/views/modules/labelSetting/com_add_update_customer_label.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="380px" style="height: 420px;" class="customer-dialog">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="350px" style="height: 420px;" class="customer-dialog">
 
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 标签自定义信息 -->
-            <el-container>
-              <fieldset class="customer-fieldset" style="width: 300px;">
-                <!--  -->
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item"  :label=labels.site>
@@ -16,7 +13,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item class="customer-item" :label=labels.customerId>
-                      <el-input v-model="pageData.customerId" :readonly="labelNoReadOnly" @blur="checkLabelNoMethod()" style="width: 120px;" ></el-input>
+                      <el-input v-model="pageData.customerId" :readonly="labelNoReadOnly" style="width: 120px;" ></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -32,7 +29,7 @@
                   <el-col :span="12">
                     <el-form-item class="customer-item">
                       <span slot="label" style="" @click="getBaseList(1099)"><a herf="#">{{labels.labelNo}}</a></span>
-                      <el-input v-model="pageData.labelNo" :readonly="labelNoReadOnly" style="width: 120px;" ></el-input>
+                      <el-input v-model="pageData.labelNo" :readonly="labelNoReadOnly" @blur="checkLabelNoMethod()" style="width: 120px;" ></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -71,8 +68,6 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </fieldset>
-            </el-container>
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="saveLabelSetting()">{{ buttons.saveButton }}</el-button>
@@ -88,7 +83,8 @@
 import {
   insertLabelSetting,
   updateLabelSetting,
-} from '@/api/labelSetting/com_add_update_default_label.js';
+  checkLabelNo,
+} from '@/api/labelSetting/com_add_update_customer_label.js';
 
 import {
   searchSysLanguagePackList,
@@ -102,7 +98,7 @@ import {
   removerLanguage,
   saveSysLanguageList
 } from "@/api/sysLanguage.js";
-import {checkLabelNo} from "../../../api/labelSetting/default_label_setting";
+
 
 /* 引入组件 */
 import Chooselist from '@/views/modules/common/Chooselist'/* 列表组件 */
@@ -114,6 +110,7 @@ export default {
       titleCon: '客户标签定义维护',
       showDefault: false,
       visible: false,
+      userId: this.$store.state.user.name,
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
@@ -175,7 +172,9 @@ export default {
         this.labelNoReadOnly = true;
       }
       //重置是否需要检验
-      this.pageData.checkFlag = 'N';
+      this.pageData.checkFlag = 'Y';
+      //重置人员信息
+      this.pageData.username = this.userId;
       //判断是否启用多语言
       //this.getMultiLanguageList();  //刷新多语言的信息
       //重置标题
@@ -195,8 +194,8 @@ export default {
         }else{
           this.pageData.labelName = '';
           this.pageData.labelNo = '';
-          this.pageData.labelType = '外箱标签';
-          this.pageData.labelClass = '打印软件';
+          this.pageData.labelType = '';
+          this.pageData.labelClass = '';
           this.$message.error(data.msg);
         }
       })
@@ -244,6 +243,21 @@ export default {
         if(data.code == 200){
           this.$message.success(data.msg);
           setTimeout(this.closeDialog(), 2000);
+        }else if(data.code == 201){
+          this.$confirm(data.msg, '提示', {
+            confirmButtonText: this.labels.confirmLabel,
+            cancelButtonText: this.labels.cancelLabel,
+            type: "warning"
+          }).then(() => {
+            //调用存储过程实现
+            this.pageData.checkFlag = 'N';
+            //重新调用当前的方法
+            this.insertLabelSettingData();
+          }).catch(() => {
+            this.pageData.checkFlag = 'Y';
+          });
+          //重置标签
+          this.pageData.checkFlag = 'Y';
         }else{
           this.$message.error(data.msg);
         }
@@ -273,7 +287,11 @@ export default {
     /* 列表方法的回调 */
     getBaseData(val) {
       if (this.tagNo === 1099) {
-
+        //设置参数
+        this.pageData.labelNo = val.ReportID;
+        this.pageData.labelType = val.ReportFamily;
+        this.pageData.labelName = val.Reportfile;
+        this.pageData.labelClass = val.ReportType;
       }
     },
 
@@ -283,7 +301,7 @@ export default {
       this.$nextTick(() => {
         let strVal = ''
         if (val === 1099) {
-
+          strVal = this.pageData.labelNo;
         }
         this.$refs.baseList.init(val, strVal)
       })
@@ -318,15 +336,8 @@ export default {
     pageData: {
       deep: true,
       handler: function (newV, oldV) {
-        //非空判断
-        if(null == newV || '' === newV){
-            debugger;
-        }else{
-          this.pageData.labelNo = this.pageData.labelNo.toUpperCase();
-          this.pageData.parentLabelNo = this.pageData.parentLabelNo.toUpperCase();
-        }
-
-
+        this.pageData.labelNo = this.pageData.labelNo.toUpperCase();
+        this.pageData.parentLabelNo = this.pageData.parentLabelNo.toUpperCase();
       }
     },
   },
diff --git a/src/views/modules/labelSetting/com_add_update_default_label.vue b/src/views/modules/labelSetting/com_add_update_default_label.vue
index 1818c19..a8a1fe6 100644
--- a/src/views/modules/labelSetting/com_add_update_default_label.vue
+++ b/src/views/modules/labelSetting/com_add_update_default_label.vue
@@ -4,9 +4,6 @@
 
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 标签自定义信息 -->
-            <el-container>
-              <fieldset class="customer-fieldset" style="width: 300px;">
-                <!--  -->
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" :label=labels.labelType>
@@ -57,8 +54,6 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </fieldset>
-            </el-container>
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="saveLabelSetting()">{{ buttons.saveButton }}</el-button>
@@ -155,7 +150,7 @@ export default {
         this.labelNoReadOnly = true;
       }
       //重置是否需要检验
-      this.pageData.checkFlag = 'N';
+      this.pageData.checkFlag = 'Y';
       //判断是否启用多语言
       //this.getMultiLanguageList();  //刷新多语言的信息
       //重置标题
@@ -224,6 +219,21 @@ export default {
         if(data.code == 200){
           this.$message.success(data.msg);
           setTimeout(this.closeDialog(), 2000);
+        }else if(data.code == 201){
+          this.$confirm(data.msg, '提示', {
+            confirmButtonText: this.labels.confirmLabel,
+            cancelButtonText: this.labels.cancelLabel,
+            type: "warning"
+          }).then(() => {
+            //调用存储过程实现
+            this.pageData.checkFlag = 'N';
+            //重新调用当前的方法
+            this.insertLabelSettingData();
+          }).catch(() => {
+            //this.pageData.checkFlag = 'Y';
+          });
+          //重置标签
+          this.pageData.checkFlag = 'Y';
         }else{
           this.$message.error(data.msg);
         }
diff --git a/src/views/modules/labelSetting/com_add_update_label.vue b/src/views/modules/labelSetting/com_add_update_label.vue
index ed1e2a2..d4941ba 100644
--- a/src/views/modules/labelSetting/com_add_update_label.vue
+++ b/src/views/modules/labelSetting/com_add_update_label.vue
@@ -4,9 +4,6 @@
 
         <el-form :inline="true" label-position="top" label-width="80px">
             <!-- 标签自定义信息 -->
-            <el-container>
-              <fieldset class="customer-fieldset" style="width: 300px;">
-                <!--  -->
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" :label=labels.labelNo>
@@ -43,8 +40,6 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-              </fieldset>
-            </el-container>
           </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="saveLabelSetting()">{{ buttons.saveButton }}</el-button>
diff --git a/src/views/modules/labelSetting/com_add_update_user_label_printer.vue b/src/views/modules/labelSetting/com_add_update_user_label_printer.vue
new file mode 100644
index 0000000..8404bbb
--- /dev/null
+++ b/src/views/modules/labelSetting/com_add_update_user_label_printer.vue
@@ -0,0 +1,391 @@
+<template>
+  <div class="customer-css">
+    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="350px" style="height: 420px;" class="customer-dialog">
+
+      <el-form :inline="true" label-position="top" label-width="80px">
+        <!-- 标签自定义信息 -->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item class="customer-item"  :label=labels.userId>
+              <el-input  v-model="pageData.userId" :readonly="readOnlyUserId" @blur="checkUserIdMethod()"  style="width: 120px;" >
+              </el-input >
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item class="customer-item" :label=labels.userDisplay>
+              <el-input v-model="pageData.userDisplay" disabled style="width: 120px;" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item class="customer-item" :label=labels.labelName>
+              <el-input v-model="pageData.labelName" disabled style="width: 120px;" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item class="customer-item" :label=labels.labelClass>
+              <el-select  v-model="pageData.labelClass" disabled style="width: 150px;" >
+                <el-option label="打印软件" value="打印软件"></el-option>
+              </el-select >
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item class="customer-item" :label=labels.ipAddress>
+              <el-input v-model="pageData.ipAddress" style="width: 120px;" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item class="customer-item" :label=labels.printerName>
+              <el-select v-model="pageData.printerName"  style="width: 285px;" >
+                <el-option v-for="(item,index) in printList"
+                  :key="index" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="saveUserLabelPrinterMethod()">{{ buttons.saveButton }}</el-button>
+            <el-button type="primary" @click="closeDialog">{{buttons.closeButton}}</el-button>
+          </span>
+    </el-dialog>
+
+    <select v-show="false" ref="printElement">
+    </select>
+    <!--列表的组件-->
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+import {
+  insertUserLabelPrinter,
+  updateUserLabelPrinter,
+  checkLabelNo,
+  checkUserId,
+} from '@/api/labelSetting/com_add_update_user_label_printer.js';
+
+import {
+  searchSysLanguagePackList,
+  searchSysLanguageParam,
+  searchFunctionButtonList,
+  saveButtonList,
+  searchSysLanguage,
+  searchLanguageListByLanguageCode,
+  saveSysLanguageOne,
+  searchPageLanguageData,
+  removerLanguage,
+  saveSysLanguageList
+} from "@/api/sysLanguage.js";
+
+
+/* 引入组件 */
+import Chooselist from '@/views/modules/common/Chooselist'/* 列表组件 */
+var functionId = 'C10000043';
+
+export default {
+  data() {
+    return {
+      titleCon: '客户标签定义维护',
+      showDefault: false,
+      visible: false,
+      readOnlyUserId: true,
+      printList: [],
+      userId: this.$store.state.user.name,
+      pageData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        userId: this.$store.state.user.name,
+        userDisplay: '',
+        labelNo: '',
+        labelName: '',
+        labelClass: '',
+        ipAddress: '',
+        printerName: '',
+        addFlag: false,
+        checkFlag: 'Y',
+      },
+      labelNoReadOnly: false,
+      dataListLoading: false,
+      buttons: {
+        saveButton: '保存',
+        closeButton: '关闭',
+      },
+      queryButton: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'button'
+      },
+      labels: {
+        userId: '用户ID:',
+        userDisplay: '用户名:',
+        titleCon: '标签打印机维护',
+        labelNo: '标签编号:',
+        labelName: '标签文件名:',
+        labelClass: '标签种类:',
+        ipAddress: 'IP地址:',
+        printerName: '打印机:',
+        confirmLabel: '确认',
+        cancelLabel: '取消',
+      },
+      queryLabel: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'label'
+      },
+    }
+  },
+  methods: {
+    //初始化组件的参数
+    init(currentRow) {
+      //初始化参数
+      this.pageData = JSON.parse(JSON.stringify(currentRow));
+      //打开页面
+      this.visible = true;
+      //判断是否是新增
+      if(this.pageData.addFlag == 'Y'){
+        this.labelNoReadOnly = false;
+      }else{
+        this.labelNoReadOnly = true;
+      }
+      //重置是否需要检验
+      this.pageData.checkFlag = 'Y';
+      //重置人员信息
+      this.pageData.username = this.userId;
+      //判断是否启用多语言
+      //this.getMultiLanguageList();  //刷新多语言的信息
+      //重置标题
+      this.titleCon = this.labels.titleCon;
+      //刷新所有的打印机名称
+      this.getPrintName();
+      //判断当前用户是都是admin
+      if(this.userId.toUpperCase() == "ADMIN"){
+        //放开修改
+        this.readOnlyUserId = false;
+      }else {
+        this.readOnlyUserId = true;
+      }
+      //触发查询用户ID事件
+      this.checkUserIdMethod();
+      //判断是否是修改的操作
+      if(this.pageData.addFlag == 'N'){
+        //修改的时候不允许改人名和标签编号
+        this.readOnlyUserId = true;
+        this.labelNoReadOnly = true;
+        this.checkLabelNoMethod();
+      }
+    },
+
+    // 获取所有打印机
+    getPrintName(){
+      this.$nextTick(() => {
+        let lodop = this.getLodop()
+        var elementById = this.$refs.printElement;
+        lodop.Create_Printer_List(elementById)
+        setTimeout(()=>{},1000)
+        var children = elementById.children
+        let list = []
+        for (let child of children) {
+          let option = {
+            value: child.innerText,
+            label: child.innerText
+          }
+          list.push(option)
+        }
+        this.printList = list
+      })
+    },
+
+    /*检验标签的编码*/
+    checkUserIdMethod(){
+      checkUserId(this.pageData).then(({data}) => {
+        //判断是否查询到了
+        if(data && data.code == 200){
+          //设置参数
+          let sysUser = data.sysUser;
+          this.pageData.userDisplay = sysUser.userDisplay;
+        }else{
+          this.pageData.userId = '';
+          this.pageData.userDisplay = '';
+          this.$message.error(data.msg);
+        }
+      })
+    },
+
+    /*检验标签的编码*/
+    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);
+        }
+      })
+    },
+
+    /*保存标签自定义的信息*/
+    saveUserLabelPrinterMethod(){
+      //判断标签内容是否为空
+      let labelNo = this.pageData.labelNo.trim();
+      let userId = this.pageData.userId.trim();
+      let printerName = this.pageData.printerName.trim();
+      if(labelNo == null || labelNo === ''){
+        this.$message.success("标签编号不能为空!");
+        return false;
+      }
+      if(userId == null || userId === ''){
+        this.$message.success("用户ID不能为空!");
+        return false;
+      }
+      if(printerName == null || printerName === ''){
+        this.$message.success("打印机不能为空!");
+        return false;
+      }
+      //判断是否是新增标签自定义
+      if(this.pageData.addFlag === 'Y'){
+        this.insertUserLabelPrinterData();
+      }else{
+        this.updateUserLabelPrinterData();
+      }
+    },
+
+    /*数量失去焦点的事件*/
+    insertUserLabelPrinterData(){
+      insertUserLabelPrinter(this.pageData).then(({data}) => {
+        if(data.code == 200){
+          this.$message.success(data.msg);
+          setTimeout(this.closeDialog(), 2000);
+        }else if(data.code == 201){
+          this.$confirm(data.msg, '提示', {
+            confirmButtonText: this.labels.confirmLabel,
+            cancelButtonText: this.labels.cancelLabel,
+            type: "warning"
+          }).then(() => {
+            //调用存储过程实现
+            this.pageData.checkFlag = 'N';
+            //重新调用当前的方法
+            this.insertUserLabelPrinter();
+          }).catch(() => {
+            this.pageData.checkFlag = 'Y';
+          });
+          //重置标签
+          this.pageData.checkFlag = 'Y';
+        }else{
+          this.$message.error(data.msg);
+        }
+      })
+    },
+
+    /*验证时长的参数*/
+    updateUserLabelPrinterData(){
+      updateUserLabelPrinter(this.pageData).then(({data}) => {
+        if(data.code == 200){
+          this.$message.success(data.msg);
+          setTimeout(this.closeDialog(), 2000);
+        }else{
+          this.$message.error(data.msg);
+        }
+      })
+    },
+
+    /*关闭modal*/
+    closeDialog(){
+      //刷新报工的页面
+      this.$emit('refreshPageTables');
+      //关闭当前的页面
+      this.visible = false;
+    },
+
+    /* 列表方法的回调 */
+    getBaseData(val) {
+      if (this.tagNo === 1099) {
+        //设置参数
+        this.pageData.labelNo = val.ReportID;
+        this.pageData.labelType = val.ReportFamily;
+        this.pageData.labelName = val.Reportfile;
+        this.pageData.labelClass = val.ReportType;
+      }
+    },
+
+    // 获取基础数据列表
+    getBaseList(val) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 1099) {
+          strVal = this.pageData.labelNo;
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+
+    getMultiLanguageList() {
+      //首先查询当前按钮的多语言
+      searchFunctionButtonList(this.queryButton).then(({data}) => {
+        if (data && data.code == 0 ) {
+          this.buttons = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+      //其次查询当前标签的多语言
+      searchFunctionButtonList(this.queryLabel).then(({data}) => {
+        if (data && data.code == 0 ) {
+          this.labels = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+    },
+
+  },
+  components: {
+    Chooselist, /* 选择的组件 */
+  },
+  watch: {
+    pageData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.pageData.userId = this.pageData.userId.trim().toUpperCase();
+        this.pageData.labelNo = this.pageData.labelNo.trim().toUpperCase();
+      }
+    },
+  },
+  created() {
+    // this.factoryList()
+    // this.getLanguageList()
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+
+
+</style>
diff --git a/src/views/modules/labelSetting/customer_label_setting.vue b/src/views/modules/labelSetting/customer_label_setting.vue
index 2dc62e9..3b8409f 100644
--- a/src/views/modules/labelSetting/customer_label_setting.vue
+++ b/src/views/modules/labelSetting/customer_label_setting.vue
@@ -381,8 +381,9 @@ export default {
          labelName: '',
          labelType: '',
          labelClass: '',
-         subLabelFlag: '',
-         parentLabelNo: '',
+         subLabelFlag: 'N',
+         parentLabelNo: '*',
+         customerId: '',
          remark: '',
          addFlag: 'Y'
       };
diff --git a/src/views/modules/labelSetting/label_setting_printer.vue b/src/views/modules/labelSetting/label_setting_printer.vue
index 769b418..c9ce114 100644
--- a/src/views/modules/labelSetting/label_setting_printer.vue
+++ b/src/views/modules/labelSetting/label_setting_printer.vue
@@ -2,12 +2,12 @@
   <div class="customer-css">
    <!--  查询时间和产品  -->
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
+      <el-form-item :label=labels.userId>
+        <el-input v-model="pageData.userId" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label=labels.labelNo>
         <el-input v-model="pageData.labelNo" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label=labels.labelType>
-        <el-input v-model="pageData.labelType" style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label=labels.labelName>
         <el-input v-model="pageData.labelName" style="width: 120px" ></el-input>
       </el-form-item>
@@ -55,7 +55,7 @@
           :label=labels.operationLabel>
           <template slot-scope="scope">
             <a class="customer-a"  @click="editLabelSettingModal(scope.row)">{{ labels.editLabel }}</a>
-            <a class="customer-a"  @click="deleteLabelSettingConfirm(scope.row)">{{ labels.deleteLabel }}</a>
+            <a class="customer-a"  @click="deleteUserLabelConfirm(scope.row)">{{ labels.deleteLabel }}</a>
           </template>
         </el-table-column>
       </el-table>
@@ -71,12 +71,12 @@
 <script>
 
 import {
-  getLabelSettingList,
-  deleteLabelSetting,
-} from '@/api/labelSetting/label_setting.js';
+  getUserLabelPrinters,
+  deleteUserLabelPrinter,
+} from '@/api/labelSetting/label_setting_printer.js';
 
 /*引入組件*/
-import comAddUpdateLabel from "./com_add_update_label";/*新增或者修改的組件*/
+import comAddUpdateLabel from "./com_add_update_user_label_printer";/*新增或者修改的組件*/
 
 /* 动态表头 */
 import {
@@ -100,7 +100,7 @@ import {
   saveSysLanguageList
 } from "@/api/sysLanguage.js";
 
-var functionId = '100008001';
+var functionId = '100008004';
 
 export default {
   data() {
@@ -115,6 +115,7 @@ export default {
       pageData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
+        userId: '',
         labelNo: '',
         labelName: '',
         labelType: '',
@@ -126,87 +127,117 @@ export default {
       columnList: [
         {
           userId: this.$store.state.user.name,
-          functionId: 100008001,
-          serialNumber: '100008001LabelLabelNo',
-          tableId: '100008001Label',
-          tableName: '标签自定义列表',
-          columnProp: 'labelNo',
+          functionId: 100008004,
+          serialNumber: '100008004LabelUserId',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'userId',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '标签编号',
-          columnWidth: 160,
+          columnLabel: '用户ID',
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: ''
-        },
-        {
+        }, {
           userId: this.$store.state.user.name,
-          functionId: 100008001,
-          serialNumber: '100008001LabelLabelType',
-          tableId: '100008001Label',
-          tableName: '标签自定义列表',
-          columnProp: 'labelType',
+          functionId: 100008004,
+          serialNumber: '100008004LabelUserDisplay',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'userDisplay',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '标签类型',
-          columnWidth: 100,
+          columnLabel: '用户名',
+          columnWidth: 95,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: ''
-        },
-        {
+        }, {
           userId: this.$store.state.user.name,
-          functionId: 100008001,
-          serialNumber: '100008001LabelLabelName',
-          tableId: '100008001Label',
-          tableName: '标签自定义列表',
-          columnProp: 'labelName',
+          functionId: 100008004,
+          serialNumber: '100008004LabelLabelName',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'labelNo',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '报表文件名',
-          columnWidth: 220,
+          columnLabel: '标签编号',
+          columnWidth: 95,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: ''
-        },
-        {
+        }, {
           userId: this.$store.state.user.name,
-          functionId: 100008001,
-          serialNumber: '100008001LabelLabelClass',
-          tableId: '100008001Label',
-          tableName: '标签自定义列表',
+          functionId: 100008004,
+          serialNumber: '100008004LabelLabelName',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'labelName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '文件名',
+          columnWidth: 160,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        }, {
+          userId: this.$store.state.user.name,
+          functionId: 100008004,
+          serialNumber: '100008004LabelLabelClass',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
           columnProp: 'labelClass',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '标签种类',
-          columnWidth: 140,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: ''
-        },
-        {
+        }, {
           userId: this.$store.state.user.name,
-          functionId: 100008001,
-          serialNumber: '100008001LabelRemark',
-          tableId: '100008001Label',
-          tableName: '标签自定义列表',
-          columnProp: 'remark',
+          functionId: 100008004,
+          serialNumber: '100008004LabelPrinterName',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'printerName',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '备注',
-          columnWidth: 300,
+          columnLabel: '打印机',
+          columnWidth: 235,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        }, {
+          userId: this.$store.state.user.name,
+          functionId: 100008004,
+          serialNumber: '100008004LabelIpAddress',
+          tableId: '100008004Label',
+          tableName: '标签打印机列表',
+          columnProp: 'ipAddress',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: 'IP地址',
+          columnWidth: 140,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -218,14 +249,14 @@ export default {
       queryTable: {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
-        tableId: '100008001Label',
+        tableId: '100008004Label',
         languageCode: this.$i18n.locale
       },
       // 用户table 查询参数
       queryTableUser: {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
-        tableId: '100008001Label',
+        tableId: '100008004Label',
         status: true,
         languageCode: this.$i18n.locale
       },
@@ -242,6 +273,7 @@ export default {
         objectType: 'button'
       },
       labels: {
+        userId: '用户ID',
         labelNo: '标签编号:',
         labelType: '标签类型:',
         labelName: '报表文件名:',
@@ -273,13 +305,13 @@ export default {
       this.currentRow = {};
       //重置是否查询
       this.pageData.searchFlag = 'Y';
-      this.refreshLabelSettingList();
+      this.refreshUserLabelPrinters();
     },
 
     // 获取当前列表的信息
-    refreshLabelSettingList() {
+    refreshUserLabelPrinters() {
       // 查询当前页面的参数
-      getLabelSettingList(this.pageData).then(({data}) => {
+      getUserLabelPrinters(this.pageData).then(({data}) => {
         // 设置查询数据
         this.labelArrays = data.rows;
       })
@@ -291,11 +323,13 @@ export default {
      let currentData = {
         site: this.$store.state.user.site,
          username: this.$store.state.user.name,
-         labelNo: '*',
+         userId: this.$store.state.user.name,
+         userDisplay: '',
+         labelNo: '',
          labelName: '',
-         labelType: '外箱标签',
-         labelClass: '打印软件',
-         remark: '',
+         labelClass: '',
+         ipAddress: '',
+         printerName: '',
          addFlag: 'Y'
       };
       //打开组件 去做新增业务
@@ -315,13 +349,13 @@ export default {
     },
 
     /*删除标签*/
-    deleteLabelSettingConfirm(row){
+    deleteUserLabelConfirm(row){
       this.$confirm('确定要删除该记录吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteLabelSetting(row).then(({data}) => {
+        deleteUserLabelPrinter(row).then(({data}) => {
           if (data && data.code == 200) {
             this.refreshPageTables();
             this.$message.success(data.msg);
@@ -344,7 +378,7 @@ export default {
       let queryTable = {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
-        tableId: '100008001Label',
+        tableId: '100008004Label',
         languageCode: this.$i18n.locale
       }
       this.$nextTick(() => {
@@ -412,7 +446,7 @@ export default {
   },
   created() {
     // 不查询
-    this.refreshLabelSettingList();
+    this.refreshUserLabelPrinters();
 
 
     // 获取动态表头的信息