elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

111

master
jiangyy 3 years ago
parent
b3ba52988a
commit
57a7a1855f
5 changed files with 55 additions and 74 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. 26
      src/assets/scss/modules/visual/a_customize.scss
  2. 57
      src/views/modules/communityService/measure/info.vue
  3. 28
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  4. 10
      src/views/modules/shequzhili/event/cpts/event-info.vue
  5. 8
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

26
src/assets/scss/modules/visual/a_customize.scss
View File

@ -91,4 +91,30 @@
} }
} }
} }
.visiual-form-pickerrange{
::v-deep .el-date-editor {
width: 360px;
position: relative;
background: #06186d;
border: 1px solid #1a64cc;
.el-range-input {
color: #fff;
background: #06186d;
margin-left: 10px;
}
.el-range-separator {
color: #fff;
}
.el-range__icon {
position: absolute;
right: 5px;
// float: right;
}
.el-input__prefix {
left: unset;
right: 5px;
}
}
}

57
src/views/modules/communityService/measure/info.vue
View File

@ -3,6 +3,7 @@
<el-card :class="{'box-card':source==='visiual'}"> <el-card :class="{'box-card':source==='visiual'}">
<el-form label-width="120px" <el-form label-width="120px"
:model="form" :model="form"
class="div_form"
:rules="rules" :rules="rules"
ref="ruleForm"> ref="ruleForm">
<el-form-item v-if="formType!=='add'" <el-form-item v-if="formType!=='add'"
@ -48,13 +49,13 @@
<el-input v-if="disabled" <el-input v-if="disabled"
v-model="form.gridName" v-model="form.gridName"
:disabled="disabled" :disabled="disabled"
class="input-width"></el-input> class="item_width_1"></el-input>
<!-- <span >{{ form.gridName }}</span> --> <!-- <span >{{ form.gridName }}</span> -->
<el-select v-else <el-select v-else
v-model="form.gridId" v-model="form.gridId"
filterable filterable
placeholder="请选择" placeholder="请选择"
class="input-width" class="item_width_1"
clearable clearable
:disabled="disabled" :disabled="disabled"
@change="handleGridChange"> @change="handleGridChange">
@ -74,14 +75,14 @@
<el-input v-if="disabled" <el-input v-if="disabled"
v-model="form.categoryName" v-model="form.categoryName"
:disabled="disabled" :disabled="disabled"
class="input-width" class="item_width_1"
clearable></el-input> clearable></el-input>
<el-cascader v-else <el-cascader v-else
v-model="form.categoryCodeArr" v-model="form.categoryCodeArr"
:options="demandOptions" :options="demandOptions"
:disabled="disabled" :disabled="disabled"
clearable clearable
class="input-width" class="item_width_1"
@change="handleCateSlect"></el-cascader> @change="handleCateSlect"></el-cascader>
</div> </div>
</el-form-item> </el-form-item>
@ -93,11 +94,11 @@
<el-input v-if="disabled" <el-input v-if="disabled"
v-model="form.reportTypeName" v-model="form.reportTypeName"
:disabled="disabled" :disabled="disabled"
class="input-width"></el-input> class="item_width_1"></el-input>
<el-select v-else <el-select v-else
v-model="form.reportType" v-model="form.reportType"
filterable filterable
class="input-width" class="item_width_1"
placeholder="请选择" placeholder="请选择"
clearable clearable
:disabled="disabled"> :disabled="disabled">
@ -117,7 +118,7 @@
<el-input v-model="form.reportUserName" <el-input v-model="form.reportUserName"
:disabled="disabled" :disabled="disabled"
placeholder="请输入" placeholder="请输入"
class="input-width" class="item_width_1"
clearable></el-input> clearable></el-input>
</div> </div>
</el-form-item> </el-form-item>
@ -129,7 +130,7 @@
<el-input v-model="form.reportUserMobile" <el-input v-model="form.reportUserMobile"
:disabled="disabled" :disabled="disabled"
placeholder="请输入" placeholder="请输入"
class="input-width" class="item_width_1"
maxlength="11" maxlength="11"
clearable></el-input> clearable></el-input>
</div> </div>
@ -141,7 +142,7 @@
<div :class="{'visiual-form':source==='visiual'}"> <div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="form.reportTime" <el-date-picker v-model="form.reportTime"
type="datetime" type="datetime"
class="input-width" class="item_width_1"
clearable clearable
:disabled="disabled" :disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -157,10 +158,10 @@
<el-input v-if="disabled" <el-input v-if="disabled"
v-model="form.demandUserName" v-model="form.demandUserName"
:disabled="disabled" :disabled="disabled"
class="input-width"></el-input> class="item_width_1"></el-input>
<el-select v-else <el-select v-else
v-model="selectDemandUser" v-model="selectDemandUser"
class="input-width" class="item_width_1"
filterable filterable
:disabled="disabled" :disabled="disabled"
placeholder="请选择" placeholder="请选择"
@ -216,11 +217,11 @@
<template v-if="disabled && addType !== 'appoint'"> <template v-if="disabled && addType !== 'appoint'">
<el-input v-model="form.serviceShowName" <el-input v-model="form.serviceShowName"
:disabled="disabled" :disabled="disabled"
class="input-width"></el-input> class="item_width_1"></el-input>
</template> </template>
<template v-else> <template v-else>
<el-select v-model="form.serviceType" <el-select v-model="form.serviceType"
class="input-width-small" class="item_width_1-small"
placeholder="请选择" placeholder="请选择"
clearable clearable
:disabled="disabled && addType !== 'appoint'" :disabled="disabled && addType !== 'appoint'"
@ -233,7 +234,7 @@
</el-select> </el-select>
- -
<el-select v-model="form.serverId" <el-select v-model="form.serverId"
class="input-width-middle" class="item_width_1-middle"
filterable filterable
placeholder="请选择" placeholder="请选择"
clearable clearable
@ -263,7 +264,7 @@
<div :class="{'visiual-form':source==='visiual'}"> <div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="finishServiceTime" <el-date-picker v-model="finishServiceTime"
class="input-width-min" class="item_width_1-min"
clearable clearable
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"
type="datetimerange" type="datetimerange"
@ -313,9 +314,9 @@
:class="{'form-item':source==='visiual'}" :class="{'form-item':source==='visiual'}"
prop="serviceStartTime"> prop="serviceStartTime">
<div :class="{'visiual-form':source==='visiual'}"> <div :class="{'visiual-form-pickerrange':source==='visiual'}">
<el-date-picker v-model="finishServiceTime" <el-date-picker v-model="finishServiceTime"
class="input-width-min" class="item_width_1-min"
clearable clearable
:disabled="disabled && addType != 'finish'" :disabled="disabled && addType != 'finish'"
type="datetimerange" type="datetimerange"
@ -329,18 +330,8 @@
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
<!-- <div class="resi-btns">
<el-button size="small"
@click="handlerClose">关闭</el-button>
<el-button v-if="addType != 'look'"
type="primary"
size="small"
:loading="btnLoading"
@click="handleSubmit">提交</el-button>
</div> -->
<div v-if="source==='manage'" <div class="div-btn ">
class="div-btn ">
<el-button size="small" <el-button size="small"
@click="handlerClose">关闭</el-button> @click="handlerClose">关闭</el-button>
<el-button v-if="addType != 'look'" <el-button v-if="addType != 'look'"
@ -349,14 +340,7 @@
size="small" size="small"
@click="handleSubmit">提交</el-button> @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else
class="div-btn">
<div class="item_btn"
@click="handlerClose()">关闭</div>
<div v-if="addType != 'look'"
class="item_btn mgl"
@click="handleSubmit()">提交</div>
</div>
</el-card> </el-card>
</div> </div>
@ -941,6 +925,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss"; @import "@/assets/scss/buttonstyle.scss";
@import "@/assets/scss/modules/management/form-main.scss";
@import "@/assets/scss/modules/visual/a_customize.scss"; @import "@/assets/scss/modules/visual/a_customize.scss";
@import "@/assets/scss/modules/shequzhili/event-info.scss"; @import "@/assets/scss/modules/shequzhili/event-info.scss";
</style> </style>

28
src/views/modules/shequzhili/event/cpts/event-detail.vue
View File

@ -90,12 +90,8 @@
2、状态=未完成 （有操作id） --> 2、状态=未完成 （有操作id） -->
<div v-if="(info.status==='processing'&&info.operationId)||(info.status==='closed_case'&&(info.satisfactionName||(!info.satisfactionName && user.id!=info.createdUserId)))" <div v-if="(info.status==='processing'&&info.operationId)||(info.status==='closed_case'&&(info.satisfactionName||(!info.satisfactionName && user.id!=info.createdUserId)))"
class="div-btn "> class="div-btn ">
<el-button v-if="source==='manage'" <el-button size="small"
size="small"
@click="handleCloseEvent">关闭</el-button> @click="handleCloseEvent">关闭</el-button>
<div v-else
class="item_btn"
@click="handleCloseEvent()">关闭</div>
</div> </div>
@ -128,8 +124,7 @@
</div> </div>
<div v-if="source==='manage'" <div class="div-btn ">
class="div-btn ">
<el-button size="small" <el-button size="small"
@click="handleCloseEvent">关闭</el-button> @click="handleCloseEvent">关闭</el-button>
<el-button style="margin-left:20px" <el-button style="margin-left:20px"
@ -137,14 +132,6 @@
size="small" size="small"
@click="handleComfirmSatisfy">确定</el-button> @click="handleComfirmSatisfy">确定</el-button>
</div> </div>
<div v-else
class="div-btn">
<div class="item_btn"
@click="handleCloseEvent()">关闭</div>
<div class="item_btn mgl"
v-if="info.status==='pending'"
@click="handleComfirmSatisfy()">确认</div>
</div>
</el-card> </el-card>
<el-dialog :visible.sync="showSatisfy" <el-dialog :visible.sync="showSatisfy"
@ -156,8 +143,7 @@
class="dialog-h" class="dialog-h"
@closed="showSatisfy=false"> @closed="showSatisfy=false">
<div v-if="source==='manage'" <div class="div-btn ">
class="div-btn ">
<el-button size="small" <el-button size="small"
@click="showSatisfy=false">关闭</el-button> @click="showSatisfy=false">关闭</el-button>
<el-button style="margin-left:20px" <el-button style="margin-left:20px"
@ -165,14 +151,6 @@
size="small" size="small"
@click="handleComfirmSatisfy">确定</el-button> @click="handleComfirmSatisfy">确定</el-button>
</div> </div>
<div v-else
class="div-btn">
<div class="item_btn"
@click="showSatisfy=false">关闭</div>
<div class="item_btn mgl"
v-if="info.status==='pending'"
@click="handleComfirmSatisfy()">确认</div>
</div>
</el-dialog> </el-dialog>

10
src/views/modules/shequzhili/event/cpts/event-info.vue
View File

@ -54,8 +54,7 @@
:eventId="eventId" :eventId="eventId"
:eventDetailData="eventDetailData"></process-form> :eventDetailData="eventDetailData"></process-form>
<div v-if="source==='manage'" <div class="div-btn ">
class="div-btn ">
<el-button size="small" <el-button size="small"
@click="handleClose">关闭</el-button> @click="handleClose">关闭</el-button>
<el-button style="margin-left:20px" <el-button style="margin-left:20px"
@ -63,13 +62,6 @@
size="small" size="small"
@click="handleComfirm">确定</el-button> @click="handleComfirm">确定</el-button>
</div> </div>
<div v-else
class="div-btn">
<div class="item_btn"
@click="handleClose()">关闭</div>
<div class="item_btn mgl"
@click="handleComfirm()">确认</div>
</div>
</el-card> </el-card>
</div> </div>

8
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
View File

@ -367,16 +367,16 @@
:uid="selUserId" :uid="selUserId"
ref="ref_people"></people> ref="ref_people"></people>
<!-- <event-info v-if="pageType==='dispose'" <event-info v-if="pageType==='dispose'"
ref="eleEditForm" ref="eleEditForm"
@handleClose="handleClose" /> --> @handleClose="handleClose" />
<!-- <service-info v-if="pageType==='dispose'" <!-- <service-info v-if="pageType==='dispose'"
ref="eleEditForm" ref="eleEditForm"
@handleClose="handleClose" /> --> @handleClose="handleClose" /> -->
<fuwu-info v-if="pageType==='dispose'" <!-- <fuwu-info v-if="pageType==='dispose'"
ref="eleEditForm" ref="eleEditForm"
@handleClose="handleClose" /> @handleClose="handleClose" /> -->
</div> </div>

Write Preview
Loading…
Cancel
Save