task2033表单模板分类设置功能开发

src/business/platform/cat/type/tree.vue

@@ -134,6 +134,20 @@ export default {
                 if (this.hasPermission) {
                     this.treeData = this.treeData.filter(i => i.isShow !== '1')
                 }
+                // 按照分类过滤
+                const routeName = this.$route.name
+                const routeMap = { 'jssllb': '体系分类', 'ywtxyxjl': '模板分类' }
+                this.treeData = this.treeData.filter(i => {
+                    const authorityName = JSON.parse(i.authorityName)
+                    if (authorityName) {
+                        if (authorityName.fenLei) {
+                            return authorityName.fenLei === routeMap[routeName] || authorityName.fenLei === '通用'
+                        } else {
+                            return true
+                        }
+                    }
+                    return true
+                })
                 this.$emit('treeData', response.data)
             })
         },

src/views/platform/cat/type/edit.vue

@@ -174,6 +174,14 @@
                     </el-radio-group>
                     <span v-else>{{ zouXiang[type.authorityObject.shenHeZouXiang] }}</span>
                 </el-form-item>
+
+                <el-form-item v-show="categoryKey==='FLOW_TYPE'" label="分类类型：" prop="authorityObject.fenLei">
+                    <el-radio-group v-model="type.authorityObject.fenLei" :disabled="readonly">
+                        <el-radio label="通用">通用</el-radio>
+                        <el-radio label="体系分类">体系分类</el-radio>
+                        <el-radio label="模板分类">模板分类</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             </el-form>
         </ibps-container>
     </div>
@@ -242,7 +250,8 @@ export default {
                     chaYue: '',
                     buMen: '',
                     shenCha: '',
-                    shenHeZouXiang: ''
+                    shenHeZouXiang: '',
+                    fenLei: '通用'
                 }
             },
             toolbars: [

src/views/platform/cat/type/manage.vue

@@ -180,21 +180,30 @@ export default {
         loadCategoryData () {
             this.loading = true
             let whereParams = {}
+            const allRequests = []
             if (this.$router.currentRoute.fullPath === '/zlgl/wjkzgl/wjjflsz') {
                 this.categoryKey = 'FILE_TYPE'
-                whereParams = {
-                    parameters: [
-                        {
-                            key: 'Q^category_key_^SL',
-                            value: 'FILE_TYPE'
-                        }
-                    ]
-                }
+                const keys = ['FILE_TYPE', 'FLOW_TYPE']
+                keys.forEach(item => {
+                    whereParams = {
+                        parameters: [
+                            {
+                                key: 'Q^category_key_^SL',
+                                value: item
+                            }
+                        ]
+                    }
+                    allRequests.push(queryPageList(whereParams))
+                })
             } else {
                 this.categoryKey = 'FLOW_TYPE'
+                allRequests.push(queryPageList(whereParams))
             }
-            queryPageList(whereParams).then(response => {
-                this.categoryOptions = response.data.dataResult
+            Promise.all(allRequests).then(responses => {
+                this.categoryOptions = []
+                responses.forEach(response => {
+                    this.categoryOptions.push(...response.data.dataResult)
+                })
                 this.loading = false
             }).catch(() => {
                 this.loading = false

src/views/system/fasc/facilityEnvConfig.vue

@@ -181,7 +181,7 @@
                                     <el-input-number v-model="form.humidityMin" size="mini" controls-position="right" :min="-100" :max="form.humidityMax" :step="1" />
                                     至
                                     <el-input-number v-model="form.humidityMax" size="mini" controls-position="right" :min="form.humidityMin" :max="100" :step="1" />
-                                    (%)
+                                    (℃)
                                 </el-form-item>
                             </el-col>
                         </el-row>

src/views/system/fasc/fecDialog.vue

@@ -110,7 +110,7 @@
                                 <el-input-number v-model="form.humidityMin" size="mini" controls-position="right" :min="-100" :max="form.humidityMax" :step="1" />
                                 至
                                 <el-input-number v-model="form.humidityMax" size="mini" controls-position="right" :min="form.humidityMin" :max="100" :step="1" />
-                                (%)
+                                (℃)
                             </el-form-item>
                         </el-col>
                     </el-row>