From b5fdcf9a9fb64b0c0be8018ee17bd37786cfe5da Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 7 Sep 2023 12:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/detail/index.vue |  3 ++
 src/views/main/BookingLedger/list/index.vue   | 44 ++++++---------
 .../BookingLedger/list/modules/formLabel.vue  | 54 +++++++++++++++++--
 .../BookingLedger/list/modules/initData.js    |  2 +-
 src/views/main/vesselinfo/index.vue           | 24 +++++++++
 5 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 820d5d2..c15ec69 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -1242,6 +1242,9 @@ export default {
       })
         .then(res => {
           if (res.success) {
+            if (res.data.statuslog) {
+                res.data.statuslog = res.data.statuslog.reverse()
+            }
             this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...res.data })
             setTimeout(() => {
               this.checkSaveFun({ type: 'details', hasChange: false })
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 942c479..1d2d219 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1172,7 +1172,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['bookingList', 'bookingGridOptions', 'firstFlag', 'saveNeedNumber', 'deleteId'])
+    ...mapGetters(['bookingList', 'bookingGridOptions', 'firstFlag', 'saveNeedNumber', 'deleteId', 'statusDIct'])
   },
   beforeRouteLeave(to, from, next) {
     this.setBookingGridOptions(this.gridOptions)
@@ -1261,22 +1261,13 @@ export default {
           })
         }
         if (item.bsstatusname) {
-          const arr = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
-          if (arr) {
-            let arrColor = ''
-            arr.value.forEach(ite => {
-              if (ite.code == 'booking_goods_status') {
-                arrColor = ite
-              }
-            })
-            if (arrColor) {
-              arrColor.children.forEach(ite => {
-                if (ite.name == item.bsstatusname) {
-                  item.bsstatusnameColor = ite.remark
-                }
-              })
-            }
-          }
+          if (this.statusDIct) {
+                    this.statusDIct.forEach(ite => {
+                      if (ite.name == item.bsstatusname) {
+                        item.bsstatusnameColor = ite.remark
+                      }
+                    })
+                  }
         }
         item.bookstatus = bookstatus
         item.refshYzitemLoad = false
@@ -2152,6 +2143,12 @@ export default {
         this.formRes[form.label] = value
       } else if (form.type === 'selectTree') {
         this.formRes[form.label] = value
+      } else if (form.type === 'multiple') {
+        if (value.length == 0) {
+          this.formRes[form.label] = ''
+        } else {
+          this.formRes[form.label] = value
+        }
       }
       this.$forceUpdate()
     },
@@ -2272,22 +2269,13 @@ export default {
                 })
               }
               if (item.bsstatusname) {
-                const arr = JSON.parse(localStorage.getItem('pro__DICT_TYPE_TREE_DATA'))
-                if (arr) {
-                  let arrColor = ''
-                  arr.value.forEach(ite => {
-                    if (ite.code == 'booking_goods_status') {
-                      arrColor = ite
-                    }
-                  })
-                  if (arrColor) {
-                    arrColor.children.forEach(ite => {
+                  if (this.statusDIct) {
+                    this.statusDIct.forEach(ite => {
                       if (ite.name == item.bsstatusname) {
                         item.bsstatusnameColor = ite.remark
                       }
                     })
                   }
-                }
               }
               item.bookstatus = bookstatus
               item.refshYzitemLoad = false
diff --git a/src/views/main/BookingLedger/list/modules/formLabel.vue b/src/views/main/BookingLedger/list/modules/formLabel.vue
index b426150..910b971 100644
--- a/src/views/main/BookingLedger/list/modules/formLabel.vue
+++ b/src/views/main/BookingLedger/list/modules/formLabel.vue
@@ -62,6 +62,33 @@
         </template>
       </a-select>
     </template>
+    <template v-else-if="labelData.type == 'multiple'">
+      <a-select
+        size="small"
+        style="margin-top: 7px"
+        v-model="valueArr"
+        show-search
+        mode="multiple"
+        :allowClear="true"
+        :filter-option="filterOption"
+        :max-tag-text-length="1"
+        :max-tag-count="1"
+        :max-tag-placeholder="
+          () => {
+            return '...'
+          }"
+        @change="
+        debounce(handleSelectChangeByMu,
+        300,
+        $event)"
+        @focus="getSelectFirst">
+        <template>
+          <a-select-option v-for="(sitem, sindex) in dataList" :key="sindex">{{
+            sitem[labelData.showLabel]
+          }}</a-select-option>
+        </template>
+      </a-select>
+    </template>
     <template v-else-if="labelData.type == 'complete'">
       <auto-complete
         size="small"
@@ -176,6 +203,7 @@ export default {
     return {
       value: '',
       dateVal: [],
+      valueArr: [],
       startValue: null,
       endValue: null,
       endOpen: false,
@@ -277,7 +305,6 @@ export default {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
     handleSelectChange(e) {
-      console.log(e)
       if (e !== '' && e !== undefined && e !== null) {
         if (this.labelData.label === 'bsStatusList') {
           this.$emit('change', {
@@ -304,6 +331,27 @@ export default {
         }
       }
     },
+    handleSelectChangeByMu(e) {
+      if (e !== '' && e !== undefined && e !== null) {
+        const arr = []
+       this.dataList.forEach((item, index) => {
+            e.forEach(ite => {
+              if (index == ite) {
+                arr.push(item[this.labelData.showLabel])
+              }
+            })
+        })
+          this.$emit('change', {
+            form: this.labelData,
+            value: arr
+          })
+      } else {
+          this.$emit('change', {
+            form: this.labelData,
+            value: ''
+          })
+        }
+    },
     handleSelectChangeTree(e) {
       this.$emit('change', {
         form: this.labelData,
@@ -327,7 +375,7 @@ export default {
             'CARGOID',
             'zhanCangFlag',
             'status',
-            'BSSTATUS',
+            'BSSTATUSNAME',
             'taskCategory',
             'taskSource',
             'taskType',
@@ -379,7 +427,7 @@ export default {
           return this.dpTreeList
         case 'OrgOp':
           return this.dpTreeList
-        case 'BSSTATUS':
+        case 'BSSTATUSNAME':
           const arr = this.statusDIct
           return arr
       }
diff --git a/src/views/main/BookingLedger/list/modules/initData.js b/src/views/main/BookingLedger/list/modules/initData.js
index 004cc63..bfde9a8 100644
--- a/src/views/main/BookingLedger/list/modules/initData.js
+++ b/src/views/main/BookingLedger/list/modules/initData.js
@@ -541,7 +541,7 @@ export default {
     { title: '报关行', align: 'center', width: 120, label: 'CUSTOMSER', type: 'complete', showLabel: 'shortName' },
     { title: '订舱编号', align: 'center', width: 120, label: 'CUSTNO', type: 'input' },
     { title: '业务编号', align: 'center', width: 120, label: 'BOOKINGNO', type: 'input' },
-    { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUS', type: 'select', showLabel: 'name' },
+    { title: '业务状态', align: 'center', width: 120, label: 'BSSTATUSNAME', type: 'multiple', showLabel: 'name' },
     // { title: '客户合同号', align: 'center', width: 120, label: 'SERVICECONTRACTNO', type: 'input' }, // 暂时去掉
     // { title: '航线代码', align: 'center', width: 120, label: 'LANECODE', type: 'input' },
     { title: '内部航次', align: 'center', width: 120, label: 'VOYNOINNER', type: 'input' },
diff --git a/src/views/main/vesselinfo/index.vue b/src/views/main/vesselinfo/index.vue
index c4c5c2a..4a40c19 100644
--- a/src/views/main/vesselinfo/index.vue
+++ b/src/views/main/vesselinfo/index.vue
@@ -259,6 +259,30 @@ export default {
           align: 'center',
           dataIndex: 'yard',
           width: 150
+        },
+        {
+          title: '创建人',
+          align: 'center',
+          dataIndex: 'createdUserName',
+          width: 100
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createdTime',
+          width: 150
+        },
+        {
+          title: '修改人',
+          align: 'center',
+          dataIndex: 'updatedUserName',
+          width: 100
+        },
+        {
+          title: '修改时间',
+          align: 'center',
+          dataIndex: 'updatedTime',
+          width: 150
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },