更改标签等于条件

src/router/pudongRoutes.json

@@ -111,6 +111,16 @@
               "meta": { "title": "修改手机号", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
             }
           ]
+        },
+        {
+          "path": "/danger/propertyScore/dealManSpecList", "name": "dealManSpecList",
+          "meta": { "title": "处置人员配置", "menuPath": true, "menuIcon": "profile", "hideInBread": false},
+          "children": [
+            {
+              "path": "/danger/propertyScore/dealManSpecList/dealManSpecModify", "name": "dealManSpecModify",
+              "meta": { "title": "修改处置人员配置", "menuPath": false, "menuIcon": "profile", "hideInBread": false }
+            }
+          ]
         }
       ]
     }

src/views/label/labelRightSide.vue

@@ -97,9 +97,6 @@
                 </a-select>
               </a-form-item>
 
-              <!-- {{cnonvertObj(availableKeyList, infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index))}} -->
-              <!-- {{infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index)}} -->
-              <!-- <div v-for="(item1) in availableKeyList" :key='item1.id'>{{item1.tableName}}</div> -->
               <a-form-item>
                 <a-select style="width: 180px" placeholder='请选择业务属性' v-decorator="['key-' + index66 +'-' + index,{initialValue: item.key, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
                   <a-select-option v-for="(item1) in cnonvertObj(availableKeyList, infoSettingForm.getFieldValue('tableName-' + index66 +'-' + index))" :key='item1.id' :value='item1.tblKey'>{{item1.tblKeyName}}</a-select-option>
@@ -108,7 +105,9 @@
 
               <a-form-item>
                 <a-select style="width: 80px" placeholder='区间' v-decorator="['codition-' + index66 +'-' + index,{initialValue: item.codition, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
-                  <a-select-option value='eq'>等于</a-select-option>
+                  <a-select-option value='eq'>等于精确</a-select-option>
+                  <a-select-option value='regex'>等于模糊</a-select-option>
+                  <a-select-option value='ne'>不等于</a-select-option>
                   <a-select-option value='gt'>大于</a-select-option>
                   <a-select-option value='gte'>大于等于</a-select-option>
                   <a-select-option value='lt'>小于</a-select-option>
@@ -116,15 +115,24 @@
                   <a-select-option value='btw'>区间</a-select-option>
                 </a-select>
               </a-form-item>
+
+              <!-- 可以是输入框或者选择框 -->
               <a-form-item>
-                <a-input style="width: 100px" placeholder='请输入' v-decorator="['inputOne-' + index66 +'-' + index,{initialValue: getInitialValueOne(item.val), validateTrigger:'blur',rules: [],}]"></a-input>
+                <a-select style="width: 100px" placeholder='请选择' v-decorator="['inputOne-' + index66 +'-' + index,{initialValue: item.val, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
+                  <a-select-option v-for="(item1) in cnonvertObjSecond()" :key='item1.id' :value='item1.tblKey'>{{item1.tblKeyName}}</a-select-option>
+                </a-select>
               </a-form-item>
+
+              <!-- <a-form-item>
+                <a-input style="width: 100px" placeholder='请输入' v-decorator="['inputOne-' + index66 +'-' + index,{initialValue: getInitialValueOne(item.val), validateTrigger:'blur',rules: [],}]"></a-input>
+              </a-form-item> -->
+
               <a-form-item v-if="infoSettingForm.getFieldValue('codition-'+index66 +'-' + index) == 'btw'">
                 <a-input style="width: 100px" placeholder='请输入' v-decorator="['inputTwo-' + index66 +'-' + index,{initialValue: getInitialValueTwo(item.val), validateTrigger:'blur',rules: []}]"></a-input>
               </a-form-item>
 
               <a-form-item>
-                <a-select style="width: 80px" placeholder='查询方式' v-decorator="['selMet-' + index66 +'-' + index,{initialValue: item.selMet, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
+                <a-select v-if="infoSettingForm.getFieldValue('codition-'+index66 +'-' + index) == 'eq' || infoSettingForm.getFieldValue('codition-'+index66 +'-' + index) == 'regex'" style="width: 80px" placeholder='查询方式' v-decorator="['selMet-' + index66 +'-' + index,{initialValue: item.selMet, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
                   <a-select-option value='equels'>精确</a-select-option>
                   <a-select-option value='like'>模糊</a-select-option>
                 </a-select>
@@ -375,7 +383,6 @@ export default {
   watch: {
     triggerType: {
       handler: function(newV, oldV) {
-        console.log(111)
         this.resetFormFields()
         this.getLabelDetail()
       },
@@ -383,7 +390,6 @@ export default {
     },
     labelId: {
       handler: function(newV, oldV) {
-        console.log(222)
         this.initKeyList()
         this.resetFormFields()
         this.getLabelDetail()
@@ -392,6 +398,12 @@ export default {
     },
   },
   methods: {
+    getValueOptions(availbleOptions, neededKey) {
+
+    },
+    getSelectedProperty(val) {
+      console.log(val);
+    },
     handleResultCancel() {
       this.resultModalVisible = !this.resultModalVisible
     },
@@ -422,17 +434,16 @@ export default {
         break
       }
 
-      console.log(tbRealName)
-
       let optionsPush = []
       for (let i = 0; i < options.length; i++) {
         if(options[i].tableName == tbRealName) {
           optionsPush.push(options[i])
         }
       }
-      console.log(optionsPush)
+
       return optionsPush
     },
+    cnonvertObjSecond() {},
     handleResultOk() {
       this.resultModalVisible = !this.resultModalVisible
       if(Object.keys(this.loopContent).length == 0) {
@@ -574,7 +585,6 @@ export default {
             this.labelNameForDel = res.data.content.labelName
             this.loopContent.data = res.data.content.selParams
 
-            console.log(this.loopContent.data)
           }
         })
       } else {

src/views/personal/InternalStaff/edit.vue

@@ -220,7 +220,7 @@ export default {
     //获取当前登录账号可操作的角色列表   供多选框选择
     getRoleLists() {
       const curUserRoles = this.$store.state.userInfos.roleIds
-      console.log(this.$store.state)
+      console.log(this.$store.state.userInfos)
       const sparams = {
         pageNo: 1,
         pageSize: 10000