1.修改：社区自组织，积分记录，增加公共服务记录列表

.env.development

@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
+VUE_APP_API_SERVER =  http://localhost:8080/api
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api

src/views/modules/communityService/commonDemand/addForm.vue

@@ -151,9 +151,9 @@
           >
             <el-option
               v-for="item in policyList"
-              :key="item.policyId"
+              :key="item.id"
               :label="item.title"
-              :value="item.policyId"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -913,14 +913,17 @@ export default {
     },
 
     async getPolicyList() {
-      const url = "/governance/policy/policyListSelect";
+      const url = "/governance/policy/policyList";
 
-      let params = {};
+      let params = {
+        pageNo: 1,
+        pageSize: 1000
+      };
 
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.policyList = data;
+        this.policyList = data.list;
       } else {
         this.$message.error(msg);
       }

src/views/modules/communityService/commonDemand/detailForm.vue

@@ -226,14 +226,14 @@
       },
 
       async getPolicyList() {
-        const url = "/governance/policy/policyListSelect";
+        const url = "/governance/policy/policyList";
 
         let params = {};
 
         const { data, code, msg } = await requestPost(url, params);
 
         if (code === 0) {
-          this.policyList = data;
+          this.policyList = data.list;
         } else {
           this.$message.error(msg);
         }
@@ -273,7 +273,7 @@
             }
           });
           this.policyList.forEach((element) => {
-            if (this.formData.policyId === element.policyId) {
+            if (this.formData.id === element.id) {
               this.formData.policyName = element.title;
             }
           });

src/views/modules/communityService/commonDemand/editForm.vue

@@ -82,9 +82,9 @@
           >
             <el-option
               v-for="item in policyList"
-              :key="item.policyId"
+              :key="item.id"
               :label="item.title"
-              :value="item.policyId"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -555,14 +555,14 @@ export default {
       });
     },
     async getPolicyList() {
-      const url = "/governance/policy/policyListSelect";
+      const url = "/governance/policy/policyList";
 
       let params = {};
 
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.policyList = data;
+        this.policyList = data.list;
       } else {
         this.$message.error(msg);
       }

src/views/modules/communityService/fuwuzhaoren/addForm.vue

@@ -798,7 +798,7 @@ export default {
     },
 
     async getPolicyList() {
-      const url = "/governance/policy/policyListSelect";
+      const url = "/governance/policy/policyList";
 
       let params = {};
 

src/views/modules/communityService/fuwuzhaoren/detailForm.vue

@@ -226,7 +226,7 @@
       },
 
       async getPolicyList() {
-        const url = "/governance/policy/policyListSelect";
+        const url = "/governance/policy/policyList";
 
         let params = {};
 

src/views/modules/communityService/fuwuzhaoren/editForm.vue

@@ -493,7 +493,7 @@ import { nextTick } from 'vue';
       });
     },
       async getPolicyList () {
-        const url = '/governance/policy/policyListSelect'
+        const url = '/governance/policy/policyList'
 
         let params = {}
 

src/views/modules/communityService/gxxq/addForm.vue

@@ -555,7 +555,7 @@ export default {
     },
 
     async getPolicyList() {
-      const url = "/governance/policy/policyListSelect";
+      const url = "/governance/policy/policyList";
 
       let params = {};
 

src/views/modules/communityService/gxxq/detailForm.vue

@@ -127,7 +127,7 @@ export default {
     },
 
     async getPolicyList() {
-      const url = "/governance/policy/policyListSelect";
+      const url = "/governance/policy/policyList";
 
       let params = {};
 

src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue

@@ -1,6 +1,10 @@
 <template>
 	<el-dialog title="积分记录" :visible.sync="scoreDiaShow" width="1370px" :before-close="handleCancle">
 		<div>
+      <el-tabs type="border-card">
+        
+<!--        个性服务-->
+        <el-tab-pane label="个性服务">
           <div class="dialog-h-content scroll-h">
             <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
               <el-form-item label="查询时间" prop="startTime">
@@ -25,7 +29,7 @@
               </div>
             </el-form>
 
-				<el-table class="m-table-item" :data="tableData" v-loading="tableLoading" style="width: 100%">
+            <el-table class="m-table-item" :data="resiDemandTableData" v-loading="resiDemandTableLoading" style="width: 100%">
               <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
               <el-table-column prop="categoryName" header-align="center" align="center" label="需求类型" width="180"></el-table-column>
               <el-table-column prop="demandUserName" header-align="center" align="center" label="需求人" width="120"></el-table-column>
@@ -36,16 +40,75 @@
             </el-table>
             <div>
               <el-pagination
-						@size-change="handleSizeChange"
+                  @size-change="handleResiDemandSizeChange"
-						@current-change="handleCurrentChange"
+                  @current-change="handleResiDemandCurrentChange"
+                  :current-page.sync="pageNo"
+                  :page-sizes="[10, 20, 50]"
+                  :page-size="pageSize"
+                  layout="sizes, prev, pager, next, total"
+                  :total="resiDemandTotal"
+              ></el-pagination>
+            </div>
+          </div>
+        </el-tab-pane>
+
+<!--        公共服务-->
+        <el-tab-pane label="公共服务">
+          <div class="dialog-h-content scroll-h">
+            <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+              <el-form-item label="查询时间" prop="startTime">
+                <el-date-picker
+                    v-model="timeRange"
+                    type="daterange"
+                    :clearable="false"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    prefix-icon="el-icon-caret-bottom"
+                    value-format="yyyy-MM-dd"
+                    @change="handleTimeChange"
+                ></el-date-picker>
+              </el-form-item>
+
+              <div>
+                <el-form-item label="总计：" prop="startTime">
+                  <span>{{ totalPoint }}</span>
+                </el-form-item>
+              </div>
+            </el-form>
+<!--            prop="satisfaction"-->
+            <el-table class="m-table-item" :data="commonServiceTableData" v-loading="commonServiceTableLoading" style="width: 100%">
+              <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+              <el-table-column prop="serviceTypeName" header-align="center" align="center" label="服务类型" width="180"></el-table-column>
+              <el-table-column prop="serviceName" header-align="center" align="center" label="服务名称" width="200"></el-table-column>
+              <el-table-column prop="remark" header-align="center" align="center" label="服务备注/内容" :show-overflow-tooltip="true" min-width="200"></el-table-column>
+              <el-table-column prop="satisfaction" header-align="center" align="center" label="满意度" width="100">
+                <template slot-scope="scope" >
+                  {{ commonServiceSatisfaction(scope.row.satisfaction) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="serviceTimeStart" header-align="center" align="center" label="服务开始时间" width="200"></el-table-column>
+              <el-table-column prop="awardPoint" header-align="center" align="center" label="积分" width="100"></el-table-column>
+            </el-table>
+            <div>
+              <el-pagination
+                  @size-change="handleCommonServiceSizeChange"
+                  @current-change="handleCommonServiceCurrentChange"
                   :current-page.sync="pageNo"
                   :page-sizes="[10, 20, 50]"
                   :page-size="pageSize"
                   layout="sizes, prev, pager, next, total"
-						:total="total"
+                  :total="commonServiceTotal"
               ></el-pagination>
             </div>
           </div>
+        </el-tab-pane>
+      </el-tabs>
+      
+      
+      
+			
 			<!-- <div class="div_btn" v-if="pageType != 'view'">
 				<el-button size="small" @click="handleCancle">取 消</el-button>
 				<el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> 
@@ -61,7 +124,7 @@
 
 <script>
 import util from '@js/util.js';
-import { requestPost } from '@/js/dai/request';
+import { requestGet, requestPost } from '@/js/dai/request'
 import { mapGetters } from 'vuex';
 import { Loading } from 'element-ui'; // 引入Loading服务
 
@@ -69,12 +132,13 @@ let loading; // 加载动画
 export default {
 	data() {
 		return {
-			loading: false,
+			totalPoint: 0,
-			totalPoint: 100,
+			resiDemandTotal: 0,
-			total: 0,
+      commonServiceTotal: 0,
-			pageSize: 10,
+			pageSize: 20,
 			pageNo: 1,
-			tableLoading: false,
+			resiDemandTableLoading: false,
+      commonServiceTableLoading: false,
 			serviceId: '',
 
 			pickerOptions: {
@@ -87,11 +151,12 @@ export default {
 			timeRange: [],
 			unitId: '',
 			formData: {
-				startTime: '',
+        startTime: null,
-				endTime: ''
+        endTime: null
 			},
 			btnDisable: false,
-			tableData: []
+			resiDemandTableData: [],
+			commonServiceTableData: []
 		};
 	},
 	components: {},
@@ -119,7 +184,9 @@ export default {
 			this.initDate();
 
 			//获取数据
-			await this.loadTable();
+			// await this.loadTable();
+      await this.loadResiDemandTable();
+      await this.loadCommonServiceTable();
 		},
 
 		handleSearch() {
@@ -137,8 +204,8 @@ export default {
 		//   "startTime": "2023-02-28 00:00:00",// 用户所选拼接00:00:00
 		//   "endTime": "2023-03-31 23:59:59" // 拼接23:59:59
 		// }
-		async loadTable() {
+		async loadResiDemandTable() {
-			this.tableLoading = true;
+			this.resiDemandTableLoading = true;
 			const url = '/governance/userdemand/recordList';
 			// const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList"
 			let params = {
@@ -153,12 +220,37 @@ export default {
 
 			if (code === 0) {
 				this.totalPoint = data.totalPoint;
-				this.total = data.page.total;
+				this.resiDemandTotal = data.page.total;
-				this.tableData = data.page.list;
+				this.resiDemandTableData = data.page.list;
+			} else {
+				this.$message.error(msg);
+			}
+			this.resiDemandTableLoading = false;
+		},
+    
+    // 公共服务
+    async loadCommonServiceTable() {
+      this.commonServiceTableLoading = true;
+      const url = '/governance/icServiceRecordV2/pointRecordList';
+      // const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList"
+      let params = {
+        serviceOrgId: '1553029649865191426',
+        serviceTimeStart: this.formData.startTime,
+        serviceTimeEnd: this.formData.endTime,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      console.log("params",params);
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        this.totalPoint = data.totalPoint;
+        this.commonServiceTotal = data.pageData.total;
+        this.commonServiceTableData = data.pageData.list;  
       } else {
         this.$message.error(msg);
       }
-			this.tableLoading = false;
+      this.commonServiceTableLoading = false;
     },
 
 		//初始化时间
@@ -221,17 +313,28 @@ export default {
 				// this.endTimeShow = ''
 			}
 
-			this.loadTable();
+			this.loadResiDemandTable();
+      this.loadCommonServiceTable();
 		},
 
-		handleSizeChange(val) {
+		handleResiDemandSizeChange(val) {
 			this.pageSize = val;
 			this.pageNo = 1;
-			this.loadTable();
+			this.loadResiDemandTable();
 		},
-		handleCurrentChange(val) {
+		handleResiDemandCurrentChange(val) {
 			this.pageNo = val;
-			this.loadTable();
+			this.loadResiDemandTable();
+		},
+
+    handleCommonServiceSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadCommonServiceTable();
+    },
+    handleCommonServiceCurrentChange(val) {
+      this.pageNo = val;
+      this.loadCommonServiceTable();
     },
 
 		// 开启加载动画
@@ -257,6 +360,20 @@ export default {
 		rowHeight() {
 			return this.clientHeight - 200 + 'px';
 		},
+    // 公共服务满意度转换
+    commonServiceSatisfaction() {
+      return (code) => {
+        if (code === 'bad') {
+          return "不满意";
+        } else if(code === 'good') {
+          return '基本满意';
+        } else if (code === 'perfect') {
+          return '非常满意';
+        } else {
+          return '';
+        }
+      }
+    },
 		...mapGetters(['clientHeight'])
 	},
 	watch: {}