Merge branch 'dev-jmlb0908'

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,