elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

feature
tianqian 3 years ago
parent
8d917c1bce 767e3b4150
commit
259e9e5b57
4 changed files with 59 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/views/modules/shequzhili/event/eventList.vue
  2. 41
      src/views/modules/shequzhili/issue/issueAuditList.vue
  3. 20
      src/views/modules/shequzhili/issue/issueList.vue
  4. 31
      src/views/modules/shequzhili/xiangmu/index.vue

22
src/views/modules/shequzhili/event/eventList.vue
View File

@ -5,12 +5,12 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'80px'">
:label-width="'100px'">
<div>
<el-form-item label="所属网格"
prop="gridId">
<el-select class="item_width_1"
<el-select class="u-item-width-normal"
v-model="formData.gridId"
placeholder="全部"
size="small"
@ -29,7 +29,7 @@
placeholder="请选择"
size="small"
clearable
class="item_width_2">
class="u-item-width-normal">
<el-option v-for="item in qudaoArray"
:key="item.value"
:label="item.label"
@ -40,7 +40,7 @@
<el-form-item label="事件内容"
prop="eventContent">
<el-input v-model="formData.eventContent"
class="item_width_1"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -62,7 +62,7 @@
value:'id'
}"
clearable
class="item_width_2"
class="u-item-width-normal"
@change="handleEventType" />
<!-- <template slot-scope="{ node, data }">
<div @click="cascaderClick(node, data)">
@ -74,7 +74,7 @@
<el-form-item label="报事人"
prop="name">
<el-input v-model="formData.name"
class="item_width_2"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -83,7 +83,7 @@
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_2"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -93,7 +93,7 @@
prop="startTime">
<el-date-picker v-model="formData.startTime"
:picker-options="startPickerOptions"
class="item_width_2"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
@ -103,7 +103,7 @@
<span class="u-data-tag">至</span>
<el-date-picker v-model="formData.endTime"
:picker-options="endPickerOptions"
class="item_width_2 u-data-tag"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
@ -114,7 +114,7 @@
<el-form-item label="状态"
prop="status">
<el-select class="item_width_2"
<el-select class="u-item-width-normal"
v-model="formData.status"
placeholder="全部"
size="small"
@ -841,7 +841,7 @@ export default {
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.m-search {
.item_width_2 {
.u-item-width-normal {
width: 200px;
}
}

41
src/views/modules/shequzhili/issue/issueAuditList.vue
View File

@ -5,12 +5,12 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'">
:label-width="'100px'">
<div>
<el-form-item label="所属组织"
prop="orgId">
<el-cascader class="item_width_2"
<el-cascader class="u-item-width-normal"
ref="myCascader"
size="small"
v-model="agencyIdArray"
@ -24,7 +24,7 @@
<el-form-item label="议题标题"
prop="issueTitle">
<el-input v-model="formData.issueTitle"
class="item_width_2"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -35,7 +35,7 @@
prop="startTime">
<el-date-picker v-model="formData.startTime"
:picker-options="startPickerOptions"
class="item_width_2"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyyMMdd"
@ -45,7 +45,7 @@
<span class="u-data-tag">至</span>
<el-date-picker v-model="formData.endTime"
:picker-options="endPickerOptions"
class="item_width_2 u-data-tag"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyyMMdd"
@ -56,7 +56,7 @@
<el-form-item label="状态"
prop="applyStatus">
<el-select class="item_width_2"
<el-select class="u-item-width-normal"
v-model="formData.applyStatus"
placeholder="全部"
size="small"
@ -69,14 +69,18 @@
</el-select>
</el-form-item>
<el-button style="margin-left:30px"
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left:30px"
size="small"
class="diy-button--search"
type="primary"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
<el-button style="margin-left:10px"
size="small"
class="diy-button--reset"
class="diy-button--white"
@click="resetSearch">重置</el-button>
</el-col>
</el-row>
</div>
</el-form>
</div>
@ -86,15 +90,13 @@
<div class="div_btn">
<el-button @click="handleExport"
class="diy-button--reset"
size="small">导出</el-button>
type="primary"
size="small">导出</el-button>
</div>
<el-table :data="tableData"
border
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
class="table"
class="m-table-item"
style="width: 100%"
:height="maxTableHeight">
<el-table-column label=""
@ -153,7 +155,7 @@
@click="handleAudit(scope.row)"
type="text"
size="small"
class="div-table-button--edit">审核</el-button>
>审核</el-button>
<el-button @click="handleWatch(scope.row)"
type="text"
@ -499,11 +501,10 @@ export default {
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
@import "@/assets/scss/modules/management/list-main.scss";
@import "@/assets/scss/modules/shequzhili/event-info.scss";
@import "@/assets/scss/modules/management/list-main.scss";
.m-search {
.item_width_2 {
.u-item-width-normal {
width: 200px;
}
}

20
src/views/modules/shequzhili/issue/issueList.vue
View File

@ -5,12 +5,12 @@
<el-form :inline="true"
:model="formData"
ref="ref_searchform"
:label-width="'90px'">
:label-width="'100px'">
<div>
<el-form-item label="所属组织"
prop="orgId">
<el-cascader class="item_width_2"
<el-cascader class="u-item-width-normal"
ref="myCascader"
size="small"
v-model="agencyIdArray"
@ -24,7 +24,7 @@
<el-form-item label="议题标题"
prop="issueTitle">
<el-input v-model="formData.issueTitle"
class="item_width_2"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -35,7 +35,7 @@
prop="startTime">
<el-date-picker v-model="formData.startTime"
:picker-options="startPickerOptions"
class="item_width_2"
class="u-item-width-daterange"
size="small"
type="date"
value-format="yyyyMMdd"
@ -45,7 +45,7 @@
<span class="u-data-tag">至</span>
<el-date-picker v-model="formData.endTime"
:picker-options="endPickerOptions"
class="item_width_2 u-data-tag"
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
value-format="yyyyMMdd"
@ -56,7 +56,7 @@
<el-form-item label="状态"
prop="issueStatus">
<el-select class="item_width_2"
<el-select class="u-item-width-normal"
v-model="formData.issueStatus"
placeholder="全部"
size="small"
@ -69,7 +69,9 @@
</el-select>
</el-form-item>
<el-button style="margin-left:30px"
<el-row type="flex" >
<el-col :span="24" align="right">
<el-button style="margin-left:30px"
size="small"
type="primary"
@click="handleSearch">查询</el-button>
@ -77,6 +79,8 @@
size="small"
class="diy-button--white"
@click="resetSearch">重置</el-button>
</el-col>
</el-row>
</div>
</el-form>
</div>
@ -548,7 +552,7 @@ export default {
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.m-search {
.item_width_2 {
.u-item-width-normal {
width: 200px;
}
}

31
src/views/modules/shequzhili/xiangmu/index.vue
View File

@ -2,18 +2,18 @@
<div class="resi-container">
<div class="g-main"
v-show="pageType == 'list'">
<el-card ref="searchCard"
class="search-card">
<div ref="searchCard"
class="m-search">
<el-form ref="searchForm"
:inline="true"
:model="fmData"
:label-width="'100px'"
class="demo-form-inline">
<div>
<el-form-item label="项目标题"
prop="title">
<el-input v-model="fmData.title"
class="resi-cell-input"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
@ -24,16 +24,16 @@
prop="date">
<el-date-picker v-model="fmData.startDate"
size="small"
class="u-item-width-daterange"
type="date"
value-format="yyyy-MM-dd"
style="width: 150px"
placeholder="开始时间">
</el-date-picker>
<span style="margin:0 8px;">至</span>
<span class="u-data-tag">至</span>
<el-date-picker v-model="fmData.endDate"
size="small"
type="date"
style="width: 150px"
class="u-item-width-daterange u-data-tag"
value-format="yyyy-MM-dd"
placeholder="结束时间">
</el-date-picker>
@ -45,8 +45,7 @@
placeholder="请选择"
size="small"
clearable
style="width: 150px"
class="resi-cell-select">
class="u-item-width-normal">
<el-option v-for="item in optionsStatus"
:key="item.value"
:label="item.label"
@ -54,18 +53,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-left: 35px">
<el-button type="primary"
<el-row>
<el-col :span="24" align="right">
<el-button type="primary"
size="small"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--white"
<el-button class="diy-button--white"
size="small"
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
<div class="resi-row-btn">
<el-button v-if="false"

Write Preview
Loading…
Cancel
Save