From 1588ba8f5dad8e19b21f711418be738cee70b34b Mon Sep 17 00:00:00 2001
From: tianq <tianq@hgzp.com.cn>
Date: Fri, 31 Mar 2023 11:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=BB=84=E7=BB=87=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A5=BD=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/yingji/zizuzhi/addForm.vue         | 50 ++++++++++---------
 .../tuceng/yingji/zizuzhi/index.vue           |  3 +-
 .../tuceng/yingji/zizuzhi/scoreRecord.vue     | 22 +++++---
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index fb50f467d..9d4d55ac3 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -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,28 +83,13 @@
 								</div>
 							</el-form-item>
 						</el-col>
-						<el-col :span="6">
-							<el-form-item label="服务事项" prop="serviceMatterList">
-								<el-select v-model="formData.serviceMatterList" multiple placeholder="请选择" size="small" clearable class="u-item-width-normal">
+						<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="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="address">
 								<el-select
@@ -245,10 +246,11 @@ export default {
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
 			list: {},
-			serviceList:[],
+			serviceList: [],
 			formData: {
 				organizationName: '',
 				categoryCode: '',
+				categoryList: [],
 				serviceMatterList: [],
 				organizationPersonCount: '',
 				principalName: '',
@@ -309,10 +311,10 @@ export default {
 	},
 
 	methods: {
-		async loadserviceList(){
+		async loadserviceList() {
 			const url = '/actual/base/serviceitem/dict-list';
 			const params = {
-				type:"usable"
+				type: 'usable'
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -397,6 +399,7 @@ export default {
 			if (code === 0) {
 				console.log('详情数据', data);
 				this.formData = { ...data };
+
 				this.initMap();
 			} else {
 				this.$message.error(msg);
@@ -451,6 +454,7 @@ export default {
 		},
 
 		async save() {
+			this.formData.serviceMatterList = [...this.formData.categoryList];
 			console.log('this.', this.formData);
 			let url = '';
 			if (this.formType === 'add') {
@@ -459,7 +463,7 @@ export default {
 				url = '/actual/base/iccommunityselforganization/editcommunityselforganization';
 				// this.dataForm.orgId = this.orgId;
 			}
-			
+
 			let params = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -534,7 +538,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 = [];
 			}
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
index 8c189557b..57b0739a5 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
@@ -59,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="orgId" align="center" width="120" /> -->
 					<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" />
@@ -126,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>
 
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
index aebaeef8e..83688eabb 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
@@ -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) {