Explorar el Código

移动端选择项目支持按照项目编号,名称搜索

Lijy hace 3 años
padre
commit
be419c911e

+ 13 - 6
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -298,9 +298,12 @@
         <!-- 选择项目弹窗 -->
         <van-popup v-model="showPickerUserddp" position="bottom" style="height: 80%">
             <!-- <van-search v-model="userName" placeholder="输入项目名称搜索" @clear="sea()" @blur="sea()" @search="sea()"></van-search> -->
-            <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
+            <van-search v-model="userName" placeholder="请输入项目名称/编号" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
-                <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">{{item.projectName}}</div>
+                <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
+                    <p>{{item.projectName}}</p> 
+                    <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+                </div>
             </div>
         </van-popup> 
     </div>
@@ -431,7 +434,11 @@
                     let text = this.userName
                     let reg = new RegExp(text)
                     let data = this.proads.filter(item => reg.test(item.projectName)) //返回
-                    this.projectss = data
+                    let datas = this.proads.filter(item => reg.test(item.projectCode))
+                    let dataTree = data.concat(datas)
+                    let arrList = Array.from(new Set(dataTree))
+                    // this.projectss = data
+                    this.projectss = arrList
                 } else {
                     console.log(456)
                     this.projectss = this.proads
@@ -1626,9 +1633,9 @@
       z-index: 999; 
   }
   .ryuan {
-        padding: 0 20px;
-        line-height: 40px;
-        height: 40px;
+            padding: 0.3rem 0.53333rem;
+        // line-height: 40px;
+        // height: 40px;
         color: #333;
         border-bottom: 2px solid #f6f6f6;
         width: 100%;

+ 14 - 5
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -320,7 +320,10 @@
             <!-- <van-search v-model="userName" placeholder="输入项目名称搜索" @clear="sea()" @blur="sea()" @search="sea()"></van-search> -->
             <van-search v-model="userName" placeholder="请输入项目名称" @clear="sea()" @blur="sea()" @search="sea()" @input="sea()"/>
             <div style="minHeight:300px;">
-                <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">{{item.projectName}}</div>
+                <div v-for="(item, index) in projectss" :key="item.id" class="ryuan" @click="fZr(item, index)">
+                    <p>{{item.projectName}}</p> 
+                    <p style="margin-top: 5px;color: #9697B2;">{{item.projectCode}}</p> 
+                </div>
             </div>
         </van-popup> 
     </div>
@@ -520,8 +523,13 @@
                     console.log(123)
                     let text = this.userName
                     let reg = new RegExp(text)
+                    // let data = this.proads.filter(item => reg.test(item.projectName)) //返回
                     let data = this.proads.filter(item => reg.test(item.projectName)) //返回
-                    this.projectss = data
+                    let datas = this.proads.filter(item => reg.test(item.projectCode))
+                    let dataTree = data.concat(datas)
+                    let arrList = Array.from(new Set(dataTree))
+                    // this.projectss = data
+                    this.projectss = arrList
                 } else {
                     console.log(456)
                     this.projectss = this.proads
@@ -1734,9 +1742,10 @@
       z-index: 999; 
   }
   .ryuan {
-        padding: 0 20px;
-        line-height: 40px;
-        height: 40px;
+       padding: 0.3rem 0.53333rem;
+        // padding: 0 20px;
+        // line-height: 40px;
+        // height: 40px;
         color: #333;
         border-bottom: 2px solid #f6f6f6;
         width: 100%;

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,7 +4,7 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 // var ip = '127.0.0.1'
-// var ip = '192.168.2.4'
+var ip = '192.168.2.4'
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {
 //     for (var j in ifaces[i]) {