no message

src/components/SalesModule/components/addOrder.vue

@@ -623,9 +623,9 @@
                   </el-col>
                   <el-col :span="6">
                     <el-form-item :label="$t('salesModule.SingleFM')">
-                      <el-radio v-model="addMsg.OneSex" label="1">{{ $t("pub.man") }}
+                      <el-radio v-model="addMsg.OneSex" :label="Number(1)">{{ $t("pub.man") }}
                       </el-radio>
-                      <el-radio v-model="addMsg.OneSex" label="2">{{ $t("pub.woman") }}
+                      <el-radio v-model="addMsg.OneSex" :label="Number(2)">{{ $t("pub.woman") }}
                       </el-radio>
                     </el-form-item>
                   </el-col>
@@ -1502,7 +1502,6 @@
               ID: s.supplierId,
               Name: s.supplierName,
             })
-            console.log(this.deepFirstLetterToLower(newVal.guestList),'=====')
             setTimeout(() => {
               let obj =  JSON.parse(JSON.stringify(this.addMsg))
 
@@ -1511,6 +1510,7 @@
                 OrderId: newVal.orderId,//	订单号
                 Meet: newVal.meet,//	成本
                 Remarks: newVal.remarks,//	订单备注
+                UnionRemark: newVal.unionRemark,
                 Mobile: newVal.mobile,//	联系手机号
                 DisplaySupplierId: s.supplierId,
                 SupplierId: s.supplierId,//	供应商id
@@ -1522,8 +1522,10 @@
                 CompanyPhone: s.companyPhone,//	电话		
                 OpeningBank: s.openingBank,//	开户行		
                 BankNo: s.bankNo,//	开户账号		
-                AppointOPList: newVal.appointOPList,//	op 格式：([1,2,3])
-                GuestList: this.deepFirstLetterToLower(newVal.guestList),//	旅客名单		
+                AppointOPList: newVal.appointOPList.map(item => {
+                  return item.opId
+                }),//	op 格式：([1,2,3])
+                GuestList: [],//	旅客名单		
                 FinalPriceTips: newVal.finalPriceTips,//	尾款提醒设置
 
                 
@@ -1547,13 +1549,26 @@
                 TripleRoomNum: newVal.tripleRoomNum,
                 VisaNum: newVal.visaNum,
                 SafeNum: newVal.safeNum,
-                OneSexNum: newVal.oneSexNum,
+                OneSex: newVal.oneSex,
                 PredictRoomNum: newVal.predictRoomNum,
                 YSeatNum: newVal.ySeatNum,
                 ESeatNum: newVal.eSeatNum,
                 FSeatNum: newVal.fSeatNum,
                 WordPath: newVal.wordPath,//附件
               };
+              newVal.guestList.forEach(item => {
+                this.addMsg.GuestList.push({
+                  Birthday: item.birthday,//	生日	
+                  Name: item.userName,//	名称	
+                  IdCard: item.idCard,//	身份证号	
+                  PassportNo: item.passportNo,//	护照号
+                  PassportIssued: item.passportIssued,//	护照签发日期	
+                  PassportExpiry: item.passportExpiry,//	护照有效期	
+                  Tel: item.tel,//	联系电话	
+                })
+              })
+
+              console.log(newVal,'=======')
             },1000)
           }
         }

src/components/SalesModule/components/groupOrder.vue

@@ -453,6 +453,10 @@
                 <span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
                   }}{{ $t("salesModule.Fen") }}）</span>
               </span>
+              <span class="RL-remarkTitle" v-if="item.appointOPList.length > 0">OP:</span>
+              <span class="RL-redType RL-remarkCon" v-if="item.appointOPList.length > 0">
+                <span v-for="childItem in item.appointOPList" style="color: blue;margin-right: 5px">{{ childItem.opName }}</span>
+              </span>
               <p v-if="item.cancelGuestList.length > 0">
                 <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                 <span class="RL-redType RL-remarkCon">
@@ -725,8 +729,6 @@ export default {
   data() {
     return {
       dataList: [],
-      showType: 1,
-      selectedSpotData: null,
     }
   },
 

src/components/SalesModule/groupTourOrder.vue

@@ -3108,6 +3108,7 @@
     },
     methods: {
       addOrders() {
+        this.selectedSpotData = null
         this.$refs.addOrders.openDrawer();
       },
       handleSaveSuccess() {

src/components/cruiseShip/list/cruiseShipInfo.vue

@@ -427,8 +427,9 @@
   <div class="flexOne changInfo" :class="{ 'drawer-mode': isDrawerMode }">
     <!-- 正常内容 -->
     <div class="resource-content clearfix">
+      <!-- :disabled="addMsg.OrderId>0&&(activeTab=='basic'||activeTab=='contact')" -->
       <el-form :model="addMsg" :rules="rules" class="h-full" ref="addMsg" label-width="120px"
-      :disabled="addMsg.OrderId>0&&(activeTab=='basic'||activeTab=='contact')">
+      >
         <div class="hotel-form-container h-full">
           <el-tabs v-model="activeTab" type="border-card" class="hotel-tabs">
             <el-tab-pane label="基础资料" name="basic">
@@ -682,7 +683,8 @@
     </el-dialog>
     <div class="btn-list">
       <div class="btn-actions">
-        <button v-if="!addMsg.OrderId" class="save-Btn" @click="submitForm('addMsg')" :disabled="isSaving">
+        <!-- v-if="!addMsg.OrderId" -->
+        <button class="save-Btn" @click="submitForm('addMsg')" :disabled="isSaving">
           <i v-if="isSaving" class="el-icon-loading" style="margin-right: 4px;"></i>
           {{ isSaving ? '' : $t('pub.saveBtn') }}
         </button>

src/components/orderCommon/order-remark.vue

@@ -49,13 +49,13 @@
       </el-row>
       <template v-if="postMsg.TeamType!=2">
         <el-row :gutter="20">
-          <el-col :span="2">
+          <el-col :span="2" v-if="userInfo.SimpleEasy!=1">
             <el-form-item :label="$t('salesModule.IsLianYn')">
               <el-checkbox v-model="postMsg.IsIntermodal" :true-label="1" :false-label="0">
               </el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="22">
+          <el-col :span="userInfo.SimpleEasy!=1?22:24">
             <el-form-item :label="$t('objFill.liangyunbeizhu')">
               <el-input v-model="postMsg.UnionRemark" type="textarea" maxlength="500">
               </el-input>
@@ -67,8 +67,10 @@
   </div>
 </template>
 <script>
+import { userMixin } from "../common/mixins/userMixin.js";
   export default {
     props: ["remarksMsg"],
+    mixins: [userMixin],
     data() {
       return {
         RemarksRules: {