船舶档案-字段调整

src/components/Table/src/components/TableAction.vue

@@ -33,7 +33,7 @@
         <slot :name="item.slot"></slot>
       </template>
 
-      <a-button type="link" size="small" v-if="!$slots.more"> 更多 <Icon icon="mdi-light:chevron-down"></Icon> </a-button>
+      <a-button type="link" size="small" v-if="!$slots.more"> 更多(more) <Icon icon="mdi-light:chevron-down"></Icon> </a-button>
     </Dropdown>
   </div>
 </template>

src/views/baseCode/ShipArchive/BaseShipArchive.data.ts

@@ -6,17 +6,12 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '状态(1-启用,0-停用)',
-    align:"center",
-    dataIndex: 'status_dictText'
-   },
-   {
-    title: '唯一编号',
+    title: '唯一编号(IMO)',
     align:"center",
     dataIndex: 'imo'
    },
    {
-    title: '船名称',
+    title: '船名称(ship name)',
     align:"center",
     dataIndex: 'shipName'
    },
@@ -26,98 +21,97 @@ export const columns: BasicColumn[] = [
     dataIndex: 'hullNumber'
    },
    {
-    title: '船类型',
+    title: '船类型(ship type)',
     align:"center",
     dataIndex: 'shipType_dictText'
    },
    {
-    title: '船厂',
+    title: '船厂(ship factory)',
     align:"center",
     dataIndex: 'shipFactory_dictText'
    },
    {
-    title: '造船日期',
+    title: '造船日期(ship date)',
     align:"center",
     dataIndex: 'shipDate'
    },
    {
-    title: '备注',
+    title: '关联客户(relate customer)',
     align:"center",
-    dataIndex: 'notes'
+    dataIndex: 'relateCustomer'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "状态(1-启用,0-停用)",
-      field: 'status',
-      component: 'JSelectMultiple',
-      componentProps:{
-      },
-      //colProps: {span: 6},
- 	},
-	{
-      label: "唯一编号",
+      label: "唯一编号(IMO)",
       field: 'imo',
       component: 'Input',
       //colProps: {span: 6},
  	},
 	{
-      label: "船名称",
+      label: "船名称(ship name)",
       field: 'shipName',
       component: 'Input',
       //colProps: {span: 6},
  	},
+   {
+    label: '关联客户(relate customer)',
+    field: 'relateCustomer',
+    component: 'Input',
+   },
 	{
       label: "hull number",
       field: 'hullNumber',
       component: 'Input',
       //colProps: {span: 6},
  	},
-	{
-      label: "船类型",
-      field: 'shipType',
-      component: 'JSelectMultiple',
-      componentProps:{
-      },
-      //colProps: {span: 6},
- 	},
-	{
-      label: "船厂",
-      field: 'shipFactory',
-      component: 'JSelectMultiple',
-      componentProps:{
-      },
-      //colProps: {span: 6},
- 	},
-     {
-      label: "造船日期",
-      field: "shipDate",
-      component: 'RangePicker',
-      componentProps: {
-          valueType: 'Date',
-          showTime:true
-      },
+   {
+    label: "船厂(ship factory)",
+    field: 'shipFactory',
+    component: 'JSelectMultiple',
+    componentProps:{
+    },
+    //colProps: {span: 6},
+ },
+ {
+  label: "造船日期(ship date)",
+  field: "shipDate",
+  component: 'RangePicker',
+  componentProps: {
+      valueType: 'Date',
+      showTime:true
+  },
+  //colProps: {span: 6},
+},
+{
+  label: "船类型(ship type)",
+  field: 'shipType',
+  component: 'JSelectMultiple',
+  componentProps:{
+  },
       //colProps: {span: 6},
-	},
+},
+
+{
+  label: "状态(status)",
+  field: 'status',
+  component: 'JSelectMultiple',
+  componentProps:{
+  },
+  //colProps: {span: 6},
+},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+ 
   {
-    label: '状态(1-启用,0-停用)',
-    field: 'status',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:""
-     },
-  },
-  {
-    label: '唯一编号',
+    label: '唯一编号(IMO)',
     field: 'imo',
     component: 'Input',
   },
   {
-    label: '船名称',
+    label: '船名称(ship name)',
     field: 'shipName',
     component: 'Input',
   },
@@ -127,7 +121,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '船类型',
+    label: '船类型(ship type)',
     field: 'shipType',
     component: 'JDictSelectTag',
     componentProps:{
@@ -135,7 +129,7 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '船厂',
+    label: '船厂(ship factory)',
     field: 'shipFactory',
     component: 'JDictSelectTag',
     componentProps:{
@@ -143,7 +137,7 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '造船日期',
+    label: '造船日期(ship date)',
     field: 'shipDate',
     component: 'DatePicker',
     componentProps: {
@@ -152,9 +146,12 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '备注',
-    field: 'notes',
-    component: 'Input',
+    label: '状态(1-启用,0-停用)',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:""
+     },
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{

src/views/baseCode/ShipArchive/BaseShipArchiveAccessories.data.ts

@@ -7,25 +7,25 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 export const columns: BasicColumn[] = [
    
    {
-    title: '配件类型',
+    title: '配件类型(accessory type)',
     align:"center",
     dataIndex: 'accessoryType',
     key: 'accessoryType'
    },
    {
-    title: '规格',
+    title: '规格(specifications)',
     align:"center",
     dataIndex: 'specifications',
     key: 'specifications'
    },
    {
-    title: '型号',
+    title: '型号(model)',
     align:"center",
     dataIndex: 'model',
     key: 'model'
    },
    {
-    title: '序列号',
+    title: '序列号(serial number)',
     align:"center",
     dataIndex: 'serialNumber',
     key: 'serialNumber'
@@ -56,32 +56,32 @@ export const formSchema: FormSchema[] = [
     show: false
   },
   {
-    label: '配件类型',
+    label: '配件类型(accessory type)',
     field: 'accessoryType',
     component: 'Input',
   },
   {
-    label: '规格',
+    label: '规格(specifications)',
     field: 'specifications',
     component: 'Input',
   },
   {
-    label: '型号',
+    label: '型号(model)',
     field: 'model',
     component: 'Input',
   },
   {
-    label: '序列号',
+    label: '序列号(serial number)',
     field: 'serialNumber',
     component: 'InputNumber',
   },
   {
-    label: '备注',
+    label: '备注(notes)',
     field: 'notes',
     component: 'Input',
   },
   {
-    label: '附件',
+    label: '附件(upload)',
     field: 'attachs',
     component: 'Input',
   },

src/views/baseCode/ShipArchive/BaseShipArchiveList.vue

@@ -4,19 +4,19 @@
    <BasicTable @register="registerTable" :rowSelection="rowSelection">
      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" v-auth="'baseCode:base_ship_archive:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'baseCode:base_ship_archive:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <a-button type="primary" v-auth="'baseCode:base_ship_archive:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+          <a-button  type="primary" v-auth="'baseCode:base_ship_archive:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
           <!-- <j-upload-button type="primary" v-auth="'baseCode:base_ship_archive:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
-         <a-button  type="primary" @click="relateCustomer"> 关联客户</a-button>
-         <a-button  type="primary" @click="hisCustomer"> 历史客户</a-button>
-         <a-button  type="primary" @click="accessories"> 配件明细</a-button>
+         <a-button  type="primary" @click="relateCustomer"> 关联客户(relate customer)</a-button>
+         <a-button  type="primary" @click="hisCustomer"> 历史客户(customer history)</a-button>
+         <a-button  type="primary" @click="accessories"> 配件明细(accessories details)</a-button>
          
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
                   <a-menu-item key="1" @click="batchHandleDelete">
                     <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
+                    删除(delete)
                   </a-menu-item>
                 </a-menu>
               </template>
@@ -29,7 +29,7 @@
       </template>
        <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"  />
       </template>
       <!--字段回显插槽-->
       <template v-slot:bodyCell="{ column, record, index, text }">
@@ -84,7 +84,7 @@
               ],
             },
            actionColumn: {
-               width: 120,
+               width: 200,
                fixed:'right'
             },
             beforeFetch: (params) => {
@@ -184,7 +184,7 @@
     record.imo=rowSelection.selectedRows[0].imo;
     openModalCustomerAdd(true, {
       record,
-      isUpdate: false,
+      isUpdate: true,
       showFooter: false,
     });
     
@@ -243,7 +243,7 @@
   function getTableAction(record){
        return [
          {
-           label: '编辑',
+           label: '编辑(edit)',
            onClick: handleEdit.bind(null, record),
            auth: 'baseCode:base_ship_archive:edit'
          }
@@ -255,10 +255,10 @@
   function getDropDownAction(record){
        return [
          {
-           label: '详情',
+           label: '详情(details)',
            onClick: handleDetail.bind(null, record),
          }, {
-           label: '删除',
+           label: '删除(delete)',
            popConfirm: {
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record),

src/views/baseCode/ShipArchive/BaseShipArchiveRelateCustomer.data.ts

@@ -6,29 +6,24 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
    
-   {
-    title: '名称',
+  {
+    title: '开始日期(start date)',
     align:"center",
-    dataIndex: 'name',
-    key: 'name'
+    dataIndex: 'startDate',
+    key: 'startDate'
    },
    {
-    title: '客户',
+    title: '客户(customer)',
     align:"center",
     dataIndex: 'customerId',
     key: 'customerId'
    },
+   
    {
-    title: '开始日期',
-    align:"center",
-    dataIndex: 'startDate',
-    key: 'startDate'
-   },
-   {
-    title: '状态',
+    title: '船名(ship name)',
     align:"center",
-    dataIndex: 'status',
-    key: 'status'
+    dataIndex: 'shipName',
+    key: 'shipName'
    },
 ];
 //查询数据
@@ -44,18 +39,18 @@ export const formSchema: FormSchema[] = [
     show: false
   },
   {
-    label: '唯一编号',
+    label: '唯一编号(IMO)',
     field: 'imo',
     component: 'Input',
     dynamicDisabled:true
   },
   {
-    label: '名称',
+    label: '名称(name)',
     field: 'name',
     component: 'Input',
   },
   {
-    label: '客户',
+    label: '客户(customer)',
     field: 'customerId',
     component: 'Input',
       show: ({ values }) => {
@@ -63,7 +58,7 @@ export const formSchema: FormSchema[] = [
       }
   },
   {
-    label: '开始日期',
+    label: '开始日期(start date)',
     field: 'startDate',
     component: 'DatePicker',
     componentProps: {

src/views/baseCode/ShipArchive/components/BaseShipArchiveAccessoriesModal.vue

@@ -1,9 +1,9 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
-      <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> 
-      <a-button style="margin-left:5px" type="primary" @click="handleEdit"> 编辑</a-button> 
-      <a-button style="margin-left:5px" type="primary" @click="handleDel"> 删除</a-button> 
-      <a-button style="margin-left:5px" type="primary" @click="handleGet" > 刷新</a-button>
+      <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button> 
+      <a-button style="margin-left:5px" type="primary" @click="handleEdit"> 编辑(edit)</a-button> 
+      <a-button style="margin-left:5px" type="primary" @click="handleDel"> 删除(delete)</a-button> 
+      <a-button style="margin-left:5px" type="primary" @click="handleGet" > 刷新(refresh)</a-button>
   
       <JVxeTable 
         ref="tableRef"

src/views/baseCode/ShipArchive/components/BaseShipArchiveAccessoriesModal2.vue

@@ -39,7 +39,7 @@
        setProps({ disabled: !data?.showFooter })
     });
     //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+    const title = computed(() => (!unref(isUpdate) ? '新增(add)' : !unref(isDetail) ? '详情(details)' : '编辑(edit)'));
     //表单提交事件
     async function handleSubmit(v) {
         try {