Merge branch 'main' of http://121.41.2.71:3000/ykx/jy-safe-app
This commit is contained in:
commit
efb8c736e3
@ -42,7 +42,8 @@
|
||||
<view class="sub-form" style="padding-bottom: 100px;">
|
||||
<view class="sub-form-wrap">
|
||||
<view class="sub-form-btns">
|
||||
<view class="sub-form-btn" @click="handleAdd" v-if='tableKey==1'>
|
||||
<!-- v-if='tableKey==1' -->
|
||||
<view class="sub-form-btn" @click="handleAdd">
|
||||
<u-icon class="icon" name="plus-circle" color="#3c9cff" size="21"></u-icon>
|
||||
<u--text type="primary" text="新增人员"></u--text>
|
||||
</view>
|
||||
@ -408,7 +409,7 @@
|
||||
const json = initFilter(this.ORG_ID, "", "NAME")
|
||||
extendInclude(json, "Nav_Person.Nav_Post")
|
||||
extendRule(json, 'ENABLE_STATUS', 1, '0')
|
||||
extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo').User.DEPARTMENT_ID)
|
||||
// extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo').User.DEPARTMENT_ID)
|
||||
if (val !== 'init') {
|
||||
const tempGroup = initFilterGroup(false);
|
||||
extendGroupRule(tempGroup, 'NAME', 9, val)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user