Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -2995,7 +2995,9 @@ export default {
                 this.$message.error('程序异常！');
                 return;
             }
-
+            if(this.grouptitleinfo.visitCountry.indexOf('、') != -1){
+                this.dialogSearchInput = this.grouptitleinfo.visitCountry;
+            }
 
             var dataC = this.dialogColumn.filter(x => x.index == buttonIndex);
             if (dataC.length == 0) {
@@ -3567,6 +3569,7 @@ export default {
                         that.visaCountryInfoArr = [];
                     }
 
+                    that.ShowBaoPi = [];
                     if (resp.data.data.baoPi.length > 0) {
                         //that.sheetDatal
                         const baoPi = resp.data.data.baoPi;
@@ -3652,8 +3655,6 @@ export default {
                                 that.cabinDatal[i].childList[3].tips = '暂无！'
                             }
                         }
-
-                        that.ShowBaoPi = [];
                     }
 
                     that.blackCodeIsTrue = resp.data.data.blackCodeIsTrue;
@@ -5797,7 +5798,18 @@ export default {
         filterdialogSearchInput() {
             var that = this;
             return this.dialogTableData.filter(function (x) {
-                return x.city.indexOf(that.dialogSearchInput) != -1 || x.country.indexOf(that.dialogSearchInput) != -1;
+                var fliterWhere = [];
+                if(that.dialogSearchInput.split('、') != -1){
+                    fliterWhere = that.dialogSearchInput.split('、');
+                }else{
+                    fliterWhere = [that.dialogSearchInput];
+                }
+
+                for(var i = 0;i < fliterWhere.length;i++){
+                    if(x.city.indexOf(fliterWhere[i]) != -1 || x.country.indexOf(fliterWhere[i]) != -1){
+                        return x;
+                    }
+                }
             })
         },
         columnWidth() {