10/23 部分问题

1 month ago · d9ae6c42a8
parent 594ff9b94a
commit d9ae6c42a8
18 changed files with 312 additions and 188 deletions
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@ -658,9 +658,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },
  ]
  const settings = {
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@ -30,14 +30,20 @@ export const columns: BasicColumn[] = [
    sorter: true,
    width: 150,
  },
-  // {
-  //   title: '序号',
-  //   dataIndex: 'index',
-  //   width: 50,
-  // },
  {
-    title: '当前箱业务状态',
-    dataIndex: 'ctnBizState',
+    title: '序号',
+    dataIndex: 'index',
+    width: 50,
+  },
+  {
+    title: '箱状态',
+    dataIndex: 'ctnState',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '箱流转状态',
+    dataIndex: 'ctnFlowState',
    sorter: true,
    width: 200,
  },
@ -48,8 +54,14 @@ export const columns: BasicColumn[] = [
    width: 200,
  },
  {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
    sorter: true,
    width: 200,
  },
@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
    width: 200,
  },
  {
-    title: '状态时间',
+    title: '发生日期',
    dataIndex: 'stateTime',
    sorter: true,
    width: 200,
@ -115,94 +127,88 @@ export const columns: BasicColumn[] = [
    sorter: true,
    width: 200,
  },
-  {
-    title: '新旧箱',
-    dataIndex: 'usedState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱主',
-    dataIndex: 'ctnOwner',
-    sorter: true,
-    width: 200,
-  },
  // {
-  //   title: '所属分部',
-  //   dataIndex: 'orgid',
+  //   title: '新旧箱',
+  //   dataIndex: 'usedState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱主',
+  //   dataIndex: 'ctnOwner',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱来源',
+  //   dataIndex: 'ctnSource',
  //   sorter: true,
  //   width: 200,
  // },
-  {
-    title: '箱来源',
-    dataIndex: 'ctnSource',
-    sorter: true,
-    width: 200,
-  },

-  {
-    title: '箱业务编号',
-    dataIndex: 'billno',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '箱业务编号',
+  //   dataIndex: 'billno',
+  //   sorter: true,
+  //   width: 200,
+  // },

-  {
-    title: '箱状态',
-    dataIndex: 'ctnState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱损坏',
-    dataIndex: 'ctnBreakState',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '是否上线',
-    dataIndex: 'isOnline',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '箱状态',
+  //   dataIndex: 'ctnState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱损坏',
+  //   dataIndex: 'ctnBreakState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '是否上线',
+  //   dataIndex: 'isOnline',
+  //   sorter: true,
+  //   width: 200,
+  // },

-  {
-    title: '当前港口',
-    dataIndex: 'port',
-    sorter: true,
-    width: 150,
-  },
+  // {
+  //   title: '当前港口',
+  //   dataIndex: 'port',
+  //   sorter: true,
+  //   width: 150,
+  // },

-  {
-    title: '业务委托单位',
-    dataIndex: 'customerName',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: 'ETD',
-    dataIndex: 'etd',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: 'ETA',
-    dataIndex: 'eta',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '生产日期',
-    dataIndex: 'productionDate',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '箱初期成本',
-    dataIndex: 'ctnValue_Base',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '业务委托单位',
+  //   dataIndex: 'customerName',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: 'ETD',
+  //   dataIndex: 'etd',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: 'ETA',
+  //   dataIndex: 'eta',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '生产日期',
+  //   dataIndex: 'productionDate',
+  //   sorter: true,
+  //   width: 200,
+  // },
+  // {
+  //   title: '箱初期成本',
+  //   dataIndex: 'ctnValue_Base',
+  //   sorter: true,
+  //   width: 200,
+  // },
 ]

 export const searchFormSchema: FormSchema[] = [
@ -277,8 +283,14 @@ export const searchFormSchema: FormSchema[] = [
    },
  },
  {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
    component: 'Input',
    colProps: { span: 4 },
  },
@ -849,8 +861,14 @@ export const formSchema: FormSchema[] = [
    },
  },
  {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
    component: 'Input',
    colProps: { span: 6 },
  },
--- a/src/views/ContainerManagement/CurrentState/index.vue
+++ b/src/views/ContainerManagement/CurrentState/index.vue
@ -46,6 +46,9 @@
    title: '集装箱信息列表',
    api: async (p) => {
      const res: API.DataResult = await ApiList(p)
+      res.data.forEach((item, index) => {
+        item.index = index + 1
+      })
      return new Promise((resolve) => {
        resolve({ data: [...res.data], total: res.count })
      })
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@ -902,9 +902,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },
  ]
  const Viewsettings = {
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@ -775,9 +775,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },
    {
      title: '合同号',
@ -1082,9 +1087,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
    },
  ]
  const settings2 = {
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@ -760,9 +760,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },

    // {
--- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
@ -711,9 +711,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },

    // {
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@ -810,9 +810,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },
  ]
  const settings = {
@ -1142,9 +1147,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
    },
  ]
  const settings2 = {
@ -1399,9 +1409,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'vessel',
+    },
+    {
+      title: '航次',
+      width: 120,
+      data: 'voyno',
    },
    {
      title: '状态时间',
@ -1587,9 +1602,14 @@
      data: 'mblno',
    },
    {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
    },
    {
      title: '合同号',
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@ -29,14 +29,20 @@ export const columns: BasicColumn[] = [
    sorter: true,
    width: 150,
  },
-  // {
-  //   title: '序号',
-  //   dataIndex: 'index',
-  //   width: 50,
-  // },
  {
-    title: '箱业务状态',
-    dataIndex: 'ctnBizState',
+    title: '序号',
+    dataIndex: 'index',
+    width: 50,
+  },
+  {
+    title: '箱状态',
+    dataIndex: 'ctnState',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '箱流转状态',
+    dataIndex: 'ctnFlowState',
    sorter: true,
    width: 200,
  },
@ -47,8 +53,14 @@ export const columns: BasicColumn[] = [
    width: 150,
  },
  {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
    sorter: true,
    width: 200,
  },
@ -60,7 +72,7 @@ export const columns: BasicColumn[] = [
    width: 200,
  },
  {
-    title: 'DATE',
+    title: '发生日期',
    dataIndex: 'changeTime',
    sorter: true,
    width: 150,
@ -110,38 +122,44 @@ export const columns: BasicColumn[] = [
    width: 150,
  },
  {
-    title: '当前港口',
-    dataIndex: 'port',
-    sorter: true,
-    width: 150,
-  },
-
-  {
-    title: '变动来源',
-    dataIndex: 'changeSource',
-    sorter: true,
-    width: 150,
-  },
-  {
-    title: '状态变动',
-    dataIndex: 'ctnFlowState',
+    title: '备注',
+    dataIndex: 'remark',
    sorter: true,
    width: 200,
  },
+  // {
+  //   title: '当前港口',
+  //   dataIndex: 'port',
+  //   sorter: true,
+  //   width: 150,
+  // },

-  {
-    title: '新旧箱',
-    dataIndex: 'usedState',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '变动来源',
+  //   dataIndex: 'changeSource',
+  //   sorter: true,
+  //   width: 150,
+  // },
+  // {
+  //   title: '状态变动',
+  //   dataIndex: 'ctnFlowState',
+  //   sorter: true,
+  //   width: 200,
+  // },

-  {
-    title: '箱状态',
-    dataIndex: 'ctnState',
-    sorter: true,
-    width: 200,
-  },
+  // {
+  //   title: '新旧箱',
+  //   dataIndex: 'usedState',
+  //   sorter: true,
+  //   width: 200,
+  // },
+
+  // {
+  //   title: '箱状态',
+  //   dataIndex: 'ctnState',
+  //   sorter: true,
+  //   width: 200,
+  // },
 ]

 export const searchFormSchema: FormSchema[] = [
@ -627,8 +645,14 @@ export const formSchema: FormSchema[] = [
    },
  },
  {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
    component: 'Input',
    colProps: { span: 6 },
  },
--- a/src/views/ContainerManagement/StateChange/index.vue
+++ b/src/views/ContainerManagement/StateChange/index.vue
@ -41,6 +41,9 @@
        notification.warning({ message: '请输入查询条件！', duration: 3 })
      } else {
        const res: API.DataResult = await ApiChangeList(p)
+        res.data.forEach((item, index) => {
+          item.index = index + 1
+        })
        return new Promise((resolve) => {
          resolve({ data: [...res.data], total: res.count })
        })
--- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
@ -369,6 +369,11 @@
      width: 200,
      data: 'dealRemark',
    },
+    {
+      title: '箱流转状态',
+      width: 120,
+      data: 'ctnFlowState',
+    },
    {
      title: '当前箱业务状态',
      width: 120,
@ -405,9 +410,14 @@
      data: 'depot',
    },
    {
-      title: '船名航次',
+      title: '船名',
+      width: 120,
+      data: 'vessel',
+    },
+    {
+      title: '航次',
      width: 120,
-      data: 'vesselVoyno',
+      data: 'voyno',
    },
    {
      title: '业务编号',
--- a/src/views/ContainerManagement/dsxxcl/columns.tsx
+++ b/src/views/ContainerManagement/dsxxcl/columns.tsx
@ -94,8 +94,14 @@ export const columns: BasicColumn[] = [
    width: 200,
  },
  {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
    sorter: true,
    width: 200,
  },
--- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
+++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
@ -91,8 +91,14 @@ export const columns: BasicColumn[] = [
    width: 200,
  },
  {
-    title: '船名航次',
-    dataIndex: 'vesselVoyno',
+    title: '船名',
+    dataIndex: 'vessel',
+    sorter: true,
+    width: 200,
+  },
+  {
+    title: '航次',
+    dataIndex: 'voyno',
    sorter: true,
    width: 200,
  },
@ -407,8 +413,14 @@ export const formSchema: FormSchema[] = [
    },
  },
  {
-    field: 'vesselVoyno',
-    label: '船名航次',
+    field: 'vessel',
+    label: '船名',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'Voyno',
+    label: '航次',
    component: 'Input',
    colProps: { span: 6 },
  },
--- a/src/views/baseinfo/ClientStakeholder/columns.tsx
+++ b/src/views/baseinfo/ClientStakeholder/columns.tsx
@ -79,7 +79,7 @@ if (res.succeeded) {
 export const columns: BasicColumn[] = [
  {
    title: '干系人姓名',
-    dataIndex: 'createByName',
+    dataIndex: 'userName',
    sorter: true,
    width: 150,
  },
@ -105,7 +105,7 @@ export const columns: BasicColumn[] = [

 export const searchFormSchema: FormSchema[] = [
  {
-    field: 'createByName',
+    field: 'userName',
    label: '干系人姓名',
    component: 'Input',
    colProps: { span: 4 },
--- a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
@ -6,6 +6,7 @@ enum Api {
  Audit = '/mainApi/ClientStakeholder/Audit',
  Get = '/mainApi/ClientStakeholder/Get',
  edit = '/mainApi/ClientStakeholder/Edit',
+  Del = '/mainApi/ClientStakeholder/Delete',
 }

 // 列表 (Auth)
@ -40,3 +41,11 @@ export function ApiEdit(data) {
    data,
  })
 }
+// 删除干系人 (Auth)
+export function ApiDel(data) {
+  return request<DataResult>({
+    url: Api.Del,
+    method: 'post',
+    data,
+  })
+}
--- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
@ -7,10 +7,10 @@
          <span class="iconfont icon-new_document"></span>
          添加
        </a-button>
-        <!-- <a-button type="link" @click="handleDel">
+        <a-button type="link" @click="handleDel">
          <span class="iconfont icon-shanchu2"></span>
          删除
-        </a-button> -->
+        </a-button>
      </template>
      <template #bodyCell="{ column, record }">
        <template v-if="column.key === 'action'">
@ -41,7 +41,7 @@
 <script lang="ts" setup>
  import { ref } from 'vue'
  import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { ApiList, ApiClientStakeholderAudit } from './api'
+  import { ApiList, ApiClientStakeholderAudit, ApiDel } from './api'
  import { columns, searchFormSchema } from './columns'
  import { formatParams } from '/@/hooks/web/common'
  import { useMessage } from '/@/hooks/web/useMessage'
@ -152,10 +152,10 @@
    const removeArr = select.map((item) => {
      return item.id
    })
-    // ApiDel({ ids: removeArr }).then((res) => {
-    //   notification.success({ message: res.message, duration: 3 })
-    //   reload()
-    // })
+    ApiDel({ ids: removeArr }).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      reload()
+    })
  }
  function handleSuccess() {
    reload()
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@ -198,6 +198,9 @@ export const EditformSchema: FormSchema[] = [
    colProps: { span: 4 },
    componentProps: (e) => {
      return {
+        min: '0',
+        step: '0.01',
+        stringMode: true,
        onEdit: () => {
          const { formActionType } = e
          formActionType ? formActionType.linkageForm(e) : null
@ -213,6 +216,10 @@ export const EditformSchema: FormSchema[] = [
    colProps: { span: 4 },
    componentProps: (e) => {
      return {
+        showTime: true,
+        allowClear: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
        onEdit: () => {
          const { formActionType } = e
          formActionType ? formActionType.linkageForm(e) : null
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@ -645,27 +645,12 @@ export const formSchema: FormSchema[] = [
    label: '注册资金',
    component: 'InputNumber',
    colProps: { span: 4 },
-    componentProps: () => {
-      return {
-        min: '0',
-        step: '0.01',
-        stringMode: true,
-      }
-    },
  },
  {
    field: 'registrationTime',
    label: '注册时间',
    component: 'DatePicker',
    colProps: { span: 4 },
-    componentProps: () => {
-      return {
-        showTime: true,
-        allowClear: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      }
-    },
  },
  {
    field: 'Divider1',
@ -680,14 +665,12 @@ export const formSchema: FormSchema[] = [
    field: 'chief',
    label: '法人',
    component: 'Input',
-
    colProps: { span: 4 },
  },
  {
    field: 'tel',
    label: '电话',
    component: 'Input',
-
    colProps: { span: 4 },
  },
  {
@ -700,7 +683,6 @@ export const formSchema: FormSchema[] = [
    field: 'web',
    label: '网址',
    component: 'Input',
-
    colProps: { span: 4 },
  },
  {