shenqilong пре 9 месеци
родитељ
комит
72885694ce

+ 3 - 2
src/views/business/onlineForm/config.vue

@@ -40,7 +40,7 @@
                         <el-form-item label="部门分组:" prop="bu_men_fen_zu_">
                             <ibps-custom-dialog
                                 v-model="form.bu_men_fen_zu_"
-                                template-key="sbbqdhk"
+                                :template-key="config?'gwzzdhkrcwh':'sbbqdhk'"
                                 :multiple="false"
                                 :disabled="readonly"
                                 type="dialog"
@@ -251,8 +251,9 @@ export default {
         }
     },
     data () {
-        const { userId, position, level } = this.$store.getters
+        const { userId, position, level, setting } = this.$store.getters
         return {
+            config: setting?.postJob?.allocation || false,
             userId,
             position,
             level: level.second || level.first,

+ 5 - 3
src/views/business/​scheduleManage/components/config.vue

@@ -237,7 +237,7 @@
                         {{ btn.label }}
                     </el-button>
                 </div>
-               
+
             <el-table
                 ref="ruleTable"
                 :data="formData.scheduleRule"
@@ -311,8 +311,9 @@ export default {
         }
     },
     data () {
-        const { isSuper, userList = [], deptList = [] } = this.$store.getters || {}
+        const { isSuper, userList = [], deptList = [], setting } = this.$store.getters || {}
         return {
+            config: setting?.postJob?.allocation || false,
             isSuper,
             userList,
             deptList,
@@ -399,8 +400,9 @@ export default {
         getPositionLis () {
             const { first, second } = this.$store.getters.level || {}
             // const sql = `select suo_shu_bu_men_ as dept, wei_hu_gang_wei_ as positionName, id_ as positionId from t_sbwhgwpzb where di_dian_ = '${second || first}'`
+            // const sql = `select bian_zhi_bu_men_ as dept, gang_wei_ming_che as positionName, id_ as positionId from t_dyzzb where gang_wei_lei_xing = '日常维护' and di_dian_ = '${second || first}'`
             this.$common.request('query', {
-                key: 'getPositionList',
+                key: this.config ? 'gwzzzha' : 'getPositionList',
                 params: [second || first]
             }).then(res => {
                 this.positionList = res.variables.data || []

+ 4 - 3
src/views/component/device/deviceDialog.vue

@@ -488,7 +488,7 @@
                                                             <ibps-custom-dialog
                                                                 v-model="form.weiHuFangShi"
                                                                 size="mini"
-                                                                template-key="sbbqdhk"
+                                                                :template-key="config?'gwzzdhkrcwh':'sbbqdhk'"
                                                                 multiple
                                                                 :disabled="readonly"
                                                                 type="dialog"
@@ -863,8 +863,9 @@ export default {
         }
     },
     data () {
-        const { userId, position, level, deptList } = this.$store.getters
+        const { userId, position, level, deptList, setting } = this.$store.getters
         return {
+            config: setting?.postJob?.allocation || false,
             tabItems: [
                 { label: '维护项目', name: 'two', ref: 'MaintenanceRef', data: 'maintenanceItemPoList', component: 'Maintenance', isKeepAlive: false },
                 { label: '附属设备及配件', name: 'three', ref: 'MoreDevicesRef', data: 'accessoriesDevicePoList', component: 'MoreDevices', isKeepAlive: false },
@@ -872,7 +873,7 @@ export default {
                 { label: '校准记录', name: 'five', component: 'CalibrationCheckRecord', isKeepAlive: true },
                 { label: '维修记录', name: 'six', component: 'RepairRecord', isKeepAlive: true },
                 { label: '停用、报废记录', name: 'seven', component: 'ScrappedRecord', isKeepAlive: true },
-                { label: '检验系统校准确认记录', name: 'eight', component: 'ConfirmationRecord', isKeepAlive: true },
+                { label: '检验系统校准确认记录', name: 'eight', component: 'ConfirmationRecord', isKeepAlive: true }
                 // 同步与深圳三院分支,后端暂未同步对应接口,不开放
                 // { label: '性能验证记录', name: 'nine', component: 'PvRecord', isKeepAlive: true }
             ],

+ 8 - 6
src/views/component/device/index.vue

@@ -54,7 +54,7 @@
                         <ibps-custom-dialog
                             v-model="row.weiHuFangShi"
                             size="mini"
-                            template-key="sbbqdhk"
+                            :template-key="config?'gwzzdhkrcwh':'sbbqdhk'"
                             multiple
                             :disabled="true"
                             type="dialog"
@@ -330,7 +330,7 @@
                         <ibps-custom-dialog
                             v-model="search.deviceClass"
                             size="mini"
-                            template-key="sbbqdhk"
+                            :template-key="config?'gwzzdhkrcwh':'sbbqdhk'"
                             multiple
                             :disabled="false"
                             type="dialog"
@@ -426,8 +426,10 @@ export default {
     },
     mixins: [FixHeight],
     data () {
-        const { userId, level = {}, position } = this.$store.getters || {}
+        const { userId, level = {}, position, setting } = this.$store.getters || {}
+
         return {
+            config: setting?.postJob?.allocation || false,
             filter: [{
                 descVal: '1',
                 includeSub: true,
@@ -519,7 +521,7 @@ export default {
                     { key: 'customPrint', label: '打印标签', icon: 'ibps-icon-cog', type: 'warning' },
                     { key: 'customExport', label: '导出数据', icon: 'ibps-icon-sign-in', type: 'primary' },
                     { key: 'customImport', label: '导入数据', icon: 'ibps-icon-sign-in', type: 'primary' },
-                    { key: 'customSetting', label: '岗位/分组配置', icon: 'ibps-icon-cogs', type: 'info' },
+                    // { key: 'customSetting', label: '岗位/分组配置', icon: 'ibps-icon-cogs', type: 'info' },
                     { key: 'customRemove', label: '删除', icon: 'ibps-icon-close', type: 'danger', hidden: () => { return !this.hasRole } }
                 ],
                 // 查询条件
@@ -1077,7 +1079,7 @@ export default {
             // const supplierSql = `select id_, gong_ying_shang_m from t_gysxxb where di_dian_ = '${second || first}'` // 供应商信息
             const { first, second } = this.$store.getters.level || {}
             const { variables: { data: deviceGroupData }} = await this.$common.request('query', {
-                key: 'getPositionList',
+                key: this.config ? 'gwzzzha' : 'getPositionList',
                 params: [second || first]
             })
             const { variables: { data: gysData }} = await this.$common.request('query', {
@@ -1572,7 +1574,7 @@ export default {
             Promise.all([
                 this.$common.request('query', { key: 'getRoomData', params: [currentPosition] }),
                 this.$common.request('query', { key: 'getSupplierList', params: [currentPosition] }),
-                this.$common.request('query', { key: 'getPositionList', params: [currentPosition] })]).then(async ([res1, res2, res3]) => {
+                this.$common.request('query', { key: this.config ? 'gwzzzha' : 'getPositionList', params: [currentPosition] })]).then(async ([res1, res2, res3]) => {
                 const { data: positionList = [] } = res1.variables || {}
                 const { data: supplierList = [] } = res2.variables || {}
                 const { data: deviceGroupList = [] } = res3.variables || {}

+ 3 - 2
src/views/component/formTemplate/index.vue

@@ -41,7 +41,7 @@
                                     <ibps-custom-dialog
                                         v-model="form.bu_men_fen_zu_"
                                         size="mini"
-                                        template-key="gwfzdhk"
+                                        :template-key="config?'gwzzdhkrcwh':'gwfzdhk'"
                                         store="id"
                                         :multiple="false"
                                         :dynamic-params="{
@@ -243,8 +243,9 @@ export default {
         }
     },
     data () {
-        const { userId, position, level, mainPosition } = this.$store.getters
+        const { userId, position, level, mainPosition, setting } = this.$store.getters
         return {
+            config: setting?.postJob?.allocation || false,
             filter: [{
                 descVal: '1',
                 includeSub: true,

+ 7 - 2
src/views/system/fasc/facilityEnvConfig.vue

@@ -434,7 +434,8 @@ export default {
                 }
             },
             subIdList: [],
-            isFirstLieBiao: true
+            isFirstLieBiao: true,
+            settig: false
         }
     },
     computed: {
@@ -509,9 +510,13 @@ export default {
     },
     async mounted () {
         const config = await getSetting('facilityEnv', 'typeList')
+        const settig = await getSetting('postJob', 'allocation')
         if (this.$utils.isNotEmpty(config)) {
             this.config = config
         }
+        if (this.$utils.isNotEmpty(settig)) {
+            this.settig = settig
+        }
         this.init()
         if (this.isEdit) {
             this.loadData()
@@ -528,7 +533,7 @@ export default {
             const { first, second } = this.$store.getters.level || {}
             // const sql = `select * from t_sbwhgwpzb where di_dian_='${second || first}'`
             this.$common.request('query', {
-                key: 'getPositionList',
+                key: this.settig ? 'gwzzzha' : 'getPositionList',
                 params: [second || first]
             }).then(res => {
                 const { data = [] } = res.variables || {}