Преглед изворни кода

销售订单-页面-配置菜单使用(待修改)

jingbb пре 5 месеци
родитељ
комит
6e254cc8ba

+ 416 - 0
src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -0,0 +1,416 @@
+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 { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '订单编号(bill code)',
+    align:"center",
+    dataIndex: 'billCode'
+   },   
+   {
+    title: '单据日期(bill date)',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+  
+   {
+    title: '项目(project)',
+    align:"center",
+    dataIndex: 'project'
+   },
+   {
+    title: '客户(customer)',
+    align:"center",
+    dataIndex: 'customer'
+   },
+   {
+    title: '优先级(priority)',
+    align:"center",
+    dataIndex: 'priority'
+   },
+   {
+    title: '产品分类(production class)',
+    align:"center",
+    dataIndex: 'productionClass'
+   },
+   {
+    title: '机型(model)',
+    align:"center",
+    dataIndex: 'model'
+   },
+   {
+    title: '厂家(maker)',
+    align:"center",
+    dataIndex: 'maker'
+   },
+   {
+    title: '销售部门(sale department)',
+    align:"center",
+    dataIndex: 'saleDepartment'
+   },
+   {
+    title: '业务员(salesman)',
+    align:"center",
+    dataIndex: 'salesman',
+    width:'250'
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit',
+    customRender:function (t, r, index) {
+      if(t.text==1){
+        return '是(yes)'
+      }else if(t.text==0){
+        return '否(no)'
+      }
+    }
+   },
+   {
+    title: '关闭(close)',
+    align:"center",
+    dataIndex: 'close',
+    customRender:function (t, r, index) {
+      if(t.text==1){
+        return '是(yes)'
+      }else if(t.text==0){
+        return '否(no)'
+      }
+    }
+   },
+   {
+    title: '客户确认(customer confirm)',
+    align:"center",
+    dataIndex: 'customerConfirm',
+    customRender:function (t, r, index) {
+      if(t.text==1){
+        return '是(yes)'
+      }else if(t.text==0){
+        return '否(no)'
+      }
+    }
+   },
+   {
+    title: '基础协议(base protocaol)',
+    align:"center",
+    dataIndex: 'baseProtocaol',
+    width:'250'
+   },
+   {
+    title: '扫描合同(scan contract)',
+    align:"center",
+    dataIndex: 'baseProtocaol',
+    width:'250'
+   },
+   {
+    title: '订单金额(order money)',
+    align:"center",
+    dataIndex: 'orderMoney',
+    width:'250'
+   },
+   {
+    title: '发货金额(delivery money)',
+    align:"center",
+    dataIndex: 'deluveryMoney',
+    width:'250'
+   },
+   {
+    title: '发票金额(invoice money)',
+    align:"center",
+    dataIndex: 'invoiceMoney',
+    width:'250'
+   },
+   {
+    title: '收款金额(collected money)',
+    align:"center",
+    dataIndex: 'invoiceMoney',
+    width:'250'
+   },
+];
+
+//子表表格配置
+export const saleOrderShipColumns: 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',
+    },
+  ]
+export const saleOrderProductColumns: JVxeColumn[] = [
+    {
+      title: '交期(delivery time)',
+      key: 'deliveryTime',
+      type: JVxeTypes.date,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品分类(product class)',
+      key: 'productClass',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品编码(product code)',
+      key: 'productCode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品中文名(chinese name)',
+      key: 'chineseName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '产品英文名(english name)',
+      key: 'englishName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '型号(model)',
+      key: 'model',
+      type: JVxeTypes.normal,
+      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.normal,
+    },
+    {
+      title: '质量等级(quality grade)',
+      key: 'qualityGrade',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '数量(quantity)',
+      key: 'quantity',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '税率(tax rate)',
+      key: 'taxRate',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      defaultValue:'',  
+      width:"200px",
+    },
+    {
+      title: '折扣(discount)',
+      key: 'discount',
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+      type: JVxeTypes.normal,
+    },
+    {
+      title: '含税单价(tax price)',
+      key: 'taxPrice',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '含税金额(tax money)',
+      key: 'taxMoney',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '折后单价(discounted unit price)',
+      key: 'discountedUnitPrice',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '折后金额(converted amount)',
+      key: 'convertedAmount',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      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',},
+  //子表高级查询
+  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',},
+    }
+  },
+  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',},
+    }
+  },
+};

+ 413 - 0
src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+              <a-form-item name="billDate">
+                <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
+                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+              </a-form-item>
+          </a-col> 
+          <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="订单单号(bill code)">订单单号(bill code)</span></template>
+                <a-input placeholder="请输入订单单号(bill code)" v-model:value="queryParam.billCode" allow-clear ></a-input>
+              </a-form-item>
+          </a-col>          
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="inquiryProject">
+                <template #label><span title="系统项目(project)">系统项目(project)</span></template>
+                <a-input v-model:value="queryParam.project" placeholder="请选择"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="inquiryCustomer">
+                <template #label><span title="客户(inquiry customer)">询价客户(inquiry customer)</span></template>
+                <a-input placeholder="请输入询价客户(inquiry customer)" v-model:value="queryParam.inquiryCustomer" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="priority">
+                <template #label><span title="优先级(priority)">优先级(priority)</span></template>
+                <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="productionClass" >
+                <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
+                <JSelectInput   v-model:value="queryParam.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="model">
+                <template #label><span title="机型(model)">机型(model)</span></template>
+                <JDictSelectTag v-model:value="queryParam.model" placeholder="请选择" dictCode="model_typer"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="maker">
+                <template #label><span title="厂家(maker)">厂家(maker)</span></template>
+                <a-input placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>            
+            <a-col :lg="8">
+              <a-form-item name="saleDepartment" >
+                <template #label><span title="销售部门(sale department)">销售部门(sale department)</span></template>
+								<JSelectDept v-model:value="queryParam.saleDepartment" :multiple="false" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="salesman">
+                <template #label><span title="业务员(salesman)">业务员(salesman)</span></template>
+                <JSelectUser v-model:value="queryParam.salesman" placeholder="请选择" :multiple="false"></JSelectUser>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="customerConfirm" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="客户确认(customer confirm)">客户确认(customer confirm)</span></template>
+                <JDictSelectTag v-model:value="queryParam.customerConfirm" placeholder="请选择" dictCode="yes_or_no"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="submit">
+                <template #label><span title="提交(submit)">提交(submit)</span></template>
+                <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no"/>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="close">
+                <template #label><span title="关闭(close)">关闭(close)</span></template>
+                <JDictSelectTag v-model:value="queryParam.close" placeholder="请选择" dictCode="yes_or_no"/>
+              </a-form-item>
+            </a-col> 
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small" >
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'saleCode:sale_inquiry_form:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+          <a-button  type="primary" v-auth="'saleCode:sale_inquiry_form:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
+          <a-button  type="primary"  @click="setStatus"> 设置其他状态(set other status)</a-button>
+          <a-button  type="primary"  @click="submit" v-auth="'saleCode:sale_inquiry_form:submitBatch'"> 提交(submit)</a-button>
+          <a-button  type="primary"  @click="cancelSubmit" v-auth="'saleCode:sale_inquiry_form:returnSubmitBatch'"> 取消提交(cancelSubmit)</a-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete"  v-auth="'saleCode:sale_inquiry_form:deleteBatch'">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除(delete)
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'saleCode:sale_inquiry_form:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <SaleInquiryFormModal @register="registerModal" @success="handleSuccess"></SaleInquiryFormModal>
+    <SetOtherStatus ref="SetOtherStatusRef" @success="handleSuccess"></SetOtherStatus>
+  </div>
+</template>
+
+<script lang="ts" name="saleCode-saleInquiryForm" setup>
+  import {ref, reactive, computed, unref,onMounted} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import SaleInquiryFormModal from './components/SaleInquiryFormModal.vue'
+  import {columns, superQuerySchema} from './SaleOrderForm.data.ts';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './SaleOrderyForm.api';
+  import { cloneDeep } from "lodash-es";
+  import { defHttp } from '/@/utils/http/axios';
+  import { JDictSelectTag} from '/@/components/Form';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import SetOtherStatus from './components/SetOtherStatus.vue';
+  import { message } from 'ant-design-vue';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  var classOption = ref([]);
+  var SetOtherStatusRef = ref()
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '销售订单',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 200,
+               fixed:'right'
+           },
+           scroll:{
+            x:'4000px'
+           },
+           beforeFetch: async (params) => {
+             let rangerQuery = await setRangeQuery();
+             return Object.assign(params, rangerQuery);
+           },
+        },
+        exportConfig: {
+            name:"销售订单",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   // 自动请求并暴露内部方法
+   onMounted(() => {
+    getOptiom()
+  });
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+  //  产品分类
+  function getOptiom(){
+        defHttp
+            .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
+            .then((res) => {
+                if (res.success) {
+                  classOption.value = []
+                  res.result.records.forEach(element => {
+                      var obj = {
+                        label: element.name?element.name:'无名称请维护',
+                        value: element.id?element.id:''
+                      };
+                      classOption.value.push( obj)
+                  });    
+                }
+            })
+            .finally(() => {
+                // loading.value = false;
+            });
+  }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑(edit)',
+           onClick: handleEdit.bind(null, record),
+           auth: 'saleCode:sale_inquiry_form:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情(detail)',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除(delete)',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft'
+           },
+           auth: 'saleCode:sale_inquiry_form:delete'
+         }
+       ]
+   }
+   function setStatus(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+    var ids=selectedRowKeys.value.join(',')
+     SetOtherStatusRef.value.getTable(ids)
+    }
+  }
+  function submit(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      batchSubmit({ids: ids},handleSuccess);
+    }
+  }
+  function cancelSubmit(){
+    if(selectedRowKeys.value.length==0){
+      message.warning('请选择数据')
+    }else{
+      var ids=selectedRowKeys.value.join(',')
+      cancelBatchSubmit({ids: ids},handleSuccess);
+    }
+  }
+
+  
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:8,
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 16,
+  });
+  const labelCol1 = reactive({
+    xs:24,
+    sm:12,
+  });
+  const wrapperCol1 = reactive({
+    xs: 24,
+    sm: 12,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  
+  let rangeField = 'billDate,'
+  
+  /**
+   * 设置范围查询条件
+   */
+  async function setRangeQuery(){
+    let queryParamClone = cloneDeep(queryParam);
+    if (rangeField) {
+      let fieldsValue = rangeField.split(',');
+      fieldsValue.forEach(item => {
+        if (queryParamClone[item]) {
+          let range = queryParamClone[item];
+          queryParamClone[item+'_begin'] = range[0];
+          queryParamClone[item+'_end'] = range[1];
+          delete queryParamClone[item];
+        } else {
+          queryParamClone[item+'_begin'] = '';
+          queryParamClone[item+'_end'] = '';
+        }
+      })
+    }
+    return queryParamClone;
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 8px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 8px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>

+ 119 - 0
src/views/saleCode/salesOrder/SaleOrderyForm.api.ts

@@ -0,0 +1,119 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/saleCode/saleInquiryForm/list',
+  save='/saleCode/saleInquiryForm/add',
+  edit='/saleCode/saleInquiryForm/edit',
+  deleteOne = '/saleCode/saleInquiryForm/delete',
+  deleteBatch = '/saleCode/saleInquiryForm/deleteBatch',
+  importExcel = '/saleCode/saleInquiryForm/importExcel',
+  exportXls = '/saleCode/saleInquiryForm/exportXls',
+  queryDataById = '/saleCode/saleInquiryForm/queryById',
+  saleInquiryFormShipList = '/saleCode/saleInquiryForm/querySaleInquiryFormShipByMainId',
+  saleInquiryFormProductList = '/saleCode/saleInquiryForm/querySaleInquiryFormProductByMainId',
+  submitBatch='/saleCode/saleInquiryForm/submitBatch',
+  cancelSubmitBatch='/saleCode/saleInquiryForm/returnSubmitBatch'
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const querySaleInquiryFormShipListByMainId = (id) => defHttp.get({url: Api.saleInquiryFormShipList, params:{ id }});
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const querySaleInquiryFormProductListByMainId = (id) => defHttp.get({url: Api.saleInquiryFormProductList, params:{ id }});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
+
+/**
+* 根据id查询数据
+* @param params
+*/
+export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
+
+// 提交
+export const batchSubmit = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认提交',
+    content: '是否提交选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.submitBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+// 取消提交
+export const cancelBatchSubmit = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认取消提交',
+    content: '是否取消提交选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.cancelSubmitBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}

+ 67 - 0
src/views/saleCode/salesOrder/components/SaleOrderFormModal.vue

@@ -0,0 +1,67 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
+    <SlaeOrderFormForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></SlaeOrderFormForm>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import SlaeOrderFormForm from './SlaeOrderFormForm.vue';
+
+  export default {
+    name: "SaleOrderFormModal",
+    components:{
+      BasicModal,
+      SlaeOrderFormForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+
+      //表单赋值
+      const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        title.value = data?.isUpdate ? (unref(formDisabled) ? '详情' : '编辑') : '新增';
+        if (unref(isUpdate)) {
+          formComponent.value.edit(data.record)
+        }else{
+          formComponent.value.add()
+        }
+      });
+
+      function handleSubmit() {
+        formComponent.value.submitForm();
+      }
+
+      function submitSuccess(){
+        emit('success');
+        closeModal();
+      }
+
+      return {
+        registerModal,
+        title,
+        formComponent,
+        formDisabled,
+        handleSubmit,
+        submitSuccess
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

+ 436 - 0
src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -0,0 +1,436 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="SaleOrderForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+							<a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="SaleOrderForm-billCode" name="billCode">
+								<a-input v-model:value="formData.billCode" placeholder="订单编号(bill code)" disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" id="SaleOrderForm-billDate" name="billDate">
+								<a-date-picker placeholder="请选择单据日期(bill date)"  v-model:value="formData.billDate"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						
+						<a-col :span="12">
+							<a-form-item label="项目(project)" v-bind="validateInfos.project" id="SaleOrderForm-project" name="project">
+								<a-input-search v-model:value="formData.project" placeholder="请输入项目(project)" :disabled="SaleOrderFormShipFormProductTable.dataSource.length!==0"  allow-clear enter-button="Search" ></a-input-search>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户(customer)" v-bind="validateInfos.customer" id="SaleOrderForm-customer" name="customer">
+                  <a-input   v-model:value="formData.customer"  placeholder="请选择" allow-clear  ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="中间人(intermediator)" v-bind="validateInfos.intermediator" id="SaleOrderForm-intermediator" name="intermediator">
+                  <a-input   v-model:value="formData.intermediator"  placeholder="请选择" allow-clear  ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="SaleOrderForm-priority" name="priority">
+                <JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="SaleOrderForm-productionClass" name="productionClass">
+								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="机型(model)" v-bind="validateInfos.model" id="SaleOrderForm-model" name="model">
+                <JDictSelectTag v-model:value="formData.model" placeholder="请选择" dictCode="model_typer" disabled/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="SaleOrderForm-maker" name="maker">
+								<a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerm" id="SaleOrderForm-deliveryTerm" name="deliveryTerm">
+                <JDictSelectTag v-model:value="formData.deliveryTerm" placeholder="请选择" dictCode="delivery_terms" style="width: 49%;margin-right: 1%;"/>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms"/>
+							</a-form-item>
+						</a-col>
+            
+            <a-col :span="12">
+							<a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="SaleOrderForm-deliveryTime" name="deliveryTime">
+								<a-date-picker placeholder="请选择交期(delivery time)"  v-model:value="formData.deliveryTime"  value-format="YYYY-MM-DD" format="YYYY-MM-DD" style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="SaleOrderForm-delivery" name="delivery">
+                <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_methods" />
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="交货地点(delivery address)" v-bind="validateInfos.deliveryAddress" id="SaleOrderForm-deliveryAddress" name="deliveryAddress">
+                <a-input v-model:value="formData.deliveryAddress" placeholder="请输入"/>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="开票抬头(invoice header)" v-bind="validateInfos.invoiceHeader" id="SaleOrderForm-invoiceHeader" name="invoiceHeader">
+                <a-input v-model:value="formData.invoiceHeader" placeholder="请输入"/>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod">
+                <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 95%;margin-right: 1%;"/>月(month)
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="是否出口(export)" v-bind="validateInfos.export" id="SaleOrderForm-export" name="export">
+                <JDictSelectTag v-model:value="formData.export" placeholder="请选择" dictCode="yes_or_no" />
+							</a-form-item>
+						</a-col>     
+            <a-col :span="12">
+							<a-form-item label="包装要求(package requirement)" v-bind="validateInfos.packageRequirement" id="SaleOrderForm-packageRequirement" name="packageRequirement">
+								<a-input v-model:value="formData.packageRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>   
+            <a-col :span="12">
+							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleOrderForm-saleDepartment" name="saleDepartment">
+								<a-input v-model:value="formData.saleDepartment" placeholder="请输入包装要求(package requirement)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>   
+            <a-col :span="12">
+							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="SaleOrderForm-salesman" name="salesman">
+								<a-input v-model:value="formData.salesman" placeholder="请输入业务员(salesman)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col> 
+            <a-col :span="12">
+							<a-form-item label="客户订单号(custormer order number)" v-bind="validateInfos.custormerOrderNumber" id="SaleOrderForm-custormerOrderNumber" name="custormerOrderNumber">
+								<a-input v-model:value="formData.custormerOrderNumber" placeholder="请输入客户订单号(custormer order number)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col> 
+            <a-col :span="12">
+							<a-form-item label="折上折(double discount)" v-bind="validateInfos.doubleDiscount" id="SaleOrderForm-doubleDiscount" name="doubleDiscount">
+								<a-input v-model:value="formData.doubleDiscount" placeholder="请输入折上折(double discount)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>     
+            <a-col :span="12">
+							<a-form-item label="折后金额(converted amount)" v-bind="validateInfos.doubleDiscconvertedAmountount" id="SaleOrderForm-convertedAmount" name="convertedAmount">
+								<a-input v-model:value="formData.convertedAmount" placeholder="请输入折后金额(converted amount)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>     
+            <a-col :span="12">
+							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
+								<a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col> 
+            <a-col :span="12">
+							<a-form-item label="预付比例(advance ratio)" v-bind="validateInfos.advanceRatio" id="SaleOrderForm-advanceRatio" name="advanceRatio">
+								<a-input v-model:value="formData.advanceRatio" placeholder="请输入质保条款(warranty terms)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
+								<a-input v-model:value="formData.notes"></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs">
+								<JUpload v-model:value="formData.attachs"></JUpload>
+							</a-form-item>
+						</a-col>
+           
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
+      <a-tab-pane tab="采购报价单 - 船明细(ship details)" key="SaleOrderFormShipFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="SaleOrderFormShipFormTableRef"
+          :loading="SaleOrderFormShipFormShipTable.loading"
+          :columns="SaleOrderFormShipFormShipTable.columns"
+          :dataSource="SaleOrderFormShipFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  >查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      <a-tab-pane tab="采购报价单 - 产品明细(product details)" key="SaleOrderFormShipFormProduct" :forceRender="true">
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
+        <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;"> 选择合同(select contract)</a-button>
+        <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;"> 选择报价单(select quotation)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="SaleOrderFormShipFormProductTableRef"
+          :loading="SaleOrderFormShipFormProductTable.loading"
+          :columns="SaleOrderFormShipFormProductTable.columns"
+          :dataSource="SaleOrderFormShipFormProductTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          asyncRemove
+          >
+          <template #action="props">
+                <a-popconfirm title="确定删除吗?">
+                  <a>删除(delete)</a>
+                </a-popconfirm>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+    </a-tabs>
+    <!-- <BaseShipArchiveAccessoriesList ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesList>
+    <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
+    <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
+    <SelectSupplierInquiryModal ref="SelectSupplierInquiryModalRef" @selectCustomerInquiry="addProductFromCustomer"></SelectSupplierInquiryModal> -->
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { PuechaseQuotationFormShippTable, queryPurcodeQuotationFormProductListByMainId, queryDataById, saveOrUpdate } from '../SaleOrderForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {saleOrderShipColumns, saleOrderProductColumns} from '../SaleOrderForm.data';
+  // import BaseShipArchiveAccessoriesList from './BaseShipArchiveAccessoriesModal.vue';
+  // import SelectPrpductModal from './SelectPrpductModal.vue';
+  // import SelectProjectModal from './SelectProjectModal.vue';
+  // import SelectSupplierInquiryModal from './SelectSupplierInquiryModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { JDictSelectTag} from '/@/components/Form';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import { Form } from 'ant-design-vue';
+  import moment from 'moment';
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "SaleOrderForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      // BaseShipArchiveAccessoriesList,
+      // SelectPrpductModal,
+      JUpload,
+      // SelectProjectModal,
+      JDictSelectTag,
+      JSelectInput,
+      // SelectSupplierInquiryModal
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const SaleOrderFormShipFormShipTableRef = ref();
+      const SaleOrderFormShipFormShipTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: saleOrderShipColumns,
+        dataSource: []
+      });
+      const SaleOrderFormShipFormProductTableRef = ref();
+      const SaleOrderFormShipFormProductTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: saleOrderProductColumns,
+        dataSource: []
+      });
+      const activeKey = ref('SaleOrderFormShipFormShip');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        billCode:'',
+        billDate: moment(new Date()).format('YYYY-MM-DD'),   
+        project: '',   
+        customer:"",
+        intermediator: '',           
+        priority: '',   
+        productionClass: '',   
+        model: '',   
+        maker: '',
+        deliveryTerm:'',
+        paymentTerms:'',
+        delivery:'',
+        deliveryTime: '',  
+        deliveryAddress:'', 
+        invoiceHeader:'', 
+        warrantyPeriod: '',   
+        export:'',
+        packageRequirement:'',
+        saleDepartment:'',
+        salesman:'',
+        custormerOrderNumber:'',
+        doubleDiscount:'',
+        convertedAmount:'',
+        warrantyTerms:'',
+        advanceRatio:'',
+        notes:'',
+        attachs:''
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+
+      function add() {
+        resetFields();
+        SaleOrderFormShipFormShipTable.dataSource = [];
+        SaleOrderFormShipFormProductTable.dataSource = [];
+        activeKey.value = 'SaleOrderFormShipFormShip'
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const SaleOrderFormShipFormShipDataList = await SaleOrderFormShipFormShippTable(row['id']);
+        SaleOrderFormShipFormShipTable.dataSource = [...SaleOrderFormShipFormShipDataList];
+        const SaleOrderFormShipFormProductDataList = await queryPurcodeQuotationFormProductListByMainId(row['id']);
+        SaleOrderFormShipFormProductTable.dataSource = [...SaleOrderFormShipFormProductDataList];
+      }
+
+      async function queryMainData(id) {
+        const row = await queryDataById(id);
+        resetFields();
+        const tmpData = {};
+        Object.keys(formData).forEach((key) => {
+          if(row.hasOwnProperty(key)){
+            tmpData[key] = row[key]
+          }
+        })
+        //赋值
+        Object.assign(formData,tmpData);
+      }
+
+      const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
+        'purPurchaseQuotationShip': SaleOrderFormShipFormShipTableRef,
+        'purPurchaseQuotationProduct': SaleOrderFormShipFormProductTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+      return {
+        SaleOrderFormShipFormShipTableRef,
+        SaleOrderFormShipFormShipTable,
+        SaleOrderFormShipFormProductTableRef,
+        SaleOrderFormShipFormProductTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+  /deep/.vxe-table--body-wrapper{
+    height: 100% !important;
+  }
+  /deep/.ant-modal-body{
+    padding: 24px !important;
+  }
+  
+  /deep/.ant-form-item{
+    margin-bottom: 8px !important;
+  }
+      
+</style>