md
This commit is contained in:
parent
a15a0042c3
commit
96762c0bc6
@ -17,46 +17,48 @@
|
|||||||
<el-input v-model="form.shortName" placeholder="请输入简称" />
|
<el-input v-model="form.shortName" placeholder="请输入简称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
|
<el-form-item label="父区域" prop="parentId">
|
||||||
|
<el-input v-model="form.parentId" placeholder="请输入父区域" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
<el-form-item label="代码" prop="code">
|
<el-form-item label="代码" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入代码" />
|
<el-input v-model="form.code" placeholder="请输入代码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
<el-form-item label="类型" prop="regionType">
|
<el-form-item label="国家id" prop="countryId">
|
||||||
<el-input v-model="form.regionType" placeholder="请输入类型" />
|
<el-input v-model="form.countryId" placeholder="请输入国家id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
|
<el-form-item label="国家大区id" prop="countryAreaId">
|
||||||
|
<el-input v-model="form.countryAreaId" placeholder="请输入国家大区id" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="类型" prop="regionType">
|
||||||
|
<el-select v-model="form.regionType" placeholder="请选择类型">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in dict.type.emis_region_level_type"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
<el-form-item label="邮编" prop="zipCode">
|
<el-form-item label="邮编" prop="zipCode">
|
||||||
<el-input v-model="form.zipCode" placeholder="请输入邮编" />
|
<el-input v-model="form.zipCode" placeholder="请输入邮编" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="删除标志(0代表存在" prop="delFlag">
|
|
||||||
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="区域名称" prop="areaName">
|
|
||||||
<el-input v-model="form.areaName" placeholder="请输入区域名称" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="国家代码" prop="countryCode">
|
|
||||||
<el-input v-model="form.countryCode" placeholder="请输入国家代码" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="国家名称" prop="countryName">
|
|
||||||
<el-input v-model="form.countryName" placeholder="请输入国家名称" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<el-form-item label="上级字典">
|
<el-form-item label="上级字典">
|
||||||
<treeselect
|
<treeselect
|
||||||
@ -91,6 +93,7 @@ export default {
|
|||||||
},
|
},
|
||||||
components: { },
|
components: { },
|
||||||
dicts: [
|
dicts: [
|
||||||
|
'emis_region_level_type',
|
||||||
],
|
],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -101,9 +104,6 @@ export default {
|
|||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
id: [
|
|
||||||
{ required: true, message: "id不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
regionName: [
|
regionName: [
|
||||||
{ required: true, message: "区域名称不能为空", trigger: "blur" }
|
{ required: true, message: "区域名称不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
|
|||||||
@ -10,85 +10,15 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="" prop="regionNameEn">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.regionNameEn"
|
|
||||||
placeholder="英文名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="shortName">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.shortName"
|
|
||||||
placeholder="简称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="code">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.code"
|
|
||||||
placeholder="代码"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="regionType">
|
<el-form-item label="" prop="regionType">
|
||||||
<el-input
|
<el-select v-model="queryParams.regionType" placeholder="类型" clearable>
|
||||||
v-model="queryParams.regionType"
|
<el-option
|
||||||
placeholder="类型"
|
v-for="dict in dict.type.emis_region_level_type"
|
||||||
clearable
|
:key="dict.value"
|
||||||
@keyup.enter.native="handleQuery"
|
:label="dict.label"
|
||||||
/>
|
:value="dict.value"
|
||||||
</el-form-item>
|
/>
|
||||||
<el-form-item label="" prop="zipCode">
|
</el-select>
|
||||||
<el-input
|
|
||||||
v-model="queryParams.zipCode"
|
|
||||||
placeholder="邮编"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="remark">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.remark"
|
|
||||||
placeholder="备注"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="delFlag">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.delFlag"
|
|
||||||
placeholder="删除标志(0代表存在"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="areaName">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.areaName"
|
|
||||||
placeholder="区域名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="countryCode">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.countryCode"
|
|
||||||
placeholder="国家代码"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="" prop="countryName">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.countryName"
|
|
||||||
placeholder="国家名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
@ -143,55 +73,23 @@
|
|||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="emisRegionList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="emisRegionList" @selection-change="handleSelectionChange"
|
||||||
|
row-key="id"
|
||||||
|
:default-expand-all="isExpandAll"
|
||||||
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
||||||
|
>
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="序号" align="center" min-width="60">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<span v-text="getIndex(scope.$index)"> </span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<!--
|
|
||||||
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
|
|
||||||
<el-table-column label="结算状态" align="center" prop="settleStatus" min-width="80">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.settleStatus == 0" style="color:red;">
|
|
||||||
<span class="el-tag el-tag--info">未结算</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.settleStatus == 10" style="color:red;">
|
|
||||||
<span class="el-tag">待确认</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.settleStatus == 11" style="color:green;">
|
|
||||||
<span class="el-tag el-tag--success el-tag--light">已确认</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.settleStatus == 20" >
|
|
||||||
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.settleStatus == 21" style="color:green;">
|
|
||||||
<span class="el-tag el-tag--success el-tag--light">已打款</span>
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.settleStatus == 40" style="color:red;">
|
|
||||||
<span class="el-tag el-tag--danger">已拒绝</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<el-table-column label="区域名称" align="center" prop="regionName" min-width="100" />
|
<el-table-column label="区域名称" align="center" prop="regionName" min-width="100" />
|
||||||
<el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" />
|
<el-table-column label="区域编码" align="center" prop="zipCode" min-width="100" />
|
||||||
<el-table-column label="简称" align="center" prop="shortName" min-width="100" />
|
<!-- <el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" /> -->
|
||||||
<el-table-column label="代码" align="center" prop="code" min-width="100" />
|
<!-- <el-table-column label="简称" align="center" prop="shortName" min-width="100" /> -->
|
||||||
<el-table-column label="类型" align="center" prop="regionType" min-width="100" />
|
<el-table-column label="类型" align="center" prop="regionType" min-width="100" >
|
||||||
<el-table-column label="邮编" align="center" prop="zipCode" min-width="100" />
|
<template slot-scope="scope">
|
||||||
<el-table-column label="备注" align="center" prop="remark" min-width="100" />
|
<dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/>
|
||||||
<el-table-column label="删除标志(0代表存在" align="center" prop="delFlag" min-width="100" />
|
</template>
|
||||||
<el-table-column label="区域名称" align="center" prop="areaName" min-width="100" />
|
</el-table-column>
|
||||||
<el-table-column label="国家代码" align="center" prop="countryCode" min-width="100" />
|
|
||||||
<el-table-column label="国家名称" align="center" prop="countryName" min-width="100" />
|
<!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@ -213,16 +111,6 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
|
||||||
v-show="total>0"
|
|
||||||
:total="total"
|
|
||||||
:page-sizes="[20,50,100,300,500,1000,2000,5000]"
|
|
||||||
:page.sync="queryParams.pageNum"
|
|
||||||
:limit.sync="queryParams.pageSize"
|
|
||||||
:page-size="queryParams.pageSize"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- 添加或修改四级省市区镇表对话框 -->
|
<!-- 添加或修改四级省市区镇表对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
|
||||||
<el-row :gutter="0">
|
<el-row :gutter="0">
|
||||||
@ -242,53 +130,48 @@
|
|||||||
<el-input v-model="form.shortName" placeholder="请输入简称" />
|
<el-input v-model="form.shortName" placeholder="请输入简称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
|
<el-form-item label="父区域" prop="parentId">
|
||||||
|
<el-input v-model="form.parentId" placeholder="请输入父区域" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
<el-form-item label="代码" prop="code">
|
<el-form-item label="代码" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入代码" />
|
<el-input v-model="form.code" placeholder="请输入代码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
<el-form-item label="类型" prop="regionType">
|
<el-form-item label="国家id" prop="countryId">
|
||||||
<el-input v-model="form.regionType" placeholder="请输入类型" />
|
<el-input v-model="form.countryId" placeholder="请输入国家id" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="8">
|
||||||
|
<el-form-item label="国家大区id" prop="countryAreaId">
|
||||||
|
<el-input v-model="form.countryAreaId" placeholder="请输入国家大区id" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="类型" prop="regionType">
|
||||||
|
<el-select v-model="form.regionType" placeholder="请选择类型">
|
||||||
|
<el-option
|
||||||
|
v-for="dict in dict.type.emis_region_level_type"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
<el-form-item label="邮编" prop="zipCode">
|
<el-form-item label="邮编" prop="zipCode">
|
||||||
<el-input v-model="form.zipCode" placeholder="请输入邮编" />
|
<el-input v-model="form.zipCode" placeholder="请输入邮编" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="删除标志(0代表存在" prop="delFlag">
|
|
||||||
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="区域名称" prop="areaName">
|
|
||||||
<el-input v-model="form.areaName" placeholder="请输入区域名称" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="国家代码" prop="countryCode">
|
|
||||||
<el-input v-model="form.countryCode" placeholder="请输入国家代码" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="国家名称" prop="countryName">
|
|
||||||
<el-input v-model="form.countryName" placeholder="请输入国家名称" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<el-col :span="24" v-show="moreInputVisible" > </el-col>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-divider content-position="right" @click="handleShowMoreInput" >更多信息[+]</el-divider>
|
|
||||||
</el-col>
|
|
||||||
-->
|
|
||||||
|
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-row>
|
</el-row>
|
||||||
@ -321,6 +204,7 @@ export default {
|
|||||||
name: "emisRegion",
|
name: "emisRegion",
|
||||||
components: { elDateSimplePicker,emisRegionView,emisRegionForm },
|
components: { elDateSimplePicker,emisRegionView,emisRegionForm },
|
||||||
dicts: [
|
dicts: [
|
||||||
|
'emis_region_level_type',
|
||||||
],
|
],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -358,9 +242,9 @@ export default {
|
|||||||
id:null,
|
id:null,
|
||||||
titleView:"",
|
titleView:"",
|
||||||
openView: false,
|
openView: false,
|
||||||
// 国家名称时间范围
|
// 备注时间范围
|
||||||
daterangeCreateTime: [],
|
daterangeCreateTime: [],
|
||||||
// 国家名称时间范围
|
// 备注时间范围
|
||||||
daterangeUpdateTime: [],
|
daterangeUpdateTime: [],
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
@ -369,22 +253,13 @@ export default {
|
|||||||
regionName: null,
|
regionName: null,
|
||||||
regionNameEn: null,
|
regionNameEn: null,
|
||||||
shortName: null,
|
shortName: null,
|
||||||
code: null,
|
|
||||||
regionType: null,
|
regionType: null,
|
||||||
zipCode: null,
|
zipCode: null,
|
||||||
remark: null,
|
|
||||||
delFlag: null,
|
|
||||||
areaName: null,
|
|
||||||
countryCode: null,
|
|
||||||
countryName: null
|
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
id: [
|
|
||||||
{ required: true, message: "id不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
regionName: [
|
regionName: [
|
||||||
{ required: true, message: "区域名称不能为空", trigger: "blur" }
|
{ required: true, message: "区域名称不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
@ -405,17 +280,8 @@ export default {
|
|||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.queryParams.params = {};
|
this.queryParams.params = {};
|
||||||
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
|
|
||||||
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
|
|
||||||
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
|
|
||||||
}
|
|
||||||
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
|
|
||||||
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
|
|
||||||
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
|
|
||||||
}
|
|
||||||
listEmisRegion(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
|
listEmisRegion(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
|
||||||
this.emisRegionList = response.rows;
|
this.emisRegionList = this.handleTree(response.data, "id");
|
||||||
this.total = response.total;
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user