采购付款申请-功能联调

src/views/purchase/purPaymentRequest/components/purPaymentRequestForm.vue

@@ -24,12 +24,14 @@
                   resultField="records"
                   labelField="name"
                   valueField="id"
+                  :params='{pageSize:-1}'
+                  @change="changeSupplier"
                 />
               </a-form-item>
             </a-col>
 						<a-col :span="12">
 							<a-form-item label="预计付款日期(expected payment date)" v-bind="validateInfos.expectedPaymentDate" id="purPaymnetRequest-expectedPaymentDate" name="expectedPaymentDate">
-                <a-date-picker placeholder="请选择预计付款日期(expected payment date"  v-model:value="formData.expectedPaymentDate"  value-format="YYYY-MM-DD"   style="width: 100%"  allow-clear />
+                <a-date-picker placeholder="请选择预计付款日期(expected payment date)"  v-model:value="formData.expectedPaymentDate"  value-format="YYYY-MM-DD"   style="width: 100%"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -63,8 +65,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="委托收款证明(entrusted certificate)" v-bind="validateInfos.attachs"  name="attachs" >
-                  <JUpload v-model:value="formData.attachs"></JUpload>
+							<a-form-item label="委托收款证明(entrusted certificate)" v-bind="validateInfos.collectionCertificate"  name="collectionCertificate" >
+                  <JUpload v-model:value="formData.collectionCertificate"></JUpload>
 							</a-form-item>
 						</a-col>
           </a-row>
@@ -95,6 +97,12 @@
                     <a>删除(delete)</a>
                   </a-popconfirm>
               </template>
+              <template #viewDetail="props">
+                    <a>查看(view)</a>
+              </template>
+              <template #invoice="props">
+                <JUpload v-model:value="props.row.invoice"></JUpload>
+              </template>
           </j-vxe-table>
       </a-tab-pane>
     </a-tabs>
@@ -170,7 +178,7 @@
         swiftCode: '',   
         currency: '',   
         notes:'',   
-        attachs:''      
+        collectionCertificate:''      
       });
 
       //表单验证
@@ -228,7 +236,7 @@
       }
 
       const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
-        'saleQuotationProduct': paymentDetailsTableRef,
+        'purPaymentRequestDetails': paymentDetailsTableRef,
       });
       //获取表单信息
       async function getFormData() {
@@ -248,11 +256,12 @@
       }
       //保存
       async function submitForm() {
-        if(formData.sourceCode==''){
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        if(!subData.purPaymentRequestDetailsList||subData.purPaymentRequestDetailsList.lenght==0){
           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
@@ -321,8 +330,20 @@
       function selectOrder(){
         SelectPurchaseOrderModalRef.value.getTableFromPurPayRequestForm()
       }
-      function addDetailList(){
-
+      function addDetailList(data){
+        data.map(item=>{
+          item.sourceId = item.childId
+          item.purchaseCode =  item.billCode
+          item.purchaseId =  item.id
+          item.orderMoney =  item.taxPrice
+        })
+        var arrSonFormDelivery = data.concat(paymentDetailsTable.dataSource)
+        paymentDetailsTable.dataSource=arrSonFormDelivery     
+      }
+      async function changeSupplier(value){
+        var param={id:value}
+        var result=await listSupplier(param)     
+        formData.supplierName =result.records[0].name
       }
       return {
         listSupplier,
@@ -350,7 +371,8 @@
         changeValues,
         SelectPurchaseOrderModalRef,
         selectOrder,
-        addDetailList
+        addDetailList,
+        changeSupplier
       }
     }
   });

src/views/purchase/purPaymentRequest/purPaymentRequest.data.ts

@@ -2,6 +2,7 @@ import {BasicColumn} from '/@/components/Table';
 import {FormSchema} from '/@/components/Table';
 import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
+import { uploadUrl } from '/@/api/common/api';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
@@ -70,8 +71,8 @@ export const paymentDetailColumns: JVxeColumn[] = [
     defaultValue:'',
   },    
   {
-    title: '销售订单(sale code)',
-    key: 'saleCode',
+    title: '采购订单(purchase code)',
+    key: 'purchaseCode',
     type: JVxeTypes.normal,
     placeholder: '请输入${title}',
     width:"200px",
@@ -86,24 +87,24 @@ export const paymentDetailColumns: JVxeColumn[] = [
     defaultValue:'',
   },
   {
-    title: '回款金额(collection amount)',
-    key: 'collectionAmount',
+    title: '入库金额(Inbound money)',
+    key: 'inboundAmount',
     type: JVxeTypes.normal,
     placeholder: '请输入${title}',
-    defaultValue:'',  
     width:"200px",
+    defaultValue:'',
   },
   {
-    title: '佣金率(commission rate)',
-    key: 'commissionRate',
+    title: '回款比例(collection rate)',
+    key: 'collectionRate',
     type: JVxeTypes.normal,
     placeholder: '请输入${title}',
     defaultValue:'',  
     width:"200px",
   },
   {
-    title: '返利金额(commission money)',
-    key: 'commissionMoney',
+    title: '已申请金额(applyed money)',
+    key: 'applyedMoney',
     type: JVxeTypes.normal,
     placeholder: '请输入${title}',
     width:"250px",
@@ -123,14 +124,35 @@ export const paymentDetailColumns: JVxeColumn[] = [
     placeholder: '请输入${title}',
     width:"200px",
     defaultValue:'',
+    type: JVxeTypes.upload,
+    token: true,
+    responseName: 'message',
+    action: uploadUrl,
+  },
+  {
+    title: '采购合同(sale contract)',
+    key: 'saleContract',
+    placeholder: '请输入${title}',
+    width:"200px",
+    defaultValue:'',
     type: JVxeTypes.slot,
     // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
-    slotName: 'invoice',
+    slotName: 'viewDetail',
+  },
+  {
+    title: '入库详情(inventory details)',
+    key: 'inventoryDetails',
+    placeholder: '请输入${title}',
+    width:"200px",
+    defaultValue:'',
+    type: JVxeTypes.slot,
+    // slot 的名称，对应 v-slot 冒号后面和等号前面的内容
+    slotName: 'viewDetail',
   },
   {
     title: '备注(notes)',
     key: 'notes',
-    type: JVxeTypes.normal,
+    type: JVxeTypes.input,
     placeholder: '请输入${title}',
     width:"200px",
     defaultValue:'',

src/views/purchase/purPaymentRequest/purPaymentRequestForm.api.ts

@@ -4,18 +4,18 @@ 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',
-  paymentDetailList = '/saleCode/saleQuotation/querySaleQuotationProductByMainId',
-  submitBatch='/saleCode/saleQuotation/submitBatch',
-  cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
-  supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1'
+  list = '/purCode/purPaymentRequest/list',
+  save='/purCode/purPaymentRequest/add',
+  edit='/purCode/purPaymentRequest/edit',
+  deleteOne = '/purCode/purPaymentRequest/delete',
+  deleteBatch = '/purCode/purPaymentRequest/deleteBatch',
+  importExcel = '/purCode/purPaymentRequest/importExcel',
+  exportXls = '/purCode/purPaymentRequest/exportXls',
+  queryDataById = '/purCode/purPaymentRequest/queryById',
+  paymentDetailList = '/purCode/purPaymentRequest/queryPurPaymentRequestDetailsByMainId',
+  submitBatch='/purCode/purPaymentRequest/submitBatch',
+  cancelSubmitBatch='/purCode/purPaymentRequest/returnSubmitBatch',
+  supplierList='/cuspCode/cuspSupplierProfile/list'
 }
 /**
  * 导出api

src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

@@ -18,9 +18,9 @@
             </a-col>          
             <template v-if="toggleSearchStatus">
               <a-col :lg="8">
-                <a-form-item name="supplier">
+                <a-form-item name="supplierName">
                   <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                  <a-input v-model:value="queryParam.supplier" placeholder="请输入" AutoComplete="off"/>
+                  <a-input v-model:value="queryParam.supplierName" placeholder="请输入" AutoComplete="off"/>
                 </a-form-item>
               </a-col>
               <a-col :lg="8">