1

src/views/platformBusiness/commissionOrder/components/commissionOrderFormForm.vue

@@ -217,6 +217,7 @@
         saleDepartmenName: '',
         notes: '',
         attachs: '',
+        commission: '',
         commissionContractCode: '',
         commissionContract: '',
       });

src/views/purchase/advanceCommission/PurAdvanceCommission.data.ts

@@ -5,20 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
+
   {
-    title: '审批(approve)(1-是,0-否)',
-    align: "center",
-    dataIndex: 'approve'
-  },
-  {
-    title: '提交(submit)1是0否',
-    align: "center",
-    dataIndex: 'submit'
-  },
-  {
-    title: '付款(payment)1是0否',
+    title: '预付款编号',
     align: "center",
-    dataIndex: 'payment'
+    dataIndex: 'billCode'
   },
   {
     title: '单据日期',
@@ -29,16 +20,6 @@ export const columns: BasicColumn[] = [
       return text;
     },
   },
-  {
-    title: '预付款编号',
-    align: "center",
-    dataIndex: 'billCode'
-  },
-  {
-    title: '返佣类型(commission type)',
-    align: "center",
-    dataIndex: 'commissionType_dictText'
-  },
   {
     title: '预计付款日期(Expected payment date)',
     align: "center",
@@ -49,39 +30,39 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '收款人(payee)',
+    title: '返佣类型(commission type)',
     align: "center",
-    dataIndex: 'payee'
+    dataIndex: 'commissionType_dictText'
   },
   {
-    title: '开户行(opening bank)',
+    title: '收款人(payee)',
     align: "center",
-    dataIndex: 'openingBank'
+    dataIndex: 'payee'
   },
   {
-    title: '银行帐号(bank account)',
+    title: '申请金额(approve money)',
     align: "center",
-    dataIndex: 'bankAccount'
+    dataIndex: 'approveMoney'
   },
   {
-    title: '银行代码(swift code)',
+    title: '币种(currency)',
     align: "center",
-    dataIndex: 'swiftCode'
+    dataIndex: 'currency'
   },
   {
-    title: '币种(currency)',
+    title: '审批(approve)',
     align: "center",
-    dataIndex: 'currency'
+    dataIndex: 'approve'
   },
   {
-    title: '备注(notes)',
+    title: '提交(submit)',
     align: "center",
-    dataIndex: 'notes'
+    dataIndex: 'submit'
   },
   {
-    title: '申请金额(approve money)',
+    title: '付款(payment)',
     align: "center",
-    dataIndex: 'approveMoney'
+    dataIndex: 'payment'
   },
 ];
 

src/views/purchase/advanceCommission/PurAdvanceCommissionList.vue

@@ -51,7 +51,7 @@
       <template #tableTitle>
         <a-button type="primary" v-auth="'purCode:pur_advance_commission:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" v-auth="'purCode:pur_advance_commission:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'purCode:pur_advance_commission:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <!-- <j-upload-button  type="primary" v-auth="'purCode:pur_advance_commission:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -66,7 +66,7 @@
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">

src/views/purchase/advanceCommission/components/PurAdvanceCommissionForm.vue

@@ -16,7 +16,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="返佣类型(commission type)" v-bind="validateInfos.commissionType" id="PurAdvanceCommissionForm-commissionType" name="commissionType">
-								<j-dict-select-tag v-model:value="formData.commissionType" dictCode="" placeholder="请选择返佣类型(commission type)"  allow-clear />
+								<j-dict-select-tag v-model:value="formData.commissionType" dictCode="commission_type" placeholder="请选择返佣类型(commission type)"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -46,7 +46,8 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="PurAdvanceCommissionForm-currency" name="currency">
-								<a-input v-model:value="formData.currency" placeholder="请输入币种(currency)"  allow-clear ></a-input>
+								<!-- <a-input v-model:value="formData.currency" placeholder="请输入币种(currency)"  allow-clear ></a-input> -->
+                <j-dict-select-tag v-model:value="formData.currency" dictCode="currency" placeholder="请输入币种(currency)"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -54,11 +55,7 @@
 								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
-							<a-form-item label="申请金额(approve money)" v-bind="validateInfos.approveMoney" id="PurAdvanceCommissionForm-approveMoney" name="approveMoney">
-								<a-input-number v-model:value="formData.approveMoney" placeholder="请输入申请金额(approve money)" style="width: 100%" />
-							</a-form-item>
-						</a-col>
+						
           </a-row>
         </a-form>
       </template>

src/views/purchase/advanceCommission/components/PurAdvanceCommissionModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <j-modal :title="title"  :visible="visible" @ok="handleOk" width="80%"  :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
     <PurAdvanceCommissionForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></PurAdvanceCommissionForm>
   </j-modal>
 </template>

src/views/purchase/advancePayment/PurAdvancePayment.data.ts

@@ -6,23 +6,15 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
+   
+  
    {
-    title: '审批(approve)(1-是,0-否)',
+    title: '单据编码(billCode)',
     align:"center",
-    dataIndex: 'approve_dictText'
-   },
-   {
-    title: '提交(submit)1是0否',
-    align:"center",
-    dataIndex: 'submit_dictText'
-   },
-   {
-    title: '付款(payment)1是0否',
-    align:"center",
-    dataIndex: 'payment_dictText'
+    dataIndex: 'billCode'
    },
    {
-    title: '单据日期',
+    title: '单据日期(billDate)',
     align:"center",
     dataIndex: 'billDate',
     customRender:({text}) =>{
@@ -30,16 +22,6 @@ export const columns: BasicColumn[] = [
       return text;
     },
    },
-   {
-    title: '单据编码',
-    align:"center",
-    dataIndex: 'billCode'
-   },
-   {
-    title: '供应商(supplier)',
-    align:"center",
-    dataIndex: 'supplierName'
-   },
    {
     title: '预计付款日期(Expected payment date)',
     align:"center",
@@ -50,55 +32,45 @@ export const columns: BasicColumn[] = [
     },
    },
    {
-    title: '收款人(payee)',
-    align:"center",
-    dataIndex: 'payee'
-   },
-   {
-    title: '开户行(opening bank)',
+    title: '供应商(supplier)',
     align:"center",
-    dataIndex: 'openingBank'
+    dataIndex: 'supplierName'
    },
    {
-    title: '银行帐号(bank account)',
+    title: '币种(currency)',
     align:"center",
-    dataIndex: 'bankAccount'
+    dataIndex: 'currency_dictText'
    },
    {
-    title: '银行代码(swift code)',
+    title: '申请金额(approve money)',
     align:"center",
-    dataIndex: 'swiftCode'
+    dataIndex: 'approveMoney'
    },
    {
-    title: '币种(currency)',
+    title: '预付款比例(prepayment ratio)',
     align:"center",
-    dataIndex: 'currency_dictText'
+    dataIndex: 'prepaymentRatio'
    },
    {
-    title: '委托收款证明(Entrusted Collection Certificate)',
+    title: '审批(approve)',
     align:"center",
-    dataIndex: 'collectionCertificate'
+    dataIndex: 'approve_dictText'
    },
    {
-    title: '备注(notes)',
+    title: '提交(submit)',
     align:"center",
-    dataIndex: 'notes'
+    dataIndex: 'submit_dictText'
    },
    {
-    title: '申请金额(approve money)',
+    title: '付款(payment)',
     align:"center",
-    dataIndex: 'approveMoney'
+    dataIndex: 'payment_dictText'
    },
    {
-    title: '来源',
+    title: '来源(sourceCode)',
     align:"center",
     dataIndex: 'sourceCode'
    },
-   {
-    title: '预付款比例',
-    align:"center",
-    dataIndex: 'prepaymentRatio'
-   },
 ];
 
 //子表表格配置

src/views/purchase/advancePayment/PurAdvancePaymentList.vue

@@ -5,46 +5,48 @@
       <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item name="approve">
-              <template #label><span title="审批(approve)(1-是,0-否)">审批(a</span></template>
-              <a-input placeholder="请输入审批(approve)(1-是,0-否)" v-model:value="queryParam.approve" allow-clear ></a-input>
+            <a-form-item name="billDate">
+              <template #label><span title="单据日期">单据日期</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="6">
-            <a-form-item name="submit">
-              <template #label><span title="提交(submit)1是0否">提交(s</span></template>
-              <a-input placeholder="请输入提交(submit)1是0否" v-model:value="queryParam.submit" allow-clear ></a-input>
+            <a-form-item name="billCode">
+              <template #label><span title="单据编码">单据编码</span></template>
+              
+              <a-input placeholder="单据编码" v-model:value="queryParam.billCode" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="supplierName">
+              <template #label><span title="供应商(supplier)">供应商(</span></template>
+              <a-input placeholder="供应商" v-model:value="queryParam.supplierName" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
+            
             <a-col :lg="6">
-              <a-form-item name="payment">
-                <template #label><span title="付款(payment)1是0否">付款(p</span></template>
-                <a-input placeholder="请输入付款(payment)1是0否" v-model:value="queryParam.payment" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="billDate">
-                <template #label><span title="单据日期">单据日期</span></template>
-                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.billDate" class="query-group-cust"/>
+              <a-form-item name="expectedPaymentDate">
+                <template #label><span title="预计付款日期(Expected payment date)">预计付款</span></template>
+                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.expectedPaymentDate" class="query-group-cust"/>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="billCode">
-                <template #label><span title="单据编码">单据编码</span></template>
-                <JRangeNumber v-model:value="queryParam.billCode" class="query-group-cust"></JRangeNumber>
+              <a-form-item name="approve">
+                <template #label><span title="审批(approve)(1-是,0-否)">审批(a</span></template>
+                <a-input placeholder="请输入审批(approve)(1-是,0-否)" v-model:value="queryParam.approve" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="supplierName">
-                <template #label><span title="供应商(supplier)">供应商(</span></template>
-                <JRangeNumber v-model:value="queryParam.supplierName" class="query-group-cust"></JRangeNumber>
+              <a-form-item name="payment">
+                <template #label><span title="付款(payment)1是0否">付款(p</span></template>
+                <a-input placeholder="请输入付款(payment)1是0否" v-model:value="queryParam.payment" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="expectedPaymentDate">
-                <template #label><span title="预计付款日期(Expected payment date)">预计付款</span></template>
-                <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParam.expectedPaymentDate" class="query-group-cust"/>
+              <a-form-item name="submit">
+                <template #label><span title="提交(submit)1是0否">提交(s</span></template>
+                <a-input placeholder="请输入提交(submit)1是0否" v-model:value="queryParam.submit" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
@@ -75,7 +77,6 @@
       <template #tableTitle>
           <a-button type="primary" v-auth="'purCode:pur_advance_payment:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
           <a-button  type="primary" v-auth="'purCode:pur_advance_payment:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" v-auth="'purCode:pur_advance_payment:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -90,7 +91,7 @@
               </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+       
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -317,4 +318,4 @@
       width: 100%;
     }
   }
-</style>
+</style>

src/views/purchase/advancePayment/components/PurAdvancePaymentModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="896" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title"  width="95%"  @ok="handleSubmit">
     <pur-advance-payment-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></pur-advance-payment-form>
   </BasicModal>
 </template>
@@ -64,4 +64,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>