大走访问题诉求开发之前

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/controller/EnterpriseElectricityController.java

@@ -54,7 +54,6 @@ public class EnterpriseElectricityController {
 	 */
 	@ApiLog("查询企业电费列表数据")
 	@ApiOperation(value = "查询企业电费列表数据")
-	@PreAuthorize("hasAuthority('enterpriseelectricity:enterpriseElectricity:list')")
 	@GetMapping("list")
 	public ResponseEntity<IPage<EnterpriseElectricityDTO>> list(EnterpriseElectricityDTO enterpriseElectricityDTO, Page<EnterpriseElectricityDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (enterpriseElectricityDTO, EnterpriseElectricityDTO.class);
@@ -68,7 +67,6 @@ public class EnterpriseElectricityController {
 	 */
 	@ApiLog("根据Id获取企业电费数据")
 	@ApiOperation(value = "根据Id获取企业电费数据")
-	@PreAuthorize("hasAnyAuthority('enterpriseelectricity:enterpriseElectricity:view','enterpriseelectricity:enterpriseElectricity:add','enterpriseelectricity:enterpriseElectricity:edit')")
 	@GetMapping("queryById")
 	public ResponseEntity<EnterpriseElectricityDTO> queryById(String id) {
 		return ResponseEntity.ok ( enterpriseElectricityWrapper.toDTO ( enterpriseElectricityService.getById ( id ) ) );

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/mapper/xml/EnterpriseElectricityMapper.xml

@@ -5,7 +5,6 @@
     <sql id="enterpriseElectricityColumns">
         a.id AS "id",
 		a.qy_id AS "qyId",
-		b.name AS "qyName",
 		a.stime AS "sTime",
 		a.etime AS "eTime",
 		a.amount AS "amount",
@@ -20,8 +19,6 @@
 		a.des7 AS "des7",
 		a.des8 AS "des8",
 
-		c.building_name AS "des9",
-		d.park_name AS "des10",
 
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -33,9 +30,6 @@
     <sql id="enterpriseElectricityJoins">
 
         LEFT JOIN sys_user qyId ON qyId.id = a.qy_id
-		LEFT JOIN ly_enterprise_info b ON b.id = a.qy_id
-		left join yl_building_management c on b.des1=c.id
-		left join ly_park_management d on c.park_management=d.id
     </sql>
 
     <select id="findList" resultType="com.jeeplus.enterpriseelectricity.service.dto.EnterpriseElectricityDTO">

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/service/dto/EnterpriseElectricityDTO.java

@@ -29,7 +29,6 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 企业
      */
-	@NotNull(message="企业不能为空")
     @Query(type = QueryType.LIKE)
 	@ExcelProperty("企业")
 	private String qyId;
@@ -39,7 +38,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
      * 开始时间
      */
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@NotNull(message="开始时间不能为空")
+
     @Query(type = QueryType.EQ)
 	@ExcelProperty("开始时间")
 	private Date stime;
@@ -48,7 +47,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
      * 结束时间
      */
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@NotNull(message="结束时间不能为空")
+
     @Query(type = QueryType.EQ)
 	@ExcelProperty("结束时间")
 	private Date etime;
@@ -56,7 +55,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 金额
      */
-	@NotNull(message="金额不能为空")
+
     @Query(type = QueryType.BETWEEN)
 	@ExcelProperty("金额")
 	private String amount;
@@ -64,7 +63,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 用电量
      */
-	@NotNull(message="用电量不能为空")
+
     @Query(type = QueryType.BETWEEN)
 	@ExcelProperty("用电量")
 	private String degrees;
@@ -72,7 +71,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 是否缴费
      */
-	@NotNull(message="是否缴费不能为空")
+
     @Query(type = QueryType.EQ)
 	@ExcelProperty(value = "是否缴费", converter = ExcelDictDTOConverter.class)
 	@ExcelDictProperty("yes_no")
@@ -81,24 +80,28 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 备注1
      */
+	@Query(type = QueryType.LIKE)
 	@ExcelProperty("备注1")
 	private String des1;
 
 	/**
      * 备注2
      */
+	@Query(type = QueryType.LIKE)
 	@ExcelProperty("备注2")
 	private String des2;
 
 	/**
      * 备注3
      */
+	@Query(type = QueryType.LIKE)
 	@ExcelProperty("备注3")
 	private String des3;
 
 	/**
      * 备注4
      */
+	@Query(type = QueryType.LIKE)
 	@ExcelProperty("备注4")
 	private String des4;
 

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/controller/EnterpriseInfoController.java

@@ -146,6 +146,28 @@ public class EnterpriseInfoController {
 		return ResponseEntity.ok (result);
 	}
 
+	/**
+	 * 登录企业
+	 */
+	@ApiLog("登录企业")
+	@ApiOperation(value = "登录企业")
+	@GetMapping("Loginlist")
+	public ResponseEntity<IPage<EnterpriseInfoDTO>> Loginlist(EnterpriseInfoDTO enterpriseInfoDTO, Page<EnterpriseInfoDTO> page) throws Exception {
+		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (enterpriseInfoDTO, EnterpriseInfoDTO.class);
+
+		UserDTO userDTO = UserUtils.getCurrentUserDTO();
+		List<HashMap<String, Object>> map=new ArrayList<>();
+
+		IPage<EnterpriseInfoDTO> result = enterpriseInfoService.findList3 (page, queryWrapper,enterpriseInfoDTO.getName());
+//		//未登录限制
+//		if(userDTO.getLoginName()==null){
+//			for(int i=0;i<result.getRecords().size();i++){
+//				result.getRecords().set(i,nologindel(result.getRecords().get(i)));
+//			}
+//		}
+		return ResponseEntity.ok (result);
+	}
+
 	private EnterpriseInfoDTO nologindel(EnterpriseInfoDTO ei){
 		List<HashMap<String, Object>> map=enterpriseInfoService.getnologinstr("nol_ogin_show");
 		ei.setDes5("*******");//初始密码

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/EnterpriseInfoMapper.java

@@ -29,6 +29,8 @@ public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfo> {
     List<EnterpriseInfoDTO> findList();
     IPage <EnterpriseInfoDTO> findList2(Page <EnterpriseInfoDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String industry,String name,String bz2);
 
+    IPage <EnterpriseInfoDTO> findList3(Page <EnterpriseInfoDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String name);
+
     String findQyidByOfficeid(String Officeid);
     String findLyidByOfficeid(String Officeid);
     String getOfficeBuildTypeforuserid(String userid);

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/xml/EnterpriseInfoMapper.xml

@@ -63,6 +63,58 @@
 		a.del_flag AS "delFlag"
     </sql>
 
+    <sql id="enterpriseInfoColumns2">
+        a.id AS "id",
+        a.name AS "name",
+		a.industry AS "industry",
+		a.entry_time AS "entryTime",
+		a.office_area AS "officeArea",
+		a.annual_rent AS "annualRent",
+		a.floor AS "floor",
+		a.des1 AS "des1",
+		a.des2 AS "des2",
+		a.des3 AS "des3",
+		a.ht_stime AS "htStime",
+		a.ht_etime AS "htEtime",
+		a.qy_des AS "qy_des",
+		a.business_content AS "businessContent",
+		a.total_number AS "totalNumber",
+		a.security_number AS "securityNumber",
+		a.below_undergraduate AS "belowUndergraduate",
+		a.undergraduate AS "undergraduate",
+		a.postgraduate AS "postgraduate",
+		a.doctoral_student AS "doctoralStudent",
+		a.num2 AS "num2",
+		a.num3 AS "num3",
+		a.soft_writing_numbers AS "softWritingNumbers",
+        a.bz1 AS "bz1",
+		a.bz2 AS "bz2",
+        a.bz3 AS "bz3",
+        a.bz4 AS "bz4",
+        a.bz5 AS "bz5",
+        a.bz6 AS "bz6",
+        a.des4 AS "des4",
+        a.des5 AS "des5",
+        a.des6 AS "des6",
+        a.des7 AS "des7",
+        a.des8 AS "des8",
+        a.des9 AS "des9",
+        a.des10 AS "des10",
+        a.des11 AS "des11",
+        a.des12 AS "des12",
+        a.des13 AS "des13",
+        a.des14 AS "des14",
+        a.des15 AS "des15",
+        a.lxr AS "lxr",
+        a.phone AS "phone",
+        a.tenant_id AS "tenantId",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag"
+    </sql>
+
     <select id="findList2" resultType="com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO">
         SELECT
         <include refid="enterpriseInfoColumns"/>
@@ -81,6 +133,29 @@
     </select>
 
 
+    <select id="findList3" resultType="com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO">
+        SELECT
+        u.name AS "lyname",
+        <include refid="enterpriseInfoColumns2"/>
+        FROM (SELECT create_by from sys_log
+        where type=1
+        <if test="name != null and name ==1">
+            and DATE(create_date) = CURDATE()
+        </if>
+
+        <if test="name != null and name ==2">
+            and YEAR(create_date) = YEAR(CURDATE())
+            AND MONTH(create_date) = MONTH(CURDATE())
+        </if>
+        GROUP BY create_by
+            )log
+        left join sys_user u on u.id=log.create_by
+        left join ly_enterprise_info a on a.phone=u.login_name
+        ${ew.customSqlSegment}
+
+    </select>
+
+
 
     <select id="findEnterpriseByPhone" resultType="com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO">
         SELECT *

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/service/EnterpriseInfoService.java

@@ -57,6 +57,12 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         return  baseMapper.findList2 (page, queryWrapper,industry,name,bz2);
     }
 
+    public IPage <EnterpriseInfoDTO> findList3(Page <EnterpriseInfoDTO> page, QueryWrapper queryWrapper,String name) {
+        //queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
+        return  baseMapper.findList3 (page, queryWrapper,name);
+    }
+
+
     //按楼宇查询企业
     public List<EnterpriseInfoDTO> findListFromLy(String Lyid) {
         return  baseMapper.findListFromLy (Lyid);

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/security/config/WebSecurityConfig.java

@@ -88,6 +88,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/sys/sysConfig/getConfig",
                         "/getAppFlowChart",
                         "/sys/getCode",
+                        "/enterpriseelectricity/enterpriseElectricity/list",
+                        "/enterpriseelectricity/enterpriseElectricity/queryById",
                         "/app/sys/getCode", "/map/mapVisualization/**",
                         "/sys/casLogin" ).permitAll ( ) // 允许请求无需认证
                 .antMatchers ( HttpMethod.OPTIONS, "/**" ).permitAll ( )

jp-ui/src/views/modules/enterpriseelectricity/EnterpriseElectricityForm.vue

@@ -4,77 +4,119 @@
     :title="title"
     :close-on-click-modal="false"
      v-dialogDrag
-    :visible.sync="visible">
+    :visible.sync="visible"
+    width='70%'>
     <el-form :model="inputForm" size="small" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
              label-width="120px">
       <el-row  :gutter="15">
+
+<!-- 政策标题、政策类型、政策级别、发布人、发布日期、政策内容 -->
+
         <el-col :span="12">
-            <el-form-item label="企业" prop="qyId"
+            <el-form-item label="政策标题" prop="des1"
                 :rules="[
-                  {required: true, message:'企业不能为空', trigger:'blur'}
+                  {required: true, message:'政策标题不能为空', trigger:'blur'}
                  ]">
-              <qy-select :limit='1' :value="inputForm.qyId" @getValue='(value) => {inputForm.qyId=value}'></qy-select>
+              <el-input v-model="inputForm.des1" placeholder="请填写政策标题"     ></el-input>
            </el-form-item>
         </el-col>
+
         <el-col :span="12">
-            <el-form-item label="开始时间" prop="stime"
+            <el-form-item label="政策发文日期" prop="stime"
                 :rules="[
-                  {required: true, message:'开始时间不能为空', trigger:'blur'}
+                  {required: true, message:'政策发文日期不能为空', trigger:'blur'}
                  ]">
                 <el-date-picker
                       style="width: 100%;"
                       v-model="inputForm.stime"
-                      type="datetime"
+                      type="date"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       placeholder="选择日期时间">
                     </el-date-picker>
            </el-form-item>
         </el-col>
+
         <el-col :span="12">
-            <el-form-item label="结束时间" prop="etime"
+            <el-form-item label="政策类型" prop="des2"
                 :rules="[
-                  {required: true, message:'结束时间不能为空', trigger:'blur'}
+                  {required: true, message:'政策类型不能为空', trigger:'blur'}
                  ]">
-                <el-date-picker
-                      style="width: 100%;"
-                      v-model="inputForm.etime"
-                      type="datetime"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      placeholder="选择日期时间">
-                    </el-date-picker>
+                <el-select v-model="inputForm.des2" placeholder="请选择"  style="width: 100%;">
+                          <el-option
+                            v-for="item in $dictUtils.getDictList('sys_zclx')"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                      </el-select>
            </el-form-item>
         </el-col>
+
         <el-col :span="12">
-            <el-form-item label="金额" prop="amount"
+            <el-form-item label="政策级别" prop="des3"
                 :rules="[
-                  {required: true, message:'金额不能为空', trigger:'blur'}
+                  {required: true, message:'政策级别不能为空', trigger:'blur'}
                  ]">
-              <el-input v-model="inputForm.amount" placeholder="请填写金额"     ></el-input>
+                <el-select v-model="inputForm.des3" placeholder="请选择"  style="width: 100%;">
+                          <el-option
+                            v-for="item in $dictUtils.getDictList('sys_zcjb')"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                      </el-select>
            </el-form-item>
         </el-col>
-        <el-col :span="12">
-            <el-form-item label="用电量" prop="degrees"
+
+        <el-col :span="24">
+            <el-form-item label="政策内容" prop="content"
                 :rules="[
-                  {required: true, message:'用电量不能为空', trigger:'blur'}
                  ]">
-              <el-input v-model="inputForm.degrees" placeholder="请填写用电量"     ></el-input>
+            <WangEditor ref="contentEditor" v-model="inputForm.des4"/>
            </el-form-item>
         </el-col>
-        <el-col :span="12">
-            <el-form-item label="是否缴费" prop="isPay"
+
+        <!-- <el-col :span="24">
+            <el-form-item label="图片" prop="des5"
                 :rules="[
-                  {required: true, message:'是否缴费不能为空', trigger:'blur'}
                  ]">
-                <el-select v-model="inputForm.isPay" placeholder="请选择"  style="width: 100%;">
-                          <el-option
-                            v-for="item in $dictUtils.getDictList('yes_no')"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                          </el-option>
-                      </el-select>
+              <el-upload ref="img"
+              v-if="visible"
+              list-type="picture-card"
+                    :action="`${this.$http.BASE_URL}/sys/file/webupload/upload?uploadPath=/qy/product/product`"
+                    :headers="{token: $cookie.get('token')}"
+                    :on-preview="(file, fileList) => {
+                        $alert(`<img style='width:100%' src=' ${(file.response && file.response.url) || file.url}'/>`,  {
+                          dangerouslyUseHTMLString: true,
+                          showConfirmButton: false,
+                          closeOnClickModal: true,
+                          customClass: 'showPic'
+                        });
+                    }"
+                    :before-upload="beforeUpload"
+                    :on-success="(response, file, fileList) => {
+                       inputForm.img = fileList.map(item => (item.response && item.response.url) || item.url).join('|')
+                    }"
+                    :on-remove="(file, fileList) => {
+                      $http.delete(`/sys/file/webupload/deleteByUrl?url=${(file.response && file.response.url) || file.url}`).then(({data}) => {
+                        $message.success(data)
+                      })
+                      inputForm.img = fileList.map(item => item.url).join('|')
+                    }"
+                    :before-remove="(file, fileList) => {
+                      return $confirm(`确定移除 ${file.name}？`)
+                    }"
+                    multiple
+                    :limit="5"
+                    :on-exceed="(files, fileList) =>{
+                      $message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+                    }"
+                    :file-list="imgArra">
+                    <i class="el-icon-plus"></i>
+                  </el-upload>
            </el-form-item>
-        </el-col>
+        </el-col> -->
+
         </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -87,6 +129,7 @@
 
 <script>
   import QySelect from '@/components/qySelect'
+  import WangEditor from '@/components/editor/WangEditor'
   import enterpriseElectricityService from '@/api/enterpriseelectricity/enterpriseElectricityService'
   export default {
     data () {
@@ -97,37 +140,43 @@
         loading: false,
         inputForm: {
           id: '',
-          qyId: '',
           stime: '',
-          etime: '',
-          amount: '',
-          degrees: '',
-          isPay: ''
+
+          des1: '',
+          des2: '',
+          des3: '',
+          des4: '',
         }
       }
     },
     components: {
-      QySelect
+      QySelect,
+      WangEditor
     },
     methods: {
       init (method, id) {
         this.method = method
         this.inputForm.id = id
         if (method === 'add') {
-          this.title = `新建企业电费`
+          this.title = `发布涉企政策`
         } else if (method === 'edit') {
-          this.title = '修改企业电费'
+          this.title = '修改涉企政策'
         } else if (method === 'view') {
-          this.title = '查看企业电费'
+          this.title = '查看涉企政策'
         }
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
           this.$refs.inputForm.resetFields()
+          this.$refs.contentEditor.init('')
           if (method === 'edit' || method === 'view') { // 修改或者查看
             this.loading = true
             enterpriseElectricityService.queryById(this.inputForm.id).then(({data}) => {
+              //data.stime=data.stime.substring(0,10)
+              data.stime=data.stime+" 00:00:00"
+              console.log(data.stime)
               this.inputForm = this.recover(this.inputForm, data)
+              this.$refs.contentEditor.init(this.inputForm.des4)
               this.loading = false
             })
           }

jp-ui/src/views/modules/enterpriseelectricity/EnterpriseElectricityList.vue

@@ -2,124 +2,41 @@
     <div class="page">
       <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
             <!-- 搜索框-->
-            <el-form-item prop="des7">
-               <GridSelect
-                 title="选择所属园区"
-                 labelName = 'parkName'
-                 placeholder="请选择园区"
-                 labelValue = 'id'
-                 :value = "searchForm.des7"
-                 :limit="1"
-                 @getValue='(value) => {searchForm.des7=value}'
-                 :columns="[
-                 {
-                   prop: 'parkName',
-                   label: '园区名称'
-                 },
-                 {
-                   prop: 'placeSelectName',
-                   label: '地点'
-                 },
-                 {
-                   prop: 'placeDetailed',
-                   label: '详细地址'
-                 },
-                 {
-                   prop: 'propertyName',
-                   label: '物业名称'
-                 }
-                 ]"
-                 :searchs="[
-                 {
-                   prop: 'parkName',
-                   label: '园区名称'
-                 }
-                 ]"
-                 dataListUrl="/parkmanagement/parkManagement/list"
-                 queryEntityUrl="/parkmanagement/parkManagement/queryById">
-               </GridSelect>
-            </el-form-item>
 
-            <el-form-item prop="des1">
-               <GridSelect
-                 title="选择所属楼宇"
-                 labelName = 'buildingName'
-                 placeholder="请选择楼宇"
-                 labelValue = 'id'
-                 :value = "searchForm.des1"
-                 :limit="1"
-                 @getValue='(value) => {searchForm.des1=value}'
-                 :columns="[
-                 {
-                   prop: 'buildingName',
-                   label: '楼宇名称'
-                 },
-                 {
-                   prop: 'placeSelectName',
-                   label: '地点'
-                 },
-                 {
-                   prop: 'buildingContacts',
-                   label: '楼宇联系人'
-                 },
-                 {
-                   prop: 'buildingArea',
-                   label: '楼宇总面积'
-                 }
-                 ]"
-                 :searchs="[
-                 {
-                   prop: 'buildingName',
-                   label: '楼宇名称'
-                 },
-                 {
-                   prop: 'organizationType',
-                   label: '组织类型',
-                   value: searchForm.des7,
-                   show: 1
-                 }
-                 ]"
-                 dataListUrl="/buildinginfo/buildingManagement/list"
-                 queryEntityUrl="/buildinginfo/buildingManagement/queryById">
-               </GridSelect>
-            </el-form-item>
 
-         <el-form-item prop="qyId">
-            <qy-select :limit='1' size="small" placeholder="请选择企业" :value="searchForm.qyId" @getValue='(value) => {searchForm.qyId=value}'></qy-select>
+
+         <el-form-item prop="des1">
+                <el-input size="small" v-model="searchForm.des1" placeholder="政策标题" clearable></el-input>
          </el-form-item>
-         <el-form-item prop="stime">
+
+         <el-form-item prop="des2">
+            <el-select v-model="searchForm.des2" placeholder="政策类型" size="small" style="width: 100%;">
+              <el-option
+                v-for="item in $dictUtils.getDictList('sys_zclx')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="des3">
+             <el-select v-model="searchForm.des3" placeholder="政策级别" size="small" style="width: 100%;">
+               <el-option
+                 v-for="item in $dictUtils.getDictList('sys_zcjb')"
+                 :key="item.value"
+                 :label="item.label"
+                 :value="item.value">
+               </el-option>
+             </el-select>
+          </el-form-item>
+          <el-form-item prop="stime">
                 <el-date-picker
                   v-model="searchForm.stime"
-                  type="datetime"
-                  size="small"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择开始时间">
-                </el-date-picker>
-         </el-form-item>
-         <el-form-item prop="etime">
-                <el-date-picker
-                  v-model="searchForm.etime"
-                  type="datetime"
+                  type="date"
                   size="small"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择结束时间">
+                  placeholder="请选择发文日期">
                 </el-date-picker>
-         </el-form-item>
-         <el-form-item prop="amount">
-                <el-input size="small" v-model="searchForm.amount" placeholder="金额" clearable></el-input>
-         </el-form-item>
-         <el-form-item prop="degrees">
-                <el-input size="small" v-model="searchForm.degrees" placeholder="用电量" clearable></el-input>
-         </el-form-item>
-         <el-form-item prop="isPay">
-                  <el-select v-model="searchForm.isPay" placeholder="请选择是否缴费" size="small" style="width: 100%;">
-                    <el-option
-                      v-for="item in $dictUtils.getDictList('yes_no')"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -182,54 +99,43 @@
             <vxe-column type="seq" width="40"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
-      field="des10"
+      field="des1"
       sortable
-      title="所属园区">
+      title="政策标题">
     </vxe-column>
+
     <vxe-column
-        field="des9"
-        sortable
-        title="所属楼宇">
-    </vxe-column>        
-    <vxe-column
-       width="240px"
-       field=""
-       sortable
-       title="企业">
-            <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('enterpriseother:enterpriseOther:edit')" @click="edit(scope.row.id)">{{scope.row.qyName }}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('enterpriseother:enterpriseOther:view')"  @click="view(scope.row.id)">{{scope.row.qyName }}</el-link>
-              <span v-else>{{scope.row.qyName}}</span>
-            </template>
-      </vxe-column>
-    <vxe-column
-        field="stime"
-        sortable
-        title="开始时间">
-      </vxe-column>
-    <vxe-column
-        field="etime"
-        sortable
-        title="结束时间">
-      </vxe-column>
-    <vxe-column
-        field="amount"
+        field="des2"
         sortable
-        title="金额">
+        title="政策类型">
+        <template slot-scope="scope">
+              {{ $dictUtils.getDictLabel("sys_zclx", scope.row.des2, '-') }}
+        </template>
       </vxe-column>
+
     <vxe-column
-        field="degrees"
+        field="des3"
         sortable
-        title="用电量">
+        title="政策级别">
+        <template slot-scope="scope">
+              {{ $dictUtils.getDictLabel("sys_zcjb", scope.row.des3, '-') }}
+        </template>
       </vxe-column>
+
+
     <vxe-column
-        field="isPay"
+        field="stime"
         sortable
-        title="是否缴费">
-        <template slot-scope="scope">
-              {{ $dictUtils.getDictLabel("yes_no", scope.row.isPay, '-') }}
-        </template>
+        title="政策发文日期">
       </vxe-column>
+
+
+      <vxe-column
+          field="updateDate"
+          sortable
+          title="更新时间">
+        </vxe-column>
+
       <vxe-column
         fixed="right"
         align="center"
@@ -275,6 +181,8 @@
           degrees: '',
           isPay: '',
           des1: '',
+          des2: '',
+          des3: '',
           des7: ''
         },
         dataList: [],