From 3a8ec110322d483ff38b6d47093ea3f655032cdf Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 19 Aug 2025 14:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0=E8=BD=AF?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A5=E5=8F=8A=E6=8A=A5=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_add_update_customer_label.vue         |  4 +--
 .../com_add_update_default_label.vue          |  4 +--
 .../com_add_update_user_label_printer.vue     | 14 --------
 .../labelSetting/customer_label_setting.vue   | 34 -------------------
 .../labelSetting/default_label_setting.vue    |  4 +--
 .../labelSetting/label_setting_printer.vue    | 34 -------------------
 6 files changed, 6 insertions(+), 88 deletions(-)

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 1bbcc83..b3d4f5f 100644
--- a/src/views/modules/labelSetting/com_add_update_customer_label.vue
+++ b/src/views/modules/labelSetting/com_add_update_customer_label.vue
@@ -33,7 +33,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <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;" >
@@ -46,7 +46,7 @@
                       <el-input v-model="pageData.labelName" disabled style="width: 120px;" ></el-input>
                     </el-form-item>
                   </el-col>
-                </el-row>
+                </el-row>-->
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" style="margin-top: -8px;">
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 63a3138..4248354 100644
--- a/src/views/modules/labelSetting/com_add_update_default_label.vue
+++ b/src/views/modules/labelSetting/com_add_update_default_label.vue
@@ -19,7 +19,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <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;" >
@@ -32,7 +32,7 @@
                       <el-input v-model="pageData.labelName" disabled style="width: 120px;" ></el-input>
                     </el-form-item>
                   </el-col>
-                </el-row>
+                </el-row>-->
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" style="margin-top: -8px;">
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
index 3dee906..1c2160e 100644
--- a/src/views/modules/labelSetting/com_add_update_user_label_printer.vue
+++ b/src/views/modules/labelSetting/com_add_update_user_label_printer.vue
@@ -25,20 +25,6 @@
               <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>
diff --git a/src/views/modules/labelSetting/customer_label_setting.vue b/src/views/modules/labelSetting/customer_label_setting.vue
index d6fab79..19f95b8 100644
--- a/src/views/modules/labelSetting/customer_label_setting.vue
+++ b/src/views/modules/labelSetting/customer_label_setting.vue
@@ -196,40 +196,6 @@ export default {
           sortLv: 0,
           status: true,
           fixed: ''
-        }, {
-          userId: this.$store.state.user.name,
-          functionId: 100008003,
-          serialNumber: '100008003LabelLabelName',
-          tableId: '100008003Label',
-          tableName: '客户标签自定义列表',
-          columnProp: 'labelName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '报表文件名',
-          columnWidth: 220,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: true,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        }, {
-          userId: this.$store.state.user.name,
-          functionId: 100008003,
-          serialNumber: '100008003LabelLabelClass',
-          tableId: '100008003Label',
-          tableName: '客户标签自定义列表',
-          columnProp: 'labelClass',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '标签种类',
-          columnWidth: 140,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
         }, {
           userId: this.$store.state.user.name,
           functionId: 100008003,
diff --git a/src/views/modules/labelSetting/default_label_setting.vue b/src/views/modules/labelSetting/default_label_setting.vue
index 8046e41..9321a93 100644
--- a/src/views/modules/labelSetting/default_label_setting.vue
+++ b/src/views/modules/labelSetting/default_label_setting.vue
@@ -158,7 +158,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: ''
-        }, {
+       /* }, {
           userId: this.$store.state.user.name,
           functionId: 100008002,
           serialNumber: '100008002LabelLabelClass',
@@ -191,7 +191,7 @@ export default {
           columnSortable: true,
           sortLv: 0,
           status: true,
-          fixed: ''
+          fixed: ''*/
         }, {
           userId: this.$store.state.user.name,
           functionId: 100008002,
diff --git a/src/views/modules/labelSetting/label_setting_printer.vue b/src/views/modules/labelSetting/label_setting_printer.vue
index fdbee18..94f01b8 100644
--- a/src/views/modules/labelSetting/label_setting_printer.vue
+++ b/src/views/modules/labelSetting/label_setting_printer.vue
@@ -176,40 +176,6 @@ export default {
           sortLv: 0,
           status: true,
           fixed: ''
-        }, {
-          userId: this.$store.state.user.name,
-          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: 100,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
         }, {
           userId: this.$store.state.user.name,
           functionId: 100008004,