Merge branch '17025' of http://119.23.210.103:3000/wy/lh_firm_former into 17025

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

@@ -125,19 +125,19 @@ export default {
         loadTreeData () {
             findTreeData({ categoryKey: this.categoryKey }).then(response => {
                 this.treeData = response.data || []
-                if (this.hasPermission) {
-                    const data = response.data || []
-                    // this.treeData = this.treeData.filter(i => i.isShow !== '1')
-                    // 处理isShow,父级节点不显示子节点都不显示
-                    const noData = data.filter(item => item.isShow === '1')
-                    const noIdList = noData.map((obj, index) => { return obj.id }).join(',').split(',')
-                    const tree = data.filter(item => item.isShow !== '1' && !noIdList.includes(item.parentId))
-                    for (const item of tree) {
-                        item.authorityName = item.authorityName || '{"chaYue":"","buMen":"","shenCha":"","shenHeZouXiang":"","fenLei":""}'
-                        item.authorityObject = item.authorityObject || JSON.parse(item.authorityName)
-                    }
-                    this.treeData = tree
+                // if (this.hasPermission) {
+                const data = response.data || []
+                // this.treeData = this.treeData.filter(i => i.isShow !== '1')
+                // 处理isShow,父级节点不显示子节点都不显示
+                const noData = data.filter(item => item.isShow === '1')
+                const noIdList = noData.map((obj, index) => { return obj.id }).join(',').split(',')
+                const tree = data.filter(item => item.isShow !== '1' && !noIdList.includes(item.parentId))
+                for (const item of tree) {
+                    item.authorityName = item.authorityName || '{"chaYue":"","buMen":"","shenCha":"","shenHeZouXiang":"","fenLei":""}'
+                    item.authorityObject = item.authorityObject || JSON.parse(item.authorityName)
                 }
+                this.treeData = tree
+                // }
                 // 按照分类过滤
                 const routeName = this.$route.name
                 console.log(routeName)

src/business/platform/org/employee/panel.vue

@@ -2,7 +2,6 @@
     <ibps-layout ref="layout" style="width: 99%;">
         <div v-if="showTree" slot="west" :style="{width:width+'px'}" class="ibps-employee-selector-tree">
             <div ref="searchForm" class="ibps-tree-search-form">
-                {{ partyTypeOptions }}
                 <el-select
                     v-model="partyType"
                     :disabled="currentOrgIdValue===''?false:$store.getters.isSuper?false:!isUseScope"

src/views/component/device/deviceDialog.vue

@@ -361,6 +361,21 @@
                                                         </el-form-item>
                                                     </el-col>
                                                 </el-row>
+                                                <el-row>
+                                                    <el-col>
+                                                        <el-form-item label="是否期间核查：">
+                                                            <el-select v-model="form.shiFouHeCha" placeholder="请选择" size="mini" style="width:100%">
+                                                                <el-option
+                                                                    v-for="item in ['是','否']"
+                                                                    :key="item"
+                                                                    :label="item"
+                                                                    :value="item"
+                                                                />
+                                                            </el-select>
+
+                                                        </el-form-item>
+                                                    </el-col>
+                                                </el-row>
                                                 <el-row>
                                                     <el-col>
                                                         <el-form-item label="核查日期：">
@@ -872,7 +887,8 @@ export default {
                 jianDingXiao: '', // 检定/校准参数
                 xiuZhengZhiXiu: '', // 修正值
                 zuiDaYunCha: '', // U/精确度/最大允差
-                shiWuShuoMing: '' // 校准机构
+                shiWuShuoMing: '', // 校准机构
+                shiFouHeCha: ''// 是否期间核查
 
             },
             rules: {
@@ -1255,6 +1271,7 @@ export default {
                 this.form.shiFouXiaoZhun = '是'
                 this.form.jianKongYiJu = '否'
                 this.form.shiFouWeiHu = '是'
+                this.form.shiFouHeCha = '是'
             }
             this.loading = false
         }

src/views/platform/bpmn/bpmInstHis/oldFilesUploadList.vue

@@ -354,10 +354,10 @@ export default {
                 const where = idwhere
                     ? this.guanJian
                         ? idwhere +
-                          ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%')`
+                          ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%' or fen_lei_ like '%${this.guanJian}%'))`
                         : idwhere
                     : this.guanJian
-                        ? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%'`
+                        ? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%' or fen_lei_ like '%${this.guanJian}%'`
                         : ''
                 const sql =
                     `select jl.*,file.file_name_,file.ext_,ee.name_ as ry_name  FROM t_ywyxjlb jl