ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 细节调整

Browse Source
This commit is contained in:
ky_yusj
2021-05-21 17:45:09 +08:00
parent c8530039eb
commit 5943b42620
6 changed files with 41 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Web/src/pages/business/house/houseCode/index.vue
View File

@@ -8,60 +8,33 @@
<container>
<br />
<a-card :bordered="false">
<yo-table
:columns="columns"
:load-data="loadData"
@query="onQuery"
@resetQuery="onResetQuery"
ref="table"
>
<yo-table :columns="columns" :load-data="loadData" @query="onQuery" @resetQuery="onResetQuery" ref="table">
<Auth auth="authCode:page" slot="query">
<!-- 此处添加查询表单控件 -->
<!-- ... -->
<a-form-model-item>
<a-cascader
:display-render="({labels}) => labels.join(' - ')"
:field-names="{ label: 'name', value: 'code', children: 'children' }"
:options="options.areaTree"
class="w-400"
expand-trigger="hover"
placeholder="请选择所在区域"
v-model="query.areaCode"
/>
<a-cascader :display-render="({ labels }) => labels.join(' - ')" :field-names="{ label: 'name', value: 'code', children: 'children' }" :options="options.areaTree" class="w-400" expand-trigger="hover" placeholder="请选择所在区域" v-model="query.areaCode" />
</a-form-model-item>
<a-form-model-item label="编号">
<a-input-number
:formatter="(number) => `000${number}`.slice(-3)"
:max="999"
:min="1"
:precision="0"
:step="1"
placeholder="请输入房屋序号"
v-model="query.no"
/>
<a-input-number :formatter="(number) => number && `000${number}`.slice(-3)" :max="999" :min="1" :precision="0" :step="1" placeholder="请输入房屋序号" v-model="query.no" />
</a-form-model-item>
<a-form-model-item label="房屋性质">
<a-radio-group @change="onChangeQueryType" button-style="solid" v-model="query.type">
<a-radio-button :value="0">全部</a-radio-button>
<a-radio-button
:key="item.code"
:value="+item.code"
v-for="item in codes.type"
>{{ item.value }}</a-radio-button>
<a-radio-button :key="item.code" :value="+item.code" v-for="item in codes.type">{{ item.value }}</a-radio-button>
</a-radio-group>
</a-form-model-item>
<a-form-model-item label="行业" v-if="query.type == 2">
<a-select class="w-150" placeholder="请选择行业" v-model="query.industry">
<a-select-option
:key="item.code"
:value="+item.code"
v-for="item in codes.industry"
>{{ item.value }}</a-select-option>
<a-select-option :key="item.code" :value="+item.code" v-for="item in codes.industry">{{ item.value }}</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="地址">
<a-input placeholder="请输入地址" v-model="query.address" />
</a-form-model-item>
<a-form-model-item label="房屋唯一编码">
<a-input placeholder="请输入房屋唯一编码" v-model="query.houseCode" />
</a-form-model-item>
</Auth>
<Auth auth="authCode:add" slot="operator">
<a-button @click="onOpen()" icon="plus">新增房屋编码</a-button>
@@ -69,7 +42,7 @@
<!-- 格式化字段内容 -->
<!-- ... -->
<template slot="houseCode" slot-scope="text, record">
<span>{{`${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`}}</span>
<span>{{ `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}` }}</span>
</template>
<template slot="type" slot-scope="text, record">
<span>{{ bindCodeValue(text, 'type') + (text === 2 ? `(${bindCodeValue(record.industry, 'industry')})` : '') }}</span>
@@ -228,12 +201,10 @@ export default {
* 如果不需要获取相应的字典数据,此方法内容可空
*/
onLoadCodes() {
this.$api
.sysDictTypeDropDowns({ code: ['dic_house_type', 'dic_house_industry'] })
.then(({ data: { dic_house_type, dic_house_industry } }) => {
this.codes.type = dic_house_type;
this.codes.industry = dic_house_industry;
});
this.$api.sysDictTypeDropDowns({ code: ['dic_house_type', 'dic_house_industry'] }).then(({ data: { dic_house_type, dic_house_industry } }) => {
this.codes.type = dic_house_type;
this.codes.industry = dic_house_industry;
});
},
/**
@@ -256,9 +227,7 @@ export default {
this.openContentWindow({
key: record ? record.id : 'business/house/houseCode/form',
title: record ? '修改房屋编码' : '新增房屋编码',
subTitle:
record &&
`${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`,
subTitle: record && `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${`000${record.no}`.slice(-3)}`,
path: 'business/house/houseCode/form',
param: {
record,

14
Web/src/pages/system/area/form.vue
View File

@@ -13,11 +13,7 @@
<!-- ... -->
<a-form-model-item label="参数类型" prop="levelType">
<a-select :disabled="exist" placeholder="请选择参数类型" v-model="form.levelType">
<a-select-option
:key="i"
:value="item.code"
v-for="(item, i) in levelType"
>{{ item.value }}</a-select-option>
<a-select-option :key="i" :value="item.code" v-for="(item, i) in levelType">{{ item.value }}</a-select-option>
<a-icon slot="suffixIcon" type="lock" v-if="exist" />
</a-select>
</a-form-model-item>
@@ -33,13 +29,7 @@
<a-input placeholder="请输入显示编码" v-model="form.adCode" />
</a-form-model-item>
<a-form-model-item label="排序" prop="sort">
<a-input-number
:max="1000"
:min="0"
class="w-100-p"
placeholder="请输入排序"
v-model="form.sort"
/>
<a-input-number :min="0" class="w-100-p" placeholder="请输入排序" v-model="form.sort" />
</a-form-model-item>
<a-form-model-item label="备注" prop="note">
<a-textarea :rows="4" placeholder="请输入备注" v-model="form.note"></a-textarea>

39
Web/src/pages/system/org/form.vue
View File

@@ -11,6 +11,9 @@
<div class="yo-form-group">
<!-- 表单控件 -->
<!-- ... -->
<a-form-model-item label="所属区域" prop="areaCode">
<a-cascader :field-names="{ label: 'name', value: 'code', children: 'children' }" :options="areaData" change-on-select placeholder="请选择所属区域" v-model="form.areaCode" @change="formAreaCodeChange" />
</a-form-model-item>
<a-form-model-item label="机构名称" prop="name">
<a-input placeholder="请输入机构名称" v-model="form.name" />
</a-form-model-item>
@@ -19,39 +22,14 @@
</a-form-model-item>
<a-form-model-item label="机构类型" prop="type">
<a-select placeholder="请选择机构类型" v-model="form.type">
<a-select-option
:key="item.code"
:value="+item.code"
v-for="item in codes.type"
>{{ item.value }}</a-select-option>
<a-select-option :key="item.code" :value="+item.code" v-for="item in codes.type">{{ item.value }}</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="上级机构" prop="pid">
<a-tree-select
:dropdown-style="{ maxHeight: '300px', overflow: 'auto' }"
:tree-data="orgData"
placeholder="请选择上级机构"
tree-default-expand-all
v-model="form.pid"
/>
</a-form-model-item>
<a-form-model-item label="所属区域" prop="areaCode">
<a-cascader
:field-names="{ label: 'name', value: 'code', children: 'children' }"
:options="areaData"
change-on-select
placeholder="请选择所属区域"
v-model="form.areaCode"
/>
<a-tree-select :dropdown-style="{ maxHeight: '300px', overflow: 'auto' }" :tree-data="orgData" placeholder="请选择上级机构" tree-default-expand-all v-model="form.pid" />
</a-form-model-item>
<a-form-model-item label="排序" prop="sort">
<a-input-number
:max="1000"
:min="0"
class="w-100-p"
placeholder="请输入排序"
v-model="form.sort"
/>
<a-input-number :max="1000" :min="0" class="w-100-p" placeholder="请输入排序" v-model="form.sort" />
</a-form-model-item>
<a-form-model-item label="备注" prop="remark">
<a-textarea placeholder="请输入备注" v-model="form.remark" />
@@ -241,6 +219,11 @@ export default {
this.areaData = data;
});
},
formAreaCodeChange(val, selectedOptions) {
var elem = selectedOptions[selectedOptions.length - 1];
this.form.name = elem.name;
this.form.code = elem.code;
},
},
};
</script>

27
Web/src/pages/system/org/index.vue
View File

@@ -5,22 +5,11 @@
2021-04-30
Lufthafen
-->
<yo-tree-layout
:load-data="loadTreeData"
@select="onSelect"
default-expanded-keys
ref="tree-layout"
>
<yo-tree-layout :load-data="loadTreeData" @select="onSelect" default-expanded-keys ref="tree-layout">
<container>
<br />
<a-card :bordered="false">
<yo-table
:columns="columns"
:load-data="loadData"
@query="onQuery"
@resetQuery="onResetQuery"
ref="table"
>
<yo-table :columns="columns" :load-data="loadData" @query="onQuery" @resetQuery="onResetQuery" ref="table">
<Auth auth="sysOrg:page" slot="query">
<!-- 此处添加查询表单控件 -->
<!-- ... -->
@@ -60,12 +49,7 @@
</yo-modal-form>
<!-- 编辑表单 -->
<yo-modal-form
:action="$api[api.edit]"
:title="'编辑' + name"
@ok="onReloadData"
ref="edit-form"
>
<yo-modal-form :action="$api[api.edit]" :title="'编辑' + name" @ok="onReloadData" ref="edit-form">
<form-body />
</yo-modal-form>
</container>
@@ -158,6 +142,10 @@ export default {
* 传给yo-table以示意数据接口及其参数和返回的数据结构
*/
loadData(params) {
if (!params.sortField) {
params.sortField = 'code';
params.sortOrder = 'ascend';
}
return this.$api[api.page]({
...params,
...this.query,
@@ -194,6 +182,7 @@ export default {
*/
onReloadData() {
this.$refs.table.onReloadData();
this.$refs['tree-layout'].onReloadData();
},
/**