11191146

src/components/Finance/Overspend.vue

@@ -62,35 +62,43 @@
                     </el-table-column>
                     <el-table-column prop="supervisorConfirmStr" label="OP主管退费确认" width="100">
                         <template slot-scope="scope">
-                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
-                                ——
+                            <span v-if=" scope.row.supervisorConfirmStr!='已确认'">
+                                -
                             </span>
-                            <span v-else>
-                                {{ scope.row.supervisorConfirmStr }}
+                            <span style="color: green;font-size:20px;" v-else>
+                                ✓
                             </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="sYsupervisorConfirmStr" label="商邀主管退费确认" width="100">
                         <template slot-scope="scope">
-                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
-                                ——
+                            <span v-if="scope.row.sYsupervisorConfirmStr!='已确认'">
+                                -
                             </span>
-                            <span v-else>
-                                {{ scope.row.sYsupervisorConfirmStr }}
+                            <span style="color: green;font-size:20px;" v-else>
+                                ✓
                             </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="managerConfirmStr" label="经理退费确认" width="100">
                         <template slot-scope="scope">
-                            <span v-if="!priceNameExists.some(element => scope.row.priceName.includes(element))">
-                                ——
+                            <span v-if="scope.row.managerConfirmStr!='已确认'">
+                                -
                             </span>
-                            <span v-else>
-                                {{ scope.row.managerConfirmStr }}
+                            <span style="color: green;font-size:20px;" v-else>
+                                ✓
                             </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="isAuditGMStr" label="是否审核" width="100">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.isAuditGMStr!='已通过'">
+                                -
+                            </span>
+                            <span style="color: green;font-size:20px;" v-else>
+                                ✓
+                            </span>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="remark" label="备注" width="100">
                         <template slot-scope="scope">
@@ -484,7 +492,7 @@ export default {
     filters: {
         //空默认值
         filter_emptyAcquiesce(value) {
-            let fhz = value == "" ? "--" : value
+            let fhz = value == "" ? "-" : value
             return fhz
         },
     },

src/components/OP/EntryDetails.vue

@@ -840,8 +840,6 @@ export default {
                         placeinifarr.push(res.data.data[i]);
                     }
                     that.placeinif = placeinifarr;
-                    console.log(that.placeinif)
-                    console.log(placeinifarr)
                 }
             })
         },
@@ -2601,7 +2599,7 @@ export default {
 .Entry-all .el-checkbox__inner::after {
     height: 10px;
     left: 6px;
-
+    
 }
 
 .Entry-all .el-table th.el-table__cell>.cell {

src/components/OP/HotelReservations.vue

@@ -185,6 +185,15 @@
                                 <el-input size="medium" type="text"
                                     v-model="RequiredParameters.DetermineNumber"></el-input>
                             </el-form-item>
+                            <el-form-item style="width:395px ;" label="所在地区" prop="AreaId">
+                                <el-select size="medium" filterable @change="AreaIdchange" v-model="RequiredParameters.AreaId"
+                                    placeholder="所在地区">
+                                    <el-option v-for="item in countrys" :key="item.id" :label="item.cityname"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
+                                <!-- <el-input size="medium" type="text" v-model="RequiredParameters.AreaId"></el-input> -->
+                            </el-form-item>
                             <el-form-item style="width:395px ;" label="所在城市" prop="LocationCity">
                                 <el-input size="medium" type="text" v-model="RequiredParameters.LocationCity"></el-input>
                             </el-form-item>
@@ -898,6 +907,7 @@ export default {
                 BookingWeb:'',//预订网站
                 ReservationNumber:'',//预订号码
                 DetermineNumber:'',//酒店确定号码
+                AreaId:'',//所在地区
                 LocationCity:'',//所在城市
                 HotelName:'',//酒店名称
                 HotelPhone:'',//酒店电话
@@ -957,7 +967,7 @@ export default {
                 remittancecardnumber:'',//对方银行卡号
                 remittancename:'',//对方姓名
             },
-
+            countrys:[],
             OpHotelReservationsData: {
                 diId: 0,
             },
@@ -981,9 +991,13 @@ export default {
                 DetermineNumber: [
                     { required: true, message: '请输入酒店确定号码', trigger: ['blur', 'change'] }
                 ],
+                AreaId: [
+                    { required: true, message: '选择所在地区', trigger: ['blur', 'change'] }
+                ],
                 LocationCity: [
                     { required: true, message: '请输入所在城市', trigger: ['blur', 'change'] }
                 ],
+                
                 HotelName: [
                     { required: true, message: '请输入酒店名称', trigger: ['blur', 'change'] }
                 ],
@@ -1165,6 +1179,13 @@ export default {
         handleCurrentChange(val) {
             this.currentPage = val;
         },
+        AreaIdchange(val){
+            var obj = {}
+            obj = this.countrys.find(function (i) {
+                return i.id === val;
+            });
+            this.RequiredParameters.LocationCity=obj.city;
+        },
         //获取客户名单info
         PostTourClientListByDiId(val) {
             this.rollcallarr=[];
@@ -1319,6 +1340,12 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
+                    let countryss=[];
+                    for (let i = 0; i < res.data.data.countrys.length; i++) {
+                        res.data.data.countrys[i]['cityname'] = res.data.data.countrys[i].country + '-' + res.data.data.countrys[i].city;
+                        countryss.push(res.data.data.countrys[i]);
+                    }
+                    that.countrys=countryss;
                     that.GuestNamelist=res.data.data.guestName;
                     that.guestType=res.data.data.guestType;
                     if(that.guestType){
@@ -1503,6 +1530,7 @@ export default {
                     that.RequiredParameters.BookingWeb=res.data.data.reservationsWebsite;//预订网站
                     that.RequiredParameters.ReservationNumber=res.data.data.reservationsNo;//预订号码
                     that.RequiredParameters.DetermineNumber=res.data.data.determineNo;//酒店确定号码
+                    that.RequiredParameters.AreaId=res.data.data.areaId;//所在城市
                     that.RequiredParameters.LocationCity=res.data.data.city;//所在城市
                     that.RequiredParameters.HotelName=res.data.data.hotelName;//酒店名称
                     that.RequiredParameters.HotelPhone=res.data.data.hotelTel;//酒店电话
@@ -1721,6 +1749,7 @@ export default {
                     reservationsWebsite:that.RequiredParameters.BookingWeb,//预订网站
                     reservationsNo:that.RequiredParameters.ReservationNumber,//预订号码
                     determineNo:that.RequiredParameters.DetermineNumber,//酒店确定号码
+                    areaId:that.RequiredParameters.AreaId,//城市
                     city:that.RequiredParameters.LocationCity,//城市
                     hotelName:that.RequiredParameters.HotelName,//酒店名称
                     hotelTel:that.RequiredParameters.HotelPhone,//酒店电话
@@ -1924,6 +1953,7 @@ export default {
                 BookingWeb:'',//预订网站
                 ReservationNumber:'',//预订号码
                 DetermineNumber:'',//酒店确定号码
+                AreaId:'',//所在地区
                 LocationCity:'',//所在城市
                 HotelName:'',//酒店名称
                 HotelPhone:'',//酒店电话

src/components/OP/OpInvitationOfficialActivities.vue

@@ -401,6 +401,31 @@
 </template>
 <script>
 import { pinyin } from 'pinyin-pro';
+var figurecharacter = (rule, value, callback) => {
+    if (!(/^\d+-*[\d,-]*$/.test(value))) { 
+        callback(new Error('请输正确座机或手机号格式！'));
+    }else {
+        callback();
+    }
+}
+var emailat = (rule, value, callback) => {
+    if (!value.includes('@')) { 
+        callback(new Error('邮箱格式不正确！'));
+    }else {
+        callback();
+    }
+}
+var namearr=['小姐','先生','女士','老师']
+var namewy = (rule, value, callback) => {
+    var array=namearr.map((item,index)=>{
+        if (value.includes(item)) { 
+            console.log(4123);
+            callback(new Error('联系人不能包含先生、女士、小姐等字样'));
+            return
+        }
+    })
+    callback();
+}
 export default {
     data() {
         return {
@@ -485,6 +510,10 @@ export default {
                 companyBankNo: [
                     { required: true, message: '请输入', trigger: 'blur' },
                 ],
+                email: [
+                    { required: true, message: '请输入', trigger: 'blur' },
+                    {validator: emailat, trigger: 'blur'},
+                ],
                 otherBankName: [
                     { required: true, message: '请输入', trigger: 'blur' },
                 ],
@@ -521,10 +550,12 @@ export default {
                 contact: [
                     { required: true, message: '请输入联系人', trigger: 'change' },
                     { required: true, message: '请输入联系人', trigger: 'blur' },
+                    {validator: namewy, trigger: 'blur'},
                 ],
                 tel: [
                     { required: true, message: '请输入联系方式', trigger: 'change' },
                     { required: true, message: '请输入联系方式', trigger: 'blur' },
+                    {validator: figurecharacter, trigger: 'blur'},
                 ],
                 address: [
                     { required: true, message: '请输入邀请方地址', trigger: 'change' },

src/components/Resource/OpOfficialActivities.vue

@@ -386,8 +386,7 @@
 <script>
 import { pinyin } from 'pinyin-pro';
 var validateBudget = (rule, value, callback) => {
-
-    if (value.split('@')[0].includes('info')) { //不输入或输0.0或0.00时，都进入
+    if (value.split('@')[0].includes('info')) { 
         callback(new Error('请输正确格式！'));
     }else {
         callback();