md
This commit is contained in:
parent
0e15ecc90e
commit
186d5ba030
@ -7,7 +7,8 @@ ENV = 'development'
|
||||
# 开发环境
|
||||
#VUE_APP_BASE_API = '/dev-api'
|
||||
VUE_APP_PDOMAIN = 'tanex56'
|
||||
VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr'
|
||||
# VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr'
|
||||
VUE_APP_BASE_API = 'http://47.102.220.189:58089/api/bizsvr'
|
||||
|
||||
VUE_APP_WS_HTTP_API = 'http://api.emis.tanex56.com/api/imsvr'
|
||||
VUE_APP_WS_SERVER = 'ws://api.emis.tanex56.com/'
|
||||
|
||||
@ -3,42 +3,27 @@
|
||||
<el-row :gutter="0">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="不计时效名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入不计时效名称" />
|
||||
<el-form-item label="所属国家,可能多个国家,逗号隔开" prop="country">
|
||||
<el-input v-model="form.country" placeholder="请输入所属国家,可能多个国家,逗号隔开" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="不计时效日期" prop="noCalcDay">
|
||||
<el-date-picker clearable
|
||||
v-model="form.noCalcDay"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择不计时效日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="英文名称" prop="nameEn">
|
||||
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="开始日期" prop="beginDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.beginDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择开始日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="结束日期" prop="endDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.endDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!-- <el-form-item label="上级字典">
|
||||
<el-form-item label="上级字典">
|
||||
<treeselect
|
||||
ref="tree"
|
||||
v-model="form.parentId"
|
||||
@ -48,7 +33,7 @@
|
||||
:show-count="true"
|
||||
placeholder="选择上级"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
</el-form-item>
|
||||
|
||||
|
||||
</el-form>
|
||||
@ -82,11 +67,14 @@ export default {
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
name: [
|
||||
{ required: true, message: "不计时效名称不能为空", trigger: "blur" }
|
||||
country: [
|
||||
{ required: true, message: "所属国家,可能多个国家,逗号隔开不能为空", trigger: "blur" }
|
||||
],
|
||||
beginDate: [
|
||||
{ required: true, message: "开始日期不能为空", trigger: "blur" }
|
||||
noCalcDay: [
|
||||
{ required: true, message: "不计时效日期不能为空", trigger: "blur" }
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "启用状态不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
@ -125,11 +113,8 @@ export default {
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
name: null,
|
||||
nameEn: null,
|
||||
country: null,
|
||||
beginDate: null,
|
||||
endDate: null,
|
||||
noCalcDay: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
tenantId: null,
|
||||
|
||||
@ -6,11 +6,8 @@
|
||||
</el-row>
|
||||
<el-descriptions title="基本信息:" class="margin-top" :column="1" border>
|
||||
<el-descriptions-item label="序号">{{ emisNotCalcAging.id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="不计时效名称">{{ emisNotCalcAging.name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="英文名称">{{ emisNotCalcAging.nameEn }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所属国家">{{ emisNotCalcAging.country }}</el-descriptions-item>
|
||||
<el-descriptions-item label="开始日期">{{ emisNotCalcAging.beginDate }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结束日期">{{ emisNotCalcAging.endDate }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所属国家,可能多个国家,逗号隔开">{{ emisNotCalcAging.country }}</el-descriptions-item>
|
||||
<el-descriptions-item label="不计时效日期">{{ emisNotCalcAging.noCalcDay }}</el-descriptions-item>
|
||||
<el-descriptions-item label="启用状态">{{ emisNotCalcAging.status }}</el-descriptions-item>
|
||||
<el-descriptions-item label="备注">{{ emisNotCalcAging.remark }}</el-descriptions-item>
|
||||
<el-descriptions-item label="租户ID">{{ emisNotCalcAging.tenantId }}</el-descriptions-item>
|
||||
|
||||
@ -2,18 +2,26 @@
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
|
||||
<el-form-item label="" prop="name">
|
||||
<el-form-item label="" prop="country">
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="不计时效名称"
|
||||
v-model="queryParams.country"
|
||||
placeholder="所属国家,可能多个国家,逗号隔开"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="nameEn">
|
||||
<el-form-item label="" prop="noCalcDay">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.noCalcDay"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择不计时效日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="remark">
|
||||
<el-input
|
||||
v-model="queryParams.nameEn"
|
||||
placeholder="英文名称"
|
||||
v-model="queryParams.remark"
|
||||
placeholder="备注"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
@ -109,12 +117,10 @@
|
||||
</el-table-column>
|
||||
-->
|
||||
|
||||
<el-table-column label="不计时效名称" align="center" prop="name" min-width="100" />
|
||||
<el-table-column label="英文名称" align="center" prop="nameEn" min-width="100" />
|
||||
<el-table-column label="所属国家" align="center" prop="country" min-width="100" />
|
||||
<el-table-column label="开始日期" align="center" prop="beginDate" min-width="100" />
|
||||
<el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
|
||||
<el-table-column label="所属国家,可能多个国家,逗号隔开" align="center" prop="country" min-width="100" />
|
||||
<el-table-column label="不计时效日期" align="center" prop="noCalcDay" min-width="100" />
|
||||
<el-table-column label="启用状态" align="center" prop="status" 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">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -151,40 +157,25 @@
|
||||
<el-row :gutter="0">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="不计时效名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入不计时效名称" />
|
||||
<el-form-item label="所属国家,可能多个国家,逗号隔开" prop="country">
|
||||
<el-input v-model="form.country" placeholder="请输入所属国家,可能多个国家,逗号隔开" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="不计时效日期" prop="noCalcDay">
|
||||
<el-date-picker clearable
|
||||
v-model="form.noCalcDay"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择不计时效日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="英文名称" prop="nameEn">
|
||||
<el-input v-model="form.nameEn" placeholder="请输入英文名称" />
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="开始日期" prop="beginDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.beginDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择开始日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="结束日期" prop="endDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.endDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!--
|
||||
<el-col :span="24" v-show="moreInputVisible" > </el-col>
|
||||
@ -263,9 +254,7 @@ export default {
|
||||
titleView:"",
|
||||
openView: false,
|
||||
// 备注时间范围
|
||||
daterangeBeginDate: [],
|
||||
// 备注时间范围
|
||||
daterangeEndDate: [],
|
||||
daterangeNoCalcDay: [],
|
||||
// 备注时间范围
|
||||
daterangeCreateTime: [],
|
||||
// 备注时间范围
|
||||
@ -274,19 +263,23 @@ export default {
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
name: null,
|
||||
nameEn: null,
|
||||
country: null,
|
||||
noCalcDay: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
name: [
|
||||
{ required: true, message: "不计时效名称不能为空", trigger: "blur" }
|
||||
country: [
|
||||
{ required: true, message: "所属国家,可能多个国家,逗号隔开不能为空", trigger: "blur" }
|
||||
],
|
||||
beginDate: [
|
||||
{ required: true, message: "开始日期不能为空", trigger: "blur" }
|
||||
noCalcDay: [
|
||||
{ required: true, message: "不计时效日期不能为空", trigger: "blur" }
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "启用状态不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
@ -299,13 +292,9 @@ export default {
|
||||
getList() {
|
||||
this.loading = true;
|
||||
this.queryParams.params = {};
|
||||
if (null != this.daterangeBeginDate && '' != this.daterangeBeginDate) {
|
||||
this.queryParams.params["beginBeginDate"] = this.daterangeBeginDate[0];
|
||||
this.queryParams.params["endBeginDate"] = this.daterangeBeginDate[1];
|
||||
}
|
||||
if (null != this.daterangeEndDate && '' != this.daterangeEndDate) {
|
||||
this.queryParams.params["beginEndDate"] = this.daterangeEndDate[0];
|
||||
this.queryParams.params["endEndDate"] = this.daterangeEndDate[1];
|
||||
if (null != this.daterangeNoCalcDay && '' != this.daterangeNoCalcDay) {
|
||||
this.queryParams.params["beginNoCalcDay"] = this.daterangeNoCalcDay[0];
|
||||
this.queryParams.params["endNoCalcDay"] = this.daterangeNoCalcDay[1];
|
||||
}
|
||||
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
|
||||
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
|
||||
@ -330,11 +319,8 @@ export default {
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
name: null,
|
||||
nameEn: null,
|
||||
country: null,
|
||||
beginDate: null,
|
||||
endDate: null,
|
||||
noCalcDay: null,
|
||||
status: null,
|
||||
remark: null,
|
||||
tenantId: null,
|
||||
@ -454,8 +440,8 @@ export default {
|
||||
if (response.code === 200) {
|
||||
const curList = response.rows
|
||||
import('@/vendor/Export2Excel').then(excel => {
|
||||
const tHeader = ['序号','不计时效名称','英文名称','所属国家','开始日期','结束日期','启用状态','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间',];
|
||||
const filterVal = ['id','name','nameEn','country','beginDate','endDate','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime',];
|
||||
const tHeader = ['序号','所属国家,可能多个国家,逗号隔开','不计时效日期','启用状态','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间',];
|
||||
const filterVal = ['id','country','noCalcDay','status','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime',];
|
||||
const data = this.formatJson(filterVal, curList, response.rows)
|
||||
excel.export_json_to_excel({
|
||||
header: tHeader,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user