From f5667e11afbf4ee72d1361cae373461b2b3e0158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 09:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerManagement/BaseInfo/columns.tsx  | 18 +++++++++---
 .../ContainerManagement/BaseInfo/index.vue    |  4 +--
 .../ContainerManagement/BuyCtn/columns.tsx    |  5 ++--
 .../ContainerManagement/CtnScrap/columns.tsx  |  5 ++--
 .../CurrentState/index.vue                    |  2 +-
 .../CurrentState/infoModal.vue                | 29 +++++++++++++++----
 .../CustFeeDui/columns.tsx                    |  3 +-
 .../ContainerManagement/RentIn/columns.tsx    |  5 ++--
 .../RentOneWay/columns.tsx                    |  5 ++--
 .../ContainerManagement/RentOut/columns.tsx   |  5 ++--
 .../ContainerManagement/SellCtn/columns.tsx   |  5 ++--
 .../infoclient/TenantAuditStepModal.vue       |  1 +
 12 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/src/views/ContainerManagement/BaseInfo/columns.tsx b/src/views/ContainerManagement/BaseInfo/columns.tsx
index d2b142c5..c6d70ad9 100644
--- a/src/views/ContainerManagement/BaseInfo/columns.tsx
+++ b/src/views/ContainerManagement/BaseInfo/columns.tsx
@@ -63,8 +63,13 @@ export const searchFormSchema: FormSchema[] = [
         labelField: 'ctnName',
         valueField: 'ediCode',
         resultField: 'data',
-        onChange: (v, obj) => {
-          formModel.ctnall = obj.label
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.ctnall = obj.label
+          }
+          if (!e && !obj) {
+            formModel.ctnall = ''
+          }
         },
       }
     },
@@ -108,8 +113,13 @@ export const formSchema: FormSchema[] = [
         labelField: 'ctnName',
         valueField: 'ediCode',
         resultField: 'data',
-        onChange: (v, obj) => {
-          formModel.ctnall = obj.label
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.ctnall = obj.label
+          }
+          if (!e && !obj) {
+            formModel.ctnall = ''
+          }
         },
       }
     },
diff --git a/src/views/ContainerManagement/BaseInfo/index.vue b/src/views/ContainerManagement/BaseInfo/index.vue
index 6ec6f16f..b930b855 100644
--- a/src/views/ContainerManagement/BaseInfo/index.vue
+++ b/src/views/ContainerManagement/BaseInfo/index.vue
@@ -2,10 +2,10 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
+        <!-- <a-button type="link" @click="handleCreate">
           <span class="iconfont icon-piliangbianji"></span>
           维护
-        </a-button>
+        </a-button> -->
       </template>
     </BasicTable>
     <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
diff --git a/src/views/ContainerManagement/BuyCtn/columns.tsx b/src/views/ContainerManagement/BuyCtn/columns.tsx
index 1487f1f5..1dc8f556 100644
--- a/src/views/ContainerManagement/BuyCtn/columns.tsx
+++ b/src/views/ContainerManagement/BuyCtn/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -265,7 +266,7 @@ export const formSchema: FormSchema[] = [
     label: '买箱日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -286,7 +287,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx
index 5b77ab37..76988111 100644
--- a/src/views/ContainerManagement/CtnScrap/columns.tsx
+++ b/src/views/ContainerManagement/CtnScrap/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -131,7 +132,7 @@ export const formSchema: FormSchema[] = [
     label: '报废日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -143,7 +144,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue
index f45494f0..bbb72e67 100644
--- a/src/views/ContainerManagement/CurrentState/index.vue
+++ b/src/views/ContainerManagement/CurrentState/index.vue
@@ -118,7 +118,7 @@
   }
   function handleAudit(record: Recordable) {
     openInfoModal(true, {
-      cntrno: record.cntrno,
+      id: record.id,
     })
   }
   function handleSuccess() {
diff --git a/src/views/ContainerManagement/CurrentState/infoModal.vue b/src/views/ContainerManagement/CurrentState/infoModal.vue
index 45580d6b..90025776 100644
--- a/src/views/ContainerManagement/CurrentState/infoModal.vue
+++ b/src/views/ContainerManagement/CurrentState/infoModal.vue
@@ -17,10 +17,10 @@
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { InfoColumns } from './columns'
   import { formatParams } from '/@/hooks/web/common'
-  const cntrno = ref('')
+  const rowId = ref('')
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ confirmLoading: false, loading: true })
-    cntrno.value = data.cntrno
+    rowId.value = data.id
     reload()
     setModalProps({ loading: false })
   })
@@ -34,9 +34,28 @@
         resolve({ data: [...res.data], total: res.count })
       })
     },
-    beforeFetch: (p) => {
-      p['cntrno'] = cntrno.value
-      return formatParams(p)
+    // beforeFetch: (p) => {
+    //   p['id'] = rowId.value
+    //   return formatParams(p)
+    // },
+    beforeFetch: () => {
+      var currentPageInfo: any = getPaginationRef()
+      const postParam = {
+        queryCondition: '',
+        pageCondition: {
+          pageIndex: currentPageInfo.current,
+          pageSize: currentPageInfo.pageSize,
+          sortConditions: [],
+        },
+      }
+      let condition: API.ConditionItem[] = []
+      condition.push({
+        FieldName: 'id',
+        FieldValue: rowId.value,
+        ConditionalType: 0,
+      })
+      postParam.queryCondition = JSON.stringify(condition)
+      return postParam
     },
     columns: InfoColumns,
     pagination: true,
diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx
index e8268c7b..d6a11cc7 100644
--- a/src/views/ContainerManagement/CustFeeDui/columns.tsx
+++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import dayjs from 'dayjs'
@@ -334,7 +335,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index 7e943df0..c43ea09d 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -440,7 +441,7 @@ export const formSchema: FormSchema[] = [
     label: '业务日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -452,7 +453,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx
index b92743cf..dad9c5a3 100644
--- a/src/views/ContainerManagement/RentOneWay/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWay/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -416,7 +417,7 @@ export const formSchema: FormSchema[] = [
     label: '业务日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -428,7 +429,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx
index 902cf474..817dac53 100644
--- a/src/views/ContainerManagement/RentOut/columns.tsx
+++ b/src/views/ContainerManagement/RentOut/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -449,7 +450,7 @@ export const formSchema: FormSchema[] = [
     label: '业务日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -461,7 +462,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx
index 6ff3aea7..eeddb532 100644
--- a/src/views/ContainerManagement/SellCtn/columns.tsx
+++ b/src/views/ContainerManagement/SellCtn/columns.tsx
@@ -1,4 +1,5 @@
 import { ref } from 'vue'
+import moment from 'moment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
@@ -200,7 +201,7 @@ export const formSchema: FormSchema[] = [
     label: '卖箱日期',
     component: 'DatePicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD 00:00:00',
@@ -221,7 +222,7 @@ export const formSchema: FormSchema[] = [
     label: '会计期间',
     component: 'MonthPicker',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: moment(new Date().toLocaleDateString(), 'YYYY-MM-DD'),
     componentProps: {
       showTime: true,
       allowClear: true,
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 43125c1f..fd269564 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -49,6 +49,7 @@
           <img src="../../../assets/svg/infoclient/shangxia.svg" class="SvgImg" />
         </span>
       </a-tooltip>
+      <!-- <span>{{ getFieldsValue().auditStatusText }}</span> -->
     </div>
     <div class="ds-detail-box sea-export-detail">
       <div :style="{ display: 'flex' }">