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

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

@@ -159,7 +159,7 @@ export const obj = {
     yinliuren: '引流人',
     guanlian: '关联',
     ruzhuriqi: '入住日期',
-    ruzhuxinxi: '入驻信息',
+    ruzhuxinxi: '入住信息',
     fangxinzonjia: '按照入住人数*房型单价=房型总价小计（不含稅）',
     renjian: '人间',
     daodianfukuan: '到店自付',

src/components/Complaints/ComplaintsDetail.vue

@@ -380,10 +380,11 @@
               <p>{{ComplainInfo.Description}}</p>
             </li>
           </ul>
+            <template v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
            <ul>
             <li style="height:auto;line-height: 20px;padding:5px 0;">
               
-             <div class="_addUpload_box _addUpload_box_btm clearfix" v-if="ComplainInfo.FileDataList.length>0">
+             <div class="_addUpload_box _addUpload_box_btm clearfix" v-if=" ComplainInfo.FileDataList.length>0">
                <p>{{$t('objFill.fj')}}</p>
               <template v-for="(file,fIndex) in ComplainInfo.FileDataList">
                 <div v-if="file.FileType==3">
@@ -404,7 +405,7 @@
             </div>
             </li>
           </ul>
-
+            </template>
          
         </div>
         <div class="CD_Conditions">

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -390,6 +390,7 @@
           </span>
         </li>
         <li>
+          <el-button class="hollowFixedBtn" v-if="IsSupperOrderEdit&&pagesTitle!='销售'" @click="setCompleted">{{$t('objFill.oneclickfinish')}}</el-button>
            <input v-if="userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
         </li>
@@ -405,7 +406,7 @@
         <span class="groupTourOrderByTuan_ico"><i
             style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
     </div>
-    <visaOrderList :pagesTitle="pagesTitle" :OrderList="dataList" v-loading="loading" @success="getList">
+    <visaOrderList ref="visaOrderList" :pagesTitle="pagesTitle" :OrderList="dataList" v-loading="loading" @success="getList">
     </visaOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
@@ -645,7 +646,8 @@
           PostId: 0,
           IsLeave: 0,
         },
-        layerCompanyList: []
+        layerCompanyList: [],
+        IsSupperOrderEdit: false,
       }
     },
     computed: {
@@ -663,6 +665,9 @@
         this.getList();
         this.$message.success('保存成功');
       },
+      setCompleted() {
+        this.$refs.visaOrderList.setCompleted()
+      },
       pickerEnd(){
         if (this.msg.FinishSDate > this.msg.FinishEDate && this.msg.FinishEDate !== "") {
           this.$message.error(this.$t('tips.jsrqbndyksriqi'));
@@ -692,6 +697,12 @@
       },
       GetSupperOrderEditAuth() {
         var actionCode = this.$AuthCode.F_InvoiceManagement;
+        var actionCodeOrderEdit = this.$AuthCode.SupperOrderEdit;
+        this.CheckUserAuth(actionCodeOrderEdit, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.IsSupperOrderEdit = true;
+          }
+        });
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {
             this.F_InvoiceManagement = true;

src/components/SalesVisa/components/visaOrderList.vue

@@ -505,10 +505,10 @@
 
 <template>
   <div>
-    <div style="text-align: right;position: fixed;top:  62px; right: 89px;">
+    <!-- <div style="text-align: right;position: fixed;top:  62px; right: 89px;">
       <el-button class="hollowFixedBtn" v-if="IsSupperOrderEdit&&pagesTitle!='销售'" @click="setCompleted"
         :loading="CompletedLoading">{{$t('objFill.oneclickfinish')}}</el-button>
-    </div>
+    </div> -->
     <el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="id"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" :selectable="selectable" :reserve-selection="true"