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

src/components/SalesModule/groupTourOrder.vue

@@ -2040,7 +2040,7 @@
                         </div>
                       </template>
                       <template v-else>
-                        <div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)">
+                        <div v-if="item.outNotice == 1" @click="toTrip(item)">
                           {{ $t("Operation.Op_teamNotice")
                         }}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
                         </div>
@@ -2230,7 +2230,8 @@
                     <el-popover width="600" placement="bottom-end" trigger="click">
                       <div class="groupTourOrder_remarks_popover">
                         <div>{{ $t("fnc.lsbeizhu") }}</div>
-                      <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
+                        <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList"
+                          :key="index2">
                           <span>{{ item2.remarks }}</span>
                           <span>{{ item2.createByName }}&ensp;<span
                               style="color: #666666">{{ item2.createDate }}</span></span>
@@ -2247,8 +2248,10 @@
                       </el-button>
                     </el-popover>
                   </div>
-              </div></div>
-                      <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}</p>
+                </div>
+              </div>
+              <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
+              </p>
             </td>
             <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
               <div>
@@ -4244,12 +4247,12 @@
           }
         }
         // 选择联运，联运备注必填
-        if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
-          if (!this.addMsg.UnionRemark) {
-            this.Error("请填写联运备注！");
-            return;
-          }
-        }
+        if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
+          if (!this.addMsg.UnionRemark) {
+            this.Error("请填写联运备注！");
+            return;
+          }
+        }
         //验证人数和机位数 20190807 修改 如果是不是单地接才判断
         if (this.addMsg.GroupType !== "4" && this.addMsg.GroupType !== "3") {
           if (

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2204,9 +2204,7 @@
                         <div v-if="isEditOrderCreate == 1 || IsSupperOrderEdit" @click="getSalerInfo(item)">
                           修改业务员
                         </div>
-                        <!-- <div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)">
-                          出团通知书<span v-if="item.outNotice == 1">(OK)</span><span v-else>(暂定)</span>
-                        </div> -->
+                  
                         <template v-if="item.lineId==90">
                         <div v-if="item.outNotice == 1" @click="toTrip(item)">
                           {{ $t("Operation.Op_teamNotice") 
@@ -2214,7 +2212,7 @@
                         </div>
                       </template>
                       <template v-else>
-                        <div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)">
+                        <div v-if="item.outNotice == 1" @click="toTrip(item)">
                           {{ $t("Operation.Op_teamNotice")
                         }}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
                         </div>