From ab5540d07daaaaa4654cafb598ca3022047755df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Thu, 11 May 2023 17:37:29 +0800
Subject: [PATCH] 5/11

---
 src/views/main/DjyTenantConfig/addForm.vue    | 11 +++++++-
 src/views/main/DjyTenantConfig/editForm.vue   | 11 +++++++-
 src/views/main/DjyTenantConfig/index.vue      | 25 ++++++++++++++++++-
 .../main/Taskmanage/TaskmanageList/index.vue  | 11 +++++---
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/main/DjyTenantConfig/addForm.vue b/src/views/main/DjyTenantConfig/addForm.vue
index 504aa5e..29c4ce3 100644
--- a/src/views/main/DjyTenantConfig/addForm.vue
+++ b/src/views/main/DjyTenantConfig/addForm.vue
@@ -38,7 +38,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select placeholder="请选择船公司" v-decorator="['Carrier']">
+              <a-select
+                show-search
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                placeholder="请选择船公司"
+                v-decorator="['Carrier']"
+              >
                 <a-select-option v-for="item in CarrierList" :key="item.code" :value="item.code">
                   {{ item.cnName }}
                 </a-select-option>
@@ -81,6 +87,9 @@ export default {
   },
   mounted() {},
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     // 初始化方法
     add(record) {
       this.data = record
diff --git a/src/views/main/DjyTenantConfig/editForm.vue b/src/views/main/DjyTenantConfig/editForm.vue
index 9314d9f..ffc75b6 100644
--- a/src/views/main/DjyTenantConfig/editForm.vue
+++ b/src/views/main/DjyTenantConfig/editForm.vue
@@ -39,7 +39,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select placeholder="请选择船公司" v-decorator="['Carrier']">
+              <a-select
+                show-search
+                option-filter-prop="children"
+                :filter-option="filterOption"
+                placeholder="请选择船公司"
+                v-decorator="['Carrier']"
+              >
                 <a-select-option v-for="item in CarrierList" :key="item.code" :value="item.code">
                   {{ item.cnName }}
                 </a-select-option>
@@ -82,6 +88,9 @@ export default {
   },
   mounted() {},
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     // 初始化方法
     edit(record, loadData) {
       console.log(record)
diff --git a/src/views/main/DjyTenantConfig/index.vue b/src/views/main/DjyTenantConfig/index.vue
index 53fcaa2..fe78acc 100644
--- a/src/views/main/DjyTenantConfig/index.vue
+++ b/src/views/main/DjyTenantConfig/index.vue
@@ -54,6 +54,10 @@
           :align="item.align"
           :show-overflow="true"
         >
+          <template #default="{ row }">
+            <span v-if="item.dataIndex == 'Carrier'">{{ FnCarrier(row[item.dataIndex]) }}</span>
+            <span v-else>{{ row[item.dataIndex] }}</span>
+          </template>
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
@@ -77,6 +81,7 @@
 import { getDjyTenantConfig, DjyTenantConfigSave } from '@/api/modular/main/DjyTenantConfig'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
+import { GetCarrierlist } from '@/api/modular/main/BookingLedger'
 import { mapGetters } from 'vuex'
 export default {
   components: {
@@ -108,12 +113,18 @@ export default {
           title: '说明',
           align: 'center',
           dataIndex: 'remarks'
+        },
+        {
+          title: '船公司',
+          align: 'center',
+          dataIndex: 'Carrier'
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
-      DisplayLoadData: []
+      DisplayLoadData: [],
+      CarrierList: []
     }
   },
   created() {},
@@ -124,6 +135,15 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+    FnCarrier(data) {
+      let RData = ''
+      this.CarrierList.forEach(item => {
+        if (data == item.code) {
+          RData = item.cnName
+        }
+      })
+      return RData
+    },
     FnQuery() {
       this.loading = true
       getDjyTenantConfig({ type: 'booking_default_value' }).then(res => {
@@ -213,6 +233,9 @@ export default {
     },
     init() {
       this.FnGetData()
+      GetCarrierlist().then(res => {
+        this.CarrierList = res.data
+      })
     },
     FnGetData() {
       this.loading = true
diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue
index a284ba9..9a2c60c 100644
--- a/src/views/main/Taskmanage/TaskmanageList/index.vue
+++ b/src/views/main/Taskmanage/TaskmanageList/index.vue
@@ -654,9 +654,14 @@ export default {
       this.spinning = true
 
       TaskManageTruckPrintTemplateWithHistoryList(Data).then(res => {
-        this.templateType = res.data
-        this.spinning = false
-        this.PrintModalVisible = true
+        console.log(res.data)
+        if (res.data.length == 1) {
+          this.FnCilckTemplateType(res.data[0].id)
+        } else {
+          this.templateType = res.data
+          this.spinning = false
+          this.PrintModalVisible = true
+        }
       })
     },
     FnPrint() {