Prechádzať zdrojové kódy

付款单-页面第一版(配置菜单)

jingbb 4 mesiacov pred
rodič
commit
ad0cf78069

+ 277 - 0
src/views/purchase/payment/components/paymentForm.vue

@@ -0,0 +1,277 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="saleInvoiceForm" ref="formRef">
+          <a-row>
+            <a-col :span="12">
+							<a-form-item label="付款单编号(bill code)" v-bind="validateInfos.billCode" id="saleInvoiceForm-billCode" name="billCode" >
+								<a-input v-model:value="formData.billCode" placeholder="自动生成" disabled></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="付款日期(bill date)" v-bind="validateInfos.billDate" id="saleInvoiceForm-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="付款类型(pay type)" v-bind="validateInfos.payType" id="saleInvoiceForm-payType" name="payType" >
+                <JDictSelectTag v-model:value="formData.payType" placeholder="请选择" dictCode="pay_type" style="width: 100%;"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="申请单(apply bill)" v-bind="validateInfos.applyBill" id="saleInvoiceForm-applyBill" name="applyBill" >
+                <JSelectInput   v-model:value="formData.applyBill"  placeholder="请选择" :options="payeeOption" style="width: 50%;margin-right: 1%;"></JSelectInput>
+                 <a-button type="primary" style="width: 35%;" > 查看详情(view detail)</a-button>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="销方(seller)" v-bind="validateInfos.seller" id="saleInvoiceForm-seller" name="seller">
+                <a-input v-model:value="formData.seller" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="saleInvoiceForm-currency" name="currency">
+                <a-input v-model:value="formData.currency" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>	
+            <a-col :span="12">
+							<a-form-item label="开户行(opening bank)" v-bind="validateInfos.openingBank" id="saleInvoiceForm-openingBank" name="openingBank">
+                <a-input v-model:value="formData.openingBank" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="银行账号(bank account)" v-bind="validateInfos.bankAccount" id="saleInvoiceForm-bankAccount" name="bankAccount">
+                <a-input v-model:value="formData.bankAccount" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="银行代码(swiftCode)" v-bind="validateInfos.swiftCode" id="saleInvoiceForm-swiftCode" name="swiftCode">
+                <a-input v-model:value="formData.swiftCode" placeholder="请输入"  allow-clear disabled></a-input>
+							</a-form-item>
+						</a-col>				
+            <a-col :span="12">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.quotationNotes" id="saleInvoiceForm-notes" name="notes" >
+								<a-input v-model:value="formData.notes" placeholder="请输入"  allow-clear AutoComplete="off"></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="申请资金(apply money)" v-bind="validateInfos.applyMoney" id="saleInvoiceForm-applyMoney" name="applyMoney" >
+								<a-input v-model:value="formData.applyMoney" placeholder="请输入"  allow-clear AutoComplete="off" disabled></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="付款资金(payment)" v-bind="validateInfos.payment" id="saleInvoiceForm-payment" name="payment" >
+								<a-input v-model:value="formData.payment" placeholder="请输入"  allow-clear AutoComplete="off" ></a-input>
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="预付款比例(prepayment ratio)" v-bind="validateInfos.prepaymentRatio" id="saleInvoiceForm-prepaymentRatio" name="prepaymentRatio" >
+								<a-input v-model:value="formData.prepaymentRatio" placeholder="请输入"  allow-clear AutoComplete="off" disabled></a-input>
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import {queryDataById, saveOrUpdate } from '../paymentForm.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  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,message } from 'ant-design-vue';
+  import moment from 'moment';
+  const useForm = Form.useForm;
+  export default defineComponent({
+    name: "paymentForm",
+    components:{
+      JVxeTable,
+			JFormContainer,
+      JUpload,
+      JDictSelectTag,
+      JSelectInput,
+    },
+    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();
+      var payeeOption =ref([]);
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        status: undefined,
+        delFlag: undefined,
+        billDate: moment(new Date()).format('YYYY-MM-DD'),   
+        billCode: '',   
+        commission: '',   
+        payee: '',   
+        expectedPaymentDate: '',   
+        currency: '',   
+        openingBank: '',   
+        bankAccount: '',   
+        invoice: '',   
+        notes: '',   
+        swiftCode:''        
+      });
+
+      //表单验证
+      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();
+        getPayeeOptions()
+      }
+      //编辑方法
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        getPayeeOptions()
+      }
+      //获取主表
+      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);
+      }
+      //获取表单信息
+      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 values = Object.assign({}, dbData, mainData);
+          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;
+      }
+      //获取收款人列表
+      function getPayeeOptions(){
+          let params = {pageSize:'-1',status:1}
+          defHttp.get({url:'/cuspCode/cuspIntermediator/list',params}, { isTransformResponse: false }).then(res=>{
+            if(res){
+              payeeOption.value = []
+              res.result.records.forEach(item=>{
+                payeeOption.value.push({
+                  label: item.name,
+                  value: item.id,
+                })
+              })
+            }
+          })
+      }
+      return {
+        validatorRules,
+        validateInfos,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+        payeeOption,
+      }
+    }
+  });
+</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/purchase/payment/components/paymentFormModal.vue

@@ -0,0 +1,68 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
+    <paymentForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></paymentForm>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import paymentForm from './paymentForm.vue';
+
+  export default {
+    name: "paymentFormModal",
+    components:{
+      BasicModal,
+      paymentForm
+    },
+    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>

+ 142 - 0
src/views/purchase/payment/components/viewDeatilModal.vue

@@ -0,0 +1,142 @@
+<template>
+    <a-modal
+      title="佣金详情(commission details)"
+      width="95%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @cancel="handleCancel">
+       <!--页脚-->
+       <template #footer>
+            <a-button @click="handleCancel">关闭</a-button>
+        </template>
+        <div>
+          <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+            <div class="table-page-search-wrapper">
+                <a-form :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol" >
+                <a-row :gutter="24">
+                    <a-col :md="12" :sm="12">
+                        <a-form-item label="收款人(payee)">
+                            <a-input placeholder="请输入" v-model:value="formData.payee" disabled></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="12" :sm="12">
+                        <a-form-item label="充值余额(recharge balance)">
+                            <a-input placeholder="请输入" v-model:value="formData.rechargeBalance" disabled></a-input>
+                        </a-form-item>
+                    </a-col>
+                    
+                </a-row>
+            </a-form>
+           </div>
+        </a-card>
+
+        <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+           <!-- 子表单区域 -->
+            <a-tabs v-model:activeKey="activeKey" animated >
+              <a-tab-pane tab="付款明细(payment details)" key="paymentDetails" :forceRender="true">
+                <j-vxe-table
+                  :keep-source="true"
+                  resizable
+                  ref="paymentDetailsTableRef"
+                  :loading="paymentDetailsTable.loading"
+                  :columns="paymentDetailsTable.columns"
+                  :dataSource="paymentDetailsTable.dataSource"
+                  :height="340"
+                  :rowNumber="true"
+                  :rowSelection="true"
+                  asyncRemove
+                  >
+                  </j-vxe-table>
+              </a-tab-pane>
+              <a-tab-pane tab="返佣明细(commission details)" key="commissionDetails" :forceRender="true">
+                <j-vxe-table
+                  :keep-source="true"
+                  resizable
+                  ref="commissionDetailsTableRef"
+                  :loading="commissionDetailsTable.loading"
+                  :columns="commissionDetailsTable.columns"
+                  :dataSource="commissionDetailsTable.dataSource"
+                  :height="340"
+                  :rowNumber="true"
+                  :rowSelection="true"
+                  >
+                  </j-vxe-table>
+              </a-tab-pane>
+            
+            </a-tabs>
+        </a-card>
+      </div>
+    </a-modal>
+</template>
+<script lang="ts" setup>
+    import {ref ,reactive} from 'vue';
+    import { defHttp } from '/@/utils/http/axios';
+    import { message } from 'ant-design-vue';
+    import { filterObj } from '/@/utils/common/compUtils'
+    import {paymentDetailsColumns,commissionDetailsColumns} from '../commissionAdvancePayForm.data';
+    
+    var visible = ref(false)
+    const labelCol = ref({
+    xs: { span: 24 },
+    sm: { span: 5 },
+    });
+    const wrapperCol = ref({
+        xs: { span: 24 },
+        sm: { span: 15 },
+    });
+    const formData = ref({
+        payee:'',
+        rechargeBalance:'',
+    });
+    const paymentDetailsTableRef = ref();
+    const paymentDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: paymentDetailsColumns,
+        dataSource: []
+    });
+    const commissionDetailsTableRef = ref();
+    const commissionDetailsTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: commissionDetailsColumns,
+        dataSource: []
+    });
+    const activeKey = ref('paymentDetails');
+    function loadData(){
+        // let params = getQueryParams();
+        // defHttp
+        // .get({ url: '/purCode/purInquiryForm/alertPurInquiryList',params}, { isTransformResponse: false })
+        // .then((res) => {
+        //     if (res.success) {
+        //         dataSource.value = res.result.records;
+        //         pagination.value.total = res.result.total;
+        //         pagination.value.current = res.result.current;
+        //         pagination.value.pageSize = res.result.size;                
+        //     } else {
+        //         message.error(res.message);
+        //     }
+        // })
+        // .finally(() => {
+        //     // loading.value = false;
+        // });
+    }
+    function handleCancel(){
+      visible.value = false
+      
+    }
+    function getDetail(){
+      visible.value = true
+    }
+    defineExpose({
+      getDetail
+    });
+</script>
+<style scoped lang="less">
+/deep/.ant-form-item{
+    margin-bottom: 8px !important;
+}
+// /deep/.ant-table-wrapper .ant-table-thead > tr > th, .ant-table-wrapper .ant-table-thead > tr > td{
+//     padding: 8px !important;
+// }
+
+</style>

+ 108 - 0
src/views/purchase/payment/paymentForm.api.ts

@@ -0,0 +1,108 @@
+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',
+  submitBatch='/saleCode/saleQuotation/submitBatch',
+  cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+
+
+/**
+ * 列表接口
+ * @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();
+      });
+    }
+  });
+}

+ 161 - 0
src/views/purchase/payment/paymentForm.data.ts

@@ -0,0 +1,161 @@
+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',
+    ellipsis:true
+   },  
+   {
+    title: '付款日期(bill date)',
+    align:"center",
+    dataIndex: 'billDate',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+  
+   {
+    title: '销方(seller)',
+    align:"center",
+    ellipsis:true,
+    width:250,
+    dataIndex: 'sellerName'
+   },
+   {
+    title: '申请金额(apply money)',
+    align:"center",
+    ellipsis:true,
+    width:200,
+    dataIndex: 'applyMoney'
+   },
+   {
+    title: '币种(currrncy)',
+    align:"center",
+    ellipsis:true,
+    dataIndex: 'currrncy'
+   },
+   {
+    title: '付款金额(payment)',
+    align:"center",
+    dataIndex: 'payment',
+    ellipsis:true,
+    width:250,
+
+   },
+   {
+    title: '提交(submit)',
+    align:"center",
+    dataIndex: 'submit_dictText',
+   },
+];
+
+export const paymentDetailsColumns: JVxeColumn[] = [
+  {
+    title: '付款申请号(billCode)',
+    key: 'billCode',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '申请日期(bill date)',
+    key: 'billDate',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '申请金额(approve money)',
+    key: 'approveMoney',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '币种(currency)',
+    key: 'currency',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '付款编号(billCode)',
+    key: 'billCode',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '付款日期(billDate)',
+    key: 'billDate',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '付款金额(payment)',
+    key: 'payment',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '币种(currency)',
+    key: 'currency',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+]
+
+export const commissionDetailsColumns: JVxeColumn[] = [
+  {
+    title: '订单编号(billCode)',
+    key: 'billCode',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '单据日期(bill date)',
+    key: 'billDate',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '订单金额(order money)',
+    key: 'orderMoney',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '收款金额(collected money)',
+    key: 'collectedMoney',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '佣金率(commission rate)',
+    key: 'commissionRate',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+  {
+    title: '佣金(commission)',
+    key: 'commission',
+    type: JVxeTypes.normal,
+    placeholder: '请输入${title}',
+    defaultValue:'',
+  },
+]

+ 315 - 0
src/views/purchase/payment/paymentList.vue

@@ -0,0 +1,315 @@
+<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 AutoComplete="off"></a-input>
+                </a-form-item>
+            </a-col>          
+            <template v-if="toggleSearchStatus">
+              <a-col :lg="8">
+                <a-form-item name="commission">
+                  <template #label><span title="付款类型(pay type)">付款类型(pay type)</span></template>
+                  <JDictSelectTag v-model:value="queryParam.payType" placeholder="请选择" dictCode="pay_type" style="width: 100%;"/>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="8">
+                <a-form-item name="seller">
+                  <template #label><span title="销方(seller)">销方(seller)</span></template>
+                  <a-input placeholder="请输入" v-model:value="queryParam.sellerName" allow-clear AutoComplete="off"></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" style="width: 100%;"/>
+                </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_order:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+            <a-button  type="primary" v-auth="'saleCode:sale_order:exportXls'"  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-dropdown v-if="selectedRowKeys.length > 0">
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item key="1" @click="batchHandleDelete"  v-auth="'saleCode:sale_order_form:deleteBatch'">
+                      <Icon icon="ant-design:delete-outlined"></Icon>
+                      删除(delete)
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+                <a-button v-auth="'saleCode:sale_order:delete'">批量操作
+                  <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>
+      <!-- 表单区域 -->
+      <paymentFormModal  @register="registerModal" @success="handleSuccess"></paymentFormModal>
+    </div>
+  </template>
+  
+  <script lang="ts" name="saleCode-saleInquiryForm" setup>
+    import {ref, reactive} from 'vue';
+    import {BasicTable, useTable, TableAction} from '/@/components/Table';
+    import { useListPage } from '/@/hooks/system/useListPage'
+    import {useModal} from '/@/components/Modal';
+    import {columns,} from './paymentForm.data';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './paymentForm.api';
+    import { cloneDeep } from "lodash-es";
+    import { defHttp } from '/@/utils/http/axios';
+    import { JDictSelectTag} from '/@/components/Form';
+    import paymentFormModal from './components/paymentFormModal.vue';
+    import { message } from 'ant-design-vue';
+    const formRef = ref();
+    const queryParam = reactive<any>({});
+    //注册model
+    const [registerModal, {openModal}] = useModal();
+     //注册table数据
+    const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+        tableProps:{
+             title: '付款单',
+             api: list,
+             columns,
+             canResize:false,
+             useSearchForm: false,
+             actionColumn: {
+                 width: 200,
+                 fixed:'right'
+             },
+             scroll:{
+              x:'2200px'
+             },
+             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
+
+  
+     /**
+      * 新增事件
+      */
+    function handleAdd() {
+       openModal(true, {
+         isUpdate: false,
+         showFooter: true,
+         isRevise: false
+       });
+    }
+     /**
+      * 编辑事件
+      */
+    function handleEdit(record: Recordable) {
+       openModal(true, {
+         record,
+         isUpdate: true,
+         showFooter: true,
+         isRevise: 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_order:edit',
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='1'
+           }, 
+         ]
+     }
+       /**
+          * 下拉操作栏
+          */
+    function getDropDownAction(record){
+         return [
+            {
+             label: '详情(detail)',
+             onClick: handleDetail.bind(null, record),
+             ifShow: record.submit=='0'||!record.submit
+           },
+           {
+             label: '删除(delete)',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+               placement: 'topLeft'
+             },
+             auth: 'saleCode:sale_order:delete',
+             ifShow: record.submit=='0'||!record.submit
+           }
+         ]
+     }
+    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,
+    });
+    /**
+     * 重置
+     */
+    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>