Просмотр исходного кода

全局配置对象新增hideSysDeviceNo属性控制系统设备编号的显示与隐藏

luoaoxuan 1 год назад
Родитель
Сommit
c1632430fc
3 измененных файлов с 37 добавлено и 15 удалено
  1. 2 1
      src/utils/query.js
  2. 16 10
      src/views/component/device/deviceDialog.vue
  3. 19 4
      src/views/component/device/index.vue

Разница между файлами не показана из-за своего большого размера
+ 2 - 1
src/utils/query.js


+ 16 - 10
src/views/component/device/deviceDialog.vue

@@ -102,7 +102,7 @@
                                     </el-col>
                                 </el-row>
                                 <el-row :gutter="20">
-                                    <el-col :span="8">
+                                    <el-col v-if="!hideSysDeviceNo" :span="8">
                                         <el-form-item label="设备编号:" prop="sheBeiShiBieH">
                                             <template slot="label">
                                                 <span>设备编号</span>
@@ -116,7 +116,7 @@
                                     <el-col :span="8">
                                         <el-form-item label="原设备编号:" prop="yuanSheBeiBian">
                                             <template slot="label">
-                                                <span class="required">原设备编号:</span>
+                                                <span class="required">{{ hideSysDeviceNo?'设备编号':'原设备编号' }}:</span>
                                             </template>
                                             <el-input v-model="form.yuanSheBeiBian" size="mini" />
                                         </el-form-item>
@@ -733,7 +733,6 @@
 </template>
 
 <script>
-import { getSetting } from '@/utils/query'
 import dayjs from 'dayjs'
 import ibpsUserSelector from '@/business/platform/org/selector'
 import { getequipmentCard, saveEquipmentCard } from '@/api/platform/device/device'
@@ -764,6 +763,16 @@ export default {
             default: function () {
                 return { '停用': '停用', '报废': '报废', '合格': '合格' }
             }
+        },
+        hideSysDeviceNo: {
+            type: Boolean,
+            default: false
+        },
+        tabList: {
+            type: Object,
+            default: function () {
+                return {}
+            }
         }
     },
     data () {
@@ -777,7 +786,6 @@ export default {
                 { label: '维修记录', name: 'six', component: 'RepairRecord', isKeepAlive: true },
                 { label: '停用、报废记录', name: 'seven', component: 'ScrappedRecord', isKeepAlive: true }
             ],
-            tabList: {},
             filter: [{
                 descVal: '1',
                 includeSub: true,
@@ -986,12 +994,7 @@ export default {
         }
     },
 
-    async mounted () {
-        const tabList = await getSetting('device', 'tabList')
-        if (tabList) {
-            console.debug(tabList)
-            this.tabList = tabList
-        }
+    mounted () {
         this.init()
     },
     methods: {
@@ -1219,6 +1222,9 @@ export default {
             })
         },
         async init () {
+            if (this.hideSysDeviceNo) {
+                this.rules.yuanSheBeiBian[0].message = '设备编号不能为空'
+            }
             this.loading = true
             this.isEdit = !!(this.params && this.params.id)
             this.isSheKou = this.deptList[0].positionId === '1166372468122714112' // 判断是否是蛇口医院

+ 19 - 4
src/views/component/device/index.vue

@@ -309,7 +309,7 @@
                 </ibps-crud>
             </template>
         </ibps-container>
-        <DeviceDialog v-if="deviceDialogShow" :params="params" :state-list="stateList" @close="close" />
+        <DeviceDialog v-if="deviceDialogShow" :params="params" :state-list="stateList" :tab-list="tabList" :hide-sys-device-no="hideSysDeviceNo" @close="close" />
         <input id="" ref="file1" type="file" name="" accept=".xlsx,.xls" @change="handleUploadChange1">
         <input id="" ref="file2" type="file" name="" accept=".xlsx,.xls" @change="handleUploadChange2">
 
@@ -621,15 +621,30 @@ export default {
                 '年保养': this.generateRule(12, `每年第`, `个月`),
                 '按需保养': ['/']
             },
-            stateList: { '停用': '停用', '报废': '报废', '合格': '合格' }
+            stateList: { '停用': '停用', '报废': '报废', '合格': '合格' },
+            hideSysDeviceNo: false,
+            tabList: {}
         }
     },
     async mounted () {
-        const stateList = await getSetting('device', 'stateList')
+        const { stateList, hideSysDeviceNo, tabList } = await getSetting('device')
         if (stateList) {
-            console.debug(stateList)
+            console.debug('stateList', stateList)
             this.stateList = stateList
         }
+        if (hideSysDeviceNo) {
+            this.hideSysDeviceNo = hideSysDeviceNo
+            // 列表隐藏设备编号 将原设备编号改为设备编号
+            this.listConfig.columns = this.listConfig.columns.filter(i => i.prop !== 'sheBeiShiBieH')
+            this.listConfig.columns.find(i => i.prop === 'yuanSheBeiBian').label = '设备编号'
+            // 查询条件隐藏设备编号 将原设备编号改为设备编号
+            this.listConfig.searchForm.forms = this.listConfig.searchForm.forms.filter(i => i.slotName !== 'nowNumber')
+            this.listConfig.searchForm.forms.find(i => i.slotName === 'preNumber').label = '设备编号'
+        }
+        if (tabList) {
+            console.debug('tabList', tabList)
+            this.tabList = tabList
+        }
         this.getDatas()
     },
     methods: {

Некоторые файлы не были показаны из-за большого количества измененных файлов