Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseUipSearchBody.java

@@ -41,6 +41,11 @@ public class EnterpriseUipSearchBody extends BasePage {
      */
     private List<Integer> areaIds;
 
+    /**
+     * 地区级别 1 省级，2 地市级，3区县级
+     */
+    private Integer regionLevel;
+
     /**
      * 城投业务类型
      */

dsk-operate-ui/src/views/detail/party-a/opport/administrative.vue

@@ -45,18 +45,18 @@ export default {
         pageSize: 20
       },
       forData: [
-        {label: '许可决定日期', prop: 'xxx', width: '100'},
+        {label: '许可决定日期', prop: 'deciTime', width: '100'},
         {label: '决定文书号', prop: 'deciWritNo', width: '200'},
-        {label: '许可编号', prop: 'xxx', width: '100'},
+        {label: '许可编号', prop: 'permitNo', width: '100'},
         {label: '决定文书名称', prop: 'deciWritName', width: '190'},
         {label: '许可内容', prop: 'content', width: '300', slot: true},
         {label: '有效期自', prop: 'valiBegin', width: '100'},
         {label: '有效期至', prop: 'valiEnd', width: '100'},
-        {label: '行政许可类别', prop: 'xxx', width: '100'},
+        {label: '行政许可类别', prop: 'permitType', width: '100'},
         {label: '许可机关', prop: 'office', width: '180'},
         {label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
-        {label: '数据来源单位', prop: 'xxx', width: '110'},
-        {label: '数据来源单位统一社会信用代码', prop: 'xxx', width: '200'},
+        {label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
+        {label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
         {label: '来源', prop: 'dataSource', width: '80'}
       ],
       formData: [

dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue

@@ -128,7 +128,6 @@ export default {
       this.tableDataTotal = res.total
     },
     getAreaList(params){
-      console.log('参数1：',params)
       if(params.province&&params.province.length>0){
         let provinceIds = [], cityIds = [], areaIds = []
         for(let i=0;i<params.province.length;i++){
@@ -147,7 +146,6 @@ export default {
           return self.indexOf(value) === index
         })
       }
-      console.log('参数2：',params)
       return params
     }
   }