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

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

@@ -6249,7 +6249,7 @@ export const obj = {
       qianzhenglb: '签证列表',
       xiugaisongqr: '修改送签日期',
       xiugaichuqr: '修改出签日期',
-      xiugaijingr: '修改进馆日',
+      xiugaijingr: '修改进馆日期',
       xuanzeqzlx: '选择签证类型',
       ouzhouqianz: '欧洲签证',
       qingshurgjmc: '输入国家名称',

src/components/SalesVisa/VisaProductOrder.vue

@@ -876,6 +876,11 @@
           <el-button v-if="IsSupperOrderEdit" class="hollowFixedBtn"
           @click="SwitchStatus==0?setCompleted():setPrepareDocument()"
           :loading="CompletedLoading">{{SwitchStatus==0?$t('objFill.oneclickfinish'):$t('objFill.v101.administrative.yijianzhidan')}}</el-button>
+           <el-button v-if="IsSupperOrderEdit" class="hollowFixedBtn" @click="setEnterTimeOrSignOutTimeDocument(1)"
+          :loading="CompletedLoading">{{$t('objFill.v101.Rest.xiugaijingr')}}</el-button>
+          <el-button v-if="IsSupperOrderEdit" class="hollowFixedBtn"
+          @click="setEnterTimeOrSignOutTimeDocument(2)"
+          :loading="CompletedLoading">{{$t('objFill.v101.Rest.xiugaisongqr')}}</el-button>
         </li>
       </ul>
     </div>
@@ -905,7 +910,7 @@
      <el-table-column
         type="selection"
         :selectable="selectable"
-        :reserve-selection="true" v-if="IsSupperOrderEdit"/>
+        :reserve-selection="true" v-if="IsSupperOrderEdit">
       </el-table-column>
       <el-table-column :label="IsSupperOrderEdit?$t('system.table_chekAll'):''">
         <template slot-scope="scope">
@@ -918,7 +923,6 @@
               <th width="6%">{{$t('hotel.hotel_StarDate')}}</th>
               <th width="6%">{{$t('fnc.bmriqi')}}</th>
               <th width="7%">{{$t('fnc.yszonge')}}</th>
-
               <th width="7%">{{$t('fnc.shishou')}}</th>
               <th width="5%">{{$t('fnc.tuikuan')}}</th>
               <th width="5%">{{$t('fnc.ptshuijin')}}</th>
@@ -1051,7 +1055,7 @@
                 </td>
               </tr>
               <tr>
-                <td colspan="9" class="groupTourOrder_remarks" style="height: 40px;">
+                <td colspan="7" class="groupTourOrder_remarks" style="height: 40px;">
                   <div>
                     <div class="fz13">
                       <span v-if="scope.row.VisaFeeNum" class="mr cblack">{{$t('objFill.v101.Rest.qianzhengrens')}}:
@@ -1084,7 +1088,29 @@
                     </div>
                   </div>
                 </td>
-                <td colspan="9" class="groupTourOrder_tickets2" style="height: 40px;">
+                 <td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
+                  <div>
+                    <div style="display: block;width: 100%;">
+                     <p style="display: flex;width: 100%;"><span class="VO-remarkTitle">{{$t('objFill.v101.Rest.jingguanrq')}}:{{scope.row.EnterTime}} 
+                   <el-tooltip class="" effect="dark" :content="$t('objFill.v101.Rest.xiugaijingr')"
+                          placement="top">
+                          <i class="el-icon-edit cursor-pointer c059FF6"
+                            @click="EnterTimeOrSignOutTimeMsg.Id=scope.row.Id;EnterTimeOrSignOutTimeMsg.type=1;EnterTimeOrSignOutTimeMsg.batch=1;EnterTimeOrSignOutTimeMsg.TimeInfo=scope.row.EnterTime;showEnterTimeOrSignOutTime=true;"></i>
+                        </el-tooltip>
+                  </span></p> 
+                     <p style="display: flex;width: 100%;"><span class="VO-remarkTitle">{{$t('visa.v_sqtime')}}:{{scope.row.SignOutTime}}
+                       <el-tooltip class="" effect="dark" :content="$t('objFill.v101.Rest.xiugaisongqr')"
+                          placement="top">
+                          <i class="el-icon-edit cursor-pointer c059FF6"
+                            @click="EnterTimeOrSignOutTimeMsg.Id=scope.row.Id;EnterTimeOrSignOutTimeMsg.batch=1;EnterTimeOrSignOutTimeMsg.type=2;EnterTimeOrSignOutTimeMsg.TimeInfo=scope.row.SignOutTime;showEnterTimeOrSignOutTime=true;"></i>
+                        </el-tooltip>
+                      </span>
+                      </p> 
+                     
+                    </div>
+                  </div>
+                </td>
+                <td colspan="8" class="groupTourOrder_tickets2" style="height: 40px;">
                   <div>
                     <div class="row justify-sb wrap mr">
                       <div class="row relative" style="margin-top: 5px;">
@@ -1204,6 +1230,23 @@
     :multipleSelection="multipleSelection"
     @close="showDocumentPreparation=false"
     @success="showDocumentPreparation=false,getList()"></OneClickDocumentPreparation>
+    <el-dialog
+  :title="EnterTimeOrSignOutTimeMsg.type==1?$t('objFill.v101.Rest.xiugaijingr'):$t('objFill.v101.Rest.xiugaisongqr')"
+  :visible.sync="showEnterTimeOrSignOutTime"
+  width="30%"
+  :before-close="handleClose">
+  <span> 
+    <el-date-picker
+      v-model="EnterTimeOrSignOutTimeMsg.TimeInfo"
+      type="date"
+     :placeholder="$t('admin.admin_choDate')"
+     @change="getTimeInfo">
+    </el-date-picker></span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="clearEnterTimeOrSignOutTimeMsg()">取 消</el-button>
+    <el-button type="primary" @click="SetEnterTimeOrSignOutTimeMsg()">确 定</el-button>
+  </span>
+</el-dialog>
   </div>
 </template>
 <script>
@@ -1220,11 +1263,19 @@
         titleType: null,
         title: '',
         showTransferOrder: false,
+        showEnterTimeOrSignOutTime: false,//设置进馆时间/出签时间
         queryObj:null,
         cdState: false,
         IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
         defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
         nameShow: true,
+        EnterTimeOrSignOutTimeMsg:{
+          Id:"",//多个ids (1,2,3格式)
+          type:0,//1-进馆时间/2送签时间
+          TimeInfo:"",//时间信息
+          batch:0,//1-单个，2-多个
+        },
+        EnterTimeOrSignOutTimeIds:[],
         msg: {
           pageIndex: 1,
           pageSize: 999,
@@ -1259,6 +1310,32 @@
       }
     },
     methods: {
+      getTimeInfo(e){
+        this.EnterTimeOrSignOutTimeMsg.TimeInfo = this.$calendarUtils.formatDate2(this.EnterTimeOrSignOutTimeMsg.TimeInfo)
+      },
+       handleClose(done) {
+        this.clearEnterTimeOrSignOutTimeMsg();
+         done();
+      },
+      clearEnterTimeOrSignOutTimeMsg(){
+        this.showEnterTimeOrSignOutTime=false;
+        this.EnterTimeOrSignOutTimeMsg. Id="";//多个ids (1,2,3格式)
+        this.EnterTimeOrSignOutTimeMsg.type=0;//1-进馆时间/2送签时间
+         this.EnterTimeOrSignOutTimeMsg.batch=0;//1-单个，2-多个
+        this.EnterTimeOrSignOutTimeMsg.TimeInfo="";//时间信息
+        this.handleClear();
+      },
+       SetEnterTimeOrSignOutTimeMsg(){
+          this.apipost('post_visa_SetVisaOrderEnterTimeOrSignOutTime', this.EnterTimeOrSignOutTimeMsg, res => {
+            if (res.data.resultCode == 1) {
+             this.clearEnterTimeOrSignOutTimeMsg();
+              this.Success(res.data.message)
+              this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+          }, err => {})
+      },
       handleClear(){
         this.$refs.multipleTable.clearSelection()
       },
@@ -1280,6 +1357,22 @@
     handleSelectionChange(val) {
       this.multipleSelection = JSON.parse(JSON.stringify(val))
     },
+    // 一键设置出签时间/进馆时间
+    setEnterTimeOrSignOutTimeDocument(type){
+      let ids = ''
+      if(this.multipleSelection&&this.multipleSelection.length>0){
+        ids = this.multipleSelection.map(x=>{ return x.Id})
+      }
+      if(ids == ''||(ids&&ids.length==0)) {
+        this.$message.error(this.$t('objFill.qinggouxuan'))
+        return
+      }
+      this.EnterTimeOrSignOutTimeMsg.Id=ids.join(',');
+       console.log("this.multipleSelection",this.EnterTimeOrSignOutTimeMsg.Id);
+      this.EnterTimeOrSignOutTimeMsg.batch=2;
+      this.EnterTimeOrSignOutTimeMsg.type=type;
+      this.showEnterTimeOrSignOutTime=true;
+    },
     // 一键制单
     setPrepareDocument(id){
       let ids = ''

src/components/SalesVisa/components/visaOrderList.vue

@@ -561,7 +561,11 @@
                   </el-image>
                 </template>
               </div>
-
+              
+                <span style="color:red;">{{$t('objFill.v101.Rest.jingguanrq')}}：</span>
+                <span style="margin-right:10px;color:red;">{{ scope.row.enterTime }}</span>
+               <span style="color:red;">{{$t('visa.v_sqtime')}}：</span>
+              <span style="margin-right:10px;color:red;">{{ scope.row.signOutTime }}</span>
               <span>{{$t('restaurant.res_oderTime')}}：</span>
               <span>{{ scope.row.createTime }}</span>
             </div>