更改采购订单新增表格折前与单价锁定

src/router/routes/basic.ts

@@ -15,7 +15,7 @@ export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
   children: [
     {
       path: '/:path(.*)*',
-      name: PAGE_NOT_FOUND_NAME,
+      name: PAGE_NOT_FOUND_CHILD,
       component: EXCEPTION_COMPONENT,
       meta: {
         title: 'ErrorPage',

src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts

@@ -1,422 +1,423 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
-import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-   {
+  {
     title: '订单编号(bill code)',
-    align:"center",
-    dataIndex: 'billCode'
-   },   
-   {
+    align: 'center',
+    dataIndex: 'billCode',
+  },
+  {
     title: '单据日期(bill date)',
-    align:"center",
+    align: 'center',
     dataIndex: 'billDate',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+    customRender: ({ text }) => {
+      text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
       return text;
     },
-   },
-  
-   {
+  },
+
+  {
     title: '项目(project)',
-    align:"center",
-    dataIndex: 'projectName'
-   },
-   {
+    align: 'center',
+    dataIndex: 'projectName',
+  },
+  {
     title: '供应商(supplier)',
-    align:"center",
-    dataIndex: 'supplierName'
-   },
-   {
+    align: 'center',
+    dataIndex: 'supplierName',
+  },
+  {
     title: '优先级(priority)',
-    align:"center",
-    dataIndex: 'priority_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'priority_dictText',
+  },
+  {
     title: '产品分类(production class)',
-    align:"center",
-    dataIndex: 'productionClass_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'productionClass_dictText',
+  },
+  {
     title: '机型(model)',
-    align:"center",
-    dataIndex: 'model'
-   },
-   {
+    align: 'center',
+    dataIndex: 'model',
+  },
+  {
     title: '厂家(maker)',
-    align:"center",
-    dataIndex: 'maker'
-   },
-   {
+    align: 'center',
+    dataIndex: 'maker',
+  },
+  {
     title: '销售订单来源(sourceCode)',
-    align:"center",
-    dataIndex: 'sourceCode2'
-   },
-   {
+    align: 'center',
+    dataIndex: 'sourceCode2',
+  },
+  {
     title: '报价选定来源(sourceCode)',
-    align:"center",
-    dataIndex: 'sourceCode'
-   },
-   {
+    align: 'center',
+    dataIndex: 'sourceCode',
+  },
+  {
     title: '采购部门(purchase department)',
-    align:"center",
-    dataIndex: 'purchaseDepartmentName'
-   },
-   {
+    align: 'center',
+    dataIndex: 'purchaseDepartmentName',
+  },
+  {
     title: '采购员(purchaseman)',
-    align:"center",
+    align: 'center',
     dataIndex: 'purchasemanName',
-    width:'250'
-   },
-   {
+    width: '250',
+  },
+  {
     title: '提交(submit)',
-    align:"center",
+    align: 'center',
     dataIndex: 'submit',
-    customRender:function (t, r, index) {
-      if(t.text==1){
-        return '是(yes)'
-      }else if(t.text==0){
-        return '否(no)'
+    customRender: function (t, r, index) {
+      if (t.text == 1) {
+        return '是(yes)';
+      } else if (t.text == 0) {
+        return '否(no)';
       }
-    }
-   },
-   {
+    },
+  },
+  {
     title: '关闭(close)',
-    align:"center",
+    align: 'center',
     dataIndex: 'close',
-    customRender:function (t, r, index) {
-      if(t.text==1){
-        return '是(yes)'
-      }else if(t.text==0){
-        return '否(no)'
+    customRender: function (t, r, index) {
+      if (t.text == 1) {
+        return '是(yes)';
+      } else if (t.text == 0) {
+        return '否(no)';
       }
-    }
-   },
-   {
+    },
+  },
+  {
     title: '关闭原因(close reason)',
-    align:"center",
-    dataIndex: 'closeReason'
-   },
-   {
+    align: 'center',
+    dataIndex: 'closeReason',
+  },
+  {
     title: '供应商确认(supplier confirm)',
-    align:"center",
+    align: 'center',
     dataIndex: 'status',
-    customRender:function (t, r, index) {
-      if(t.text==1){
-        return '已确认'
-      }else if(t.text==0){
-        return '未确认'
+    customRender: function (t, r, index) {
+      if (t.text == 1) {
+        return '已确认';
+      } else if (t.text == 0) {
+        return '未确认';
       }
-    }
-   },
-   {
+    },
+  },
+  {
     title: '基础协议(base protocaol)',
-    align:"center",
+    align: 'center',
     dataIndex: 'baseProtocaol',
-    width:'250',
+    width: '250',
     slots: { customRender: 'viewFile' },
-   },
-   {
+  },
+  {
     title: '扫描合同(scan contract)',
-    align:"center",
+    align: 'center',
     dataIndex: 'scanProtocaol',
-    width:'250',
+    width: '250',
     slots: { customRender: 'viewFile' },
-   },
-   {
+  },
+  {
     title: '版本号(version)',
-    align:"center",
+    align: 'center',
     dataIndex: 'version',
-    width:'250'
-   },
+    width: '250',
+  },
 ];
 
 //子表表格配置
 export const purchaseOrderShipColumns: JVxeColumn[] = [
-    {
-      title: '船名(ship name)',
-      key: 'shipName',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '主机号(host number)',
-      key: 'hostNumber',
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '工程编号(project No)',
-      key: 'projectNo',
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '船厂(ship factory)',
-      key: 'shipFactory',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '船东(shipowner)',
-      key: 'shipowner',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '操作(operation)',
-      key: 'action',
-      width:"400px",
-      // 固定在右侧
-      fixed: 'right',
-      // 对齐方式为居中
-      align: 'center',
-      // 组件类型定义为【插槽】
-      type: JVxeTypes.slot,
-      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
-      slotName: 'action',
-    },
-  ]
+  {
+    title: '船名(ship name)',
+    key: 'shipName',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '主机号(host number)',
+    key: 'hostNumber',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '工程编号(project No)',
+    key: 'projectNo',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '船厂(ship factory)',
+    key: 'shipFactory',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '船东(shipowner)',
+    key: 'shipowner',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '操作(operation)',
+    key: 'action',
+    width: '400px',
+    // 固定在右侧
+    fixed: 'right',
+    // 对齐方式为居中
+    align: 'center',
+    // 组件类型定义为【插槽】
+    type: JVxeTypes.slot,
+    // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+    slotName: 'action',
+  },
+];
 export const purchaseOrderProductColumns: JVxeColumn[] = [
-    {
-      title: '交期(delivery time)',
-      key: 'deliveryTime',
-      type: JVxeTypes.date,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '最早发货日期(earline delivery date)',
-      key: 'earliestDeliveryDate',
-      type: JVxeTypes.date,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '最晚发货日期(latest delivery date)',
-      key: 'latestDeliveryDate',
-      type: JVxeTypes.date,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '产品中文名(chinese name)',
-      key: 'chineseName',
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '产品英文名(english name)',
-      key: 'englishName',
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '型号(model)',
-      key: 'model',
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '备件号(partno)',
-      key: 'partno',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '订货号(orderno)',
-      key: 'orderno',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '图号(drawingno)',
-      key: 'drawingno',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    // {
-    //   title: '厂家(factory)',
-    //   key: 'factory',
-    //   placeholder: '请输入${title}',
-    //   width:"200px",
-    //   defaultValue:'',
-    //   type: JVxeTypes.select,
-    //   options: [],
-    //   dictCode: 'factory',
-    // },
-    {
-      title: '质量等级(quality grade)',
-      key: 'qualityGrade',
-      type: JVxeTypes.select,
-      options: [],
-      dictCode: 'quality_grade',
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '需要船检证书(need Ship inspection certificate)',
-      key: 'needShip',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '船检证书(ship Inspection certificate)',
-      key: 'shipInspection',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '数量(quantity)',
-      key: 'quantity',
-      type: JVxeTypes.inputNumber,
-      validateRules: [{ required: true, message: '' }],
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
-    {
-      title: '折扣(discount)',
-      key: 'discount',
-      type: JVxeTypes.normal,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '折前单价(taxPriceOriginal)',
-      key: 'taxPriceOriginal',
-      type: JVxeTypes.normal,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '单价(price)',
-      key: 'taxPrice',
-      type: JVxeTypes.inputNumber,
-      validateRules: [{ required: true, message: '' }],
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '金额(money)',
-      key: 'taxAmount',
-      type: JVxeTypes.normal,
-      width:"200px",
-      placeholder: '请输入${title}',
-      defaultValue:'',
-      statistics:['sum'],
-    },
-    {
-      title: '备注(note)',
-      key: 'notes',
-      width:"200px",
-      type: JVxeTypes.input,
-      placeholder: '请输入${title}',
-      defaultValue:'',
-    },
-    {
-      title: '操作(operation)',
-      key: 'action',
-      width:"200px",
-      // 固定在右侧
-      fixed: 'right',
-      // 对齐方式为居中
-      align: 'center',
-      // 组件类型定义为【插槽】
-      type: JVxeTypes.slot,
-      // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
-      slotName: 'action',
-    },
-  ]
+  {
+    title: '交期(delivery time)',
+    key: 'deliveryTime',
+    type: JVxeTypes.date,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '最早发货日期(earline delivery date)',
+    key: 'earliestDeliveryDate',
+    type: JVxeTypes.date,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '最晚发货日期(latest delivery date)',
+    key: 'latestDeliveryDate',
+    type: JVxeTypes.date,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '产品中文名(chinese name)',
+    key: 'chineseName',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '产品英文名(english name)',
+    key: 'englishName',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '型号(model)',
+    key: 'model',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '备件号(partno)',
+    key: 'partno',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '订货号(orderno)',
+    key: 'orderno',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '图号(drawingno)',
+    key: 'drawingno',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  // {
+  //   title: '厂家(factory)',
+  //   key: 'factory',
+  //   placeholder: '请输入${title}',
+  //   width:"200px",
+  //   defaultValue:'',
+  //   type: JVxeTypes.select,
+  //   options: [],
+  //   dictCode: 'factory',
+  // },
+  {
+    title: '质量等级(quality grade)',
+    key: 'qualityGrade',
+    type: JVxeTypes.select,
+    options: [],
+    dictCode: 'quality_grade',
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '需要船检证书(need Ship inspection certificate)',
+    key: 'needShip',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '船检证书(ship Inspection certificate)',
+    key: 'shipInspection',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '数量(quantity)',
+    key: 'quantity',
+    type: JVxeTypes.inputNumber,
+    validateRules: [{ required: true, message: '' }],
+    placeholder: '请输入${title}',
+    width: '200px',
+    defaultValue: '',
+  },
+  {
+    title: '折扣(discount)',
+    key: 'discount',
+    type: JVxeTypes.normal,
+    width: '200px',
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '折前单价(taxPriceOriginal)',
+    key: 'taxPriceOriginal',
+    type: JVxeTypes.inputNumber,
+    validateRules: [{ required: true, message: '' }],
+    width: '200px',
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '单价(price)',
+    key: 'taxPrice',
+    type: JVxeTypes.normal,
+    // validateRules: [{ required: true, message: '' }],
+    width: '200px',
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '金额(money)',
+    key: 'taxAmount',
+    type: JVxeTypes.normal,
+    width: '200px',
+    placeholder: '请输入${title}',
+    defaultValue: '',
+    statistics: ['sum'],
+  },
+  {
+    title: '备注(note)',
+    key: 'notes',
+    width: '200px',
+    type: JVxeTypes.input,
+    placeholder: '请输入${title}',
+    defaultValue: '',
+  },
+  {
+    title: '操作(operation)',
+    key: 'action',
+    width: '200px',
+    // 固定在右侧
+    fixed: 'right',
+    // 对齐方式为居中
+    align: 'center',
+    // 组件类型定义为【插槽】
+    type: JVxeTypes.slot,
+    // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+    slotName: 'action',
+  },
+];
 
 // 高级查询数据
 export const superQuerySchema = {
-  status: {title: '状态(1-已报价,0-已报价)',order: 0,view: 'number', type: 'number',},
-  otherStatus: {title: '其他状态(other status)',order: 2,view: 'text', type: 'string',},
-  submit: {title: '提交(1是 0否)',order: 3,view: 'text', type: 'string',},
-  billDate: {title: '单据日期(bill date)',order: 4,view: 'date', type: 'string',},
-  billCode: {title: '询价单号(bill code)',order: 5,view: 'text', type: 'string',},
-  inquiryProject: {title: '询价项目(inquiry project)',order: 6,view: 'text', type: 'string',},
-  inquiryCustomer: {title: '询价客户(inquiry customer)',order: 7,view: 'text', type: 'string',},
-  inquiryPlatform: {title: '询价平台(inquiry platform)',order: 8,view: 'text', type: 'string',},
-  customerInquiryNumber: {title: '客户询价单号(customer inquiry number)',order: 9,view: 'text', type: 'string',},
-  inquiryPeriodEnd: {title: '询价有效期(inquiry period)止',order: 10,view: 'date', type: 'string',},
-  inquiryPeriodBegin: {title: '询价有效期(inquiry period)始',order: 11,view: 'date', type: 'string',},
-  busynessType: {title: '业务类型(busyness type)',order: 12,view: 'text', type: 'string',},
-  priority: {title: '优先级(priority)',order: 13,view: 'text', type: 'string',},
-  productionClass: {title: '产品分类(production class)',order: 14,view: 'text', type: 'string',},
-  model: {title: '机型(model)',order: 15,view: 'text', type: 'string',},
-  maker: {title: '厂家(maker)',order: 16,view: 'text', type: 'string',},
-  saleDepartment: {title: '销售部门(sale department)',order: 17,view: 'text', type: 'string',},
-  salesman: {title: '业务员(salesman)',order: 18,view: 'text', type: 'string',},
-  inquiryTeam: {title: '采购询价组(procurement inquiry team)',order: 19,view: 'text', type: 'string',},
-  deliveryTime: {title: '交期(delivery time)',order: 20,view: 'datetime', type: 'string',},
-  attachs: {title: '附件(attachs)',order: 21,view: 'text', type: 'string',},
-  inquiryNotes: {title: '询价备注(inquiry notes)',order: 22,view: 'text', type: 'string',},
+  status: { title: '状态(1-已报价,0-已报价)', order: 0, view: 'number', type: 'number' },
+  otherStatus: { title: '其他状态(other status)', order: 2, view: 'text', type: 'string' },
+  submit: { title: '提交(1是 0否)', order: 3, view: 'text', type: 'string' },
+  billDate: { title: '单据日期(bill date)', order: 4, view: 'date', type: 'string' },
+  billCode: { title: '询价单号(bill code)', order: 5, view: 'text', type: 'string' },
+  inquiryProject: { title: '询价项目(inquiry project)', order: 6, view: 'text', type: 'string' },
+  inquiryCustomer: { title: '询价客户(inquiry customer)', order: 7, view: 'text', type: 'string' },
+  inquiryPlatform: { title: '询价平台(inquiry platform)', order: 8, view: 'text', type: 'string' },
+  customerInquiryNumber: { title: '客户询价单号(customer inquiry number)', order: 9, view: 'text', type: 'string' },
+  inquiryPeriodEnd: { title: '询价有效期(inquiry period)止', order: 10, view: 'date', type: 'string' },
+  inquiryPeriodBegin: { title: '询价有效期(inquiry period)始', order: 11, view: 'date', type: 'string' },
+  busynessType: { title: '业务类型(busyness type)', order: 12, view: 'text', type: 'string' },
+  priority: { title: '优先级(priority)', order: 13, view: 'text', type: 'string' },
+  productionClass: { title: '产品分类(production class)', order: 14, view: 'text', type: 'string' },
+  model: { title: '机型(model)', order: 15, view: 'text', type: 'string' },
+  maker: { title: '厂家(maker)', order: 16, view: 'text', type: 'string' },
+  saleDepartment: { title: '销售部门(sale department)', order: 17, view: 'text', type: 'string' },
+  salesman: { title: '业务员(salesman)', order: 18, view: 'text', type: 'string' },
+  inquiryTeam: { title: '采购询价组(procurement inquiry team)', order: 19, view: 'text', type: 'string' },
+  deliveryTime: { title: '交期(delivery time)', order: 20, view: 'datetime', type: 'string' },
+  attachs: { title: '附件(attachs)', order: 21, view: 'text', type: 'string' },
+  inquiryNotes: { title: '询价备注(inquiry notes)', order: 22, view: 'text', type: 'string' },
   //子表高级查询
   saleInquiryFormShip: {
     title: '销售询价单子表 - 船明细',
     view: 'table',
     fields: {
-        shipId: {title: '船id',order: 0,view: 'text', type: 'string',},
-        shipName: {title: '船名',order: 1,view: 'text', type: 'string',},
-        hostNumber: {title: '主机号',order: 2,view: 'text', type: 'string',},
-        projectNo: {title: '工程编号',order: 3,view: 'text', type: 'string',},
-        shipFactory: {title: '船厂',order: 4,view: 'text', type: 'string',},
-        shipowner: {title: '船东',order: 5,view: 'text', type: 'string',},
-    }
+      shipId: { title: '船id', order: 0, view: 'text', type: 'string' },
+      shipName: { title: '船名', order: 1, view: 'text', type: 'string' },
+      hostNumber: { title: '主机号', order: 2, view: 'text', type: 'string' },
+      projectNo: { title: '工程编号', order: 3, view: 'text', type: 'string' },
+      shipFactory: { title: '船厂', order: 4, view: 'text', type: 'string' },
+      shipowner: { title: '船东', order: 5, view: 'text', type: 'string' },
+    },
   },
   saleInquiryFormProduct: {
     title: '销售询价单子表 - 产品明细',
     view: 'table',
     fields: {
-        productId: {title: '产品id',order: 0,view: 'number', type: 'number',},
-        deliveryTime: {title: '交期',order: 1,view: 'date', type: 'string',},
-        productClass: {title: '产品分类',order: 2,view: 'text', type: 'string',},
-        productCode: {title: '产品编码',order: 3,view: 'text', type: 'string',},
-        chineseName: {title: '产品中文名',order: 4,view: 'text', type: 'string',},
-        englishName: {title: '产品英文名',order: 5,view: 'text', type: 'string',},
-        specifications: {title: '规格',order: 6,view: 'text', type: 'string',},
-        model: {title: '型号',order: 7,view: 'text', type: 'string',},
-        factory: {title: '厂家',order: 8,view: 'text', type: 'string',},
-        qualityGrade: {title: '质量等级',order: 9,view: 'text', type: 'string',},
-        quantity: {title: '数量',order: 10,view: 'number', type: 'number',},
-        unit: {title: '单位',order: 11,view: 'text', type: 'string',},
-        needShip: {title: '需要船检证书（1是 0否）',order: 12,view: 'text', type: 'string',},
-        shipInspection: {title: '船检证书',order: 13,view: 'text', type: 'string',},
-        notes: {title: '备注',order: 14,view: 'text', type: 'string',},
-    }
+      productId: { title: '产品id', order: 0, view: 'number', type: 'number' },
+      deliveryTime: { title: '交期', order: 1, view: 'date', type: 'string' },
+      productClass: { title: '产品分类', order: 2, view: 'text', type: 'string' },
+      productCode: { title: '产品编码', order: 3, view: 'text', type: 'string' },
+      chineseName: { title: '产品中文名', order: 4, view: 'text', type: 'string' },
+      englishName: { title: '产品英文名', order: 5, view: 'text', type: 'string' },
+      specifications: { title: '规格', order: 6, view: 'text', type: 'string' },
+      model: { title: '型号', order: 7, view: 'text', type: 'string' },
+      factory: { title: '厂家', order: 8, view: 'text', type: 'string' },
+      qualityGrade: { title: '质量等级', order: 9, view: 'text', type: 'string' },
+      quantity: { title: '数量', order: 10, view: 'number', type: 'number' },
+      unit: { title: '单位', order: 11, view: 'text', type: 'string' },
+      needShip: { title: '需要船检证书（1是 0否）', order: 12, view: 'text', type: 'string' },
+      shipInspection: { title: '船检证书', order: 13, view: 'text', type: 'string' },
+      notes: { title: '备注', order: 14, view: 'text', type: 'string' },
+    },
   },
 };

src/views/saleCode/deliveryNotice/components/ViewFileListModal.vue

@@ -20,7 +20,7 @@
           size="small"
           height="500"
           :pagination="false"
-          :scroll="{ x: 1000 }"
+          :scroll="{ x: 1000, y: 500 }"
         >
           <template #operation="{ text, record, index }">
             <a @click="handleEdit(record)">编辑(edit)</a>

src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -60,12 +60,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item
-                label="客户联系人(inquiry platform)"
-                v-bind="validateInfos.inquiryPlatform"
-                id="SaleInquiryFormForm-inquiryPlatform"
-                name="inquiryPlatform"
-              >
+              <a-form-item label="客户联系人(inquiry liaisonId)" v-bind="validateInfos.liaisonId" id="SaleInquiryFormForm-liaisonId" name="liaisonId">
                 <a-select v-model:value="formData.liaisonId" labelInValue @change="onChangeLiaison" allowClear>
                   <a-select-option v-for="item in linkOption" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
                 </a-select>
@@ -169,7 +164,12 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="质量等级(quality grade)" v-bind="validateInfos.inquiryTeam" id="SaleInquiryFormForm-inquiryTeam" name="inquiryTeam">
+              <a-form-item
+                label="质量等级(quality grade)"
+                v-bind="validateInfos.qualityGradeHead"
+                id="SaleInquiryFormForm-qualityGradeHead"
+                name="qualityGradeHead"
+              >
                 <JDictSelectTag
                   v-model:value="formData.qualityGradeHead"
                   placeholder="请选择"
@@ -366,7 +366,13 @@
       const validatorRules = reactive({
         projectName: [{ required: true, message: '请选择询价项目(select project)' }],
         inquiryCustomer: [{ required: true, message: '请选择询价客户(select customer)' }],
+        inquiryPlatform: [{ required: true, message: '请选择询价平台(select platform)' }],
+        liaisonId: [{ required: true, message: '请选择客户联系人(select liaison)' }],
+        customerInquiryNumber: [{ required: true, message: '请输入客户询价单号(input customerInquiryNumber)' }],
+        inquiryTime: [{ required: true, message: '请选择客户询价日期(select inquiryTime)' }],
         model: [{ required: true, message: '请选择机型(model)' }],
+        maker: [{ required: true, message: '请输入厂家(input maker)' }],
+        qualityGradeHead: [{ required: true, message: '请选择质量等级(select qualityGradeHead)' }],
       });
       const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
       const dbData = {};

src/views/saleCode/salesInvoice/components/SelectCommissionOrderModal.vue

@@ -89,7 +89,7 @@
           size="small"
           @change="handleTableChange"
           :pagination="pagination"
-          :scroll="{ x: 2000 }"
+          :scroll="{ x: 2000, y: 400 }"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         />
       </a-card>
@@ -218,21 +218,22 @@
     size: 'small',
   });
   function loadData() {
-    // let params = getQueryParams();
-    // defHttp.get({ url: '/saleCode/saleDelivery/list',params}, { isTransformResponse: false })
-    // .then((res) => {
-    //     if (res.success) {
-    //         dataSource.value = res.result.records;
-    //         pagination.value.total = res.result.total;
-    //         pagination.value.current = res.result.current;
-    //         pagination.value.pageSize = res.result.size;
-    //     } else {
-    //         message.error(res.message);
-    //     }
-    // })
-    // .finally(() => {
-    //     // loading.value = false;
-    // });
+    let params = getQueryParams();
+    defHttp
+      .get({ url: '/saleCode/saleDelivery/list', params }, { isTransformResponse: false })
+      .then((res) => {
+        if (res.success) {
+          dataSource.value = res.result.records;
+          pagination.value.total = res.result.total;
+          pagination.value.current = res.result.current;
+          pagination.value.pageSize = res.result.size;
+        } else {
+          message.error(res.message);
+        }
+      })
+      .finally(() => {
+        // loading.value = false;
+      });
   }
   function getQueryParams() {
     let params = Object.assign(queryParams.value);

src/views/saleCode/salesInvoice/components/SelectDeliveryNoticeModal.vue

@@ -120,7 +120,7 @@
           size="small"
           @change="handleTableChange"
           :pagination="pagination"
-          :scroll="{ x: 2500 }"
+          :scroll="{ x: 2500, y: 400 }"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         />
       </a-card>

src/views/saleCode/salesOrder/components/SelectSaleOrderModal.vue

@@ -73,7 +73,7 @@
           size="small"
           @change="handleTableChange"
           :pagination="false"
-          :scroll="{ x: 4500 }"
+          :scroll="{ x: 4500, y: 400 }"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         />
       </a-card>

src/views/saleCode/salesOrder/components/ViewFileListModal.vue

@@ -20,7 +20,7 @@
           size="small"
           height="500"
           :pagination="false"
-          :scroll="{ x: 1000 }"
+          :scroll="{ x: 1000, y: 500 }"
         >
           <template #operation="{ text, record, index }">
             <a @click="handleEdit(record)">编辑(edit)</a>