新增组件及页面

dgtis-ui/src/views/index.vue

@@ -149,6 +149,15 @@
                 </el-form-item>
               </el-form>
               <el-form v-if="lunboActiveIndex == 2" ref="conditionData" :model="conditionData" label-width="96px">
+                <el-form-item class="formItemFull" label="客户姓名：" size="mini">
+                  <el-input v-model="conditionData.name"></el-input>
+                </el-form-item>
+                <el-form-item class="formItemFull" label="证件号码：" size="mini">
+                  <el-input v-model="conditionData.idcard"></el-input>
+                </el-form-item>
+                <el-form-item class="formItemFull" label="手机号：" size="mini">
+                  <el-input v-model="conditionData.mobile"></el-input>
+                </el-form-item>
                 <el-form-item class="formItemFull" label="年收入：" size="mini">
                   <el-input v-model="conditionData.PIncomeS" style="width: 43%;"></el-input>
                   &nbsp;-&nbsp;
@@ -299,7 +308,7 @@
           },
           {
             iconSrc:require('../assets/image/money.png'),
-            name:'资产信息',
+            name:'客户信息',
           },
           {
             iconSrc:require('../assets/image/guanlian.png'),

dgtis-ui/src/views/system/userInfoList/index.vue

@@ -209,19 +209,14 @@
       let that = this;
       that.loading = true;
       that.params = that.$route.params;
-      Object.assign(
-        that.queryParams,
-        that.params
-      )
-      // let params = Object.assign({pageNum: that.queryParams.pageNum}, this.$route.query )
-      // console.log(params)
-      // this.$router.push({params})
-      if(that.queryParams.education){
-        that.queryParams.education = that.queryParams.education.join("&");
-      }
+      console.log(that.$route.params)
+      var newQueryParams = {...that.queryParams,...that.params};
 
-      // console.log(this.$route.params)
-        listCustomer(that.queryParams).then(response => {
+      if(newQueryParams.education){
+        newQueryParams.education = newQueryParams.education.join("&");
+      }
+      console.log(newQueryParams)
+        listCustomer(newQueryParams).then(response => {
             console.log(response);
           this.customerList = response.data.list;
           // if(response.data.scrollId != undefined && response.data.scrollId !=""){