elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into dev

dev-用户反馈
wangxianzhang 3 years ago
parent
b5f885cd8e b8f755dfd7
commit
ebe6c5e44e
13 changed files with 137 additions and 154 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/utils/validate.js
  2. 4
      src/views/components/resiSearch.vue
  3. 33
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  4. 6
      src/views/modules/communityService/shzz/cpts/edit.vue
  5. 200
      src/views/modules/communityService/shzz/index.vue
  6. 9
      src/views/modules/communityService/worklog/workLog.vue
  7. 2
      src/views/modules/plugins/change/changedeath.vue
  8. 2
      src/views/modules/plugins/change/changerelocation.vue
  9. 2
      src/views/modules/plugins/change/changewelfare.vue
  10. 14
      src/views/modules/plugins/rent/renthouse.vue
  11. 5
      src/views/modules/plugins/rent/renthouseForm.vue
  12. 6
      src/views/modules/plugins/rent/renttenantinfo.vue
  13. 6
      src/views/modules/plugins/stats/factagencyuserhousedaily.vue

2
src/utils/validate.js
View File

@ -37,7 +37,7 @@ export function isURL(s) {
* @param {*} s
*/
export function isCard(s) {
return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/.test(s);
return /^(\d{15}$)|(^\d{17}([0-9]|X)$)|^[a-zA-Z0-9]{8,9}$/.test(s);
}
/**
* 护照

4
src/views/components/resiSearch.vue
View File

@ -48,6 +48,7 @@
v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区"
size="small"
filterable
clearable
class="resi-cell-select"
@clear="handleClearVillage"
@ -65,6 +66,7 @@
v-model.trim="form.BUILD_ID"
placeholder="楼号"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select"
@ -85,6 +87,7 @@
:disabled="changeBDisabled"
placeholder="单元"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select"
@ -104,6 +107,7 @@
:disabled="changeDDisabled"
placeholder="房号"
size="small"
filterable
clearable
style="width: 120px;"
class="resi-cell-select"

33
src/views/modules/communityParty/regionalParty/activitysForm.vue
View File

@ -236,13 +236,17 @@ export default {
data () {
let initFormData = () => {
let _form = {
unitName: '',
gridId: '',
serviceMatter: '',//服务事项
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //备注【最大500字】
unitId: '',//单位ID
unitIdList: [],
title: '',//活动标题
target: '',//活动目标
content: '',//活动内容
activityTime: '',//活动时间
peopleCount: 0,//服务人数
result: '', //活动结果
address: '', //详细地址
longitude: this.$store.state.user.longitude, //经度
latitude: this.$store.state.user.latitude//纬度
@ -528,17 +532,22 @@ export default {
this.activityId = ''
this.keyWords = ''
this.formData = {
unitName: '',
gridId: '',
serviceMatter: '',//服务事项
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //备注【最大500字】
unitId: '',//单位ID
unitIdList: [],
title: '',//活动标题
target: '',//活动目标
content: '',//活动内容
activityTime: '',//活动时间
peopleCount: 0,//服务人数
result: '', //活动结果
address: '', //详细地址
longitude: this.$store.state.user.longitude, //经度
latitude: this.$store.state.user.latitude//纬度
}
},
// 开启加载动画
startLoading () {

6
src/views/modules/communityService/shzz/cpts/edit.vue
View File

@ -294,7 +294,6 @@ export default {
props: {},
watch: {
"dataForm.serviceTime": function (val) {
console.log("watch start"+val+'_'+Array.isArray(val))
if (Array.isArray(val) && val.length == 2) {
this.dataForm.serviceStartTime = val[0];
this.dataForm.serviceEndTime = val[1];
@ -391,14 +390,11 @@ export default {
return isPNG && isLt1M
},
handleProgress(event, file, fileList) {
console.log('percentage', event, file.percentage)
this.uploading = true
this.unloadPencent = Number(file.percentage.toFixed(0))
},
handleImgSuccess(res, file) {
if (res.code === 0 && res.msg === 'success') {
console.log('res.data.url', res.data.url)
this.uploading = false
this.unloadPencent = 0
this.dataForm.imageList.push(res.data.url)
@ -423,7 +419,6 @@ export default {
this.$refs.ref_form.resetFields();
this.formType = type;
console.log(row);
this.dataForm.imageList = []
if (row) {
this.dataForm = {...this.dataForm, ...row};
@ -441,7 +436,6 @@ export default {
async loadAgency() {
const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {};
console.log("======loadAgency")
const {data, code, msg} = await requestPost(url, params);
if (code === 0) {

200
src/views/modules/communityService/shzz/index.vue
View File

@ -1,108 +1,85 @@
<template>
<div>
<div class="resi-container">
<el-card class="resi-card">
<el-row class="resi-row-box"
:class="openSearch && 'resi-row-more'">
<el-row class="resi-row"
:gutter="20">
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">组织名称</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.societyName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
<!-- <el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">负责人</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.personInCharge"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>-->
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">服务电话</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.serviceTimeStr"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="24">
<div class="resi-cell">
<div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.serviceTimeStr"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
&lt;!&ndash; <el-date-picker v-model="fmData.serviceTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd">
</el-date-picker>&ndash;&gt;
</div>
</div>
</el-col>
</el-row>-->
</el-row>
<el-row class="resi-search">
<el-col :span="24">
<el-button type="primary"
size="small"
@click="handleSearch">查询
</el-button>
</el-col>
</el-row>
</el-card>
</div>
<div class="resi-container">
<el-card class="resi-card">
<div class="">
<el-form ref="fmData" :inline="true" :model="fmData" class="demo-form-inline">
<el-form-item label="组织名称" prop="societyName">
<el-input v-model="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item label="服务电话" prop="mobile">
<el-input v-model="fmData.mobile" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item label="服务时间" prop="serviceTimeStr">
<el-input v-model="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('fmData')">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- <el-row class="resi-row-box"
:class="openSearch && 'resi-row-more'">
<el-row class="resi-row"
:gutter="20">
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">组织名称</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.societyName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">服务电话</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="resi-cell">
<div class="resi-cell-label">服务时间</div>
<div class="resi-cell-value"
:class="'resi-cell-value-radio'">
<el-input v-model="fmData.serviceTimeStr"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</div>
</div>
</el-col>
</el-row>
</el-row>
<el-row class="resi-search">
<el-col :span="24">
<el-button class="diy-button&#45;&#45;add"
size="small"
@click="handleSearch">查询
</el-button>
</el-col>
</el-row>-->
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button type="success"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增
</el-button>
@ -122,7 +99,7 @@
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest">
<el-button type="warning"
<el-button class="diy-button--delete"
size="small"
:loading="importLoading">{{
importBtnTitle
@ -131,7 +108,7 @@
</el-upload>
<el-button @click="handleChu"
type="danger"
class="diy-button--reset"
size="small">导出
</el-button>
</div>
@ -336,15 +313,15 @@ export default {
})
.then((res) => {
this.importLoading = false;
this.importBtnTitle = "excel导入";
this.importBtnTitle = "导入";
console.log("resresresresresresres", res);
this.getTableData();
if (res.data.code == 0) {
return this.$message.success(res.data.data || '导入成功');
} else {
return this.$message.error(res.data.msg);
}
this.$message({
showClose: true,
message: '导入中，请到系统管理-导入记录中查看进度',
duration: 0
})
})
.catch((err) => {
console.log("失败", err);
@ -372,7 +349,10 @@ export default {
this.pageNo = 1;
this.getTableData();
},
resetForm(formName) {
this.$refs[formName].resetFields()
this.handleSearch()
},
async handleAdd() {
this.formShow = true;
await nextTick();

9
src/views/modules/communityService/worklog/workLog.vue
View File

@ -71,15 +71,15 @@
</el-input>
</el-form-item>
<el-form-item label="服务时间"
prop="wantServiceStartTime">
prop="serviceTimeArea">
<el-date-picker v-model="serviceTimeArea"
clearable
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
clearable>
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-button style="margin-left:10px"
@ -425,6 +425,9 @@ export default {
if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
this.workLog.serviceTimeStart = this.serviceTimeArea[0];
this.workLog.serviceTimeEnd = this.serviceTimeArea[1];
}else {
this.workLog.serviceTimeStart = '';
this.workLog.serviceTimeEnd = '';
}
const url = "/heart/workdiaryService/record/page"

2
src/views/modules/plugins/change/changedeath.vue
View File

@ -1,5 +1,4 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentDeath} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@ -135,7 +134,6 @@
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
</div>
</el-card>
</template>
<script>

2
src/views/modules/plugins/change/changerelocation.vue
View File

@ -1,5 +1,4 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-change__changeRelocation} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
@ -213,7 +212,6 @@
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
</div>
</el-card>
</template>
<script>

2
src/views/modules/plugins/change/changewelfare.vue
View File

@ -1,5 +1,4 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-rent__rentDeath} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@ -132,7 +131,6 @@
</span>
</el-dialog>
</div>
</el-card>
</template>
<script>

14
src/views/modules/plugins/rent/renthouse.vue
View File

@ -2,7 +2,7 @@
<div class="mod-rent__rentHouse} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
<el-form-item label="所属网格" size="small"
<el-form-item label="所属网格" size="small" label-width="100px"
prop="gridId">
<el-select
v-model.trim="dataForm.gridId"
@ -19,7 +19,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属房屋" >
<el-form-item label="所属房屋" label-width="100px">
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
@ -99,7 +99,7 @@
</el-form-item>
<br/>
<el-form-item label="姓名"
<el-form-item label="姓名" label-width="100px"
prop="ownerName">
<el-input v-model="dataForm.ownerName"
size="small"
@ -108,7 +108,7 @@
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="证件号"
<el-form-item label="证件号" label-width="100px"
prop="ownerIdCard">
<el-input v-model="dataForm.ownerIdCard"
size="small"
@ -117,7 +117,7 @@
placeholder="请输入证件号">
</el-input>
</el-form-item>
<el-form-item label="手机"
<el-form-item label="手机" label-width="100px"
prop="ownerPhone">
<el-input v-model="dataForm.ownerPhone"
size="small"
@ -127,13 +127,13 @@
</el-input>
</el-form-item>
<br/>
<el-form-item label="房屋状态" prop="rentFlag">
<el-form-item label="房屋状态" prop="rentFlag" label-width="100px">
<el-select size="small" v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
<el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="购房时间" size="small"
<el-form-item label="购房时间" label-width="100px"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"

5
src/views/modules/plugins/rent/renthouseForm.vue
View File

@ -520,11 +520,12 @@ export default {
async addRoom () {
const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
const regPassport = /^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/; //护照号，1字母8数字或2字母7数字
if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false && regPassport.test(this.dataForm.ownerIdCard) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
message: '请输入正确的身份证号码'
message: '请输入正确的证件号'
})
return false;
}

6
src/views/modules/plugins/rent/renttenantinfo.vue
View File

@ -2,13 +2,13 @@
<div class="mod-rent__rentTenantInfo} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="姓名" label-width="60px">
<el-form-item label="姓名" label-width="100px">
<el-input size="small" v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
</el-form-item>
<el-form-item label="证件号" label-width="60px">
<el-form-item label="证件号" label-width="100px">
<el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
</el-form-item>
<el-form-item label="手机号" label-width="60px">
<el-form-item label="手机号" label-width="100px">
<el-input size="small" v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
</el-form-item>
<el-form-item>

6
src/views/modules/plugins/stats/factagencyuserhousedaily.vue
View File

@ -1,5 +1,4 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mode-block resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@ -18,7 +17,7 @@
>
</el-option>
</el-select> -->
<el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
<el-cascader size="small" ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
<template slot-scope="{ node, data }">
<div @click="cascaderClick(data)">
<!-- <span class="block"></span> -->
@ -28,7 +27,7 @@
</template>
</el-cascader>
</el-form-item>
<el-form-item label="时间范围"
<el-form-item label="时间范围" label-width="100px"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
@ -107,7 +106,6 @@
</template>
</el-dialog>
</div>
</el-card>
</template>
<script>

Write Preview
Loading…
Cancel
Save