no message

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

@@ -8209,6 +8209,7 @@ export const obj = {
     zuoyewangcheng: '作业完成',
     biangengshenqing: '变更申请',
     biangengyuanyin: '变更原因',
+    danxiangyoulun: '单项邮轮订单'
   }
   //#endregion
 }

src/components/FinancialModule/BasicDocuments.vue

@@ -900,8 +900,14 @@
 
           <div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'singleProductHotelOrderOP':'singleProductHotelOrder')">{{$t('objFill.dxjddd')+':'+GetDetail.ReFinanceId}}</div>
-          <div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right"
+          
+          <template v-if="GetDetail.OtherType==66">
+            <div v-if="userInfo.SimpleEasy" class="illustrate-right fygsbumen-box-right"
+            @click="ImpressionSingleDetails(isOrderOP?'cruiseShipOrderListOP':'cruiseShipOrderList')">{{$t('objFill.v103.danxiangyoulun')+':'+GetDetail.ReFinanceId}}</div>
+            <div v-else class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'SingleticketOrderListOP':'SingleticketOrderList')">{{$t('objFill.dxmpdd')+':'+GetDetail.ReFinanceId}}</div>
+          </template>
+
           <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">{{$t('objFill.dxcdd')+':'+GetDetail.ReFinanceId}}</div>
           <div v-if="GetDetail.OtherType==80">

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -925,9 +925,17 @@
             <div v-if="GetDetail.OtherType==61||GetDetail.OtherType==62" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails(isOrderOP?'singleProductHotelOrderOP':'singleProductHotelOrder')">
               {{$t('objFill.dxjddd')+':'+GetDetail.ReFinanceId}}</div>
-            <div v-if="GetDetail.OtherType==66" class="illustrate-right fygsbumen-box-right"
+
+            <template v-if="GetDetail.OtherType==66">
+              <div v-if="userInfo.SimpleEasy" class="illustrate-right fygsbumen-box-right"
+              @click="ImpressionSingleDetails(isOrderOP?'cruiseShipOrderListOP':'cruiseShipOrderList')">
+              {{$t('objFill.v103.danxiangyoulun')+':'+GetDetail.ReFinanceId}}</div>
+              <div v-else class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails(isOrderOP?'SingleticketOrderListOP':'SingleticketOrderList')">
               {{$t('objFill.dxmpdd')+':'+GetDetail.ReFinanceId}}</div>
+            </template>
+
+            
             <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">
               {{$t('objFill.dxcdd')+':'+GetDetail.ReFinanceId}}</div>

src/components/common/BaseListManager.vue

@@ -32,7 +32,7 @@
                   <el-form-item :label="field.label">
                     <!-- 输入框 -->
                     <el-input v-if="field.type === 'input'" v-model="advancedFilters[field.key]"
-                      :placeholder="field.placeholder" :type="field.inputType || 'text'" size="small">
+                      :placeholder="field.placeholder" clearable :type="field.inputType || 'text'" size="small">
                     </el-input>
 
                     <!-- 选择器 -->
@@ -45,7 +45,7 @@
 
                     <!-- 日期选择器 -->
                     <el-date-picker v-else-if="field.type === 'date'" v-model="advancedFilters[field.key]"
-                      :type="field.dateType || 'date'" :placeholder="field.placeholder" size="small"
+                      :type="field.dateType || 'date'" :placeholder="field.placeholder" clearable size="small"
                       style="width: 100%;" :value-format="field.valueFormat || 'yyyy-MM-dd'">
                     </el-date-picker>
                   </el-form-item>

src/components/cruiseShip/components/editOP.vue

@@ -426,16 +426,16 @@
 <template>
   <div class="flexOne changInfo" :class="{ 'drawer-mode': isDrawerMode }">
     <div class="resource-content clearfix">
-      <el-form :model="addMsg" :rules="rules" class="h-full" ref="addMsg" label-width="0">
+      <el-form :model="addMsg" :rules="rules" class="h-full" ref="addMsg" label-width="80px">
         <div class="hotel-form-container h-full">
           <el-tabs v-model="activeTab" type="border-card" class="hotel-tabs">
             <el-tab-pane label="编辑OP" name="basic">
               <div class="tab-content">
                 <el-row :gutter="16">
                   <el-col :span="19">
-                    <el-form-item label="" prop="OpEmpId">
+                    <el-form-item label="OP" prop="AppointOPList">
                       <el-select v-model="addMsg.AppointOPList"
-                      multiple filterable placeholder="请选择OP">
+                      multiple filterable placeholder="请选择OP" clearable>
                       <el-option v-for='item in EmployeeList' :label='item.EmName' 
                       :value='item.EmployeeId' :key='item.EmployeeId'></el-option>
                       </el-select>

src/components/cruiseShip/list/cruiseShipOrderList.vue

@@ -29,12 +29,16 @@
         {{ row.Income-row.CostMoney-row.Refund>0?(row.Income-row.CostMoney-row.Refund).toFixed(2):'-' }}
       </template>
       <template slot="OrderGuestList" slot-scope="{ row }">
-        <el-tag v-for="(item,index) in row.OrderGuestList" :key="index"
-        size="mini" class="mr-xs">{{ item.Name }}</el-tag>
+        <template v-for="(item,index) in row.OrderGuestList">
+          <el-tag :key="index"
+          size="mini" class="mr-xs">{{ item.Name }}</el-tag>
+        </template>
       </template>
       <template slot="AppointOPList" slot-scope="{ row }">
-        <el-tag v-for="(item,index) in row.AppointOPList" :key="index"
-        size="mini" class="mr-xs">{{ item.OPName }}</el-tag>
+        <template v-for="(item,index) in row.AppointOPList">
+          <el-tag :key="index"
+          size="mini" class="mr-xs">{{ item.OPName }}</el-tag>,
+        </template>
       </template>
       <template slot="SupplierModel" slot-scope="{ row }">
         <span>
@@ -42,7 +46,7 @@
         </span>
       </template>
       <template slot="IncomeList" slot-scope="{ row }">
-        <div class="row justify-end pr-sm mb-xs">
+        <div class="row justify-end pr-sm mb-xs" v-if="row.OrderStatus == 2">
           <el-tooltip class="item" effect="dark" :content="$t('objFill.preparedocument')" placement="top">
             <i class="pointer el-icon-circle-plus c059FF6"
               @click="makeAdocument(row, $index, 1)"></i>
@@ -125,7 +129,7 @@
             @click="clickOperation(row,4)"
             >{{$t('pub.edit')}}OP</span>
 
-            <span v-if="row.OrderStatus!=3&&isOP"
+            <span v-if="row.OrderStatus!=3"
             class="c059FF6 mr-xs pointer"
             @click="clickOperation(row,5)"
             >{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>