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

Merge branch 'release/epdc' of http://121.42.41.42:7070/r/esua-epdc-admin into release/epdc

epdc-admin-dangqun
zhaoyongnian 3 years ago
parent
162839369c 228079033a
commit
5406d29180
12 changed files with 47 additions and 39 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. 1
      .gitignore
  2. 4
      src/views/modules/events/issue-change-list.vue
  3. 4
      src/views/modules/events/issue-close-list.vue
  4. 4
      src/views/modules/events/issue-process-list.vue
  5. 4
      src/views/modules/events/item-close-list.vue
  6. 17
      src/views/modules/events/item-deal-detail-view.vue
  7. 6
      src/views/modules/events/item-deal-list.vue
  8. 4
      src/views/modules/events/item-end-list.vue
  9. 28
      src/views/modules/events/item-reject-deal-detail-view.vue
  10. 6
      src/views/modules/events/item-reject-deal-list.vue
  11. 4
      src/views/modules/events/item-timeout-list.vue
  12. 4
      src/views/modules/events/itemfusingdelay-list.vue

1
.gitignore
View File

@ -17,3 +17,4 @@ epdc-admin
shibei-admin shibei-admin
epdc-admin-hlpt epdc-admin-hlpt
.idea/ .idea/
public/index.html

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

@ -138,7 +138,7 @@
></el-table-column> ></el-table-column>
<el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center" <el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column <!-- <el-table-column
prop="participateNum" prop="participateNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -172,7 +172,7 @@
width="100" width="100"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

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

@ -139,7 +139,7 @@
></el-table-column> ></el-table-column>
<el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center" <el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column <!-- <el-table-column
prop="participateNum" prop="participateNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -173,7 +173,7 @@
width="100" width="100"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

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

@ -138,7 +138,7 @@
></el-table-column> ></el-table-column>
<el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center" <el-table-column show-overflow-tooltip width="120px" prop="groupName" label="来源" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column <!-- <el-table-column
prop="participateNum" prop="participateNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -172,7 +172,7 @@
header-align="center" header-align="center"
width="100" width="100"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

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

@ -141,7 +141,7 @@
min-width="200" min-width="200"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
prop="participantsNum" prop="participantsNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -175,7 +175,7 @@
header-align="center" header-align="center"
width="100" width="100"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

17
src/views/modules/events/item-deal-detail-view.vue
View File

@ -5,7 +5,7 @@
<div class="project-detail-tip">项目详情</div> <div class="project-detail-tip">项目详情</div>
<el-form label-position="right" <el-form label-position="right"
class="projectDetail" class="projectDetail"
label-width="120px"> label-width="140px">
<el-form-item label="项目内容:" <el-form-item label="项目内容:"
prop="eventContent"> prop="eventContent">
<div>{{dataForm.itemContent}}</div> <div>{{dataForm.itemContent}}</div>
@ -31,11 +31,11 @@
prop="distributeTime"> prop="distributeTime">
<div>{{dataForm.distributeTime}}</div> <div>{{dataForm.distributeTime}}</div>
</el-form-item> </el-form-item>
<el-form-item label="上报人:" <el-form-item label="联系人姓名:"
prop="nickName"> prop="nickName">
<div>{{dataForm.nickName}}</div> <div>{{dataForm.nickName}}</div>
</el-form-item> </el-form-item>
<el-form-item label="电话:" <el-form-item label="上报人电话:"
prop="mobile"> prop="mobile">
<div>{{dataForm.mobile}}</div> <div>{{dataForm.mobile}}</div>
</el-form-item> </el-form-item>
@ -1202,18 +1202,21 @@ export default {
<style lang="scss"> <style lang="scss">
.projectDetail{ .projectDetail{
.el-form-item:nth-child(3){ .el-form-item{
margin-bottom: 0px;
}
.el-form-item:nth-child(1){
.el-form-item__label{ .el-form-item__label{
width: 120px; width: 120px;
padding-left: 48px; padding-left: 54px;
text-align: left !important; text-align: left !important;
} }
} }
.el-form-item:nth-child(4){ .el-form-item:nth-child(2){
.el-form-item__label{ .el-form-item__label{
width: 120px; width: 120px;
padding-left: 48px; padding-left: 54px;
text-align: left !important; text-align: left !important;
} }
} }

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

@ -35,10 +35,10 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br> <br>
<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.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入联系人"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -127,7 +127,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"

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

@ -139,7 +139,7 @@
min-width="200" min-width="200"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
prop="participantsNum" prop="participantsNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -180,7 +180,7 @@
header-align="center" header-align="center"
width="120" width="120"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

28
src/views/modules/events/item-reject-deal-detail-view.vue
View File

@ -4,8 +4,8 @@
<div class="project-detail"> <div class="project-detail">
<div class="project-detail-tip">项目详情</div> <div class="project-detail-tip">项目详情</div>
<el-form label-position="right" <el-form label-position="right"
class="projectDetail" class="projectDetail1"
label-width="120px"> label-width="140px">
<el-form-item label="项目内容:" <el-form-item label="项目内容:"
prop="eventContent"> prop="eventContent">
<div>{{dataForm.itemContent}}</div> <div>{{dataForm.itemContent}}</div>
@ -31,11 +31,11 @@
prop="distributeTime"> prop="distributeTime">
<div>{{dataForm.distributeTime}}</div> <div>{{dataForm.distributeTime}}</div>
</el-form-item> </el-form-item>
<el-form-item label="上报人:" <el-form-item label="联系人姓名:"
prop="nickName"> prop="nickName">
<div>{{dataForm.nickName}}</div> <div>{{dataForm.nickName}}</div>
</el-form-item> </el-form-item>
<el-form-item label="电话:" <el-form-item label="上报人姓名:"
prop="mobile"> prop="mobile">
<div>{{dataForm.mobile}}</div> <div>{{dataForm.mobile}}</div>
</el-form-item> </el-form-item>
@ -124,7 +124,7 @@
v-model="dataForm.handlerDeptIdRule" v-model="dataForm.handlerDeptIdRule"
:options="options" :options="options"
:props="{ multiple: false, checkStrictly: true }" :props="{ multiple: false, checkStrictly: true }"
@change="changeHandle" @change="changeHandle"
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
@ -713,7 +713,7 @@ export default {
var data = res.data var data = res.data
this.getSelectedNode(data, data) this.getSelectedNode(data, data)
this.categoryOptions = data this.categoryOptions = data
this.disabledCategory = false this.disabledCategory = false
}) })
.catch(() => {}) .catch(() => {})
@ -1243,19 +1243,23 @@ export default {
</style> </style>
<style lang="scss"> <style lang="scss">
.projectDetail{ .projectDetail1{
.el-form-item:nth-child(3){
.el-form-item{
margin-bottom: 0px;
}
.el-form-item:nth-child(1){
.el-form-item__label{ .el-form-item__label{
width: 120px; width: 120px;
padding-left: 48px; padding-left: 53px;
text-align: left !important; text-align: left !important;
} }
} }
.el-form-item:nth-child(4){ .el-form-item:nth-child(2){
.el-form-item__label{ .el-form-item__label{
width: 120px; width: 120px;
padding-left: 48px; padding-left: 53px;
text-align: left !important; text-align: left !important;
} }
} }
@ -1263,7 +1267,7 @@ export default {
} }
.operation{ .operation{
.el-form-item{ .el-form-item{
margin-bottom: 10px; // margin-bottom: 10px;
} }
} }
.project-handle { .project-handle {

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

@ -35,10 +35,10 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br> <br>
<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.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入联系人"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -127,7 +127,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"

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

@ -131,7 +131,7 @@
:formatter="itemStatus" :formatter="itemStatus"
width="120" width="120"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column <!-- <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="提交人"
header-align="center" header-align="center"
@ -173,7 +173,7 @@
header-align="center" header-align="center"
width="100" width="100"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:itemout:deal')" <el-button v-if="$hasPermission('events:itemout:deal')"

4
src/views/modules/events/itemfusingdelay-list.vue
View File

@ -147,7 +147,7 @@
min-width="200" min-width="200"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
prop="participantsNum" prop="participantsNum"
label="参与人数" label="参与人数"
header-align="center" header-align="center"
@ -181,7 +181,7 @@
header-align="center" header-align="center"
width="100" width="100"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
:label="$t('handle')" :label="$t('handle')"
fixed="right" fixed="right"

Write Preview
Loading…
Cancel
Save