elink-star
/
epmet-work-pc
13
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

V1.0
dai 3 years ago
parent
79ccefe518 65d61a717e
commit
7ce4c30ac9
4 changed files with 41 additions and 21 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. 2
      src/assets/scss/buttonstyle.scss
  2. 13
      src/views/modules/communityService/commonDemand/detailForm.vue
  3. 15
      src/views/modules/communityService/commonDemand/index.vue
  4. 32
      src/views/modules/communityService/policy/personListItem.vue

2
src/assets/scss/buttonstyle.scss
View File

@ -94,7 +94,7 @@
}
//白色
.diy-button--white {
font-size: 14px !important;
font-size: 12px !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0056d6 !important;

13
src/views/modules/communityService/commonDemand/detailForm.vue
View File

@ -100,9 +100,12 @@
</div>
<div class="div-btn">
<el-button size="small" @click="handleCancle">关 闭</el-button>
</div>
<el-row type="flex" justify="right">
<el-col :span="24" align="right">
<el-button size="small" @click="handleCancle" style="margin-right:16px;">关 闭</el-button>
</el-col>
</el-row>
<el-dialog
v-if="showPersonList"
:visible.sync="showPersonList"
@ -374,4 +377,10 @@
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
.info-prop{
margin-top: 29px;
}
.scroll-h{
padding: 0 90px !important;
}
</style>

15
src/views/modules/communityService/commonDemand/index.vue
View File

@ -9,9 +9,10 @@
<el-form-item prop="serviceType"
label="服务类别"
>
<el-select class="u-item-width-normal"
<el-select class="u-item-width-daterange"
v-model.trim="formData.serviceTypeLevel1Id"
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in serviceTypesLevel1"
@click.native="handleChangeServiceTypeLevel1"
@ -22,9 +23,10 @@
</el-select>
</el-form-item>
<el-form-item prop="serviceType">
<el-select class="u-item-width-normal"
<el-select class="u-item-width-daterange"
v-model.trim="formData.serviceTypeLevel2Id"
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in serviceTypesLevel2"
@click.native=""
@ -72,8 +74,9 @@
<el-form-item label="服务组织"
prop="serviceOrgType">
<el-select v-model="formData.serviceOrgType"
class="u-item-width-normal"
class="u-item-width-daterange"
placeholder="请选择"
size="small"
clearable
@change="handleServiceChange('add', $event)">
<el-option v-for="item in serviceOptions"
@ -83,9 +86,10 @@
</el-option>
</el-select>
<el-select v-model="formData.serviceOrgId"
class="u-item-width-normal u-data-tag"
class="u-item-width-daterange u-data-tag"
filterable
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in serviceOptiondList"
:key="item.value"
@ -134,7 +138,8 @@
type="primary "
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
type="primary"
is-plain
class="diy-button--white el-button--default"
size="small"
@click="resetSearch">重置</el-button>
</el-col>

32
src/views/modules/communityService/policy/personListItem.vue
View File

@ -9,9 +9,10 @@
<div>
<el-form-item label="所属组织"
prop="orgId">
<el-cascader class="customer_cascader"
<el-cascader
ref="myCascader"
size="small"
class="u-item-width-normal"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
@ -27,7 +28,7 @@
placeholder="小区"
size="small"
clearable
class="item_width_2"
class="u-item-width-communitycascader"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
@ -42,7 +43,7 @@
:disabled="!this.formData.neighborHoodId"
size="small"
clearable
class="item_width_2 item_width_2-middle item_width_2"
class="u-item-width-buildcascader"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
@ -57,7 +58,7 @@
size="small"
:disabled="!this.formData.buildingId"
clearable
class="item_width_2 item_width_2-middle item_width_2"
class="u-item-width-buildcascader"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
@ -72,7 +73,7 @@
:disabled="!this.formData.unitId"
size="small"
clearable
class="item_width_2 item_width_2-middle item_width_2">
class="u-item-width-buildcascader">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
@ -87,7 +88,7 @@
prop="name">
<el-input v-model="formData.name"
size="small"
class="item_width_2"
class="u-item-width-normal"
clearable
placeholder="请输入姓名">
</el-input>
@ -97,7 +98,7 @@
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="item_width_2"
class="u-item-width-normal"
clearable
placeholder="请输入手机号">
</el-input>
@ -108,24 +109,28 @@
prop="mobile">
<el-input v-model="formData.idCard"
size="small"
class="item_width_2"
class="u-item-width-normal"
clearable
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-button style="margin-left:30px"
<el-row justify="right u-bto10">
<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"
size="small"
class="diy-button--reset"
class="el-button--default diy-button--white"
@click="resetSearch">重置</el-button>
<el-button style="margin-left:10px"
class="diy-button--add"
size="small"
type="primary"
@click="handleExport">导出</el-button>
</el-col>
</el-row>
</div>
</el-form>
</div>
@ -137,7 +142,6 @@
border
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column type="selection"
width="55"></el-table-column>
@ -587,6 +591,8 @@ export default {
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/list-main.scss";
.g-main {
width: 100%;

Write Preview
Loading…
Cancel
Save