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

src/components/SupplierIndex.vue

@@ -613,23 +613,25 @@
           <div style="width: 100%;min-height:200px;  overflow-x: auto;padding:0 20px; " class="HotelQueryList"
             v-loading="loading">
             <div style="margin:20px 0">
-              <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
-              <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
-              <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
-              <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
-              <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
+              <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">赤い日</span>
+              <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">ハイシーズン</span>
+              <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">フラットシーズン</span>
+              <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">ローシーズン</span>
+              <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特別価格</span>
             </div>
             <template v-if="isShow">
               <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
                 :height="tableHeight">
-                <el-table-column fixed label="酒店名称" min-width="180">
+                <!-- 酒店名称 -->
+                <el-table-column fixed label="ホテル名" min-width="180">
                   <template slot-scope="scope">
                     <div>
                       {{scope.row.HotelName}}</div>
                     <div>{{scope.row.TotalInventory}}</div>
                   </template>
                 </el-table-column>
-                <el-table-column label="价格&库存" fixed min-width="120">
+                <!-- 价格库存 -->
+                <el-table-column label="価格&在庫" fixed min-width="120">
                   <template slot-scope="scope">
                     <div class="Hotel_kong">价格</div>
                     <div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
@@ -741,10 +743,10 @@
             <el-form>
               <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
                 <tr>
-                  <th width="50">编号</th>
+                  <th width="50">数</th>
                   <th>内容</th>
-                  <th width="70">操作人</th>
-                  <th width="140">操作时间</th>
+                  <th width="70">オペレーター</th>
+                  <th width="140">稼働時間</th>
                 </tr>
                 <template v-if="queryMsg.total>0">
                   <tr v-for="(item,index) in HotelTipList">

src/components/SupplierLogin.vue

@@ -59,13 +59,13 @@
           <div class="login_Title">
             {{groupModel.GroupName?groupModel.GroupName:''}}
           </div>
-          <div class="loginXI">供应商登录</div>
+          <div class="loginXI">サプライヤーログイン</div>
         </div>
         <div class="login-commonBotm T1">
           <i class="icon-login-name iconfont icon-user11"></i>
           <input class="input" @focus="name_bline=true" @blur="name_bline=false" maxlength="20"
             autocomplete="new-password" v-model="userInfo.name" style="background-color:transparent !important;"
-            type="text" :placeholder="$t('login.login_account')" @keyup.enter="doLogin" />
+            type="text" placeholder="アカウント番号を入力してください" @keyup.enter="doLogin" />
           <div class="name_bline_left Supplier_Left_Line" :class="name_bline==true?'_bline_w':''"></div>
           <div class="name_bline_right Supplier_Right_Line" :class="name_bline==true?'_bline_w':''"></div>
         </div>
@@ -76,7 +76,7 @@
           <i class="icon-login-password iconfont icon-mima"></i>
           <input class="input" @focus="pwd_bline=true" @blur="pwd_bline=false" maxlength="20"
             autocomplete="new-password" v-model="userInfo.password" style="background-color:transparent !important"
-            type="password" :placeholder="$t('login.login_password')" @keyup.enter="doLogin" />
+            type="password" placeholder="パスワードを入力してください" @keyup.enter="doLogin" />
           <div class="pwd_bline_left Supplier_Left_Line" :class="pwd_bline==true?'_bline_w':''"></div>
           <div class="pwd_bline_right Supplier_Right_Line" :class="pwd_bline==true?'_bline_w':''"></div>
         </div>
@@ -84,7 +84,7 @@
           <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
         </div>
         <button type="button" class="loginBtn" :class="{'loginIng':loginState==1}" :disabled="loginState==1"
-          @click="doLogin">{{loginState==1?'登录中...':'登录'}}</button>
+          @click="doLogin">{{loginState==1?'ログイン...':'ログイン'}}</button>
       </div>
     </form>
   </div>
@@ -213,11 +213,11 @@
       doLogin() {
         if (this.userInfo.name == "") {
           this.nameIsShow = true;
-          this.nameErrorMsg = "请输入用户名";
+          this.nameErrorMsg = "ユーザー名を入力してください";
           return;
         } else if (this.userInfo.password == "") {
           this.passwordIsShow = true;
-          this.passwordErrorMsg = "请输入密码";
+          this.passwordErrorMsg = "パスワードを入力してください";
           return;
         } else {
           this.nameIsShow = false;

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -23,6 +23,8 @@
       <div class="_vad_top clearfix">
         <span class="_num PingFangSC">{{$t('visa.v_tuan')}}：{{num}}</span>
         <div class="fr">
+          <button @click="DeleteMore" class="normalBtn">批量删除</button>
+
           <el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
             {{$t('visa.v_tvisa')}}
             <el-dropdown-menu slot="dropdown" >
@@ -33,7 +35,7 @@
           <el-dropdown split-button type="primary" trigger="click"  @command="bindVisa">
             {{$t('visa.v_gvisa')}}
             <el-dropdown-menu slot="dropdown" >
-              <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
+              <el-dropdown-item v-for="(item,index) in VisaManagementList" :key='index+50000' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
            </el-dropdown-menu>
           </el-dropdown>
@@ -48,7 +50,7 @@
           <th>{{$t('visa.v_visaType')}}</th>
           <th>{{$t('visa.v_qianzhengst')}}</th>
           <th>{{$t('admin.admin_czPerson')}}</th>
-          <th>{{$t('hotel.table_operat')}}</th>
+          <th> <input type="checkbox" @change="checkAll2" v-model="checkd2" >{{$t('hotel.table_operat')}}</th>
         </tr>
         <tr v-for="(item,index) in dataList">
           <td width=150 class="text_left"> 
@@ -97,6 +99,7 @@
           </td>
           <td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td>
           <td style="position:relative;width:200px"> 
+            <input v-if="item.VisaType==2 || item.SignStatus==2" type="checkbox"  v-model="checkList2" :value="item.Id" @change="checkThis2">
             <el-button @click="deletelist(item.Id)" type="danger" style="padding:5px" icon="el-icon-delete" circle></el-button>
             <!-- <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i> -->
           <span v-if="LineID!=14">
@@ -126,6 +129,11 @@ export default {
         checkListAll:[],
         loading:false,
         checkd:false,
+        checkd2:false,
+        checkList2:[],
+        checkListAll2:[],
+        deleteStatus:false,
+        lastlen:false,
         StatusList:[
           {
             Id:'-1',
@@ -186,6 +194,7 @@ export default {
               cancelButtonText: this.$t('pub.cancelBtn'),
               type: 'warning'
           }).then(() => {  
+            this.deleteStatus=false;               
               this.deleteTshi(id)
           }).catch(() => {
           this.$message({
@@ -197,8 +206,17 @@ export default {
     deleteTshi(id){  // 删除操作
       this.apipost('dmc_post_DelVisaPeople',{GuestId:id},res=>{
         if(res.data.resultCode==1){
+          if(this.deleteStatus){
+            if(this.lastlen){
+              this.getData()
+              this.$message.success(res.data.message)
+
+            }
+          }else{
             this.$message.success(res.data.message)
             this.getData()
+          }
+            
         }else{
             this.$message.error(res.data.message)
         }
@@ -229,6 +247,50 @@ export default {
         }
       },err=>{})
     },
+    DeleteMore(){
+      let len=this.checkList2.length;
+      if(len==0){
+        this.Error("至少选择一条！");
+        return;
+      }
+      this.deleteStatus=true; 
+      this.lastlen=false;               
+      
+      this.$confirm(this.$t('visaT.sfshanchubd'), this.$t('tips.tips'), {
+              confirmButtonText: this.$t('pub.sureBtn'),
+              cancelButtonText: this.$t('pub.cancelBtn'),
+              type: 'warning'
+          }).then(() => {  
+            for(let i=0;i<this.checkList2.length;i++){
+        
+              if(i+1==len){
+                this.lastlen=true;
+              }
+              this.deleteTshi(this.checkList2[i])
+            }
+          }).catch(() => {
+          this.$message({
+              type: 'info',
+              message: this.$t('tips.cancleDelete')
+        });
+      });
+      
+    
+    },
+    checkThis2(){ // 单选
+      if(this.checkList2.length==this.checkListAll2.length){
+        this.checkd2 = true
+        return
+      }
+      this.checkd2 = false
+    },
+    checkAll2(){ //全选
+      if(this.checkList2.length==this.checkListAll2.length){
+          this.checkList2=[]
+          return
+      }
+      this.checkList2 = this.checkListAll2
+    },
     checkThis(){ // 单选
       if(this.checkList.length==this.checkListAll.length){
         this.checkd = true
@@ -243,6 +305,7 @@ export default {
       }
       this.checkList = this.checkListAll
     },
+    
     getVisaManagementList(){  //  获取签证管理
         this.apipost('dmc_get_visa_GetVisaManagementList',{Status:0,BranchId:-1,SignStatus:0},res=>{
             if(res.data.resultCode==1){
@@ -259,6 +322,11 @@ export default {
         // console.log("res",res);
             if(res.data.resultCode==1){
                 this.dataList = res.data.data;
+                this.dataList.forEach(x=>{
+                  if(x.VisaType==2 || x.SignStatus==2){
+                    this.checkListAll2.push(x.Id)
+                  }
+                })
                 if(this.LineID==14){
                   this.dataList.forEach(x=>{
                   if(x.ApplyStatus==-1){