diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 0f4596253..2aeb97321 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -1,76 +1,168 @@
 <template>
-	<el-card>
-		<div class="dialog-h-content scroll-h">
-			<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'120px'" v-if="pageType != 'view'">
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-						</el-form-item>
+	<el-dialog :title="title" :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
+		<span slot="title">
+			<span v-if="pageType == 'add'">新增</span>
+			<span v-if="pageType == 'edit'">修改</span>
+			<span v-if="pageType == 'view'">查看</span>
+		</span>
+		<div>
+			<div class="dialog-h-content scroll-h">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+					<el-row>
+						<el-col :span="6">
+							<el-form-item label="组织名称" prop="name">
+								<el-input v-model="formData.organizationName" 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="categoryCode">
+								<el-select v-model="formData.categoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
+									<el-option v-for="item in placeTypeList" :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="areaCovered">
+								<el-input
+									v-model="formData.organizationPersonCount"
+									:disabled="disabled"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="24">
+							<el-form-item label="组织成员" prop="organizationPersonnel">
+								<div class="m-staffs">
+									<div class="item" :key="'staff' + index" v-for="(item, index) in formData.organizationPersonnel">
+										<el-autocomplete
+											class="item_width_1"
+											v-model="item.personName"
+											:fetch-suggestions="querySearchVolunteer"
+											placeholder="成员姓名"
+											:maxlength="50"
+											show-word-limit
+											@select="vItem => handleSelectVolunteer(index, vItem)"
+											:disabled="item.icResiUserId != ''"
+										></el-autocomplete>
 
-						<el-form-item label="设备类型" prop="equipmentCategoryCode">
-							<el-select v-model="formData.equipmentCategoryCode" :disabled="disabled" placeholder="请选择" size="small" clearable class="u-item-width-normal">
-								<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
-							</el-select>
-						</el-form-item>
+										<el-input
+											style="margin-left: 10px"
+											class="item_width_1"
+											show-word-limit
+											placeholder="联系电话"
+											:disabled="item.icResiUserId != ''"
+											v-model="item.personPhone"
+										/>
 
-						<el-form-item label="负责人" prop="principalName">
-							<el-input v-model="formData.principalName" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-						</el-form-item>
-						<el-form-item label="联系电话" prop="contactNum">
-							<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="16">
-						<el-form-item label="所处位置" prop="location" style="display: block">
-							<el-select
-								v-model="formData.location"
-								style="width: 200px;"
-								:disabled="disabled"
-								filterable
-								remote
-								:reserve-keyword="true"
-								placeholder="请输入关键词"
-								:remote-method="remoteMethod"
-								:loading="loading"
-							>
-								<el-option
-									v-for="(item, index) in searchOptions"
-									@click.native="handleClickKey(index)"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"
-								></el-option>
-							</el-select>
-							<div id="app_event" class="div_map"></div>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<el-form :inline="false" :model="formData" ref="form" :label-width="'120px'" v-if="pageType == 'view'">
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
-						<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
-						<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
-						<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
-					</el-col>
-					<el-col :span="16">
-						<el-form-item label="场所地址" prop="location" style="display: block">
-							{{ formData.location }}
-							<div id="app_event" class="div_map"></div>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-		</div>
-		<div class="div_btn">
-			<el-button size="small" @click="handleCancle">关闭</el-button>
-			<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
-			<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm" v-if="pageType != 'view'">确 定</el-button>
+										<el-button style="margin-left: 10px" size="small" @click="handleDelStaff(index)">删除</el-button>
+									</div>
+
+									<div class="item-add"><el-button size="small" @click="handleAddStaff">添加</el-button></div>
+								</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="daterange"
+									range-separator="至"
+									start-placeholder="开始日期"
+									end-placeholder="结束日期"
+									value-format="yyyy-MM-dd"
+								></el-date-picker>
+							</el-form-item>
+						</el-col>
+
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="address" style="display: block">
+								<el-select
+									v-model="formData.address"
+									filterable
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="(item, index) in searchOptions"
+										@click.native="handleClickKey(index)"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="24"><div id="app_event" class="div_map"></div></el-col>
+						<el-col :span="12">
+							<el-form-item label="备注" prop="remark" style="margin-top: 20px;width: 100%;">
+								<el-input
+									type="textarea"
+									maxlength="500"
+									show-word-limit
+									:rows="3"
+									v-model="formData.remark"
+									class="u-item-width-normal"
+									size="small"
+									clearable
+									placeholder="请输入"
+								></el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<el-form :inline="false" :model="formData" ref="form" :label-width="'90px'" v-if="pageType == 'view'">
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="设备名称" prop="equipmentName">{{ formData.equipmentName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="设备类型" prop="equipmentCategoryCode">{{ formData.equipmentCategoryName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="负责人" prop="principalName">{{ formData.principalName }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="联系电话" prop="contactNum">{{ formData.contactNum }}</el-form-item>
+						</el-col>
+						<el-col :span="6">
+							<el-form-item label="场所地址" prop="location" style="display: block">{{ formData.location }}</el-form-item>
+						</el-col>
+					</el-row>
+					<div id="app_event" class="div_map"></div>
+				</el-form>
+			</div>
+			<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> -->
+				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+			</div>
 		</div>
-		<div style="margin-top: 30px;"><record v-if="pageType != 'add' && detailId" :formType="pageType" :id="detailId" :info="{ agencyId: agencyId }"></record></div>
-	</el-card>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleCancle">关 闭</el-button>
+			<!-- <el-button type="primary" @click="handleComfirm">确 定</el-button> -->
+		</span>
+	</el-dialog>
 </template>
 
 <script>
@@ -80,7 +172,7 @@ import { Loading } from 'element-ui'; // 引入Loading服务
 import { requestPost, requestGet } from '@/js/dai/request';
 import daiMap from '@/utils/dai-map';
 import nextTick from 'dai-js/tools/nextTick';
-import record from './record';
+
 let loading; // 加载动画
 let map;
 var search;
@@ -90,6 +182,10 @@ var geocoder; // 新建一个正逆地址解析类
 
 export default {
 	props: {
+		dialogVisible: {
+			type: Boolean,
+			default: ''
+		},
 		defaultData: {
 			type: Object,
 			default: null
@@ -124,37 +220,46 @@ export default {
 			}
 		};
 		return {
+			title: '',
 			btnDisable: false,
 			user: '',
 			agencyId: '',
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
 			list: {},
 			formData: {
-				equipmentName: '',
-				scaleTotal: '',
-				gridId: '',
-				equipmentCategoryCode: '',
-				placeType: '',
+				organizationName: '',
+				categoryCode: '',
+				serviceItem: '',
+				organizationPersonCount: '',
 				principalName: '',
-				location: '',
-				contactNum: '',
-				// result: '',
-				remark: ''
+				principalPhone: '',
+				organizationCreatedTime: '',
+				address: '',
+				remark: '',
+				longitude: '',
+				latitude: '',
+				organizationPersonnel: []
 			},
 			dataRule: {
-				equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'bulr' }],
-				equipmentCategoryCode: [{ required: true, message: '设备类型不能为空', trigger: 'bulr' }],
-				placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }],
-				result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }],
-				scaleTotal: [{ required: true, message: '场所规模不能为空', trigger: 'bulr' }],
-				gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }],
-				principalName: [{ required: true, message: '负责人不能为空', trigger: 'bulr' }],
-				contactNum: [{ required: true, validator: checkMObile, trigger: 'blur' }],
-				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
-				// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
+				organizationName: [
+					{ required: true, message: '组织名称	不能为空', trigger: 'blur' },
+					{
+						min: 1,
+						max: 50,
+						message: '组织名称	长度在 1 到 50个字符',
+						trigger: 'blur'
+					}
+				],
+				categoryCode: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+				organizationPersonCount: [{ required: true, message: '组织人数不能为空', trigger: 'blur' }],
+				serviceItem: [{ required: true, message: '服务事项不能为空', trigger: 'blur' }],
+				principalName: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+				principalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+				address: [{ required: true, message: '地址不能为空', trigger: 'blur' }]
+				// longitude: [
+				//   { required: true, message: "请拖动地图选择坐标点", trigger: "blur" },
+				// ],
 			},
 			//地图
 			loading: false,
@@ -163,13 +268,15 @@ export default {
 		};
 	},
 	watch: {},
-	components: { record },
+	components: {},
 	created() {},
 	async mounted() {
 		console.log('detailId', this.detailId);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
 		this.startLoading();
+		this.getVolunteerList();
+		this.loadplaceType();
 		// this.loadGrid();
 		// this.loadplaceType();
 		if (this.pageType != 'add') {
@@ -182,6 +289,50 @@ export default {
 	},
 
 	methods: {
+		querySearchVolunteer (queryString, cb) {
+		  const { volunteerList } = this;
+		  var results = queryString
+		    ? volunteerList.filter((item) => {
+		      return item.value.indexOf(queryString) !== -1;
+		    })
+		    : volunteerList;
+		  // 调用 callback 返回建议列表的数据
+		  cb(results);
+		},
+		handleSelectVolunteer (index, vItem) {
+		  this.formData.organizationPersonnel[index] = {
+		    personName: vItem.name,
+		    personPhone: vItem.mobile,
+		    icResiUserId: vItem.icResiUserId,
+		  };
+		},
+		
+		async getVolunteerList() {
+			const url = '/epmetuser/icresiuser/volunteer-list';
+			const params = {};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.volunteerList = data.map(item => {
+					return {
+						name: item.name,
+						value: item.label,
+						mobile: item.mobile,
+						icResiUserId: item.icResiUserId
+					};
+				});
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		handleAddStaff() {
+			this.formData.organizationPersonnel = [...this.formData.organizationPersonnel, { personName: '', personPhone: '', icResiUserId: '' }];
+		},
+		handleDelStaff(index) {
+			const { organizationPersonnel } = this.formData;
+			organizationPersonnel.splice(index, 1);
+			this.formData.organizationPersonnel = organizationPersonnel;
+		},
+
 		async loadGrid() {
 			const url = '/gov/org/customergrid/gridoption';
 			let params = {
@@ -197,10 +348,9 @@ export default {
 		},
 		//场所类型
 		async loadplaceType() {
-			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
-			let params = {
-				// agencyId: this.agencyId,
-				// purpose: 'query'
+			const url = '/sys/dict/data/dictlist';
+			const params = {
+				dictType: 'self_org_category'
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -222,7 +372,25 @@ export default {
 		},
 
 		handleComfirm() {
-			this.save();
+			this.$refs['form'].validate((valid, messageObj) => {
+				if (!valid) {
+					app.util.validateRule(messageObj);
+				} else {
+					const {
+						formData: { organizationPersonnel }
+					} = this;
+					let vlt = organizationPersonnel.every(item => {
+						return item.personName && item.personPhone;
+					});
+					if (!vlt) {
+						return this.$message({
+							type: 'error',
+							message: '成员姓名/联系电话为空'
+						});
+					}
+					this.save();
+				}
+			});
 		},
 		async handleAdd() {
 			// this.btnDisable = true;
@@ -251,20 +419,20 @@ export default {
 		},
 
 		async save() {
-			console.log('this.formData', this.formData);
-			var url = '';
-			var params = {};
-			if (this.pageType == 'add') {
-				url = '/actual/base/safetyEquipment/save';
+			let url = '';
+			if (this.formType === 'add') {
+				url = '/actual/base/iccommunityselforganization/addcommunityselforganization';
 			} else {
-				url = '/actual/base/safetyEquipment/update';
+				url = '/actual/base/iccommunityselforganization/editcommunityselforganization';
+				// this.dataForm.orgId = this.orgId;
 			}
+
 			params = { ...this.formData };
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
 				this.$message.success('添加成功');
 				this.resetData();
-				this.$emit('handleComfirm');
+				this.handleCancle();
 			} else if (code >= 8000) {
 				this.$message.error(msg);
 			}
@@ -293,7 +461,7 @@ export default {
 		}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
 		initMap() {
 			let { latitude, longitude } = this.$store.state.user;
-		
+
 			if (this.formData.latitude && this.formData.longitude) {
 				latitude = this.formData.latitude;
 				longitude = this.formData.longitude;
@@ -302,7 +470,7 @@ export default {
 				latitude = 39.9088810666821;
 				longitude = 116.39743841556731;
 			}
-		
+
 			this.$nextTick(() => {
 				map = new daiMap(
 					document.getElementById('app_event'),
@@ -317,7 +485,7 @@ export default {
 				map.on('dragend', e => {
 					this.handleMoveCenter(e);
 				});
-		
+
 				map.setCenter(latitude, longitude);
 				if (this.formData.latitude) {
 					map.setMarker(latitude, longitude);
@@ -379,35 +547,6 @@ export default {
 
 <style lang="scss" scoped>
 @import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-/deep/ .el-input.is-disabled .el-input__inner,
-/deep/ .el-textarea.is-disabled textarea.el-textarea__inner {
-	// border:none;background-color: transparent;
-}
-.div_map {
-	width: 100%;
-}
-.form-item::v-deep .el-form-item__label {
-	color: #fff;
-}
-.form-item {
-	.el-radio {
-		color: #fff;
-	}
-
-	.el-checkbox {
-		color: #fff;
-	}
-}
-.verifyRed::before {
-	content: '*';
-	color: #f56c6c;
-	margin-right: 4px;
-}
-.form_label_box {
-	width: 150px;
-	display: inline-block;
-	text-align: right;
-	padding-right: 12px;
-}
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
index 5676cdec1..12c4a11c3 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/index.vue
@@ -1,22 +1,24 @@
 <template>
 	<div class="g-main">
-		<div v-show="pageType == 'list'">
+		<div>
 			<div class="m-search">
 				<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
 					<div>
-						<el-form-item label="设备名称" prop="equipmentName">
-							<el-input v-model="formData.equipmentName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+						<el-form-item label="组织名称" prop="organizationName">
+							<el-input v-model="formData.organizationName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
-						<el-form-item label="设备类型" prop="equipmentCategoryCode">
-							<el-select v-model="formData.equipmentCategoryCode" placeholder="请选择" size="small" clearable class="u-item-width-normal">
-								<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label" :value="item.value"></el-option>
-							</el-select>
+						<el-form-item label="创建时间" prop="createTime">
+							<el-date-picker
+								v-model="formData.createTime"
+								type="daterange"
+								range-separator="至"
+								start-placeholder="开始日期"
+								end-placeholder="结束日期"
+								value-format="yyyy-MM-dd"
+							></el-date-picker>
 						</el-form-item>
-						<el-form-item label="所处位置" prop="location">
-							<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
-						</el-form-item>
-						<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 label="备注" prop="remark">
+							<el-input v-model="formData.remark" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 
 						<el-row>
@@ -54,25 +56,30 @@
 					<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
 				</div>
 				<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="selection" align="center" width="50" /> -->
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
-					<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="equipmentCategoryCode" align="center" width="80" label="设备类型"></el-table-column>
-					<el-table-column prop="location" label="所处位置" min-width="140" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="principalName" align="center" width="110" label="负责人" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="contactNum" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
-					<el-table-column prop="latestInspectTime" align="center" width="100" label="最新检查时间" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="latestInspectResult" align="center" label="最新巡查结果" :show-overflow-tooltip="true">
-						<template slot-scope="scope">
-							<span v-if="scope.row.latestResult === '0'">合格</span>
-							<span v-else-if="scope.row.latestResult === '1'">不合格</span>
-							<span v-else>--</span>
-						</template>
-					</el-table-column>
+					<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" />
+					<el-table-column prop="serviceItem" align="center" width="110" label="服务事项" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="score" align="center" :show-overflow-tooltip="true" label="积分"></el-table-column>
+					<el-table-column prop="principalName" align="center" :show-overflow-tooltip="true" label="负责人"></el-table-column>
+					<el-table-column prop="principalPhone" align="center" :show-overflow-tooltip="true" label="联系电话"></el-table-column>
+					<el-table-column prop="address" align="center" :show-overflow-tooltip="true" label="地址"></el-table-column>
+					<el-table-column prop="remark" align="center" :show-overflow-tooltip="true" label="备注"></el-table-column>
+					<el-table-column prop="organizationCreatedTime" align="center" :show-overflow-tooltip="true" label="创建时间"></el-table-column>
 					<el-table-column fixed="right" label="操作" align="center" width="200">
 						<template slot-scope="scope">
 							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
+							<el-button type="text" class="div-table-button--detail" size="small" @click="handleScore(scope.row)">积分记录</el-button>
 
+							
+							<el-button @click="handleSync(scope.row)" v-if="scope.row.syncType === 'not_sync'" type="text" size="small" class="div-table-button--edit">
+								同步
+							</el-button>
+							<el-button @click="handleNoSync(scope.row)" v-if="scope.row.syncType === 'sync'" type="text" size="small" class="div-table-button--edit">
+								取消同步
+							</el-button>
 							<el-button
 								v-if="scope.row.latitude && agencyId == scope.row.agencyId"
 								style="margin-right: 10px"
@@ -109,8 +116,10 @@
 				</div>
 			</div>
 		</div>
-		<div v-if="pageType != 'list'">
+		<div>
 			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -120,6 +129,17 @@
 				@dialogOk="handleEditSuccess"
 			/>
 		</div>
+		<!-- 积分记录 -->
+		<el-dialog :visible.sync="scoreDiaShow"
+		           :close-on-click-modal="false"
+		           :close-on-press-escape="false"
+		           :title="scoreDiaTitle"
+		           width="70%"
+		           top="5vh"
+		           @closed="diaClose">
+		  <score-record ref="ref_score"
+		                :serviceType="'community_org'"></score-record>
+		</el-dialog>
 	</div>
 </template>
 
@@ -129,31 +149,27 @@ import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
 import addForm from './addForm.vue';
 import axios from 'axios';
-
+import scoreRecord from "./scoreRecord.vue";
 export default {
 	data() {
 		return {
+			scoreDiaShow:false,
+			dialogVisible: false,
 			importLoading: false,
 			disabled: false,
 			user: '',
 			agencyId: '',
 			formData: {
-				equipmentName: '',
-				gridId: '',
-				equipmentCategoryCode: '',
-				placeType: '',
-				result: '',
-				scaleTotal: '',
-				contactNum: '',
-				address: '',
-				principalName: ''
+				name: '',
+				category: '',
+				address: ''
 			},
 			pageType: 'list', // 列表list 新增add  处理dispose 详情info
 			gridList: [], //所属网格list--场所区域
 			placeTypeList: [], //场所类型
 			tableData: [],
-			resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }],
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+
+			categoryArray: [],
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
 			total: 1,
@@ -163,7 +179,7 @@ export default {
 			rowObj: {}
 		};
 	},
-	components: { addForm },
+	components: { addForm,scoreRecord },
 	created() {},
 	computed: {
 		maxTableHeight() {
@@ -180,6 +196,17 @@ export default {
 		this.getTableData();
 	},
 	methods: {
+		//积分记录
+		handleScore (row) {
+		  this.scoreDiaShow = true;
+		  this.$nextTick(() => {
+		    this.$refs.ref_score.initForm(row.orgId);
+		  });
+		},
+		
+		diaClose () {
+		  this.scoreDiaShow = false;
+		},
 		handleSelectionChange(val) {
 			this.multipleSelection = [];
 			val.forEach(element => {
@@ -206,9 +233,10 @@ export default {
 		},
 		//场所类型
 		async loadplaceType() {
-			const url = '/gov/org/coverage/dict-select-list/enterprise_patrol';
+			const url = '/sys/dict/data/dictlist';
 			let params = {
-				// agencyId: this.agencyId,
+				dict_type: 'emergency_site_type'
+
 				// purpose: 'query'
 			};
 			const { data, code, msg } = await requestPost(url, params);
@@ -218,13 +246,97 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		async handleSync(row) {
+			this.$confirm('确认同步到通讯录？', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.syncUnit(row);
+				})
+				.catch(err => {
+					if (err == 'cancel') {
+					}
+				});
+		},
+		async handleNoSync(row) {
+			this.$confirm('确认取消同步?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					this.noSyncUnit(row);
+				})
+				.catch(err => {
+					if (err == 'cancel') {
+					}
+				});
+		},
+
+		async syncUnit(row) {
+			const url = '/gov/org/department/syncdept';
+
+			let params = {
+				id: row.orgId,
+				deptName: row.organizationName,
+				mobile: row.principalPhone,
+				personName: row.principalName,
+				deptType: 'community_org'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				if (data.type) {
+					this.$message({
+						type: 'success',
+						message: data.msg || '同步成功'
+					});
+
+					this.loadTable();
+				} else {
+					this.$message.error(data.msg);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
 
+		async noSyncUnit(row) {
+			const url = '/gov/org/department/notsyncdept';
+			// const url = "http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunit/delete"
+
+			let params = {
+				id: row.orgId,
+				deptId: row.deptId,
+				deptStaffId: row.deptStaffId,
+				deptType: 'community_org'
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				if (data.type) {
+					this.$message({
+						type: 'success',
+						message: '取消同步成功'
+					});
+					this.getTableData();
+				} else {
+					this.$message.error(data.msg);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
 		async handleImport() {
 			// 导入
 		},
 		async handleExport() {
 			// 导出
-			const url = '/actual/base/safetyEquipment/export';
+			const url = '/actual/base/iccommunityselforganization/exportcommunityselforganization';
 			const { pageSize, pageNo, formData } = this;
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
@@ -265,8 +377,10 @@ export default {
 			} else {
 				this.disabled = false;
 			}
+			this.dialogVisible = true;
 		},
 		handleClose() {
+			this.dialogVisible = false;
 			this.pageType = 'list';
 			this.detailId = '';
 			this.getTableData();
@@ -294,8 +408,9 @@ export default {
 				.catch(err => {});
 		},
 		async del(id) {
-			const url = '/actual/base/enterprise/delete';
-			const { data, code, msg } = await requestPost(url, id);
+			const url = '/actual/base/iccommunityselforganization/delcommunityselforganization';
+			let idArr = { orgId: id };
+			const { data, code, msg } = await requestPost(url, idArr);
 			if (code === 0) {
 				this.$message.success('删除成功！');
 				this.getTableData();
@@ -304,7 +419,7 @@ export default {
 			}
 		},
 		async getTableData() {
-			const url = '/actual/base/safetyEquipment/page';
+			const url = '/actual/base/iccommunityselforganization/communityselforganizationlist';
 			// const url = 'http://yapi.elinkservice.cn/mock/330/actual/base/enterprise/list';
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
@@ -313,6 +428,7 @@ export default {
 				...formData
 			});
 			if (code === 0) {
+				console.log('shuju ', data);
 				this.total = data.total || 0;
 				this.tableData = data.list
 					? data.list.map(item => {
@@ -334,21 +450,15 @@ export default {
 		},
 		resetSearch() {
 			this.formData = {
-				equipmentName: '',
-				gridId: '',
-				equipmentCategoryCode: '',
-				placeType: '',
-				result: '',
-				scaleTotal: '',
-				contactNum: '',
-				address: '',
-				principalName: ''
+				name: '',
+				category: '',
+				address: ''
 			};
 			this.pageNo = 1;
 			this.getTableData();
 		},
 		async handleExportModule() {
-			let url = '/actual/base/safetyEquipment/downloadTemplate';
+			let url = '/actual/base/iccommunityselforganization/import-template-download';
 			let params = {};
 			await this.$http({
 				method: 'POST',
@@ -414,7 +524,7 @@ export default {
 			formData.append('file', file.file); //添加文件对象
 			formData.append('code', ''); //添加文件对象
 			await this.$http
-				.post('/actual/base/safetyEquipment/import', formData)
+				.post('/actual/base/iccommunityselforganization/importcommunityselforganization', formData)
 				.then(res => {
 					console.log('res-up', res);
 					if (res.data.code == 0 && res.data.msg == 'success') {
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue
deleted file mode 100644
index f05336d12..000000000
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/record.vue
+++ /dev/null
@@ -1,428 +0,0 @@
-<template>
-	<div class="m-record">
-		<h3>检查记录</h3>
-		<div>
-			<div class="u-table-btn1 mt10" v-if="formType == 'edit'">
-				<el-button size="small" class="diy-button--blue" :disabled="btnDisabled || disabled" @click="handleAdd">新增</el-button>
-			</div>
-			<div class="m-table-item">
-				<el-table :data="tableData" class="resi-table" row-key="id" border style="width: 100%">
-					<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
-
-					<el-table-column prop="inspectTime" label="检查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.inspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffId" label="检查人员" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select
-								v-if="scope.row.isEdit"
-								v-model="scope.row.inspectStaffId"
-								placeholder="请选择"
-								class="input-width"
-								@change="handleChangeStaff(scope.row)"
-								clearable
-							>
-								<el-option v-for="subItem in optionStaff" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectStaffName }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectStaffMobile" label="联系电话" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="number"
-								v-model="scope.row.inspectStaffMobile"
-								placeholder="请输入"
-								class="input-width"
-								clearable
-								disabled
-							></el-input>
-							<div v-else class="div-content">{{ scope.row.inspectStaffMobile }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
-								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
-							</el-select>
-							<div v-else class="div-content">{{ scope.row.inspectResult == 1 ? '正常' : '异常' }}</div>
-						</template>
-					</el-table-column>
-
-					<!-- <el-table-column
-						prop="detailed"
-						label="隐患明细"
-						align="center"
-						width="200px"
-					>
-						<template slot-scope="scope">
-							<el-input
-								v-if="scope.row.isEdit"
-								type="text"
-								v-model="scope.row.detailed"
-								placeholder="请输入"
-								class="input-width"
-								maxlength="500"
-								clearable
-							></el-input>
-							<div v-else class="div-content">
-								{{ scope.row.detailed }}
-							</div>
-						</template>
-					</el-table-column> -->
-
-					<el-table-column prop="imgList" label="图片列表" align="center" width="150px">
-						<template slot-scope="scope">
-							<div v-if="scope.row.isEdit">
-								<el-upload
-									:headers="$getElUploadHeaders()"
-									class="avatar-uploader"
-									:action="uploadUrl"
-									:data="{ customerId: customerId }"
-									:show-file-list="true"
-									:limit="3"
-									:file-list="scope.row.imgShowList"
-									:on-success="res => handleImgSuccess(res, scope.row)"
-									:on-remove="res => handleImgRemove(res, scope.row)"
-									list-type="picture"
-									:before-upload="beforeImgUpload"
-								>
-									<i class="el-icon-plus avatar-uploader-icon"></i>
-									最多三张图片
-								</el-upload>
-							</div>
-
-							<div v-else class="div-content">
-								<el-image
-									v-if="scope.row.imgList.length > 0"
-									style="width: 100px; height: 50px"
-									:src="scope.row.imgList[0]"
-									fit="cover"
-									:preview-src-list="scope.row.imgList"
-								></el-image>
-							</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column prop="nextInspectTime" label="拟复查时间" align="center" width="200px">
-						<template slot-scope="scope">
-							<el-date-picker
-								v-if="scope.row.isEdit"
-								v-model="scope.row.nextInspectTime"
-								type="date"
-								class="input-width"
-								value-format="yyyy-MM-dd"
-								placeholder="选择日期"
-							></el-date-picker>
-							<div v-else class="div-content">{{ scope.row.nextInspectTime }}</div>
-						</template>
-					</el-table-column>
-
-					<el-table-column v-if="!disabled" fixed="right" label="操作" align="center" width="120">
-						<template slot-scope="scope">
-							<template v-if="scope.row.isEdit">
-								<el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">保存</el-button>
-								<el-button @click="handleChange(scope.row, 'cancle')" type="text" size="small" class="btn-color-edit">取消</el-button>
-							</template>
-							<template v-else>
-								<el-button v-if="formType == 'edit'" @click="handleChange(scope.row, 'edit')" type="text" size="small" :disabled="disabled" class="btn-color-edit">
-									修改
-								</el-button>
-								<el-popconfirm v-if="formType == 'edit'" title="删除之后无法恢复，确认删除？" @onConfirm="del(scope.row)" @confirm="del(scope.row)">
-									<el-button slot="reference" type="text" size="small" class="btn-color-del" style="margin-left: 10px">删除</el-button>
-								</el-popconfirm>
-							</template>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import { requestPost, requestGet } from '@/js/dai/request';
-export default {
-	props: {
-		id: {
-			type: String,
-			default: ''
-		},
-		info: {
-			type: Object,
-			default: () => ({})
-		},
-		disabled: {
-			type: Boolean,
-			default: false
-		},
-		formType: {
-			type: String,
-			default: ''
-		},
-		source: {
-			//展示来源：manage  管理平台    visiual  可视化平台
-			type: String,
-			default: 'manage'
-		}
-	},
-	data() {
-		return {
-			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: localStorage.getItem('customerId'),
-
-			btnDisabled: false,
-			btnType: 'cancle',
-			isEdit: false,
-			tableData: [],
-			tempRow: {},
-
-			optionResult: [
-				{
-					label: '合格',
-					value: '0'
-				},
-				{
-					label: '不合格',
-					value: '1'
-				}
-			],
-			optionStaff: [
-				// {
-				//   label: "人名",
-				//   value: "inspectStaffId",
-				// },
-			]
-		};
-	},
-
-	computed: {
-		allowOperate() {
-			const {
-				info: { agencyId }
-			} = this;
-			return agencyId && agencyId == this.$store.state.user.agencyId;
-		}
-	},
-	watch: {
-		id: {
-			handler(val) {
-				console.log('val------points', val);
-				if (val.length > 0) {
-					this.btnDisabled = false;
-					this.getList();
-				} else this.btnDisabled = true;
-			},
-			immediate: true
-		}
-	},
-
-	created() {
-		console.log("id",this.id)
-		this.getOptionStaff();
-	},
-
-	methods: {
-		beforeImgUpload(file) {
-			console.log(file);
-			const isLt1M = file.size / 1024 / 1024 < 10;
-			const srcType = file.type;
-			const format = file.name.split('.').pop();
-
-			if (!isLt1M) {
-				this.$message.error('上传文件大小不能超过 10MB!');
-				return false;
-			}
-			if (srcType.indexOf('image') == -1) {
-				this.$message.error('仅限图片格式');
-				return false;
-			}
-			return true;
-		},
-
-		handleImgSuccess(res, row) {
-			console.log('handleImgSuccess', res);
-			if (res.code === 0 && res.msg === 'success') {
-				row.imgList.push(res.data.url);
-				this.computeImgShowList(row);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-
-		computeImgShowList(row) {
-			row.imgShowList = row.imgList.map(url => {
-				return { name: '', url };
-			});
-		},
-
-		handleImgRemove(file, row) {
-			console.log('handleImgRemove', file);
-			let url = file.url || file.response.data.url;
-			if (url) {
-				row.imgList = row.imgList.filter(item => item !== url);
-				this.computeImgShowList(row);
-			}
-		},
-
-		getRowClass({ rowIndex, columnIndex }) {
-			if (rowIndex === 0) {
-				return 'background: #2195fe; color: #fff;';
-			}
-		},
-
-		handleChange(row, type) {
-			console.log('type----', type);
-			if (type == 'cancle') {
-				row = { ...this.tempRow };
-				row.isEdit = false;
-				if (this.btnType == 'add') this.tableData.pop();
-				this.getList();
-				console.log('row----', row);
-			} else {
-				this.tempRow = { ...row };
-				row.isEdit = true;
-			}
-			this.btnType = type;
-			this.isEdit = !this.isEdit;
-		},
-
-		handleChangeStaff(row) {
-			const { inspectStaffId } = row;
-			const { optionStaff } = this;
-			let item = optionStaff.find(item => item.value == inspectStaffId);
-			if (item) {
-				row.inspectStaffName = item.name;
-				row.inspectStaffMobile = item.mobile;
-			}
-		},
-
-		async getOptionStaff() {
-			let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
-			const { data, code, msg } = await requestPost(url, {});
-
-			if (code === 0) {
-				this.optionStaff = data || [];
-			} else {
-				this.$message.error('请求工作人员数据失败！');
-			}
-		},
-
-		async handleEdit(row) {
-			if (this.btnType == 'add') this.save(row);
-			else this.edit(row);
-		},
-
-		handleAdd() {
-			this.btnType = 'add';
-			this.isEdit = true;
-
-			const item = {
-				isEdit: true,
-				id: this.id,
-				inspectTime: '',
-				inspectStaffId: '',
-				inspectStaffName: '',
-				inspectStaffMobile: '',
-				inspectResult: '',
-				imgList: [],
-				nextInspectTime: ''
-			};
-			this.computeImgShowList(item);
-			this.tableData.push(item);
-		},
-
-		async save(row) {
-			const params = {
-				equipmentId: this.id,
-				...row
-			};
-			const url = `/actual/base/safetyEquipmentInspectRecord/save`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				return this.$message.error(res.msg);
-			} else {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.btnType = 'cancle';
-				this.getList();
-			}
-		},
-
-		async edit(row) {
-			const params = {
-				...row
-			};
-			const url = `/actual/base/safetyEquipmentInspectRecord/update`;
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				return this.$message.error(res.msg);
-			} else {
-				this.$message.success('保存成功');
-				row.isEdit = false;
-				this.isEdit = false;
-				this.getList();
-			}
-		},
-
-		async del(row) {
-			const url = `/actual/base/safetyEquipmentInspectRecord/delete/${this.id}`;
-			const { data, code, msg } = await requestPost(url);
-
-			if (code === 0) {
-				return this.$message.error(res.msg);
-			} else {
-				this.$message.success('删除成功');
-				this.getList();
-			}
-		},
-
-		async getList() {
-			const params = {
-				equipmentId: this.id
-			};
-			const url = `/actual/base/safetyEquipmentInspectRecord/page`;
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				return this.$message.error(res.msg);
-			} else {
-				this.tableData = res.data.list.map(item => {
-					this.computeImgShowList(item);
-					return {
-						...item,
-						isEdit: false
-					};
-				});
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
-@import '@/assets/scss/modules/management/list-main.scss';
-
-.mt10 {
-	margin-bottom: 10px;
-}
-.input-width {
-	width: 170px;
-}
-</style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
new file mode 100644
index 000000000..1ba828ea2
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/scoreRecord.vue
@@ -0,0 +1,351 @@
+<template>
+  <div class="g-main">
+
+    <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>
+
+    <el-table class="table"
+              :data="tableData"
+              border
+              :height="tableHeight"
+              v-loading="tableLoading"
+              :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+              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>
+      <el-table-column prop="content"
+                       header-align="center"
+                       align="center"
+                       label="需求内容"
+                       :show-overflow-tooltip="true"
+                       min-width="230">
+      </el-table-column>
+
+      <el-table-column prop="pointTime"
+                       header-align="center"
+                       align="center"
+                       label="时间"
+                       width="150">
+      </el-table-column>
+
+      <el-table-column prop="score"
+                       header-align="center"
+                       align="center"
+                       label="评价"
+                       width="120">
+      </el-table-column>
+
+      <el-table-column prop="point"
+                       header-align="center"
+                       align="center"
+                       label="积分"
+                       width="100">
+      </el-table-column>
+
+    </el-table>
+    <div>
+      <el-pagination @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page.sync="pageNo"
+                     :page-sizes="[10, 20, 50]"
+                     :page-size="pageSize"
+                     layout="sizes, prev, pager, next, total"
+                     :total="total">
+      </el-pagination>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+import util from '@js/util.js';
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      totalPoint: 100,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+      serviceId: '',
+
+      pickerOptions: { //控制时间范围
+        disabledDate (time) {
+          return time.getTime() > (Date.now())
+        }
+      },
+
+      timeRange: [],
+      unitId: '',
+      formData: {
+
+        startTime: '',
+        endTime: ''
+      },
+
+      tableData: [],
+
+
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  async mounted () {
+
+
+  },
+
+  methods: {
+    async initForm (serviceId) {
+      this.initDate()
+
+      this.serviceId = serviceId
+
+      //获取数据
+      await this.loadTable()
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+
+    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,
+        serviceId: this.serviceId,
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.totalPoint = data.totalPoint
+        this.total = data.page.total
+        this.tableData = data.page.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    //初始化时间
+    initDate () {
+      let today = new Date((new Date).getTime())
+
+      let year = today.getFullYear()
+      let month = today.getMonth() + 1 //月
+      let day = today.getDate() //日
+
+      let days = new Date(year, month, 0);
+      days = days.getDate(); //获取当前月的天数
+      let year2 = year;
+      let month2 = parseInt(month) - 1;
+      if (month2 == 0) {
+        year2 = parseInt(year2) - 1;
+        month2 = 12;
+      }
+      let day2 = day;
+      let days2 = new Date(year2, month2, 0);
+      days2 = days2.getDate();
+      if (day2 > days2) {
+        day2 = days2;
+      }
+      if (month2 < 10) {
+        month2 = '0' + month2;
+      }
+      if (month < 10) {
+        month = '0' + month;
+      }
+      if (day < 10) {
+        day = '0' + day;
+      }
+      if (day2 < 10) {
+        day2 = '0' + day2;
+      }
+      let t2 = year2 + '-' + month2 + '-' + day2;
+      let t1 = year + '-' + month + '-' + day;
+      // let t3 = formate(t2, style);
+      this.formData.startTime = t2 + ' 00:00:00'
+      this.formData.endTime = t1 + ' 23:59:59'
+
+      this.timeRange = [t2, t1]
+    },
+
+
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+        // this.startTimeShow = ''
+        // this.endTimeShow = ''
+      }
+
+      this.loadTable()
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 460)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+    serviceType: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+
+.g-main {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 23px 30px 10px;
+}
+
+.m-search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+.item_width_2 {
+  width: 495px;
+}
+
+.m-table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>