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

Merge remote-tracking branch 'origin/dev' into preview 

* origin/dev:
  bug
  积分
  死亡登记,迁出登记时间组件修改当前日期
  1
  1
  自组织编辑功能好了
  1
  参数
  社区自组织列表
feature
luyan 3 years ago
parent
e074a666cb 023e8d87cf
commit
c37e6395b5
6 changed files with 117 additions and 58 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. 9
      src/views/components/resiChangeTransfer.vue
  2. 13
      src/views/dataBoard/sida/cpts/sqpj.vue
  3. 9
      src/views/modules/plugins/change/resideathAdd.vue
  4. 93
      src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
  5. 27
      src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
  6. 24
      src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue

9
src/views/components/resiChangeTransfer.vue
View File

@ -20,6 +20,7 @@
<el-form-item label="迁出时间" prop="outOfTime">
<el-date-picker
v-model="dataForm.outOfTime"
:picker-options="startPickerOptions"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
@ -177,6 +178,10 @@ import { requestPost, requestGet } from "@/js/dai/request";
let loading; // 加载动画
export default {
data() {
let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
return time.getTime() > nowData
}
return {
btnDisable: false,
communityList: [],
@ -214,6 +219,10 @@ export default {
welfareFlag: false,
},
startPickerOptions: {
disabledDate: startDisabledDate
},
customerId: "", //客户id
userId: "", //操作人员id
gridName: "",

13
src/views/dataBoard/sida/cpts/sqpj.vue
View File

@ -100,10 +100,10 @@ export default {
},
methods: {
async init() {
// if (this.orgId) {
// await this.getResiCategoryData();
// this.getPie();
// }
if (this.orgId) {
await this.getResiCategoryData();
this.getPie();
}
},
handleClickItem(item) {
@ -120,6 +120,7 @@ export default {
},
async getResiCategoryData() {
let url = '';
if (this.currentTab == '满意度') {
url = 'satis_eval_view';
@ -131,7 +132,7 @@ export default {
// 烦心度
url = 'upset_eval_view';
}
const { data, code, msg } = await requestPostBi(
url,
{
@ -142,7 +143,7 @@ export default {
}
},
{
// mockId: 60031937,
mockId: 66906114,
}
);
if (code === 0) {

9
src/views/modules/plugins/change/resideathAdd.vue
View File

@ -22,6 +22,7 @@
<el-form-item label="死亡日期" style="display: block" prop="deathDate">
<el-date-picker
:picker-options="startPickerOptions"
v-model="dataForm.deathDate"
class="u-edit-width-normal"
type="date"
@ -76,6 +77,10 @@ import { requestPost, requestGet } from "@/js/dai/request";
let loading; // 加载动画
export default {
data() {
let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
return time.getTime() > nowData
}
return {
btnDisable: false,
@ -85,6 +90,10 @@ export default {
deathReason: "",
deathDate: "",
},
startPickerOptions: {
disabledDate: startDisabledDate
},
};
},
components: {},

93
src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
View File

@ -34,6 +34,22 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责人" prop="principalName">
<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系电话" prop="principalPhone">
<el-input v-model="formData.principalPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间" prop="organizationCreatedTime">
<el-date-picker v-model="formData.organizationCreatedTime" type="date" style="width: 150px;" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="组织成员" prop="organizationPersonnel">
<div class="m-staffs">
@ -67,24 +83,11 @@
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务事项" prop="serviceItem">
<el-input v-model="formData.serviceItem" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责人" prop="principalName">
<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系电话" prop="principalPhone">
<el-input v-model="formData.principalPhone" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间" prop="organizationCreatedTime">
<el-date-picker v-model="formData.organizationCreatedTime" type="date" style="width: 150px;" value-format="yyyy-MM-dd"></el-date-picker>
<el-col :span="24">
<el-form-item label="服务事项" prop="categoryList">
<el-select v-model="formData.categoryList" multiple placeholder="请选择" size="small" clearable class="u-item-width-normal" style="width: 500px;">
<el-option v-for="item in serviceList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
@ -128,7 +131,7 @@
</el-form>
<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
<el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="组织名称" prop="organizationName">{{ formData.organizationName }}</el-form-item>
</el-col>
<el-col :span="6">
@ -137,7 +140,17 @@
<el-col :span="6">
<el-form-item label="组织人数" prop="organizationPersonCount">{{ formData.organizationPersonCount }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责人" prop="principalName" style="display: block">{{ formData.principalName }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系电话" prop="principalPhone" style="display: block">{{ formData.principalPhone }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间" prop="organizationCreatedTime" style="display: block">{{ formData.organizationCreatedTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="组织成员" prop="organizationPersonnel">
<div class="m-staffs">
<div style="width:500px;" :key="'staff' + index" v-for="(item, index) in formData.organizationPersonnel">
@ -149,19 +162,10 @@
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="24">
<el-form-item label="服务事项" prop="serviceItem" style="display: block">{{ formData.serviceItem }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责人" prop="principalName" style="display: block">{{ formData.principalName }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系电话" prop="principalPhone" style="display: block">{{ formData.principalPhone }}</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间" prop="organizationCreatedTime" style="display: block">{{ formData.organizationCreatedTime }}</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="24">
<el-form-item label="详细地址" prop="address" style="display: block">{{ formData.address }}</el-form-item>
</el-col>
</el-row>
@ -243,10 +247,12 @@ export default {
gridList: [], //所属网格list--场所区域
placeTypeList: [], //场所类型
list: {},
serviceList: [],
formData: {
organizationName: '',
categoryCode: '',
serviceItem: '',
categoryList: [],
serviceMatterList: [],
organizationPersonCount: '',
principalName: '',
principalPhone: '',
@ -269,7 +275,7 @@ export default {
],
categoryCode: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
organizationPersonCount: [{ required: true, message: '组织人数不能为空', trigger: 'blur' }],
serviceItem: [{ required: true, message: '服务事项不能为空', trigger: 'blur' }],
serviceMatterList: [{ required: true, message: '服务事项不能为空', trigger: 'blur' }],
principalName: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
principalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }]
@ -293,6 +299,7 @@ export default {
this.startLoading();
this.getVolunteerList();
this.loadplaceType();
this.loadserviceList();
// this.loadGrid();
// this.loadplaceType();
if (this.pageType != 'add') {
@ -305,6 +312,18 @@ export default {
},
methods: {
async loadserviceList() {
const url = '/actual/base/serviceitem/dict-list';
const params = {
type: 'usable'
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.serviceList = data;
} else {
this.$message.error(msg);
}
},
querySearchVolunteer(queryString, cb) {
const { volunteerList } = this;
var results = queryString
@ -376,11 +395,13 @@ export default {
}
},
async getDetail() {
const url = `/actual/base/safetyEquipment/detail/${this.detailId}`;
const url = `/actual/base/iccommunityselforganization/community-self-org-detail/${this.detailId}`;
const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log('详情数据', data);
data.categoryList = data.categoryList.map(item => item.categoryCode);
this.formData = { ...data };
this.initMap();
} else {
this.$message.error(msg);
@ -435,6 +456,8 @@ export default {
},
async save() {
this.formData.serviceMatterList = [...this.formData.categoryList];
console.log('this.', this.formData);
let url = '';
if (this.formType === 'add') {
url = '/actual/base/iccommunityselforganization/addcommunityselforganization';
@ -442,7 +465,7 @@ export default {
url = '/actual/base/iccommunityselforganization/editcommunityselforganization';
// this.dataForm.orgId = this.orgId;
}
console.log('this.', this.formData);
let params = { ...this.formData };
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
@ -517,7 +540,7 @@ export default {
let { msg, data } = await map.getAddress(lat, lng);
if (msg == 'success') {
this.formData.location = data.address;
this.formData.address = data.address;
this.searchValue = data.address;
this.searchOptions = [];
}

27
src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
View File

@ -9,6 +9,7 @@
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
unlink-panels
v-model="formData.createTime"
type="daterange"
range-separator="至"
@ -18,7 +19,7 @@
></el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
<el-input v-model="formData.remark" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-row>
@ -58,6 +59,7 @@
<el-table :data="tableData" border class="m-table-item" style="width: 100%" @selection-change="handleSelectionChange" :height="maxTableHeight">
<!-- <el-table-column label="" fixed="left" type="selection" align="center" width="50" /> -->
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column label="所属组织" prop="agencyName" align="center" />
<el-table-column prop="organizationName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="categoryName" align="center" width="80" label="分类名称"></el-table-column>
<el-table-column prop="organizationPersonCount" label="组织人数" min-width="140" align="center" :show-overflow-tooltip="true" />
@ -71,9 +73,9 @@
<el-table-column fixed="right" label="操作" align="center" width="300">
<template slot-scope="scope">
<el-button @click="handleAdd(scope.row, 'view')" size="small" type="text">查看</el-button>
<el-button size="small" @click="handleScore(scope.row)" type="text">积分记录</el-button>
<el-button @click="handleSync(scope.row)" v-if="scope.row.syncType === 'not_sync'" size="small" type="text">同步</el-button>
<el-button @click="handleNoSync(scope.row)" v-if="scope.row.syncType === 'sync'" size="small" type="text">取消同步</el-button>
<el-button size="small" @click="handleScore(scope.row)" type="text">积分记录</el-button>
<!-- <el-button @click="handleSync(scope.row)" v-if="scope.row.syncType === 'not_sync'" size="small" type="text">同步</el-button>
<el-button @click="handleNoSync(scope.row)" v-if="scope.row.syncType === 'sync'" size="small" type="text">取消同步</el-button> -->
<el-button
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
@ -125,7 +127,7 @@
</div>
<!-- 积分记录 -->
<score-record :detailId="orgId" v-if="scoreDiaShow" @diaClose="diaClose" :scoreDiaShow="scoreDiaShow" :serviceType="'community_org'"></score-record>
<score-record :detailId="orgId" v-if="scoreDiaShow" @diaClose="diaClose" :scoreDiaShow="scoreDiaShow" ></score-record>
</div>
</template>
@ -353,8 +355,8 @@ export default {
});
},
handleAdd(row, type) {
if (row.equipmentId) {
this.detailId = row.equipmentId;
if (row.orgId) {
this.detailId = row.orgId;
}
this.pageType = type;
if (type == 'view') {
@ -388,7 +390,7 @@ export default {
type: 'warning'
})
.then(() => {
this.del(rowData.equipmentId);
this.del(rowData.orgId);
})
.catch(err => {});
},
@ -407,6 +409,15 @@ export default {
const url = '/actual/base/iccommunityselforganization/communityselforganizationlist';
// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
const { pageSize, pageNo, formData } = this;
if (Array.isArray(formData.createTime) && formData.createTime.length == 2) {
formData.startTime = formData.createTime[0];
formData.endTime = formData.createTime[1];
} else {
formData.startTime = '';
formData.endTime = '';
}
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,

24
src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
View File

@ -73,7 +73,7 @@ export default {
totalPoint: 100,
total: 0,
pageSize: 10,
pageNo: 0,
pageNo: 1,
tableLoading: false,
serviceId: '',
@ -100,14 +100,9 @@ export default {
type: Boolean,
default: ''
},
detailId: {
type: String,
default: ''
},
serviceType: {
type: String,
default: ''
}
},
async created() {},
@ -130,19 +125,30 @@ export default {
handleSearch() {
this.loadTable();
},
// \
// 社区自组织的积分记录，与原来一样；原来接口调用的/heart/userdemand/recordList
// 现在改为：
// /governance/userdemand/recordList
// {
// "serviceType": "community_org", //前端写死此值
// "serviceId": "当前社区自组织组织id",
// "pageSize": 10,
// "pageNo": 1,
// "startTime": "2023-02-28 00:00:00",// 用户所选拼接00:00:00
// "endTime": "2023-03-31 23:59:59" // 拼接23:59:59
// }
async loadTable() {
this.tableLoading = true;
const url = '/governance/userdemand/recordList';
// const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList"
let params = {
serviceType: this.serviceType,
serviceType: 'community_org',
serviceId: this.detailId,
pageSize: this.pageSize,
pageNo: this.pageNo,
...this.formData
};
console.log("params",params);
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {

Write Preview
Loading…
Cancel
Save