task-5390 task-5339 设备档案-设备编号相关调整

src/views/component/device/deviceDialog.vue

@@ -118,12 +118,12 @@
                   <el-col v-if="!hideSysDeviceNo" :span="8">
                     <el-form-item label="设备编号：" prop="sheBeiShiBieH">
                       <template slot="label">
-                        <span>设备编号</span>
+                        <span>{{changeDeviceLabel ? '系统编号' : '设备编号'}}</span>
                         <el-tooltip
                           effect="dark"
-                          content="设备编号由系统自动生成。"
                           placement="top"
-                        >
+                        > 
+                          <div slot="content">{{changeDeviceLabel ? '系统编号' : '设备编号'}}由系统自动生成。</div>
                           <i class="el-icon-question question-icon">：</i>
                         </el-tooltip>
                       </template>
@@ -135,7 +135,7 @@
                       <template slot="label">
                         <span class="required"
                           >{{
-                            hideSysDeviceNo ? '设备编号' : '原设备编号'
+                            (hideSysDeviceNo || changeDeviceLabel)  ? '设备编号' : '原设备编号'
                           }}：</span
                         >
                       </template>
@@ -1349,7 +1349,8 @@ export default {
         // chuChangRiQi: [
         //   { required: true, message: '出厂日期不能为空', trigger: 'blur' }
         // ]
-      }
+      },
+      changeDeviceLabel: false
     }
   },
   computed: {
@@ -1614,8 +1615,9 @@ export default {
     },
     async init() {
       const deviceres = await getSetting('device')
+      this.changeDeviceLabel = deviceres?.changeDeviceLabel || false
       this.showzhuCeYouXiaoQi = deviceres?.showzhuCeYouXiaoQi || false
-      if (this.hideSysDeviceNo) {
+      if (this.hideSysDeviceNo || deviceres?.changeDeviceLabel) {
         this.rules.yuanSheBeiBian[0].message = '设备编号不能为空'
       }
       this.loading = true

src/views/component/device/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="main-container">
+
     <ibps-container class="page">
       <template>
         <ibps-crud
@@ -678,13 +679,13 @@ export default {
             },
             {
               prop: '',
-              label: '设备编号',
+              label: setting?.device?.changeDeviceLabel ? '系统编号' : '设备编号',
               fieldType: 'slot',
               slotName: 'nowNumber'
             },
             {
               prop: '',
-              label: '原设备编号',
+              label: setting?.device?.changeDeviceLabel ? '设备编号' : '原设备编号',
               fieldType: 'slot',
               slotName: 'preNumber'
             },
@@ -747,8 +748,8 @@ export default {
             sortable: true,
             width: 130
           },
-          { prop: 'sheBeiShiBieH', label: '设备编号', sortable: true },
-          { prop: 'yuanSheBeiBian', label: '原设备编号', sortable: true },
+          { prop: 'sheBeiShiBieH', label: setting?.device?.changeDeviceLabel ? '系统编号' : '设备编号', sortable: true },
+          { prop: 'yuanSheBeiBian', label: setting?.device?.changeDeviceLabel ? '设备编号' :'原设备编号', sortable: true },
           { prop: 'sheBeiMingCheng', label: '设备名称', sortable: true },
           {
             prop: 'sheBeiLeiXing',
@@ -795,7 +796,7 @@ export default {
         bianZhiBuMen: '部门',
         sheBeiMingCheng: '设备名称',
         // sheBeiShiBieH: '设备编号（导入无需填写）',
-        yuanSheBeiBian: '原设备编号（必填，且不可重复）',
+        yuanSheBeiBian: setting?.device?.hideSysDeviceNo ? '设备编号（必填，且不可重复）' : '原设备编号（必填，且不可重复）',
         sheBeiZhuangTa: '设备状态（合格/停用/限用）',
         sheBeiLeiXing: '设备类型（检验系统/通用设备/软件/信息系统）',
         shiFouWeiHu: '是否维护（是/否）',
@@ -837,7 +838,7 @@ export default {
         shiJiShiYongF: '关机时间（时间格式，时分秒）'
       },
       projectColums: {
-        yuanSheBeiBian: '原设备编号*',
+        yuanSheBeiBian: setting?.device?.hideSysDeviceNo ? '设备编号*' : '原设备编号*',
         sheBeiMingCheng: '设备名称*',
         weiHuLeiXing:
           '维护类型*(日保养/周保养/月保养/季度保养/半年保养/年保养/按需保养)',
@@ -855,7 +856,7 @@ export default {
       requiredFieldMap: {
         bianZhiBuMen: '部门',
         sheBeiMingCheng: '设备名称',
-        yuanSheBeiBian: '原设备编号',
+        yuanSheBeiBian: setting?.device?.hideSysDeviceNo ? '设备编号' :'原设备编号',
         sheBeiZhuangTa: '设备状态',
         sheBeiLeiXing: '设备类型',
         shiFouWeiHu: '是否维护',
@@ -898,7 +899,7 @@ export default {
         ziChanYuanZhi: '资产原值(元)'
       },
       maintenanceRequiredFieldMap: {
-        yuanSheBeiBian: '原设备编号',
+        yuanSheBeiBian: setting?.device?.hideSysDeviceNo ? '设备编号' : '原设备编号',
         sheBeiMingCheng: '设备名称',
         weiHuLeiXing: '维护类型',
         weiHuRiQi: '维护日期',
@@ -929,6 +930,7 @@ export default {
       },
       stateList: { 停用: '停用', 报废: '报废', 合格: '合格' },
       hideSysDeviceNo: false,
+      changeDeviceLabel: false,   //显示系统编号还是原设备编号文案
       hidefuJianShang: false,
       hasFuZeRenDianHua: false,
       hasChangJiaLianXiRen: false,
@@ -950,6 +952,7 @@ export default {
     const {
       stateList,
       hideSysDeviceNo,
+      changeDeviceLabel,
       hidefuJianShang,
       tabList,
       hasDeviceRole,
@@ -1552,8 +1555,12 @@ export default {
           '设备维护项目数据' + this.getTimeStamp()
         )
       } else {
-        const attachmentId = 'device_maintainProject'
+        let attachmentId = 'device_maintainProject'
+        if(this.hideSysDeviceNo){
+          attachmentId = 'device_maintainProject_new'
+        }
         const res = await download({ attachmentId })
+       
         // 判断 ArrayBuffer 的大小，主要用于兼容没有文件的情况
         if (res.data?.byteLength === 0) {
           this.xlsx(
@@ -1738,7 +1745,7 @@ export default {
         if (indices.length > 1) {
           return [
             {
-              field: `发现重复的原设备编号：${key} 在第 ${indices.join(
+              field: `发现重复的${this.hideSysDeviceNo ? '设备编号': '原设备编号'}：${key} 在第 ${indices.join(
                 ', '
               )} 行`
             }