From dedac4eb4c7aa2dfa3c231c1a154136ce2818b67 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 18 May 2023 13:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/list/index.vue   |  4 +-
 .../BookingLedger/list/modules/formLabel.vue  | 83 ++++++-------------
 .../BookingLedger/list/modules/initData.js    |  2 +-
 3 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index a3ff544..173e57c 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1722,8 +1722,8 @@ export default {
           return GetSysUserPage
         case 'ROUTE':
           return GetSysUserPage
-        case 'OP':
-          return GetSysUserPage
+        // case 'OP':
+        //   return GetSysUserPage
         case 'DOC':
           return GetSysUserPage
         case 'CUSTOMSER':
diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue
index 00a8402..4e7dfd3 100644
--- a/src/views/main/BookingLedger/list/modules/formLabel.vue
+++ b/src/views/main/BookingLedger/list/modules/formLabel.vue
@@ -4,50 +4,21 @@
       <inputView ref="inputView" :type="labelData.label" :parentVal="value" @getInputChange="inputChange" />
     </template>
     <template v-else-if="labelData.type == 'date'">
-      <datePickerView
-        ref="datePickerView"
-        class="date-picker"
-        :parentVal="value"
-        type="etd"
-        format="YYYY-MM-DD"
-        @dateChange="dateChangeFun"
-      ></datePickerView>
+      <datePickerView ref="datePickerView" class="date-picker" :parentVal="value" type="etd" format="YYYY-MM-DD"
+        @dateChange="dateChangeFun"></datePickerView>
     </template>
     <template v-else-if="labelData.type == 'dateRange'">
       <div class="picker-box" style="display: flex; padding-right: 2px">
-        <a-date-picker
-          style="min-width: 30px; flex: 1"
-          v-model="startValue"
-          :disabled-date="disabledStartDate"
-          format="YYYY-MM-DD"
-          suffixIcon=" "
-          placeholder="开始时间"
-          @openChange="handleStartOpenChange"
-        />
+        <a-date-picker style="min-width: 30px; flex: 1" v-model="startValue" :disabled-date="disabledStartDate"
+          format="YYYY-MM-DD" suffixIcon=" " placeholder="开始时间" @openChange="handleStartOpenChange" />
         <span style="margin: 0 4px">-</span>
-        <a-date-picker
-          style="min-width: 30px; flex: 1"
-          v-model="endValue"
-          :disabled-date="disabledEndDate"
-          format="YYYY-MM-DD"
-          placeholder="结束时间"
-          suffixIcon=" "
-          :open="endOpen"
-          @openChange="handleEndOpenChange"
-        />
+        <a-date-picker style="min-width: 30px; flex: 1" v-model="endValue" :disabled-date="disabledEndDate"
+          format="YYYY-MM-DD" placeholder="结束时间" suffixIcon=" " :open="endOpen" @openChange="handleEndOpenChange" />
       </div>
     </template>
     <template v-else-if="labelData.type == 'select'">
-      <a-select
-        size="small"
-        style="margin-top: 7px"
-        v-model="value"
-        show-search
-        :dropdownMatchSelectWidth="false"
-        :filter-option="filterOption"
-        @change="debounce(handleSelectChange, 300, $event)"
-        @focus="getSelectFirst"
-      >
+      <a-select size="small" style="margin-top: 7px" v-model="value" show-search :dropdownMatchSelectWidth="false"
+        :filter-option="filterOption" @change="debounce(handleSelectChange, 300, $event)" @focus="getSelectFirst">
         <template v-if="['CARRIER', 'YARDID', 'ISSUETYPE', 'CARGOID'].includes(labelData.label)">
           <a-select-option v-for="(sitem, sindex) in dataList" :key="sindex">
             {{ sitem[labelData.showLabel2] }}/ {{ sitem[labelData.showLabel] }}
@@ -61,18 +32,9 @@
       </a-select>
     </template>
     <template v-else-if="labelData.type == 'complete'">
-      <auto-complete
-        size="small"
-        :allowClear="true"
-        class="customer-input"
-        :dropdown-match-select-width="false"
-        :dropdown-style="{ width: '200px' }"
-        v-model="value"
-        option-label-prop="label"
-        @select="completeSelect"
-        @focus="completeChangeFirst"
-        @change="debounce(completeChange, 300, $event)"
-      >
+      <auto-complete size="small" :allowClear="true" class="customer-input" :dropdown-match-select-width="false"
+        :dropdown-style="{ width: '200px' }" v-model="value" option-label-prop="label" @select="completeSelect"
+        @focus="completeChangeFirst" @change="debounce(completeChange, 300, $event)">
         <!-- <template slot="dataSource" v-if="labelData.label === 'VESSEL'">
           <a-select-option v-for="(item, index) in dataSourceList" :key="index" :value="item[labelData.showLabel]">
             <div class="vessel-label">
@@ -82,12 +44,8 @@
           </a-select-option>
         </template>-->
         <template slot="dataSource">
-          <a-select-option
-            v-for="(item, index) in dataSourceList"
-            :key="`${index}-${item[labelData.showLabel]}`"
-            :value="`${index}-${item[labelData.showLabel]}`"
-            :label="item[labelData.showLabel]"
-          >
+          <a-select-option v-for="(item, index) in dataSourceList" :key="`${index}-${item[labelData.showLabel]}`"
+            :value="`${index}-${item[labelData.showLabel]}`" :label="item[labelData.showLabel]">
             <div>
               <div class="title">{{ item[labelData.showLabel] }}</div>
             </div>
@@ -183,7 +141,7 @@ export default {
       'bookingInitData'
     ])
   },
-  mounted() {},
+  mounted() { },
   methods: {
     debounce(func, wait, ...args) {
       if (timer) clearTimeout(timer)
@@ -280,7 +238,8 @@ export default {
             'CARRIER',
             'NOBILL',
             'CARGOID',
-            'zhanCangFlag'
+            'zhanCangFlag',
+            'OP'
           ].includes(this.labelData.label)
         ) {
           this.dataList = this.emnuData(this.labelData.label)
@@ -294,6 +253,7 @@ export default {
       }
     },
     emnuData(type) {
+      console.log(this.bookingInitData.opInitList)
       switch (type) {
         case 'LINENAME':
           return this.lineList
@@ -313,6 +273,8 @@ export default {
           return this.labelData.data
         case 'zhanCangFlag':
           return this.labelData.data
+        case 'OP':
+          return this.bookingInitData.opInitList
       }
     },
     completeSelect(value) {
@@ -345,7 +307,6 @@ export default {
           'FORWARDER',
           'SALE',
           'CUSTSERVICE',
-          'OP',
           'DOC',
           'ROUTE',
           'PAYABLEAT',
@@ -396,10 +357,13 @@ export default {
 .aa {
   transform: scaleY(0.8);
 }
+
 /deep/ .ant-select-selection__clear {
   margin-top: 0;
 }
+
 .vessel-label {
+
   // border-bottom:1px solid #eee;
   .title {
     height: 28px;
@@ -410,6 +374,7 @@ export default {
     border-bottom: 1px dashed #ddd;
     margin-bottom: 4px;
   }
+
   .voyno,
   .etd {
     height: 22px;
@@ -422,10 +387,12 @@ export default {
 /deep/.ant-calendar-picker-input {
   overflow: hidden;
 }
+
 /deep/.ant-calendar-range-picker-input {
   height: 24px !important;
   line-height: 24px !important;
 }
+
 /deep/ .ant-input {
   height: 24px !important;
 }
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 51822fe..0d98e00 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -468,7 +468,7 @@ export default {
     { title: '装货港', align: 'center', width: 120, label: 'PORTLOAD', type: 'complete', showLabel: 'enName' },
     { title: '揽货人', align: 'center', width: 120, label: 'SALE', type: 'complete', showLabel: 'name' }, // 销售
     { title: '客服员', align: 'center', width: 120, label: 'CUSTSERVICE', type: 'complete', showLabel: 'name' },
-    { title: '操作员', align: 'center', width: 120, label: 'OP', type: 'complete', showLabel: 'name' },
+    { title: '操作员', align: 'center', width: 120, label: 'OP', type: 'select', showLabel: 'name' },
     { title: '单证员', align: 'center', width: 120, label: 'DOC', type: 'complete', showLabel: 'name' },
     { title: '报关行', align: 'center', width: 120, label: 'CUSTOMSER', type: 'complete', showLabel: 'shortName' },
     { title: '订舱编号', align: 'center', width: 120, label: 'CUSTNO', type: 'input' },