销售订单/销售询价单-筛选条件、列表-增加船名船IMO字段

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -29,7 +29,8 @@ export const columns: BasicColumn[] = [
    {
     title: '询价客户(inquiry customer)',
     align:"center",
-    dataIndex: 'inquiryCustomer_dictText'
+    dataIndex: 'inquiryCustomer_dictText',
+    // ellipsis: false,
    },
    {
     title: '询价有效期(inquiry period)',
@@ -70,11 +71,16 @@ export const columns: BasicColumn[] = [
     width:250,
     dataIndex: 'customerInquiryNumber'
    },
-  //  {
-  //   title: '船(ship)',
-  //   dataIndex: 'shipName',
-  //   align:"center",
-  //  },
+   {
+    title: '船IMO(imo)',
+    dataIndex: 'imo',
+    align:"center",
+   },
+   {
+    title: '船(shipName)',
+    dataIndex: 'shipName',
+    align:"center",
+   },
    {
     title: '优先级(priority)',
     align:"center",

src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -39,12 +39,18 @@
                 <JSelect   v-model:value="queryParam.inquiryCustomer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
-            <!-- <a-col :lg="8">
-              <a-form-item name="shipID">
-                <template #label><span title="船(ship)">船(ship)</span></template>
-                <JInput placeholder="请输入船(ship)" v-model:value="queryParam.shipID" allow-clear ></JInput>
+            <a-col :lg="8">
+              <a-form-item name="shipName" :label-col="{ style: 'width: 280px' }">
+                <template #label><span title="船(shipName)">船(shipName)</span></template>
+                <JInput placeholder="请输入船(shipName)" v-model:value="queryParam.shipName" allow-clear ></JInput>
               </a-form-item>
-            </a-col> -->
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="imo" :label-col="{ style: 'width: 280px' }">
+                <template #label><span title="船IMO(imo)">船IMO(imo)</span></template>
+                <JInput placeholder="请输入船IMO(imo)" v-model:value="queryParam.imo" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="priority" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="优先级(priority)">优先级(priority)</span></template>

src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -29,7 +29,9 @@ export const columns: BasicColumn[] = [
    {
     title: '客户(customer)',
     align:"center",
-    dataIndex: 'customerName'
+    dataIndex: 'customerName',
+    width:280,
+    // ellipsis: false,
    },
    {
     title: '优先级(priority)',
@@ -51,6 +53,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '船IMO(imo)',
+    dataIndex: 'imo',
+    align:"center",
+   },
+   {
+    title: '船(shipName)',
+    dataIndex: 'shipName',
+    align:"center",
+   },
    {
     title: '销售部门(sale department)',
     align:"center",

src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -73,6 +73,18 @@
                 <JDictSelectTag v-model:value="queryParam.maker" placeholder="请选择" dictCode="factory" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="shipName" >
+                <template #label><span title="船(shipName)">船(shipName)</span></template>
+                <JInput placeholder="请输入船(shipName)" v-model:value="queryParam.shipName" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="imo" >
+                <template #label><span title="船IMO(imo)">船IMO(imo)</span></template>
+                <JInput placeholder="请输入船IMO(imo)" v-model:value="queryParam.imo" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="saleDepartment">
                 <template #label><span title="销售部门(sale saleDepartment)">销售部门(sale department)</span></template>
@@ -252,7 +264,7 @@
         fixed: 'right',
       },
       scroll: {
-        x: '4500px',
+        x: '5000px',
         y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {