task-5339 设备编号问题

src/views/component/device/deviceDialog.vue

@@ -118,14 +118,10 @@
                   <el-col v-if="!hideSysDeviceNo" :span="8">
                     <el-form-item label="设备编号：" prop="sheBeiShiBieH">
                       <template slot="label">
-                        <span>{{
-                          changeDeviceLabel ? '系统编号' : '设备编号'
-                        }}</span>
+                        <span>设备编号</span>
                         <el-tooltip effect="dark" placement="top">
                           <div slot="content"
-                            >{{
-                              changeDeviceLabel ? '系统编号' : '设备编号'
-                            }}由系统自动生成。</div
+                            >设备编号由系统自动生成。</div
                           >
                           <i class="el-icon-question question-icon">：</i>
                         </el-tooltip>
@@ -138,7 +134,7 @@
                       <template slot="label">
                         <span class="required"
                           >{{
-                            hideSysDeviceNo || changeDeviceLabel
+                            hideSysDeviceNo
                               ? '设备编号'
                               : '原设备编号'
                           }}：</span
@@ -1368,7 +1364,6 @@ export default {
         //   { required: true, message: '出厂日期不能为空', trigger: 'blur' }
         // ]
       },
-      changeDeviceLabel: false
     }
   },
   computed: {
@@ -1528,7 +1523,7 @@ export default {
       if (data[0].num > 0) {
         throw new Error(
           `系统当前已经存在此${
-            this.hideSysDeviceNo || this.changeDeviceLabel
+            this.hideSysDeviceNo
               ? '设备编号'
               : '原设备编号'
           },请更换另一个编号!`
@@ -1640,9 +1635,8 @@ export default {
     async init() {
       this.loading = true
       const deviceres = await getSetting('device')
-      this.changeDeviceLabel = deviceres?.changeDeviceLabel || false
       this.showzhuCeYouXiaoQi = deviceres?.showzhuCeYouXiaoQi || false
-      if (this.hideSysDeviceNo || deviceres?.changeDeviceLabel) {
+      if (this.hideSysDeviceNo) {
         this.rules.yuanSheBeiBian[0].message = '设备编号不能为空'
       }
       this.isEdit = !!(this.params && this.params.id)

src/views/component/device/index.vue

@@ -679,13 +679,13 @@ export default {
             },
             {
               prop: '',
-              label: setting?.device?.changeDeviceLabel ? '系统编号' : '设备编号',
+              label: '设备编号',
               fieldType: 'slot',
               slotName: 'nowNumber'
             },
             {
               prop: '',
-              label: setting?.device?.changeDeviceLabel ? '设备编号' : '原设备编号',
+              label: '原设备编号',
               fieldType: 'slot',
               slotName: 'preNumber'
             },
@@ -748,8 +748,8 @@ export default {
             sortable: true,
             width: 130
           },
-          { prop: 'sheBeiShiBieH', label: setting?.device?.changeDeviceLabel ? '系统编号' : '设备编号', sortable: true },
-          { prop: 'yuanSheBeiBian', label: setting?.device?.changeDeviceLabel ? '设备编号' :'原设备编号', sortable: true },
+          { prop: 'sheBeiShiBieH', label: '设备编号', sortable: true },
+          { prop: 'yuanSheBeiBian', label: '原设备编号', sortable: true },
           { prop: 'sheBeiMingCheng', label: '设备名称', sortable: true },
           {
             prop: 'sheBeiLeiXing',
@@ -930,7 +930,6 @@ export default {
       },
       stateList: { 停用: '停用', 报废: '报废', 合格: '合格' },
       hideSysDeviceNo: false,
-      changeDeviceLabel: false,   //显示系统编号还是原设备编号文案
       hidefuJianShang: false,
       hasFuZeRenDianHua: false,
       hasChangJiaLianXiRen: false,
@@ -952,7 +951,6 @@ export default {
     const {
       stateList,
       hideSysDeviceNo,
-      changeDeviceLabel,
       hidefuJianShang,
       tabList,
       hasDeviceRole,