Merge branch 'huyt' of http://ufidahz.com.cn:9015/root/middleground_code_v2 into huyt

# Conflicts:
#	vue.config.js

src/components/base/baseNewForm/index.vue

@@ -398,7 +398,7 @@ export default {
           obj = item
         }
       })
-      this.$emit('onSelect', val, index, indexRow, obj)
+      this.$emit('onSelect', val, index, indexRow, obj,options,this.ruleForm,row)
       if (row.changeRemind) {
         this.$emit('changeRemind', this.ruleForm)
       }

src/views/masterDataOptions/distribute/settingForm.vue

@@ -292,7 +292,15 @@ export default {
         {
           label: '<',
           value: '4'
-        }
+        },
+        {
+          label: 'like',
+          value: '5'
+        },
+        {
+          label: 'notLike',
+          value: '6'
+        },
 
       ],//对比类型options
       connectionSymbolOptions: [
@@ -557,7 +565,6 @@ export default {
           label: item.name
         })
       })
-
     },
     //编辑获取数据
     async getrowDetails(id) {

src/views/recordContrast/configData.js

@@ -35,7 +35,7 @@ const tableColumnData = [
   {
     label: '名称',
     prop: 'rightName'
-  },
+  }
 ]
 const tableVersionColumn = [
   {
@@ -65,34 +65,26 @@ const formRow = [
         label: '左应用编码',
         prop: 'leftAppCode',
         tag: 'elInput',
-        span: 12
+        span: 12,
+        disabled: true
       },
       {
         label: '左应用名称',
         prop: 'leftAppName',
-        tag: 'elInput',
+        tag: 'elSelect',
-        span: 12
+        span: 12,
+        options: []
       }
     ]
   },
   {
     elCol: [
-      {
-        label: '主键',
-        prop: 'leftId',
-        tag: 'elInput',
-        span: 12
-      },
       {
         label: '编码',
         prop: 'leftCode',
         tag: 'elInput',
         span: 12
-      }
-    ]
       },
-  {
-    elCol: [
       {
         label: '名称',
         prop: 'leftName',
@@ -101,46 +93,44 @@ const formRow = [
       }
     ]
   },
+  {},
   {
     elCol: [
       {
-        label: '应用编码',
+        label: '右应用编码',
         prop: 'rightAppCode',
         tag: 'elInput',
-        span: 12
+        span: 12,
+        disabled: true
       },
       {
-        label: '应用名称',
+        label: '右应用名称',
         prop: 'rightAppName',
-        tag: 'elInput',
+        tag: 'elSelect',
-        span: 12
+        span: 12,
+        options: []
       }
     ]
   },
   {
     elCol: [
-      {
-        label: '主键',
-        prop: 'rightId',
-        tag: 'elInput',
-        span: 12
-      },
       {
         label: '编码',
         prop: 'rightCode',
         tag: 'elInput',
         span: 12
-      }
-    ]
       },
-  {
-    elCol: [
       {
         label: '名称',
         prop: 'rightName',
         tag: 'elInput',
         span: 12
+      }
+    ]
   },
+  {
+    elCol: [
+
       {
         label: '排序',
         prop: 'sorts',
@@ -159,40 +149,37 @@ const peopleFormRow = [
         label: '左应用编码',
         prop: 'leftAppCode',
         tag: 'elInput',
-        span: 12
+        span: 12,
+        disabled: true
       },
       {
         label: '左应用名称',
         prop: 'leftAppName',
-        tag: 'elInput',
+        tag: 'elSelect',
-        span: 12
+        span: 12,
+        options: []
       }
     ]
   },
   {
     elCol: [
-      {
-        label: '主键',
-        prop: 'leftId',
-        tag: 'elInput',
-        span: 12
-      },
       {
         label: '编码',
         prop: 'leftCode',
         tag: 'elInput',
         span: 12
-      }
-    ]
       },
-  {
-    elCol: [
       {
         label: '名称',
         prop: 'leftName',
         tag: 'elInput',
         span: 12
+      }
+    ]
   },
+  {
+    elCol: [
+
       {
         label: '手机号',
         prop: 'leftTel',
@@ -200,77 +187,70 @@ const peopleFormRow = [
         type: 'number',
         span: 12
       },
-    ]
-  },
-  {
-    elCol: [
       {
         label: '身份证号',
         prop: 'leftIc',
         tag: 'elInput',
         type: 'number',
         span: 12
-      },
-    ]
-  },
-  {
-    elCol: [
-      {
-        label: '应用编码',
-        prop: 'rightAppCode',
-        tag: 'elInput',
-        span: 12
-      },
-      {
-        label: '应用名称',
-        prop: 'rightAppName',
-        tag: 'elInput',
-        span: 12
       }
     ]
   },
   {
     elCol: [
       {
-        label: '主键',
+        label: '右应用编码',
-        prop: 'rightId',
+        prop: 'rightAppCode',
         tag: 'elInput',
-        span: 12
+        span: 12,
+        disabled: true
       },
+      {
+        label: '右应用名称',
+        prop: 'rightAppName',
+        tag: 'elSelect',
+        span: 12,
+        options: []
+      }
+    ]
+  },
+  {
+    elCol: [
       {
         label: '编码',
         prop: 'rightCode',
         tag: 'elInput',
         span: 12
-      }
-    ]
       },
-  {
-    elCol: [
       {
         label: '名称',
         prop: 'rightName',
         tag: 'elInput',
         span: 12
+      }
+    ]
   },
+  {
+    elCol: [
+
       {
         label: '手机号',
         prop: 'rightTel',
         tag: 'elInput',
         type: 'number',
         span: 12
-      }
-    ]
       },
-  {
-    elCol: [
       {
         label: '身份证号',
         prop: 'rightIc',
         tag: 'elInput',
         type: 'number',
         span: 12
+      }
+    ]
   },
+  {
+    elCol: [
       {
         label: '排序',
         prop: 'sorts',
@@ -279,7 +259,7 @@ const peopleFormRow = [
         span: 12
       }
     ]
-  },
+  }
 ]
 const basicsRules = {
   leftCode: [{
@@ -301,7 +281,7 @@ const basicsRules = {
     required: true,
     message: '请填写名称',
     trigger: 'blur'
-  }],
+  }]
 }
 
 // 查看

src/views/recordContrast/rightDialog.vue

@@ -154,32 +154,38 @@ export default {
     }
   },
   mounted() {
-    this.initSelect()
+
   },
   methods: {
-    // 插件下拉
+    onSelect(val, index, indexRow, obj, op, form, row) {
-    async initSelect() {
+      if (row.prop === 'leftAppName') {
-      let res = await authApi(
+        this.$set(form, 'leftAppCode', obj.code)
-        'pluginService',
+        this.$set(form, 'leftAppId', obj.value)
-        'plugins',
+        this.$set(form, 'leftAppName', obj.label)
-        'queryPluginsByType',
-        '',
-        {
-          'pluginType': '1'
       }
-      )
+      if (row.prop === 'rightAppName') {
-      if (res.status == 200) {
+        this.$set(form, 'rightAppCode', obj.code)
-        console.log(res.attribute)
+        this.$set(form, 'rightAppId', obj.value)
-        res.attribute.forEach(item => {
+        this.$set(form, 'rightAppName', obj.label)
-          this.$set(this.select_dist, item.pluginId, item)
-        })
-        console.log(res.attribute, 'res.attribute插件返回')
-        this.formRow[0].elCol[0].options = res.attribute
       }
     },
-    //下拉改变事件
+    // 插件下拉
-    onSelect(val, index, indexRow, obj) {
+    async initSelect() {
-      this.$set(this.$refs.basicsForm.ruleForm, 'plugName', this.select_dist[val]['pluginName'])
+      const res = await authApi('sysApplicationService', '', 'queryEntity', '', {})
+      console.log(res)
+      this.formRow[0].elCol[1].options = []
+      res.attribute.forEach(item => {
+        this.formRow[0].elCol[1].options.push({
+          value: item.id,
+          label: item.name,
+          code: item.appId
+        })
+        this.formRow[3].elCol[1].options.push({
+          value: item.id,
+          label: item.name,
+          code: item.appId
+        })
+      })
     },
     openDialog(type, row, treeType) {
       this.treeType = treeType
@@ -189,6 +195,7 @@ export default {
       } else {
         this.formRow = configData.formRow
       }
+      this.initSelect()
       // this.queryProductClassfy();
       this.submitShow = true
       this.isEdit = false