Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/common/lang/EN/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
   btbqtcd: 'B2B Front Desk Menu',
   gerenzxcd: 'Personal Central Menu',
   yibaohan: 'Included',
+  bubaohan: 'Not Included',
   daohangcaid: 'Navigation Menu',
   erjicaid: 'Secondary Menu',
   sanjicaid: 'Three-level menu',

src/assets/common/lang/zhCN/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
     btbqtcd: 'B2B前台菜单',
     gerenzxcd: '个人中心菜单',
     yibaohan: '已包含',
+    bubaohan: '不包含',
     daohangcaid: '导航菜单',
     erjicaid: '二级菜单',
     sanjicaid: '三级菜单',

src/assets/common/lang/zhTW/fill.js

@@ -2503,6 +2503,7 @@ export const obj = {
   btbqtcd: 'B2B前臺菜單',
   gerenzxcd: '個人中心菜單',
   yibaohan: '已包含',
+  bubaohan: '不包含',
   daohangcaid: '導航菜單',
   erjicaid: '二級菜單',
   sanjicaid: '三級菜單',

src/components/Hotel/DiDa/HotelDetails.vue

@@ -708,7 +708,8 @@
           {{$t('objFill.v101.hote.fuhetjdfx')}}</div>
         <div style="display: flex;justify-content: flex-start;margin-top:10px; ">
           <template v-if="qRoomTypeList&&qRoomTypeList.length>0">
-            <el-select placeholder="房型" v-model="qMsg.RoomTypeName" style="width:130px;" clearable filterable @clear="qMsg.RoomTypeName=''">
+            <el-select placeholder="房型" v-model="qMsg.RoomTypeName" style="width:130px;" clearable filterable
+              @clear="qMsg.RoomTypeName=''">
               <el-option label="房型(全部)" value=""></el-option>
               <el-option v-for="(item,index) in qRoomTypeList" :label="item.RoomName_CN" :value="item.RoomName_CN"
                 :key="`ry_`+index"></el-option>
@@ -764,9 +765,9 @@
             </div>
           </div>
         </div>
+        <div v-loading="loading">
           <template
             v-if="DidaHotelRoomDetails&&DidaHotelRoomDetails.HotelList&&DidaHotelRoomDetails.HotelList.length>0&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList&&DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList.length>0 ">
-          <div v-loading="loading">
             <div class="q-card row  q-cardradius " v-for="(item, index) in getQueryData" :key="`dh_`+index">
               <div class="col q-pa-sm q-pr-lg col-3 row no-wrap justify-between"
                 style="border-right: 1px solid rgb(238, 238, 238);width:15%;height:auto;">
@@ -952,13 +953,13 @@
                 </div>
               </div>
             </div>
-          </div>
           </template>
           <template v-else>
             <div class="q-my-md q-px-lg" style="text-align:center;margin-top:15px;">{{$t('system.content_noData')}}
             </div>
           </template>
         </div>
+      </div>
       <!-- 价格循环结束 -->
       <div class="rounded-borders bg-white row items-center q-pb-md" style="margin-top:20px;width: 1300px;">
         <div class="row q-px-lg q-mb-lg row justify-between " style="width:100%;">
@@ -1170,6 +1171,7 @@
         get() {
           var _this = this;
           var tempData = [];
+          _this.loading = true;
           if (_this.DidaHotelRoomDetails && _this.DidaHotelRoomDetails.HotelList && _this.DidaHotelRoomDetails
             .HotelList
             .length > 0 && _this.DidaHotelRoomDetails.HotelList[0].GroupRoomTypeList) {
@@ -1203,6 +1205,7 @@
               tempData = newDataArray;
             }
           }
+          _this.loading = false;
           return tempData;
         },
       }
@@ -1311,6 +1314,7 @@
           this.msg.CheckInDate = '';
           this.msg.CheckOutDate = '';
         }
+        this.DidaHotelRoomDetails = {};
         var that = this;
         this.apipost('dmc_post_GetDiDaPriceSearchList', this.msg, res => {
           this.loading = false

src/components/SalesModule/MyCustomer.vue

@@ -579,15 +579,16 @@
               style="cursor: pointer;text-decoration: underline;">{{item.visiteCount}}</span></td>
           <!-- <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{item.cL_Balance}}</td> -->
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
-            <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.SalesModule.dindanysze')" placement="top-start">
-              <span @click="goUrl(type,item.customerId,3)"
-              style="cursor: pointer;text-decoration: underline;">
+            <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.SalesModule.dindanysze')"
+              placement="top-start">
+              <span @click="goUrl(type,item.customerId,3)" style="cursor: pointer;text-decoration: underline;">
                 {{item.tradeTotal}}</span>
             </el-tooltip>
           </td>
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{item.inquireCount}}</td>
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{item.allianceName}}</td>
-          <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2"><span style="cursor: pointer;text-decoration: underline;"
+          <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2"><span
+              style="cursor: pointer;text-decoration: underline;"
               @click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td>
           <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
             <span style="cursor: pointer;color: #2CA4F0"
@@ -602,11 +603,13 @@
               <el-button style="padding:4px" @click.stop="goUrlT('empBankAccount',item.customerId)" type="danger"
                 icon="iconfont icon-guanliyuan" circle></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('objFill.jiaoyixiangqing')" placement="top-start" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+            <el-tooltip class="item" effect="dark" :content="$t('objFill.jiaoyixiangqing')" placement="top-start"
+              v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
               <el-button style="padding:4px" @click.stop="goUrC('CustomerAnalysis',item.customerId)" type="success"
                 icon="iconfont icon-icon-test6" circle></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('objFill.tuanduichengyuan')" placement="top-start" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+            <el-tooltip class="item" effect="dark" :content="$t('objFill.tuanduichengyuan')" placement="top-start"
+              v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
               <el-button style="padding:4px" @click.stop="goTeamMember(item)" type="primary" icon="el-icon-user-solid"
                 circle></el-button>
             </el-tooltip>
@@ -686,7 +689,7 @@
                 <div style="display: flex;flex-wrap: wrap;">
                   <div class="_info_img" v-if="addMsg.BusinessCardPhotos&&addMsg.BusinessCardPhotos.length>0">
                     <ul class="clearfix">
-                      <li v-for="(img,imgI) in addMsg.BusinessCardPhotos"
+                      <li v-for="(img,imgI) in addMsg.BusinessCardPhotos" :key="`cb_`+imgI"
                         style="margin-right: 5px;position: relative;border:1px dashed #d1d1d1;border-radius: 6px;">
                         <img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
                         <el-image v-if="img&&verificationFile(img,3)" :src="img" :preview-src-list="[img]">
@@ -726,14 +729,15 @@
                       <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInputTwo"
                         size="small" @keyup.enter.native="handleInputConfirm(1)" @blur="handleInputConfirm(1)">
                       </el-input>
-                      <el-button v-else class="button-new-tag" size="small" @click="showInput(1)">+ {{$t('fnc.tianjia')}}</el-button>
+                      <el-button v-else class="button-new-tag" size="small" @click="showInput(1)">+
+                        {{$t('fnc.tianjia')}}</el-button>
                     </div>
                   </div>
                 </div>
               </el-form-item>
             </el-col>
             <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
-              <el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType" >
+              <el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType">
                 <div style="display: flex;flex-wrap: nowrap;">
                   <div>
                     <el-checkbox v-model='addMsg.SigningType'>
@@ -781,7 +785,7 @@
             <el-col :span="4">
               <el-form-item :label="$t('visaT.post')" prop="Duty">
                 <el-select filterable v-model='addMsg.Duty' :placeholder="$t('pub.pleaseSel')">
-                  <el-option v-for='item in zw' :label='item.Name' :value='item.ID' :key='item.ID'>
+                  <el-option v-for='item in zwList' :label='item.Name' :value='item.ID' :key='item.ID'>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -789,7 +793,7 @@
             <el-col :span="4">
               <el-form-item :label="$t('salesModule.premises')" prop="Premises">
                 <el-select filterable v-model='addMsg.Premises' :placeholder="$t('pub.pleaseSel')">
-                  <el-option v-for='item in jycs' :label='item.Name' :value='item.ID' :key='item.ID'>
+                  <el-option v-for='item in jycsList' :label='item.Name' :value='item.ID' :key='item.ID'>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -908,8 +912,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
-            <p class="fz12 color333 fbold" style="border: none; margin-bottom: 15px; padding-left: 20px;">{{$t('objFill.xushenhexx')}}<span
-                class="colorE95252 fz12 fwnormal">
+            <p class="fz12 color333 fbold" style="border: none; margin-bottom: 15px; padding-left: 20px;">
+              {{$t('objFill.xushenhexx')}}<span class="colorE95252 fz12 fwnormal">
                 {{$t('objFill.bianjimddzjrsh')}}
               </span>
             </p>
@@ -977,7 +981,8 @@
               <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="small"
                 @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
               </el-input>
-              <el-button v-else class="button-new-tag" size="small" @click="showInput">+ {{$t('fnc.tianjia')}}</el-button>
+              <el-button v-else class="button-new-tag" size="small" @click="showInput">+ {{$t('fnc.tianjia')}}
+              </el-button>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -1164,8 +1169,8 @@
         provinceList: [],
         cityList: [],
         regionList: [],
-        jycs: [], //经营场所
-        zw: [], //职务
+        jycsList: [], //经营场所
+        zwList: [], //职务
         khly: [], //客户来源
         outerVisible: false,
         updateMsg: {
@@ -1654,19 +1659,21 @@
           }, err => {})
         } else {}
       },
+      //经营场所
       getJycs() {
         this.apipost('app_today_visit_GetCustomerPremisesEnum', {}, res => {
           if (res.data.resultCode == 1) {
-            this.jycs = res.data.data
-            this.addMsg.Premises = res.data.data[0].ID
+            this.jycsList = res.data.data
+            this.addMsg.Premises = this.jycsList[0].ID
           }
         }, err => {})
       },
+      //职务
       getZw() {
         this.apipost('app_today_visit_GetCustomerDutyEnum', {}, res => {
           if (res.data.resultCode == 1) {
-            this.zw = res.data.data
-            this.addMsg.Duty = res.data.data[1].ID
+            this.zwList = res.data.data
+            this.addMsg.Duty = this.zwList[1].ID
           }
         }, err => {})
       },
@@ -1824,11 +1831,6 @@
         if (this.addMsg.District == '') {
           this.addMsg.District = 0
         }
-
-        // if (this.BusinessCardPhotos) {
-        //   this.addMsg.BusinessCardPhotos = []
-        //   this.addMsg.BusinessCardPhotos.push(this.BusinessCardPhotos)
-        // }
         if (this.HousePhotos) {
           this.addMsg.HousePhotos = []
           this.addMsg.HousePhotos.push(this.HousePhotos)
@@ -1864,7 +1866,6 @@
         let AreaName = sheng + shi + qu
         if (this.addMsg.address == '' || !this.addMsg.address) {
           this.addMsg.address = AreaName
-          // this.addMsg.address = AreaName + ',' + this.addMsg.address
         }
         if (this.addMsg.address && this.addMsg.address.indexOf(AreaName) == -1) {
           this.addMsg.address = AreaName + ',' + this.addMsg.address
@@ -1880,27 +1881,7 @@
         this.loadingSave = true
         this.apipost('app_add_new_visit_customer', this.addMsgS, res => {
           if (res.data.resultCode == 1) {
-            this.addMsg = {
-              customerName: '',
-              contact: '',
-              contactNumber: '',
-              address: '',
-              brandIds: [],
-              remark: '',
-              Duty: '',
-              Premises: '',
-              CustomerId: '0',
-              BusinessCardPhotos: [],
-              HousePhotos: [],
-              Images: [],
-              CustomerSourceType: '',
-              CustomerSource: '',
-              Country: '2',
-              Province: '',
-              City: '',
-              District: '',
-              PlatformUserNameList: []
-            }
+            this.cancelData();
             this.addMsgS.customerVisit.expectVisitDateTime = ''
             this.$message.success(res.data.message)
             this.addShow = false
@@ -1919,36 +1900,41 @@
         this.resetForm('addMsg')
       },
       cancelData() {
-        this.addMsg = {
-          CustomerId: 0,
-          customerName: '',
-          contact: '',
-          contactNumber: '',
-          address: '',
-          brandIds: [],
-          remark: '',
-          Duty: '',
-          Premises: '',
-          CustomerId: '0',
-          BusinessCardPhotos: [],
-          HousePhotos: [],
-          Images: [],
-          CustomerSourceType: '',
-          CustomerSource: '',
-          Country: '2',
-          Province: '',
-          City: '',
-          District: '',
-          UniqueCode: '',
-          LINEID: '',
-          Email: '',
-          PlatformUserNameList: [],
-         
-        }
-        this.BusinessCardPhotos = '',
-          this.HousePhotos = '',
-          this.Images = '',
-          this.addMsgS.customerVisit.expectVisitDateTime = ''
+        this.addMsg.CustomerId = 0;
+        this.addMsg.customerName = "";
+        this.addMsg.contact = "";
+        this.addMsg.contactNumber = "";
+        this.addMsg.address = "";
+        this.addMsg.brandIds = [];
+        this.addMsg.remark = "";
+        this.addMsg.Duty = "";
+        if (this.zwList && this.zwList.length > 1) {
+          this.addMsg.Duty = this.zwList[1].ID;
+        }
+        this.addMsg.Premises = "";
+        if (this.jycsList && this.jycsList.length > 0) {
+          this.addMsg.Premises = this.jycsList[0].ID;
+        }
+        this.addMsg.BusinessCardPhotos = [];
+        this.addMsg.HousePhotos = [];
+        this.addMsg.Images = [];
+        this.addMsg.CustomerSourceType = "";
+        if (this.khly && this.khly.length > 0) {
+          this.addMsg.CustomerSourceType = this.khly[0].ID;
+        }
+        this.addMsg.CustomerSource = "";
+        this.addMsg.Country = "2";
+        this.addMsg.Province = "";
+        this.addMsg.City = "";
+        this.addMsg.District = "";
+        this.addMsg.UniqueCode = "";
+        this.addMsg.LINEID = "";
+        this.addMsg.Email = "";
+        this.addMsg.PlatformUserNameList = [];
+        this.BusinessCardPhotos = '';
+        this.HousePhotos = '';
+        this.Images = '';
+        this.addMsgS.customerVisit.expectVisitDateTime = '';
       },
       resetForm(formName) { // 重置表单
         this.$refs[formName].resetFields();