Merge remote-tracking branch 'origin/master'

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
     }
   }

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -27,7 +27,7 @@
             <div class="wj wj1"></div>上传文件
           </el-upload>
         </div>
-        <div>
+        <div style="display: none">
           <el-upload
             class="upload-demo"
             :action="action"
@@ -274,7 +274,7 @@
   .uploadbox{
     position: absolute;
     width: 124px;
-    height: 73px;
+    height: 36px;
     background: #FFFFFF;
     box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.08);
     border-radius: 2px;