ソースを参照

发货通知单-第一版页面

jingbb 4 ヶ月 前
コミット
78b86c672e

+ 563 - 0
src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -0,0 +1,563 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="quotationFormForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+							<a-form-item label="发货通知单号(bill code)" v-bind="validateInfos.billCode" id="quotationFormForm-billCode" name="billCode" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.billCode" placeholder="请输入发货通知单号(bill code)" ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="发货日期(delivery date)" v-bind="validateInfos.deliveryDate" id="quotationFormForm-deliveryDate" name="deliveryDate">
+								<a-date-picker placeholder="请选择发货日期(delivery date)"  v-model:value="formData.deliveryDate"  value-format="YYYY-MM-DD" disabled  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="quotationFormForm-projectName" name="projectName">
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)"  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="客户(customer)" v-bind="validateInfos.customer" id="quotationFormForm-customer" name="customer" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JSelectInput   v-model:value="formData.customer"  placeholder="请选择" :options="customerOption" disabled></JSelectInput>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="quotationFormForm-priority" name="priority">
+                <JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority" disabled/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="quotationFormForm-productionClass" name="productionClass" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JSelectInput   v-model:value="formData.productionClass"  placeholder="请选择" :options="classOption" disabled></JSelectInput>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="机型(model)" v-bind="validateInfos.model" id="quotationFormForm-model" name="model">
+                <JSelectMultiple 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="quotationFormForm-maker" name="maker" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<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="币种(currency)" v-bind="validateInfos.currency" id="quotationFormForm-currency" name="currency">
+								<JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" disabled/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="交货条款(delivery terms)" v-bind="validateInfos.deliveryTerms" id="quotationFormForm-deliveryTerms" name="deliveryTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JDictSelectTag v-model:value="formData.deliveryTerms" placeholder="请选择" dictCode="delivery_terms" disabled/>
+							</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" disabled/>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="交货地点(place of delivery)" v-bind="validateInfos.placeDelivery" id="quotationFormForm-placeDelivery" name="placeDelivery">
+								<a-input v-model:value="formData.placeDelivery" placeholder="请输入交货地点(place of delivery)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="是否希望出口(export)" v-bind="validateInfos.export" id="quotationFormForm-export" name="export" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <JDictSelectTag v-model:value="formData.export" placeholder="请选择" dictCode="yes_or_no"/>
+							</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: 85%;margin-right: 1%;"/>月(month)
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleInquiryFormForm-saleDepartment" name="saleDepartment">
+								<a-input v-model:value="formData.saleDepartment" placeholder=""  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="包装要求(packaging requirement)" v-bind="validateInfos.packagingRequirement" id="quotationFormForm-packagingMethod" name="packagingMethod" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.packagingMethod" placeholder="请输入包装要求(packaging requirement)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="联系人(linkman)" v-bind="validateInfos.linkman" id="quotationFormForm-linkman" name="linkman" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.linkman" placeholder="请输入联系人(linkman)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="收货地址(address)" v-bind="validateInfos.address" id="quotationFormForm-address" name="address">
+								<a-input v-model:value="formData.address" placeholder=""  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="联系电话(linkman phone)" v-bind="validateInfos.linkmanPhone" id="quotationFormForm-linkmanPhone" name="linkmanPhone">
+								<a-input v-model:value="formData.linkmanPhone" placeholder=""  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="quotationFormForm-salesman" name="salesman">
+								<a-input v-model:value="formData.salesman" placeholder=""  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="F号(F number)" v-bind="validateInfos.FNumber" id="quotationFormForm-FNumber" name="FNumber" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+                <a-input v-model:value="formData.FNumber" placeholder="请选择" />
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="提单号(B/L NO)" v-bind="validateInfos.BLNO" id="quotationFormForm-BLNO" name="BLNO">
+								<a-input v-model:value="formData.BLNO" placeholder="请输入"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>						
+            <a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="quotationFormForm-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear ></a-input>
+							</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="发货通知单 - 发货明细(delivery details)" key="deliveryDetailFormProduct" :forceRender="true">
+        <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
+        <a-button type="primary" @click="selectSaleOrderList"> 选择销售订单(selete saleOrder)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="deliveryDetailFormProductTableRef"
+          :loading="deliveryDetailFormProductTable.loading"
+          :columns="deliveryDetailFormProductTable.columns"
+          :dataSource="deliveryDetailFormProductTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          asyncRemove
+          >
+            <template #action="props">
+                  <a-popconfirm title="确定删除吗?" @confirm="handleDelete1(props)">
+                    <a>删除(delete)</a>
+                  </a-popconfirm>
+              </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      <a-tab-pane tab="发货通知单 - 船明细(ship details)" key="deliveryNoticeFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="deliveryNoticeFormShipTableRef"
+          :loading="deliveryNoticeFormShipTable.loading"
+          :columns="deliveryNoticeFormShipTable.columns"
+          :dataSource="deliveryNoticeFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      
+    </a-tabs>
+    <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
+    <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
+    <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
+    <SelectSaleOrderModal ref="SelectSaleOrderModalRef" @selectSaleOrder="addFormSaleOrder"></SelectSaleOrderModal>
+ </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { querysaleQuotationFormShipListByMainId,querySaleQuotationFormProductListByMainId,queryDataById, saveOrUpdate } from '../delivertNoticeForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {deliveryNoticeShipColumns, deliveryNoticeProductColumns} from '../delivertNoticeForm.data';
+  import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
+  import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
+  import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
+  import SelectSaleOrderModal from '../../../publicComponents/SelectSaleOrderModal.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { JDictSelectTag,JSelectMultiple} from '/@/components/Form';
+  import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import { Form,message } from 'ant-design-vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import moment from 'moment';
+  const userStore = useUserStore();
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "deliveryNoticeForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      BaseShipArchiveAccessoriesModal,
+      SelectPrpductModal,
+      JUpload,
+      SelectProjectModal,
+      JDictSelectTag,
+      JSelectInput,
+      JSelectMultiple,
+      SelectSaleOrderModal
+    },
+    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 SelectSaleOrderModalRef = ref();
+      var SelectPrpductModalRef = ref()
+      var SelectProjectModalRef = ref()
+      const deliveryNoticeFormShipTableRef = ref();
+      const deliveryNoticeFormShipTable = reactive<Record<string, any>>({
+        loading: false,
+        columns:deliveryNoticeShipColumns,
+        dataSource: []
+      });
+      const deliveryDetailFormProductTableRef = ref();
+      const deliveryDetailFormProductTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: deliveryNoticeProductColumns,
+        dataSource: []
+      });
+      var SelectShipSModalRef = ref();
+      var BaseShipArchiveAccessoriesListRef = ref();
+      const activeKey = ref('deliveryDetailFormProduct');
+      var notAllowEdit = ref(false);
+      var classOption = ref([]);
+      var customerOption =ref([]);
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,   
+        deliveryDate: moment(new Date()).format('YYYY-MM-DD'),   
+        billCode: '',   
+        project: '',   
+        projectName: '',   
+        customer: '',   
+        customerName: '',     
+        priority: '',   
+        productionClass: '',   
+        model: '',   
+        maker: '',   
+        currency:"",
+        deliveryTerms: '',   
+        delivery: '',
+        placeDelivery:'',
+        export:'',
+        warrantyPeriod:'',
+        paymentTerms: '',
+        saleDepartment:'',
+        packagingMethod:'', 
+        linkman:'',    
+        address:'', 
+        linkmanPhone:'',
+        salesman: '', 
+        FNumber:"",
+        BLNO: '',   
+        notes: '',   
+        sourceCode:'',
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 8}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 13}},
+        labelCol1: {xs: {span: 24}, sm: {span: 8}},
+        wrapperCol1: {xs: {span: 24}, sm: {span: 13}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      
+      //新增方法
+      function add() {
+        resetFields();
+        deliveryNoticeFormShipTable.dataSource = [];
+        deliveryDetailFormProductTable.dataSource = [];
+        activeKey.value = 'deliveryDetailFormProduct'
+        getOptiom()
+        getCustomerOptions()
+        formData.salesman=userStore.getUserInfo.username;
+        formData.saleDepartment = userStore.getUserInfo.orgCode
+        notAllowEdit.value = false
+      }
+      //编辑方法
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const deliveryNoticeFormShipDataList = await querysaleQuotationFormShipListByMainId(row['id']);
+        deliveryNoticeFormShipTable.dataSource = [...deliveryNoticeFormShipDataList];
+        const deliveryDetailFormProductDataList = await querySaleQuotationFormProductListByMainId(row['id']);
+        deliveryDetailFormProductTable.dataSource = [...deliveryDetailFormProductDataList];
+        getOptiom()
+        getCustomerOptions()
+        notAllowEdit.value=true
+      }
+      //获取主表
+      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, {
+        'saleQuotationShip': deliveryNoticeFormShipTableRef,
+        'saleQuotationProduct': deliveryDetailFormProductTableRef,
+      });
+      //获取表单信息
+      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() {
+        if(formData.sourceCode==''){
+          message.warning('请选择供应商报价单')
+        }else{
+          const mainData = await getFormData();
+          const subData = await getSubFormAndTableData();
+          const values = Object.assign({}, dbData, mainData, subData);
+          console.log('表单提交数据', values)
+          const isUpdate = values.id ? true : false
+          const isRevise = values.status=='1' ? true : false
+          await saveOrUpdate(values, isUpdate,isRevise);
+          //关闭弹窗
+          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;
+      }
+      //产品明细-删除行
+      async function handleDelete1(prop) {
+        var newArray = [...deliveryDetailFormProductTable.dataSource]
+        newArray.splice(prop.rowIndex, 1)
+        deliveryDetailFormProductTable.dataSource = newArray  
+        if( deliveryDetailFormProductTable.dataSource.length!==0){
+          var arr = []
+          deliveryDetailFormProductTable.dataSource.map(item=>{
+            if(item.sourceId){
+              arr.push(item.sourceId)
+            } 
+          })
+          if(arr.length==0){
+            formData.sourceCode=''
+            notAllowEdit.value=false
+          }
+        }else{
+           formData.sourceCode=''
+           notAllowEdit.value=false
+        }
+      }
+      //增行-产品明细
+      function addProduct(data){
+        data.map(item=>{
+          item.productClass = item.classId_dictText
+          item.productCode = item.code
+          // item.unit = item.measurementUnit
+          item.deliveryTime = formData.deliveryTime
+          item.productId = item.id
+        })
+        var arrProduct = data.concat(deliveryDetailFormProductTable.dataSource)
+        deliveryDetailFormProductTable.dataSource=arrProduct      
+      }
+      //选择项目
+      function addProject(data) {
+        if(data.length==0){
+          formData.quotationProject = 
+          formData.quotationProjectName = ''
+        }else{
+          formData.quotationProject = data[0].id
+          formData.quotationProjectName = data[0].name
+          formData.quotationCustomer =data[0].customerId
+          formData.quotationCustomerName =data[0].customerId_dictText
+          customerOption.value.map(item=>{
+            if(item.value==data[0].customerId){
+              formData.priority =item.priority
+            }
+          })
+        }
+      }
+      //获取客户列表
+      function getCustomerOptions(){
+          let params = {pageSize:'-1',status:1}
+          defHttp.get({url:'/cuspCode/cuspCustomerProfile/list',params}, { isTransformResponse: false }).then(res=>{
+            if(res){
+              customerOption.value = []
+              res.result.records.forEach(item=>{
+                customerOption.value.push({
+                  label: item.name,
+                  value: item.id,
+                  priority:item.priority,
+                  intermediatorCommission:item.intermediatorCommission
+                })
+              })
+            }
+          })
+      }
+      //查看配件信息
+      function viewAccessory(prop){
+        BaseShipArchiveAccessoriesListRef.value.getTable(prop.row)
+      }
+      //选择产品
+      function selectProducts(){
+        SelectPrpductModalRef.value.getTable()
+      }
+      //选择项目  
+      function onSearchProject(){
+        SelectProjectModalRef.value.getTable()
+      }
+      //获取产品分类下拉框
+      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 selectSaleOrderList(){
+        SelectSaleOrderModalRef.value.getTable(formData)
+      }
+      function addFormSaleOrder(data){
+      }
+
+      return {
+        deliveryNoticeFormShipTableRef,
+        deliveryNoticeFormShipTable,
+        deliveryDetailFormProductTableRef,
+        deliveryDetailFormProductTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        SelectShipSModalRef,
+        add,
+        edit,
+        formRef,
+        addProduct,
+        BaseShipArchiveAccessoriesListRef,
+        viewAccessory,
+        handleDelete1,
+        selectProducts,
+        SelectPrpductModalRef,
+        SelectProjectModalRef,
+        onSearchProject,
+        addProject,
+        getOptiom,
+        classOption,
+        getCustomerOptions,
+        customerOption,
+        notAllowEdit,
+        selectSaleOrderList,
+        SelectSaleOrderModalRef,
+        addFormSaleOrder
+      }
+    }
+  });
+</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>

+ 68 - 0
src/views/saleCode/deliveryNotice/components/deliveryNoticeFormModal.vue

@@ -0,0 +1,68 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
+    <deliveryNoticeForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></deliveryNoticeForm>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import deliveryNoticeForm from './deliveryNoticeForm.vue';
+
+  export default {
+    name: "deliveryNoticeFormModal",
+    components:{
+      BasicModal,
+      deliveryNoticeForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const isRevise = 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>

+ 125 - 0
src/views/saleCode/deliveryNotice/delivertNoticeForm.api.ts

@@ -0,0 +1,125 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/saleCode/saleQuotation/list',
+  save='/saleCode/saleQuotation/add',
+  edit='/saleCode/saleQuotation/edit',
+  deleteOne = '/saleCode/saleQuotation/delete',
+  deleteBatch = '/saleCode/saleQuotation/deleteBatch',
+  importExcel = '/saleCode/saleQuotation/importExcel',
+  exportXls = '/saleCode/saleQuotation/exportXls',
+  queryDataById = '/saleCode/saleQuotation/queryById',
+  saleQuotationFormShipList = '/saleCode/saleQuotation/querySaleQuotationShipByMainId',
+  saleQuotationFormProductList = '/saleCode/saleQuotation/querySaleQuotationProductByMainId',
+  submitBatch='/saleCode/saleQuotation/submitBatch',
+  cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
+  supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1'
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const querysaleQuotationFormShipListByMainId = (id) => defHttp.get({url: Api.saleQuotationFormShipList, params:{ id }});
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const querySaleQuotationFormProductListByMainId = (id) => defHttp.get({url: Api.saleQuotationFormProductList, 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();
+      });
+    }
+  });
+}
+
+//获取供应商列表
+export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});

+ 356 - 0
src/views/saleCode/deliveryNotice/delivertNoticeForm.data.ts

@@ -0,0 +1,356 @@
+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'
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '通知单号(bill code)',
+    align:"center",
+    dataIndex: 'billCode'
+   }, 
+   {
+    title: '合同编号(contract code)',
+    align:"center",
+    dataIndex: 'contractCode'
+   },  
+   {
+    title: '发货日期(delivert date)',
+    align:"center",
+    dataIndex: 'delivertDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+  
+   {
+    title: '项目(project)',
+    align:"center",
+    width:250,
+    dataIndex: 'projectName'
+   },
+   {
+    title: '客户(customer)',
+    align:"center",
+    width:250,
+    dataIndex: 'customerName'
+   },
+   {
+    title: '优先级(priority)',
+    align:"center",
+    dataIndex: 'priority_dictText'
+   },
+   {
+    title: '产品分类(production class)',
+    align:"center",
+    dataIndex: 'productionClass_dictText',
+    width:250,
+   },
+   {
+    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'
+   },
+   {
+    title: '清关资料(customs clearance documents)',
+    align:"center",
+    dataIndex: 'customsClearanceDocuments'
+   },
+   {
+    title: '证书/报告(certificate/report)',
+    align:"center",
+    dataIndex: 'file'
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit',
+   },
+   {
+    title: '关闭(close)',
+    align:"center",
+    dataIndex: 'close',
+   },
+];
+
+//子表表格配置
+export const deliveryNoticeShipColumns: 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 deliveryNoticeProductColumns: 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: '规格(specifications)',
+    //   key: 'specifications',
+    //   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,
+      dictCode: 'factory',
+    },
+    {
+      title: '质量等级(quality grade)',
+      key: 'qualityGrade',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '订单数量(order quantity)',
+      key: 'orderQuantity',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '订单金额(order money)',
+      key: 'orderMoney',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      defaultValue:'',  
+      width:"200px",
+    },
+    {
+      title: '已发货数量(delivery quantity)',
+      key: 'deliveryQuantity',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '数量(quantity)',
+      key: 'quantity',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
+    {
+      title: '金额(money)',
+      key: 'money',
+      type: JVxeTypes.inputNumber,
+      placeholder: '请输入${title}',
+      width:"200px",
+      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',},
+    }
+  },
+};

+ 390 - 0
src/views/saleCode/deliveryNotice/deliveryNoticeList.vue

@@ -0,0 +1,390 @@
+<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="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>
+            <a-col :lg="8">
+                <a-form-item name="bideliveryDatellDate">
+                  <template #label><span title="发货日期(delivery date)">发货日期(delivery date)</span></template>
+                  <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.deliveryDate" class="query-group-cust"/>
+                </a-form-item>
+            </a-col>           
+            <template v-if="toggleSearchStatus">
+              <a-col :lg="8">
+                <a-form-item name="project">
+                  <template #label><span title="项目(project)">项目(project)</span></template>
+                  <a-input placeholder="请输入项目(project)" v-model:value="queryParam.project" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="customer">
+                  <template #label><span title="客户(customer)">客户(customer)</span></template>
+                  <a-input placeholder="请输入客户(customer)" v-model:value="queryParam.customer" 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>
+                  <a-input placeholder="请输入销售部门(sale department)" v-model:value="queryParam.saleDepartment" allow-clear ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="salesman">
+                  <template #label><span title="业务员(salesman)">业务员(salesman)</span></template>
+                  <a-input placeholder="请输入业务员(salesman)" v-model:value="queryParam.salesman" allow-clear ></a-input>
+                </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"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+            <a-button  type="primary"   preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
+            <a-button  type="primary"  @click="submit"> 提交(submit)</a-button>
+            <a-button  type="primary"  @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+            <a-button  type="primary"  > 关闭(close)</a-button>
+            <a-button  type="primary" > 取消关闭(cancelClose)</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>
+                <a-button>批量操作
+                  <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>
+      <deliveryNoticeFormModal  @register="registerModal" @success="handleSuccess"></deliveryNoticeFormModal>
+      <!-- 表单区域 -->
+    </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 {columns} from './delivertNoticeForm.data';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './delivertNoticeForm.api';
+    import { defHttp } from '/@/utils/http/axios';
+    import { JDictSelectTag} from '/@/components/Form';
+    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import deliveryNoticeFormModal from './components/deliveryNoticeFormModal.vue';
+    import { message } from 'ant-design-vue';
+    const formRef = ref();
+    const queryParam = reactive<any>({});
+    const checkedKeys = ref<Array<string | number>>([]);
+    //注册model
+    const [registerModal, {openModal}] = useModal();
+    var classOption = ref([]);
+     //注册table数据
+    const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+        tableProps:{
+             title: '发货通知单',
+             api: list,
+             columns,
+             canResize:false,
+             useSearchForm: false,
+             actionColumn: {
+                 width: 340,
+                 fixed:'right'
+             },
+             scroll:{
+              x:'2700px'
+             },
+             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
+
+     // 自动请求并暴露内部方法
+     onMounted(() => {
+      getOptiom()
+    });
+  
+     /**
+      * 新增事件
+      */
+    function handleAdd() {
+       openModal(true, {
+         isUpdate: false,
+         showFooter: true,
+         isRevise: false
+       });
+    }
+     /**
+      * 编辑事件
+      */
+    function handleEdit(record: Recordable) {
+       openModal(true, {
+         record,
+         isUpdate: true,
+         showFooter: true,
+         isRevise: false
+       });
+     }
+     
+    //  产品分类
+    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,
+         isRevise: 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),
+             ifShow: record.submit=='0'
+           },
+           {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='1'
+           }, 
+         ]
+     }
+       /**
+          * 下拉操作栏
+          */
+    function getDropDownAction(record){
+         return [
+         
+           {
+             label: '删除(delete)',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+               placement: 'topLeft'
+             },
+             ifShow: record.status=='0',
+           }
+         ]
+     }
+    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>