elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【pc端 - 优化bug】-【】-（魏凯）-2020/07/23

master
weikai 5 years ago
parent
3832beb2cd
commit
7abf193050
12 changed files with 72 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      public/index.html
  2. 14
      src/views/modules/events/issue-change-list.vue
  3. 15
      src/views/modules/events/issue-close-list.vue
  4. 14
      src/views/modules/events/issue-process-list.vue
  5. 12
      src/views/modules/events/issue-reject-list.vue
  6. 8
      src/views/modules/events/issue-review-list.vue
  7. 14
      src/views/modules/events/item-close-list.vue
  8. 14
      src/views/modules/events/item-deal-list.vue
  9. 14
      src/views/modules/events/item-end-list.vue
  10. 17
      src/views/modules/events/item-timeout-list.vue
  11. 2
      src/views/modules/message/mail-template.vue
  12. 4
      src/views/modules/message/sms.vue

2
public/index.html
View File

@ -35,7 +35,7 @@
<!-- 开发环境 --> <!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'localhost:9094/epdc-api' window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
</script> </script>
<% } %> <% } %>
<!-- 集成测试环境 --> <!-- 集成测试环境 -->

14
src/views/modules/events/issue-change-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,7 +15,7 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="议题编号:" prop="issueCode"> <el-form-item label="议题编号" prop="issueCode">
<el-input <el-input
v-model="dataForm.issueCode" v-model="dataForm.issueCode"
placeholder="请输入议题编号" placeholder="请输入议题编号"
@ -23,7 +23,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="来源:"> <el-form-item label="来源">
<el-select v-model="dataForm.source" placeholder="全部" clearable> <el-select v-model="dataForm.source" placeholder="全部" clearable>
<el-option <el-option
v-for="item in sourceOptions" v-for="item in sourceOptions"
@ -33,22 +33,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="议题内容:"> <br>
<el-form-item label="议题内容">
<el-input <el-input
v-model="dataForm.issueContent" v-model="dataForm.issueContent"
placeholder="请输入议题内容" placeholder="请输入议题内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" label-width="70px"> <el-form-item label="提交人" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

15
src/views/modules/events/issue-close-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,14 +15,14 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="议题编号:" prop="issueCode"> <el-form-item label="议题编号" prop="issueCode">
<el-input <el-input
v-model="dataForm.issueCode" v-model="dataForm.issueCode"
placeholder="请输入议题编号" placeholder="请输入议题编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="来源:"> <el-form-item label="来源">
<el-select v-model="dataForm.source" placeholder="全部" clearable> <el-select v-model="dataForm.source" placeholder="全部" clearable>
<el-option <el-option
v-for="item in sourceOptions" v-for="item in sourceOptions"
@ -32,23 +32,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="议题内容:"> <br/>
<el-form-item label="议题内容">
<el-input <el-input
v-model="dataForm.issueContent" v-model="dataForm.issueContent"
placeholder="请输入议题内容" placeholder="请输入议题内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" label-width="70px"> <el-form-item label="提交人" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

14
src/views/modules/events/issue-process-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,14 +15,14 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="议题编号:" prop="issueCode"> <el-form-item label="议题编号" prop="issueCode">
<el-input <el-input
v-model="dataForm.issueCode" v-model="dataForm.issueCode"
placeholder="请输入议题编号" placeholder="请输入议题编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="来源:"> <el-form-item label="来源">
<el-select v-model="dataForm.source" placeholder="全部" clearable> <el-select v-model="dataForm.source" placeholder="全部" clearable>
<el-option <el-option
v-for="item in sourceOptions" v-for="item in sourceOptions"
@ -32,22 +32,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="议题内容:"> <br>
<el-form-item label="议题内容">
<el-input <el-input
v-model="dataForm.issueContent" v-model="dataForm.issueContent"
placeholder="请输入议题内容" placeholder="请输入议题内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" label-width="70px"> <el-form-item label="提交人" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入议题提交人" placeholder="请输入议题提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br/>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

12
src/views/modules/events/issue-reject-list.vue
View File

@ -6,11 +6,11 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()"> @keyup.enter.native="getDataListSearch()">
<div> <div>
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable> <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="来源:" label-width="70px"> <el-form-item label="来源" label-width="70px">
<el-select v-model="dataForm.source" placeholder="全部" clearable> <el-select v-model="dataForm.source" placeholder="全部" clearable>
<el-option <el-option
v-for="item in sourceOptions" v-for="item in sourceOptions"
@ -21,15 +21,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<br/>
<div> <div>
<el-form-item label="议题内容:"> <el-form-item label="议题内容">
<el-input <el-input
v-model="dataForm.eventContent" v-model="dataForm.eventContent"
placeholder="请输入议题内容" placeholder="请输入议题内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" label-width="70px"> <el-form-item label="提交人" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入议题提交人" placeholder="请输入议题提交人"
@ -37,8 +38,9 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</div> </div>
<br/>
<div> <div>
<el-form-item label="时间:" label-width="70px" <el-form-item label="时间" label-width="70px"
prop="startTime"> prop="startTime">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"

8
src/views/modules/events/issue-review-list.vue
View File

@ -5,25 +5,25 @@
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable> <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="议题内容:"> <el-form-item label="议题内容">
<el-input <el-input
v-model="dataForm.eventContent" v-model="dataForm.eventContent"
placeholder="请输入议题内容" placeholder="请输入议题内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:"> <el-form-item label="提交人">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入议题提交人" placeholder="请输入议题提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br/>
<el-form-item label="时间" <el-form-item label="时间"
prop="startTime" label-width="72px"> prop="startTime" label-width="72px">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"

14
src/views/modules/events/item-close-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,36 +15,38 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="项目编号:" prop="itemCode" label-width="100px"> <el-form-item label="项目编号" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.itemCode" v-model="dataForm.itemCode"
placeholder="请输入项目编号" placeholder="请输入项目编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="itemCode"> <el-form-item label="项目内容" prop="itemCode">
<el-input <el-input
v-model="dataForm.itemContent" v-model="dataForm.itemContent"
placeholder="请输入项目内容" placeholder="请输入项目内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" prop="itemCode" label-width="70px"> <br>
<el-form-item label="提交人" prop="itemCode" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人手机号:" prop="itemCode"> <el-form-item label="提交人手机号" prop="itemCode">
<el-input <el-input
v-model="dataForm.mobile" v-model="dataForm.mobile"
placeholder="请输入提交人手机号" placeholder="请输入提交人手机号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

14
src/views/modules/events/item-deal-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,36 +15,38 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="项目编号:" prop="itemCode" label-width="100px"> <el-form-item label="项目编号" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.itemCode" v-model="dataForm.itemCode"
placeholder="请输入项目编号" placeholder="请输入项目编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="itemCode"> <el-form-item label="项目内容" prop="itemCode">
<el-input <el-input
v-model="dataForm.itemContent" v-model="dataForm.itemContent"
placeholder="请输入项目内容" placeholder="请输入项目内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" prop="itemCode" label-width="70px"> <br>
<el-form-item label="提交人" prop="itemCode" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人手机号:" prop="itemCode"> <el-form-item label="提交人手机号" prop="itemCode">
<el-input <el-input
v-model="dataForm.mobile" v-model="dataForm.mobile"
placeholder="请输入提交人手机号" placeholder="请输入提交人手机号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

14
src/views/modules/events/item-end-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,36 +15,38 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="项目编号:" prop="itemCode" label-width="100px"> <el-form-item label="项目编号" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.itemCode" v-model="dataForm.itemCode"
placeholder="请输入项目编号" placeholder="请输入项目编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="itemCode"> <el-form-item label="项目内容" prop="itemCode">
<el-input <el-input
v-model="dataForm.itemContent" v-model="dataForm.itemContent"
placeholder="请输入项目内容" placeholder="请输入项目内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" prop="itemCode" label-width="70px"> <br>
<el-form-item label="提交人" prop="itemCode" label-width="70px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人手机号:" prop="itemCode" > <el-form-item label="提交人手机号" prop="itemCode" >
<el-input <el-input
v-model="dataForm.mobile" v-model="dataForm.mobile"
placeholder="请输入提交人手机号" placeholder="请输入提交人手机号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="时间:" prop="startTime" label-width="70px"> <el-form-item label="时间" prop="startTime" label-width="70px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

17
src/views/modules/events/item-timeout-list.vue
View File

@ -6,7 +6,7 @@
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataListSearch()" @keyup.enter.native="getDataListSearch()"
> >
<el-form-item label="所属机构:" label-width="120px"> <el-form-item label="所属机构" label-width="120px">
<el-cascader <el-cascader
v-model="ids" v-model="ids"
:options="options" :options="options"
@ -15,7 +15,7 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="项目编号:" prop="itemCode"> <el-form-item label="项目编号" prop="itemCode">
<el-input <el-input
v-model="dataForm.itemCode" v-model="dataForm.itemCode"
placeholder="请输入项目编号" placeholder="请输入项目编号"
@ -23,22 +23,22 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="itemCode" label-width="100px"> <el-form-item label="项目内容" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.itemContent" v-model="dataForm.itemContent"
placeholder="请输入项目内容" placeholder="请输入项目内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br>
<el-form-item label="项目状态:" label-width="120px"> <el-form-item label="项目状态" label-width="120px">
<el-select v-model="dataForm.itemState" clearable placeholder="请选择现在项目状态"> <el-select v-model="dataForm.itemState" clearable placeholder="请选择现在项目状态">
<el-option label="处理中" value="0"></el-option> <el-option label="处理中" value="0"></el-option>
<el-option label="已关闭" value="5"></el-option> <el-option label="已关闭" value="5"></el-option>
<el-option label="已结案" value="10"></el-option> <el-option label="已结案" value="10"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提交人:" prop="itemCode" label-width="72px"> <el-form-item label="提交人" prop="itemCode" label-width="72px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入提交人"
@ -46,7 +46,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目统计年月:" prop="itemCode"> <el-form-item label="项目统计年月" prop="itemCode">
<el-date-picker <el-date-picker
v-model="dataForm.totalYearMonth" v-model="dataForm.totalYearMonth"
type="month" type="month"
@ -54,8 +54,9 @@
placeholder="选择月"> placeholder="选择月">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<br>
<div> <div>
<el-form-item label="项目创建时间:" prop="startTime" label-width="120px"> <el-form-item label="项目创建时间" prop="startTime" label-width="120px">
<el-date-picker <el-date-picker
v-model="dataForm.startTime" v-model="dataForm.startTime"
type="date" type="date"

2
src/views/modules/message/mail-template.vue
View File

@ -2,7 +2,7 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-message__mail-template"> <div class="mod-message__mail-template">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="模板名称："> <el-form-item label="模板名称">
<el-input v-model="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input> <el-input v-model="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

4
src/views/modules/message/sms.vue
View File

@ -2,10 +2,10 @@
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never" class="aui-card--fill">
<div class="mod-message__sms"> <div class="mod-message__sms">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch ()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch ()">
<el-form-item label="手机号:"> <el-form-item label="手机号">
<el-input v-model="dataForm.mobile" :placeholder="$t('sms.mobile')" clearable></el-input> <el-input v-model="dataForm.mobile" :placeholder="$t('sms.mobile')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态 :"> <el-form-item label="状态">
<el-select v-model="dataForm.status" :placeholder="$t('sms.status')" clearable> <el-select v-model="dataForm.status" :placeholder="$t('sms.status')" clearable>
<el-option :label="$t('sms.status1')" :value="1"></el-option> <el-option :label="$t('sms.status1')" :value="1"></el-option>
<el-option :label="$t('sms.status0')" :value="0"></el-option> <el-option :label="$t('sms.status0')" :value="0"></el-option>

Write Preview
Loading…
Cancel
Save