master
lion 1 year ago
parent f13802704c
commit 3880b9f02a

@ -56,9 +56,9 @@
</div> </div>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<div> <div>
<el-checkbox :disabled="stateObj.auth_type==1 || is_search" @change="changeAllArea" v-model="allArea"></el-checkbox> <el-checkbox :disabled="is_search" @change="changeAllArea" v-model="allArea"></el-checkbox>
</div> </div>
<el-select :disabled="stateObj.auth_type==1 || is_search" style="width:100%" v-model="form.area_ids" multiple <el-select :disabled="is_search" style="width:100%" v-model="form.area_ids" multiple
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
@ -79,7 +79,7 @@
</div> </div>
</div> </div>
</template> </template>
<template v-slot:catalog_id> <template v-slot:catalog_id v-if="false">
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label" style="font-weight: bold"> <div class="xy-table-item-label" style="font-weight: bold">
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>所属目录 <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>所属目录

@ -12,7 +12,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div v-if="stateObj.is_admin">
<el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域"> <el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域">
<el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
@ -272,7 +272,7 @@
}, { }, {
"key": "area_id", "key": "area_id",
"op": "eq", "op": "eq",
"value": this.select.area_id ? this.select.area_id : '' "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
}, { }, {
"key": "year", "key": "year",
"op": "eq", "op": "eq",

@ -12,7 +12,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div v-if="stateObj.is_admin">
<el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域"> <el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域">
<el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
@ -215,7 +215,8 @@
const res = await index({ const res = await index({
page_size: this.select.page_size, page_size: this.select.page_size,
page: this.select.page, page: this.select.page,
table_name: this.select.table_name, table_name: this.select.table_name,
is_auth: this.stateObj.is_admin ? '' : 1,
json_data_fields: ['area_id', 'business_id'], json_data_fields: ['area_id', 'business_id'],
filter: [{ filter: [{
"key": "business_id", "key": "business_id",
@ -224,7 +225,7 @@
},{ },{
"key": "area_id", "key": "area_id",
"op": "eq", "op": "eq",
"value": this.select.area_id ? this.select.area_id : '' "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
}, { }, {
"key": "year", "key": "year",
"op": "eq", "op": "eq",

@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath * Detail: https://cli.vuejs.org/config/#publicpath
*/ */
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test', outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
assetsDir: 'static', assetsDir: 'static',
css: { css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项 loaderOptions: { // 向 CSS 相关的 loader 传递选项

Loading…
Cancel
Save