no message

src/components/Complaints/AddComplaints.vue

@@ -226,7 +226,7 @@
         </ul>
       </div>
 
-      <div v-if="userInfo.SimpleEasy==1">
+      <div v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
             <p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
 
             <div class="_addUpload_box clearfix">

src/components/Complaints/ComplaintsDetail.vue

@@ -418,7 +418,7 @@
           <p v-if="item.Level!=0">
             {{item.Description}}
           </p>
-           <template v-if="userInfo.SimpleEasy==1">
+           <template v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
               <div class="_addUpload_box _addUpload_box_btm clearfix" v-if="item.FileDataList.length>0">
                 <p>{{$t('objFill.fj')}}</p>
                 <template v-for="(file,fIndex) in item.FileDataList">
@@ -512,7 +512,7 @@
             </el-select>
           </td>
         </tr>
-        <tr v-if="userInfo.SimpleEasy==1"><td>  <p>{{$t('fnc.scfujian')}}</p>
+        <tr v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1"><td>  <p>{{$t('fnc.scfujian')}}</p>
           <p class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</p></td><td>
           
           <div>

src/components/SalesModule/components/groupOrder.vue

@@ -263,6 +263,10 @@
                   <el-button type="primary" style="background: green; border-color: green"
                     icon="iconfont icon-bianji-smal" @click="getRemarks(item)"></el-button>
                 </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="修改op备注" placement="top-start">
+                    <el-button type="primary" style="background: green; border-color: green"
+                    icon="iconfont icon-bianji-smal" @click="getRemarks(item,1)"></el-button>
+                </el-tooltip>
                 <el-tooltip effect="dark" :content="$t('fnc.rizhi')" placement="top-start" style="float: left">
                   <el-popover width="230" trigger="click">
                     <div class="priceContentDiv">
@@ -815,8 +819,8 @@ export default {
     getLogDetail(obj) {
         this.$emit('getLogDetail', obj)
     },
-    getRemarks(obj) {
-        this.$emit('getRemarks', obj)
+    getRemarks(obj,type) {
+        this.$emit('getRemarks', obj,1)
     },
     getDetail(obj) {
         this.$emit('getDetail', obj)

src/components/SalesModule/groupTourOrder.vue

@@ -1647,7 +1647,7 @@
           </el-popover>
         </li>
         <li>
-          <input v-if="userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
+          <input v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="addOrders"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="
               getList();
               resetPageIndex();
@@ -1774,7 +1774,7 @@
     </div>
     <!-- 表格 -->
     <div style="width: 100%; height: auto; overflow-x: auto" class="ownScrollbarStyle" v-loading="loading">
-      <groupOrder v-if="userInfo.SimpleEasy==1" :list="list" :orderList="orderList" 
+      <groupOrder v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" :list="list" :orderList="orderList" 
       :logList="logList" :redBagList="redBagList" :qjGroupId="qjGroupId" :isShow="isShow"
       :showID="showID" :TransferMission="TransferMission" :isEditOrderCreate="isEditOrderCreate"
       @goIisDetail="goIisDetail" @goUrlTS="goUrlTS" @goContract="goContract" 
@@ -2707,6 +2707,9 @@
         <addOrder v-if="visible&&showType==1" :isDrawerMode="true" 
         :details="selectedSpotData"
         @close="close" @save-success="handleSaveSuccess"></addOrder>
+        <editOPRemarks v-if="visible&&showType==2" :isDrawerMode="true" 
+        :details="selectedSpotData"
+        @close="close" @save-success="handleSaveSuccess"></editOPRemarks>
       </template>
     </pinkDrawer>
   </div>
@@ -2726,6 +2729,7 @@
   import addOrder from './components/addOrder.vue';
   import addConfig from "./components/addConfig.js";
   import groupOrder from "./components/groupOrder.vue";
+  import editOPRemarks from "./components/editOPRemarks.vue";
   export default {
     data() {
       return {
@@ -3080,6 +3084,7 @@
       pinkDrawer,
       addOrder,
       groupOrder,
+      editOPRemarks,
     },
     filters: {
       priceFormat(value) {
@@ -3946,6 +3951,12 @@
         this.showID = data;
       },
       getRemarks(obj) {
+        if(this.userInfo.SimpleEasy&&this.userInfo.SimpleEasy==1){
+          this.showType = 2
+          this.selectedSpotData = obj;
+          this.$refs.addOrders.openDrawer(obj);
+          return;
+        }
         // 华国豪5-5新增
         if (moment().format("YYYY-MM-DD") >= obj.startDate) {
           // 该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？
@@ -3977,7 +3988,7 @@
         }
       },
       getDetail(obj) {
-        if(this.userInfo.SimpleEasy==1){
+        if(this.userInfo.SimpleEasy&&this.userInfo.SimpleEasy==1){
           this.OperationType = 1
           this.showType = 1
           obj.OperationType = 1

src/components/SingleAirTicket/components/OrderList.vue

@@ -608,7 +608,7 @@
           </div>
         </div>
         <div class="c9e fz12">
-          <span v-if="userInfo.SimpleEasy==1">供应商：{{ item.SupplierModel.SupplierName+'/'+item.SupplierModel.CompanyPhone }} </span>
+          <span v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">供应商：{{ item.SupplierModel.SupplierName+'/'+item.SupplierModel.CompanyPhone }} </span>
           <span v-else>{{$t('objFill.guestinfor')}}：{{ item.GuestName }}<template v-if="item.MobilePhone">/{{ item.MobilePhone }}</template> </span>
           <template v-if="item.ContractNum&&item.ContractNum.length>0">
             <template v-for="(sItem,sIndex) in item.ContractNum">
@@ -618,7 +618,7 @@
           <!-- <a v-else style="color:blue;cursor:pointer" @click="GoToContract(item,0)">{{$t('objFill.chujinghet')}}</a> -->
         </div>
         <div class="row c9e fz12">
-          <span class="mr" v-if="userInfo.SimpleEasy==1">OP：{{ item.AppointOPList.map(x=>x.OPName).join(',') }}</span>
+          <span class="mr" v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">OP：{{ item.AppointOPList.map(x=>x.OPName).join(',') }}</span>
           <span class="mr" v-if="item.LureEmpName">{{$t('objFill.yinliuren')}}：{{ item.CreateByName }}</span>
           <span>{{$t('visaT.sale')}}：</span>
           <span class="mr">
@@ -741,7 +741,7 @@
                 @click="CheckOutDetails(scope.row)"></i>
             </template>
           </el-table-column> -->
-          <template slot="append" v-if="userInfo.SimpleEasy==1">
+          <template slot="append" v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1">
             <div style="padding:10px;color:#f1416c"><ul style="display: flex; flex-wrap: wrap;">旅客名单：
               <li v-for="(mitem,mindex) in item.OrderGuestList" :key="mindex" style="margin-left:10px"><el-tag size="mini">{{mitem.Name}}</el-tag></li>
             </ul></div>

src/components/SingleAirTicket/components/TicketOrder.vue

@@ -146,7 +146,7 @@
                       <el-input v-model='msg.StartCityName'></el-input>
         </li>
         <li>
-          <input v-if="userInfo.SimpleEasy==1" type="button" class="normalBtn" value="新增机票" @click="AddAirTicket()" />
+          <input v-if="userInfo.SimpleEasy&&userInfo.SimpleEasy==1" type="button" class="normalBtn" value="新增机票" @click="AddAirTicket()" />
 
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
             @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />