wzl-2021-01-21

src/router/pudongRoutes.json

@@ -57,12 +57,6 @@
         {
           "path": "/danger/credit/creditTitle", "name": "creditTitle", 
           "meta": { "title": "信用主体评分", "menuPath": true, "menuIcon": "profile", "hideInBread": false}
-        },
-        {
-          "path": "/danger/credit/archive", "name": "creditArchive",
-          "meta": { 
-            "title": "信用主体归档", "menuPath": true, "menuIcon": "profile", "hideInBread": false
-          }
         }
       ]
     },
@@ -85,28 +79,28 @@
       "meta": { "title": "服务考核", "menuPath": true, "menuIcon": "profile", "hideInBread": true },
       "children": [
         {
-          "path": "/danger/propertyScore/scoreTemplateList", "name": "scoreTemplateList",
-          "meta": { "title": "物业评分模版列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
+          "path": "/danger/propertyScore/propertyAchievedList", "name": "propertyAchievedList",
+          "meta": { "title": "达标考核列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
           "children": [
             {
-              "path": "/danger/propertyScore/scoreTemplateList/scoreTempImport", "name": "scoreTempImport",
-              "meta": { "title": "物业评分模版导入", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
+              "path": "/danger/propertyScore/propertyAchievedList/propertyAchievedModify", "name": "propertyAchievedModify",
+              "meta": { "title": "达标考核修改", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
             }
           ]
-        }, 
+        },
         {
-          "path": "/danger/propertyScore/propertyQuarterScoreList", "name": "propertyQuarterScoreList",
-          "meta": { "title": "物业评分季度列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
+          "path": "/danger/propertyScore/scoreTemplateList", "name": "scoreTemplateList",
+          "meta": { "title": "评分模板配置", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
           "children": [
             {
-              "path": "/danger/propertyScore/propertyQuarterScoreList/propertyScoreList", "name": "propertyScoreList",
-              "meta": { "title": "物业评分列表", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
+              "path": "/danger/propertyScore/scoreTemplateList/scoreTempImport", "name": "scoreTempImport",
+              "meta": { "title": "物业评分模版导入", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
             }
           ]
         }, 
         {
           "path": "/danger/propertyScore/propertyPhoneList", "name": "propertyPhoneList",
-          "meta": { "title": "物业手机号列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
+          "meta": { "title": "评分人员配置", "menuPath": true, "menuIcon": "profile", "hideInBread": false },
           "children": [
             {
               "path": "/danger/propertyScore/propertyPhoneList/addPhone", "name": "addPhone",

src/server/api.js

@@ -61,8 +61,8 @@ case 'huangpu-prod':
 
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2' 
-  // BASE_URL = 'http://211.136.105.193/apiv2'
-  BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
+  BASE_URL = 'http://211.136.105.193/apiv2'
+  // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/api/v2'
  

src/views/houseData/basicInfo.vue

@@ -347,7 +347,7 @@ export default {
       tableName: '', // 邻里小汇
       formed: '', // 邻里小汇
       type: '', // 邻里小汇
-      isBeforeTwoThousand: '0',
+      isBeforeTwoThousand: '',
       twoThousandValue: '',
       personalizedKey: ''
     }
@@ -421,6 +421,12 @@ export default {
     },
     reset(){ // 重置表单
       this.form.resetFields()
+
+      this.stLevel = ''
+      this.cspServiceType = ''
+      this.type = ''
+      this.isBeforeTwoThousand = ''
+
       this.pagination.pageNo = 1
       this.pagination.current = 1
       this.pagination.pageSize = 20
@@ -514,10 +520,12 @@ export default {
         'cspServiceType': !this.cspServiceType? '': this.cspServiceType,
         // 'tableName': !this.tableName?'': this.tableName,
         'type': !this.type? '': this.type,
-        'sectType_in': '1',
+        'sectType': 1,
+        'sectType_in': this.sectType_in,
         'c.createTime_desc': 'desc',
-        'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
-        'finishDate_gt': !this.form.getFieldValue('finishDate') ? '' : !this.isBeforeTwoThousand? '2000-01-01': '',
+        // 'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
+        'finishDate_lt': this.isBeforeTwoThousand == '1' ? '2020-01-01':'',
+        'finishDate_gt': this.isBeforeTwoThousand == '2' ? '2020-01-01':'',
       }, obj, isHocId)// 融合obj 和isHocId 到入参
 
       searchParams[this.personalizedKey] = !this.formed?'': this.formed
@@ -796,7 +804,7 @@ export default {
 
       case '2':
         this.tableName = 'tbl_community'
-        this.formed = '10, ' + (this.$moment().format('L').split('/')).join('')
+        this.formed = '10,' + (this.$moment().format('L').split('/')).join('')
         this.type = 'bet'
         break  
 
@@ -815,7 +823,19 @@ export default {
       this.getList()
     },
     changeFinishDate(val) {
-      this.isBeforeTwoThousand = val
+      switch (val) {
+      case '1':
+        this.isBeforeTwoThousand = '1'
+        break
+
+      case '2':
+        this.isBeforeTwoThousand = '2'
+        break
+      
+      default:
+        this.isBeforeTwoThousand = 'none'
+        break
+      }
       this.getList()
     }
   },

src/views/houseData/managers.vue

@@ -16,8 +16,8 @@
           </a-col>
           <a-col span="8" >
             <a-form-item label="物业服务企业名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
-              <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['cspId'] " @change="changeWy">
-                <a-select-option v-for="(item) in wuye" :key="item.cspId" :value="item.cspId">{{ item.cspName}}</a-select-option>
+              <a-select showSearch placeholder="请选择查询内容" v-decorator="['cspId'] " @change="changeWy">
+                <a-select-option v-for="(item) in wuye" :key="item.cspId" :value=" item.cspName+'#'+item.cspId">{{ item.cspName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -172,7 +172,8 @@ export default {
       this.$ajax.get({
         url: this.$api.GET_PROPCOMPANIES_LIST,
         params: {
-          pageSize: 100000
+          pageSize: 100000,
+          sectType_in: '1'
         }
       }).then(res => {
         if (res.code == 200 ) {
@@ -180,11 +181,11 @@ export default {
         }
       })
     },
-    changeWy(){
-      // let query=JSON.parse(JSON.stringify(this.$route.query))
-      // query={id:'',name:''}
-      // this.$router.push({path:'basicInfo',query:query}) 
-
+    changeWy(value){// 切换街道
+      this.form.setFieldsValue({
+        'cspId': value.split('#')[1]
+      })
+      this.getList()
     },
     getList(){ // 获取数据
       //处理动态的搜索条件,耦合到搜索列表

src/views/houseData/propertyInfoView.vue

@@ -234,7 +234,7 @@
                     <p style=" text-align: left; font-weight: bold; color: #232323; font-size: 16px; text-indent: 0.5rem;
                     line-height: 60px; border-bottom: 1px solid #e0e0e0; margin-top: 20px;">管理小区列表</p>
 
-                    <a-table :dataSource="tableData" :columns="columns" size="large" :pagination="pagination" rowKey="id" bordered> 
+                    <a-table :dataSource="tableData1" :columns="columns" size="large" :pagination="pagination" rowKey="id" bordered> 
                     </a-table> 
 
                   </div>
@@ -816,6 +816,7 @@ export default {
       customKeyEnable: 'false',
       tbl: '',
       tableData: [],
+      tableData1: [],
       columns: [
         {
           title: '小区名称',
@@ -858,16 +859,19 @@ export default {
     }
   },
   mounted() {
-    this.getStList()
+    this.getStList(),
+    this.getAfterStList()
   },
   methods: {
     getStList(){
       this.$ajax.get({
         url: this.$api.GET_BASIC_LIST,
         params: {
-          'c.csmId': this.$route.query.id,
+          'c.cspId': this.$route.query.id,
           pageSize: 10,
-          pageNo: this.pagination.pageNo
+          pageNo: this.pagination.pageNo,
+          'c.createTime_desc': 'desc',
+          'sectType_in': '1'
         }
       }).then(res => {
         if (res.code == 200 ) {
@@ -879,6 +883,26 @@ export default {
         }
       })
     },
+    getAfterStList(){
+      this.$ajax.get({
+        url: this.$api.GET_BASIC_LIST,
+        params: {
+          'c.csmId': this.$route.query.id,
+          pageSize: 10,
+          pageNo: this.pagination.pageNo,
+          'c.createTime_desc': 'desc',
+          'sectType_in': '1'
+        }
+      }).then(res => {
+        if (res.code == 200 ) {
+          this.tableData1 = res.data.content
+          this.pagination.pageNo = res.data.totalPages
+          this.pagination.current = res.data.page
+          this.pagination.pageSize = res.data.pageSize
+          this.pagination.total = res.data.totalRows
+        }
+      })
+    },
     pageChange(page, pageSize){ //分页切换
       this.pagination.pageNo = page
       this.pagination.current = page