liaxian补全加页面

src/components/Finance/DailyFeePayment.vue

@@ -56,7 +56,15 @@
                 </div>
                 <div class="feeType-box">
                     <label>费用描述:</label>
-                    <el-input @input="downtrigger()" v-model="formInline.feeDesc" placeholder="费用描述"></el-input>
+                    <el-select popper-class="my-select" style="width:100%" v-model="formInline.feeDesc" clearable filterable remote :remote-method="DailyFeeKeywordSearch" :loading="selectLoading" @change="downtrigger()" placeholder="请选择">
+                        <el-option
+                        v-for="item in inputArr"
+                        :key="item.id"
+                        :label="item.instructions"
+                        :value="item.instructions">
+                        </el-option>
+                    </el-select>
+                    <!-- <el-input @input="downtrigger()" v-model="formInline.feeDesc" placeholder="费用描述"></el-input> -->
                 </div>
                 <div class="feeType-box">
                     <label>申请人: </label>
@@ -251,10 +259,35 @@ export default {
             multipleTable:[],
             token:'',
             userid:'',
-            sqrpd:false
+            sqrpd:false,
+            inputArr:[],
+            selectLoading:false,
         }
     },
     methods:{
+        //搜索提示
+        DailyFeeKeywordSearch(query) {
+            if (query !== '') {
+                this.selectLoading=true;
+                var url = "/api/System/DailyFeeKeywordSearch?keyword=" + query+"&auditType=0"
+                var that = this
+                this.$axios({
+                    method: 'get',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                }).then(function (res) {
+                    if (res.data.code == 200) {
+                        that.inputArr = res.data.data;
+                    }else{
+                        that.inputArr=[];
+                    }
+                }).finally(()=>{
+                    that.selectLoading=false;
+                })
+            }
+        },
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
             this.currentPage = 1;
@@ -683,4 +716,14 @@ export default {
         font-size: 14px;
         color: #606266;
     }
+    .my-select .el-select-dropdown__item {
+        width: 350px;
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .my-select .el-select-dropdown__list {
+        width: 350px;
+    }
 </style>y

src/components/Finance/LncomingBills.vue

@@ -4,10 +4,16 @@
             <div class="lncomingbill-head">
                 <div class="lncomingbill-head-li">
                     <label>团组名称:</label>
-                    <el-select style="width:250px" @change="changediid()" v-model="value" filterable placeholder="请选择">
-                        <el-option v-for="item in options" :key="item.id" :label="item.groupName" :value="item.id">
+                    <el-select style="width:250px" @change="changediid()" v-model="value" filterable :filter-method="advancedFilter" placeholder="请选择">
+                        <el-option v-for="item in filteredOptions" :key="item.id" :label="item.groupName" :value="item.id">
+                            <span v-if="item.isNull=='false'" style="color:#409EFF">{{ item.groupName }}</span>
+                            <span v-else style="color:gray">{{ item.groupName }}</span>
                         </el-option>
                     </el-select>
+                    <!-- <el-select style="width:250px" @change="changediid()" v-model="value" filterable placeholder="请选择">
+                        <el-option v-for="item in options" :key="item.id" :label="item.groupName" :value="item.id">
+                        </el-option>
+                    </el-select> -->
                 </div>
                 <div class="lncomingbill-head-li">
                     <el-button @click="Saveition()" type="primary">保存数据</el-button>
@@ -143,6 +149,8 @@ export default {
             value: "",
             valuelist: '',
             options: [],
+            filteredOptions: [],
+            searchMode: 'character', // 'character': 字符匹配, 'fuzzy': 模糊匹配
             DownloadInitlist: [],
             tableData: [
                 // {
@@ -165,6 +173,41 @@ export default {
         }
     },
     methods: {
+        advancedFilter(query) {
+            if (!query || query.trim() === '') {
+                this.filteredOptions = [...this.options];
+                return;
+            }
+
+            const trimmedQuery = query.trim();
+
+            if (this.searchMode === 'character') {
+                // 字符匹配模式：每个字都必须包含
+                this.characterMatchFilter(trimmedQuery);
+            } else {
+                // 模糊匹配模式（默认的filterable行为）
+                this.fuzzyMatchFilter(trimmedQuery);
+            }
+        },
+        /*** 严格的字符匹配 - 每个查询字符都必须出现*/
+        characterMatchFilter(query) {
+            const queryChars = query.split('').filter(char => char.trim() !== '');
+
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = item.groupName || '';
+                return queryChars.every(char => groupName.includes(char));
+            });
+        },
+        /*** 模糊匹配 - 包含整个查询字符串即可*/
+        fuzzyMatchFilter(query) {
+            const lowerQuery = query.toLowerCase();
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = (item.groupName || '').toLowerCase();
+                return groupName.includes(lowerQuery);
+            });
+        },
+
+
         filter_time(value) {
             if (value!=undefined) {
                 return value.split(' ')[0];
@@ -184,8 +227,8 @@ export default {
                     currUserId: that.userid
                 }
             }).then(function (res) {
-                console.log(res)
                 that.options = res.data.data.groupNameData;
+                that.filteredOptions = that.options;
                 that.currencyoptions = res.data.data.currencyData;
                 that.typeoptions = res.data.data.remittanceMethodData;
                 that.value = res.data.data.groupNameData[0].id;

src/components/Finance/PayReceived.vue

@@ -4,14 +4,20 @@
             <div class="received-head">
                 <div class="received-head-li">
                     <label>团组名称:</label>
-                    <el-select style="width: 250px;" @change="changediid()" v-model="value" filterable placeholder="请选择">
+                    <el-select style="width:250px" @change="changediid()" v-model="value" filterable :filter-method="advancedFilter" placeholder="请选择">
+                        <el-option v-for="item in filteredOptions" :key="item.id" :label="item.groupName" :value="item.id">
+                            <span v-if="item.isNull=='false'" style="color:#409EFF">{{ item.groupName }}</span>
+                            <span v-else style="color:gray">{{ item.groupName }}</span>
+                        </el-option>
+                    </el-select>
+                    <!-- <el-select style="width: 250px;" @change="changediid()" v-model="value" filterable placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.id"
                         :label="item.groupName"
                         :value="item.id">
                         </el-option>
-                    </el-select>
+                    </el-select> -->
                 </div>
                 <div class="received-head-li">
                     <el-button @click="ysSaveition()" type="primary">保存数据</el-button>
@@ -156,6 +162,8 @@ export default {
             userid:'',
             value:'',
             options:[],
+            filteredOptions: [],
+            searchMode: 'character', // 'character': 字符匹配, 'fuzzy': 模糊匹配
             currencyoptions:[],
             UnassignedData:[
                 // {
@@ -184,6 +192,41 @@ export default {
         }
     },
     methods:{
+        advancedFilter(query) {
+            if (!query || query.trim() === '') {
+                this.filteredOptions = [...this.options];
+                return;
+            }
+
+            const trimmedQuery = query.trim();
+
+            if (this.searchMode === 'character') {
+                // 字符匹配模式：每个字都必须包含
+                this.characterMatchFilter(trimmedQuery);
+            } else {
+                // 模糊匹配模式（默认的filterable行为）
+                this.fuzzyMatchFilter(trimmedQuery);
+            }
+        },
+        /*** 严格的字符匹配 - 每个查询字符都必须出现*/
+        characterMatchFilter(query) {
+            const queryChars = query.split('').filter(char => char.trim() !== '');
+
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = item.groupName || '';
+                return queryChars.every(char => groupName.includes(char));
+            });
+        },
+        /*** 模糊匹配 - 包含整个查询字符串即可*/
+        fuzzyMatchFilter(query) {
+            const lowerQuery = query.toLowerCase();
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = (item.groupName || '').toLowerCase();
+                return groupName.includes(lowerQuery);
+            });
+        },
+
+
         //获取团组
         GetForeignReceivablesDataSources(){
             var url = "/api/Financial/GetForeignReceivablesDataSources"
@@ -201,6 +244,7 @@ export default {
                 console.log(res)
                 if(res.data.code==200){
                     that.options=res.data.data.groupNameData;
+                    that.filteredOptions = that.options;
                     that.currencyoptions=res.data.data.currencyData;
                     that.typeoptions=res.data.data.remittanceMethodData;
                     that.value=res.data.data.groupNameData[0].id;

src/components/Finance/Sendack.vue

@@ -4,14 +4,20 @@
             <div class="sendack-head">
                 <div class="sendack-head-li">
                     <label>团组名称:</label>
-                    <el-select style="width:250px" @change="changediid()" v-model="value" filterable placeholder="请选择">
+                    <el-select style="width:250px" @change="changediid()" v-model="value" filterable :filter-method="advancedFilter" placeholder="请选择">
+                        <el-option v-for="item in filteredOptions" :key="item.id" :label="item.groupName" :value="item.id">
+                            <span v-if="item.isNull=='false'" style="color:#409EFF">{{ item.groupName }}</span>
+                            <span v-else style="color:gray">{{ item.groupName }}</span>
+                        </el-option>
+                    </el-select>
+                    <!-- <el-select style="width:250px" @change="changediid()" v-model="value" filterable placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.id"
                         :label="item.groupName"
                         :value="item.id">
                         </el-option>
-                    </el-select>
+                    </el-select> -->
                 </div>
                 <div v-if="addAuth=1" class="sendack-head-li">
                     <el-button @click="addclick()" type="primary">新增数据</el-button>
@@ -191,6 +197,8 @@ export default {
             userid:'',
             value:'',
             options:[],
+            filteredOptions: [],
+            searchMode: 'character', // 'character': 字符匹配, 'fuzzy': 模糊匹配
             groupInfo:{},
             groupsendData:[],
             pageId:0,
@@ -250,6 +258,40 @@ export default {
         }
     },
     methods:{
+        advancedFilter(query) {
+            if (!query || query.trim() === '') {
+                this.filteredOptions = [...this.options];
+                return;
+            }
+
+            const trimmedQuery = query.trim();
+
+            if (this.searchMode === 'character') {
+                // 字符匹配模式：每个字都必须包含
+                this.characterMatchFilter(trimmedQuery);
+            } else {
+                // 模糊匹配模式（默认的filterable行为）
+                this.fuzzyMatchFilter(trimmedQuery);
+            }
+        },
+        /*** 严格的字符匹配 - 每个查询字符都必须出现*/
+        characterMatchFilter(query) {
+            const queryChars = query.split('').filter(char => char.trim() !== '');
+
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = item.groupName || '';
+                return queryChars.every(char => groupName.includes(char));
+            });
+        },
+        /*** 模糊匹配 - 包含整个查询字符串即可*/
+        fuzzyMatchFilter(query) {
+            const lowerQuery = query.toLowerCase();
+            this.filteredOptions = this.options.filter(item => {
+                const groupName = (item.groupName || '').toLowerCase();
+                return groupName.includes(lowerQuery);
+            });
+        },
+
         //保留两位小数
         townum(val){
             return val.toFixed(2)
@@ -275,6 +317,7 @@ export default {
                 console.log(res)
                 if(res.data.code==200){
                     that.options=res.data.data.groupNameData;
+                    that.filteredOptions = that.options;
                     that.value=res.data.data.groupNameData[0].id;
                     that.PostShareGroupInfo();
                     setTimeout(function(){

src/components/OP/EntryDetails.vue

@@ -1,6 +1,7 @@
 <template>
     <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="Entry-all">
+
             <el-dialog :close-on-click-modal="false" title="实时汇率提示" :visible.sync="SSHLVisible">
                 <el-table border :data="currencyss">
                     <el-table-column property="currName" label="币种" width="150"></el-table-column>
@@ -11,7 +12,7 @@
                     <el-button type="primary" @click="SSHLVisible=false">已知晓</el-button>
                 </div>
             </el-dialog>
-            <el-dialog v width="400px" title="设置查看权限" class="permissionsbox" :visible.sync="setpermissions" :close-on-click-modal="false">
+            <el-dialog  width="400px" title="设置查看权限" class="permissionsbox" :visible.sync="setpermissions" :close-on-click-modal="false">
                 <el-checkbox-group v-model="viewUsers" @change="handleCheckAllChange">
                     <el-checkbox v-for="item in viewUsersarr" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
                 </el-checkbox-group>
@@ -20,6 +21,139 @@
                     <el-button size="mini" @click="setpermissions=false">取消</el-button>
                 </div>
             </el-dialog>
+            <el-dialog  width="1400px" title="交通费详细" :visible.sync="TransportationVisible">
+                <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                    <div>接送机(合计)</div>
+                    <el-button size="mini" type="primary">添加一行</el-button>
+                </div>
+                <el-table border :data="Transportationdata">
+                    <el-table-column property="a" label="序号" width="50"></el-table-column>
+                    <el-table-column property="b" label="城市" width="150">
+                        <template slot-scope="scope">
+                            <el-select size="mini"
+                                v-model="scope.row.a" filterable placeholder="请选择">
+                                <el-option v-for="item in fulecao" :key="item.id" :label="item.cityname"
+                                    :value="item.id">
+                                    <span style="float: left">{{ item.cityname }}</span>
+                                    <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{item.city}}</span> -->
+                                </el-option>
+                            </el-select>
+                            <!-- <el-input disabled size="mini" v-model="scope.row.b"></el-input> -->
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="c" label="成本价(要除以团组人数)" width="150">
+                        <template slot-scope="scope">
+                            <el-input disabled size="mini" v-model="scope.row.c"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="d" label="接送机导游" width="150">
+                        <template slot-scope="scope">
+                            <el-input disabled size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="e" label="其他费用(只有澳大利亚有这个数据)" width="150">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="f" label="服务次数(默认为1)" width="150">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="g" label="系数(默认2.5)" width="150">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="h" label="报价" width="200">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="i" label="备注">
+                        <template slot-scope="scope">
+                            <el-input size="mini" v-model="scope.row.d"></el-input>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="jiaotongfei-ul">
+                    <div class="jiaotongfei-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>拉车(合计)</div>
+                            <el-button size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <!-- <div>拉车(合计)</div> -->
+                        <el-table border :data="lache">
+                            <el-table-column property="a" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="jiaotongfei-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>火车(合计)</div>
+                            <el-button size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <el-table border :data="huoche">
+                            <el-table-column property="a" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="jiaotongfei-li">
+                        <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
+                            <div>城市机票(合计)</div>
+                            <el-button size="mini" type="primary">添加一行</el-button>
+                        </div>
+                        <el-table border :data="chengshijipiao">
+                            <el-table-column property="a" label="成本价" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="系数" width="150">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column property="a" label="备注">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.d"></el-input>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+                <div style="text-align: right;margin-top: 20px;">
+                    <el-button>取消</el-button>
+                    <el-button type="primary">确 定</el-button>
+                </div>
+            </el-dialog>
             <div class="Entry-head">
                 <div class="Entry-head-li">
                     <label>团组名称:</label>
@@ -741,6 +875,65 @@ export default {
             //实时汇率
             liveRateInfos:[],
             SSHLVisible:false,
+            //交通费弹窗
+            Transportationdata:[
+                {
+                    a:1,
+                    b:'',
+                    c:'',
+                    d:'',
+                    e:'',
+                    f:'',
+                    g:'',
+                    h:'',
+                    i:'',
+                },
+                {
+                    a:2,
+                    b:'',
+                    c:'',
+                    d:'',
+                    e:'',
+                    f:'',
+                    g:'',
+                    h:'',
+                    i:'',
+                },
+                {
+                    a:3,
+                    b:'',
+                    c:'',
+                    d:'',
+                    e:'',
+                    f:'',
+                    g:'',
+                    h:'',
+                    i:'',
+                }
+            ],
+            TransportationVisible:true,
+            lache:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            huoche:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            chengshijipiao:[
+                {
+                    a:1,
+                    b:"",
+                    c:"",
+                }
+            ],
+            fulecao:[],
         }
     },
     methods: {
@@ -3102,4 +3295,12 @@ export default {
     line-height: 25px;
     color: #606266;
 }
+.jiaotongfei-ul{
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+}
+.jiaotongfei-li{
+    width: 32.5%;
+}
 </style>

src/components/expenseMobile.vue

@@ -28,9 +28,17 @@
             <div class="expenseMobile-top">
                 <div class="expenseMobile-title">{{this.portType!=2?'日常付款申请':''}}</div>
                 <div class="expenseMobile-search">
-                    <el-input clearable placeholder="请输入费用描述" v-model="input" class="input-with-select">
+                    <el-select popper-class="my-select" style="width:100%" v-model="input" clearable filterable remote :remote-method="DailyFeeKeywordSearch" :loading="selectLoadingrf" @change="searchbtn" placeholder="请选择">
+                        <el-option
+                        v-for="item in inputArrrf"
+                        :key="item.id"
+                        :label="item.instructions"
+                        :value="item.instructions">
+                        </el-option>
+                    </el-select>
+                    <!-- <el-input clearable placeholder="请输入费用描述" v-model="input" class="input-with-select">
                         <el-button @click="searchbtn" slot="append" icon="el-icon-search"></el-button>
-                    </el-input>
+                    </el-input> -->
                 </div>
             </div>
             <div id="scroll-div" ref="element" class="daily-box">
@@ -57,7 +65,7 @@
             <div class="expenseMobile-top">
                 <div class="expenseMobile-title">{{this.portType!=2?'费用审核':''}}</div>
                 <div class="expenseMobile-search">
-                    <el-select style="width:100%" v-model="value" clearable filterable remote :remote-method="GroupItemKeywordSearch" :loading="selectLoading" @change="searchexamine" placeholder="请选择">
+                    <el-select popper-class="my-select" style="width:100%" v-model="value" clearable filterable remote :remote-method="GroupItemKeywordSearch" :loading="selectLoading" @change="searchexamine" placeholder="请选择">
                             <el-option
                             v-for="item in inputArr"
                             :key="item.id"
@@ -125,10 +133,35 @@ export default {
             value:'',
             inputArr: [],
             selectLoading: false,
+            inputArrrf: [],
+            selectLoadingrf: false,
             groupData:[],
         }
     },
     methods:{
+        //搜索提示
+        DailyFeeKeywordSearch(query) {
+            if (query !== '') {
+                this.selectLoadingrf=true;
+                var url = "/api/System/DailyFeeKeywordSearch?keyword=" + query+"&auditType=1"
+                var that = this
+                this.$axios({
+                    method: 'get',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                }).then(function (res) {
+                    if (res.data.code == 200) {
+                        that.inputArrrf = res.data.data;
+                    }else{
+                        that.inputArrrf=[];
+                    }
+                }).finally(()=>{
+                    that.selectLoadingrf=false;
+                })
+            }
+        },
         //搜索提示
         GroupItemKeywordSearch(query) {
             if (query !== '') {
@@ -533,5 +566,14 @@ export default {
 .examine-card-name{
     font-weight: 600;
 }
-
+.my-select .el-select-dropdown__item {
+    width: 350px;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.my-select .el-select-dropdown__list {
+    width: 350px;
+}
 </style>

src/components/system/TaskList.vue

@@ -169,7 +169,8 @@
                     </el-table-column>
                     <el-table-column prop="status" label="状态" width="80">
                         <template slot-scope="scopes">
-                            <div v-if="scopes.row.createUserName==cnName">
+                            <!-- <div v-if="scopes.row.createUserName==cnName"> -->
+                            <div>
                                 <span v-if="scopes.row.status==0">
                                     未开始
                                 </span>
@@ -186,7 +187,7 @@
                                     已完成
                                 </span>
                             </div>
-                            <div v-else-if="scopes.row.createUserName!=cnName">
+                            <!-- <div v-else-if="scopes.row.createUserName!=cnName">
                                 <span v-if="scopes.row.status==-1">
                                     未开始
                                 </span>
@@ -208,7 +209,7 @@
                                 <span v-if="scopes.row.status==5">
                                     任务中止
                                 </span>
-                            </div>
+                            </div> -->
                         </template>
                         <!-- <template v-if="status" slot-scope="scope">
                             {{ scope.row.status==0? scope.row.status==1?:'全部'  }}