箱管调整

3 months ago · f5667e11af
parent 2a15941595
commit f5667e11af
12 changed files with 62 additions and 25 deletions
--- 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 = ''
+          }
        },
      }
    },
--- 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" />
--- 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,
--- 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,
--- 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() {
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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' }">