huangxiao před 1 měsícem
rodič
revize
e63f83ffa6

+ 0 - 1
src/main/java/net/mingsoft/people/dao/IPeopleDao.xml

@@ -351,7 +351,6 @@
 				<if test="where.peoplePhone != null and where.peoplePhone !=''">
 					and p.PEOPLE_PHONE=#{where.peoplePhone}
 				</if>
---
 				<if test="where.companyName != null and where.companyName !=''">
 					and e.COMPANY_NAME like CONCAT(CONCAT('%',#{where.companyName}),'%')
 				</if>

+ 135 - 2
src/main/webapp/WEB-INF/manager/people/people-user/index.ftl

@@ -90,6 +90,66 @@
                 </el-row>
                 <el-row>
                     <el-col :span=8>
+                        <!--公司名称-->
+
+                        <el-form-item  label="公司名称" prop="companyName">
+                            <el-input
+                                    v-model="form.companyName"
+                                    :disabled="false"
+                                    :readonly="false"
+                                    :style="{width:  '100%'}"
+                                    :clearable="true"
+                                    placeholder="请输入公司名称">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span=8>
+                        <!--职位-->
+
+                        <el-form-item  label="职位" prop="position">
+                            <el-input
+                                    v-model="form.position"
+                                    :disabled="false"
+                                    :readonly="false"
+                                    :style="{width:  '100%'}"
+                                    :clearable="true"
+                                    placeholder="请输入职位">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span=8>
+                        <!--了解渠道-->
+
+                        <el-form-item  label="了解渠道" prop="channel">
+                            <ms-dict  v-model="form.channel"
+                                      :style="{width: '100%'}"
+                                      dict-type="注册-了解渠道"
+                                      :filterable="false"
+                                      :disabled="false"
+                                      :multiple="false" :clearable="true"
+                                      placeholder="请选择了解渠道">
+                            </ms-dict>
+                        </el-form-item>
+
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span=8>
+                        <!--参观目的-->
+
+                        <el-form-item  label="参观目的" prop="purpose">
+                            <ms-dict  v-model="form.purpose"
+                                      :style="{width: '100%'}"
+                                      dict-type="注册-参观目的"
+                                      :filterable="false"
+                                      :disabled="false"
+                                      :multiple="false" :clearable="true"
+                                      placeholder="请选择参观目的">
+                            </ms-dict>
+                        </el-form-item>
+
+                    </el-col>
+                    <el-col :span=8>
                         <el-form-item label="用户ID" prop="peopleId">
                             <el-input v-model="form.peopleId"
                                       :disabled="false"
@@ -99,7 +159,7 @@
                             </el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span=16  style="text-align:right;">
+                    <el-col :span=8  style="text-align:right;">
                         <el-button type="primary" class="el-icon-search" size="default" @click="loading=true;currentPage=1;list()">查询
                         </el-button>
                         <el-button @click="rest" class="el-icon-refresh" size="default">重置</el-button>
@@ -145,6 +205,16 @@
                     {{scope.row.peopleState==0?'未审':'已审'}}
                 </template>
             </el-table-column>
+            <el-table-column label="用户等级"   align="left" prop="puLevelName">
+            </el-table-column>
+            <el-table-column label="公司名称"   align="left" prop="companyName">
+            </el-table-column>
+            <el-table-column label="职位"   align="left" prop="position">
+            </el-table-column>
+            <el-table-column label="了解渠道"   align="left" prop="channel" :formatter="channelFormat">
+            </el-table-column>
+            <el-table-column label="参观目的"   align="left" prop="purpose" :formatter="purposeFormat">
+            </el-table-column>
             <@shiro.hasPermission name="people:user:update">
                 <el-table-column label="操作" width="180px" align="center">
                     <template #default="scope">
@@ -216,6 +286,10 @@
                     // 地址
                     puAddress: ''
                 },
+                // 了解渠道
+                channelOptions:[],
+                // 参观目的
+                purposeOptions:[],
                 peopleDateTimes: null,
                 puSexOptions: [{
                     "value": 1,
@@ -390,7 +464,57 @@
                 this.$refs.searchForm.resetFields();
                 this.peopleDateTimes = null;
                 this.list();
-            }
+            },
+            //了解渠道  列表格式化
+            channelFormat:function(row, column, cellValue, index){
+                var value="";
+
+                if(cellValue){
+                    var data = this.channelOptions.find(function(value){
+                        return value.dictValue==cellValue;
+                    })
+                    if(data&&data.dictLabel){
+                        value = data.dictLabel;
+                    }
+                }
+
+                return value;
+            },
+
+//获取channel数据源
+            channelOptionsGet:function() {
+                var that = this;
+                ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'注册-了解渠道',pageSize:99999}).then(function (res) {
+                    that.channelOptions = res.data.rows;
+                }).catch(function (err) {
+                    console.log(err);
+                });
+            },
+            //参观目的  列表格式化
+            purposeFormat:function(row, column, cellValue, index){
+                var value="";
+
+                if(cellValue){
+                    var data = this.purposeOptions.find(function(value){
+                        return value.dictValue==cellValue;
+                    })
+                    if(data&&data.dictLabel){
+                        value = data.dictLabel;
+                    }
+                }
+
+                return value;
+            },
+
+//获取purpose数据源
+            purposeOptionsGet:function() {
+                var that = this;
+                ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'注册-参观目的',pageSize:99999}).then(function (res) {
+                    that.purposeOptions = res.data.rows;
+                }).catch(function (err) {
+                    console.log(err);
+                });
+            },
         },
         mounted: function () {
             //如果存在历史参数,恢复页面结果
@@ -402,6 +526,15 @@
                 this.pageSize = parseInt(_history.page.pageSize);
             }
             this.list();
+        },
+        created:function(){
+            var that = this;
+
+            //加载了解渠道 数据
+            this.channelOptionsGet();
+
+            //加载参观目的 数据
+            this.purposeOptionsGet();
         }
     });
 </script>