Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/views/modules/partymember/icpartyorgtree.vue

@@ -78,7 +78,7 @@
               top="5vh"
               class="dialog-h"
               :before-close="handleClose">
-          <el-form ref="principalRules"
+          <el-form ref="refPrincipalRules"
                    :inline="true"
                    :model="editPrincipalData"
                    :rules="principalRules"
@@ -120,7 +120,8 @@
           editPrincipalData: {
               principal: '',
               principalMobile: '',
-              partyOrgId: ''
+              partyOrgId: '',
+              principalStaffId: ''
           },
         searchH: 0,
         dataForm: {
@@ -203,6 +204,9 @@
     methods:{
         principal(row) {
             this.principalShow = true
+            this.$nextTick(() => {
+                this.$refs['refPrincipalRules'].resetFields();
+            })
             this.editPrincipalData.partyOrgId = row.id
             this.editPrincipalData.principal = row.principal
             this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
@@ -217,10 +221,11 @@
             this.staffs.forEach(s => {
                 if (this.editPrincipalData.principal === s.value){
                     this.editPrincipalData.principal = s.name
+                    this.editPrincipalData.principalStaffId = s.value
                     this.editPrincipalData.principalMobile = s.mobile
                 }
             })
-            this.$refs['principalRules'].validate((valid) => {
+            this.$refs['refPrincipalRules'].validate((valid) => {
                 if (!valid) {
                     return false
                 }
@@ -243,7 +248,8 @@
             this.editPrincipalData = {
                 principal: '',
                 principalMobile: '',
-                partyOrgId: ''
+                partyOrgId: '',
+                principalStaffId: ''
             }
         },
       // 查询列表

src/views/modules/shequzhili/event/cpts/event-detail.vue

@@ -10,8 +10,8 @@
             <span>{{ info.gridName }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
-            <span class="info-title-2">上报时间：</span>
+            <span class="info-title-2">发生时间：</span>
-            <span>{{ info.createdTime }}</span>
+            <span>{{ info.happenTime }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">事件内容：</span>

src/views/modules/shequzhili/event/eventList.vue

@@ -48,18 +48,23 @@
             </el-form-item>
             <el-form-item label="事件类型"
                           prop="firstIdList">
-              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
+              <el-cascader ref="cascaderEvent"
-                collapse-tags
+                           v-model="eventTypeCheck"
-                :show-all-levels="false"
+                           :options="cateOptions"
-                :props="{
+                           collapse-tags
+                           :show-all-levels="false"
+                           :props="{
                   multiple: true,
                   checkStrictly: false,
                   emitPath: false,
                   children:'subCategory',
                   label:'name',
                   value:'id'
-                }" clearable class="item_width_2" @change="handleEventType" />
+                }"
-                <!-- <template slot-scope="{ node, data }">
+                           clearable
+                           class="item_width_2"
+                           @change="handleEventType" />
+              <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
                     <span>{{ data.name }}</span>
                   </div>
@@ -177,14 +182,12 @@
                            label="所属网格"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="categoryName"
-            prop="categoryName"
+                           label="事件类型"
-            label="事件类型"
+                           min-width="140"
-            min-width="140"
+                           align="center"
-            align="center"
+                           :show-overflow-tooltip="true" />
-            :show-overflow-tooltip="true"
+          <!-- <template slot-scope="scope">
-          />
-            <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
           </el-table-column> -->
@@ -259,11 +262,11 @@
           </template> -->
           </el-table-column>
 
-          <el-table-column prop="createdTime"
+          <el-table-column prop="happenTime"
                            align="center"
                            width="140"
                            :show-overflow-tooltip="true"
-                           label="上报时间">
+                           label="发生时间">
           </el-table-column>
           <el-table-column prop="operationTypeShow"
                            align="center"
@@ -505,7 +508,7 @@ export default {
     this.getCateOptions()
   },
   methods: {
-    handleEventType(val) {
+    handleEventType (val) {
       // console.log('val-----eee', val)
       console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
       const nodes = this.$refs.cascaderEvent.getCheckedNodes()
@@ -709,11 +712,11 @@ export default {
         this.delEvent(rowData.icEventId);
       }).catch((err) => { });
     },
-    async delEvent (eventId){
+    async delEvent (eventId) {
       const url = "/gov/project/icEvent/delete";
       let idsArr = [eventId];
 
-      const { data, code, msg } =await requestPost(url, idsArr);
+      const { data, code, msg } = await requestPost(url, idsArr);
 
       if (code === 0) {
         this.$message.success("删除成功！");
@@ -757,7 +760,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getCateOptions() {
+    async getCateOptions () {
       const url = "/gov/issue/issueprojectcategorydict/list";
 
       const { data, code, msg } = await requestPost(url, {});
@@ -807,7 +810,7 @@ export default {
       this.getTableData();
       // this.loadTable()
     },
-    deepTree(arr, child) {
+    deepTree (arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {
         return arr.map(item => {
           // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
@@ -831,5 +834,4 @@ export default {
     width: 200px;
   }
 }
-
 </style>

src/views/modules/visual/basicinfo/people.vue

@@ -70,22 +70,22 @@
 
               <div class="ren-prop z-4">
                 <img src="@/assets/img/shuju/people/ren-prop-4.png" />
-                <span>志愿者类别</span>
+                <span>住户类别</span>
 
                 <div class="ren-cnt">
-                  <h5>志愿者类别：</h5>
+                  <h5>住户类别：</h5>
                   <p>
                     {{
-                      info.volunteerCategory.length == 0
+                      info.isTenant == null || info.isTenant == ''
                         ? "--"
-                        : info.volunteerCategory.join("、")
+                        : info.isTenant == '1' ? '租户' : '业主'
                     }}
                   </p>
                 </div>
               </div>
 
-              <div class="ren-prop z-5">
+              <div class="ren-prop z-6">
-                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
+                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
                 <span>房屋信息</span>
 
                 <div class="ren-cnt">
@@ -100,18 +100,16 @@
                 </div>
               </div>
 
-              <div class="ren-prop z-6">
+              <div class="ren-prop z-5">
-                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
+                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
-                <span>经济状况</span>
+                <span>联系电话</span>
 
                 <div class="ren-cnt">
-                  <h5>经济状况：</h5>
+
                   <p>
-                    月薪:
+                    联系电话:
                     {{
-                      info.financialSituation.monthlyIncome || "--"
+                      info.mobile || "--"
-                    }}，退休金：{{
-                      info.financialSituation.retirementAmount || "--"
                     }}
                   </p>
                 </div>

src/views/modules/workSys/resiCate.vue

@@ -185,6 +185,26 @@
                            size="small"
                            label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
+
+        <el-form-item v-if="form.columnName==='IS_YLFN'"
+                      label="自动匹配">
+          <el-switch v-model="autoMatching"></el-switch>
+        </el-form-item>
+
+        <el-form-item v-if="form.columnName==='IS_YLFN' && autoMatching"
+                      label="匹配规则">
+          <span>年龄：</span>
+          <el-input-number v-model="ageMin"
+                           :min="0"
+                           size="small"
+                           label="描述文字"></el-input-number>
+
+          <span>{{' — '}}</span>
+          <el-input-number v-model="ageMax"
+                           :min="ageMin"
+                           size="small"
+                           label="描述文字"></el-input-number>
+        </el-form-item>
       </el-form>
       <div class="resi-btns">
         <el-button size="small"
@@ -290,6 +310,10 @@ export default {
         level2: 0,
         level3: 0
       },
+
+      autoMatching: false,
+      ageMin: 0,
+      ageMax: 1,
       rules: {
         managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
         dataIcon: [{ required: true, message: '数据平台图标不能为空', trigger: 'blur' }],
@@ -430,8 +454,26 @@ export default {
         warn: row.warn == '1' ? true : false,
         level1: row.level1 || 0,
         level2: row.level2 || 0,
-        level3: row.level3 || 0
+        level3: row.level3 || 0,
+
       }
+
+      if (row.columnName === 'IS_YLFN') {
+        if (row.autoMatching === '1') {
+          this.autoMatching = true
+        } else {
+          this.autoMatching = false
+        }
+
+        if (row.ylfnValue) {
+          let array = row.ylfnValue.split(',')
+
+          this.ageMin = array[0]
+          this.ageMax = array[1]
+        }
+
+      }
+
       this.dialogVisible = true
     },
     async handleSUbmit () {
@@ -440,6 +482,21 @@ export default {
           if (this.form.warn) {
             if (!this.form.level1) return this.$message.error('黄色预警不能为0')
           }
+
+          if (this.form.columnName === 'IS_YLFN') {
+            this.form.autoMatching = this.autoMatching ? '1' : '0'
+
+            if (this.autoMatching) {
+              if ((this.ageMin > 0 || this.ageMin === 0) && (this.ageMax > 0 || this.ageMax === 0)) {
+                this.form.ylfnValue = this.ageMin + ',' + this.ageMax
+              } else {
+                return this.$message.error('年龄范围不能为空')
+              }
+            }
+
+          } else {
+
+          }
           this.btnLoading = true
           const _form = {
             ...this.form,