采购付款申请-页面

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

@@ -5,7 +5,7 @@
         <a-form v-bind="formItemLayout" name="purPaymnetRequest" ref="formRef">
           <a-row>
             <a-col :span="12">
-							<a-form-item label="申请单编号(bill code)" v-bind="validateInfos.billCode" id="purPaymnetRequest-billCode" name="billCode" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="申请单编号(bill code)" v-bind="validateInfos.billCode" id="purPaymnetRequest-billCode" name="billCode">
 								<a-input v-model:value="formData.billCode" placeholder="自动生成" disabled></a-input>
 							</a-form-item>
 						</a-col>
@@ -58,12 +58,12 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="purPaymnetRequest-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="purPaymnetRequest-notes" name="notes">
 								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="委托收款证明(entrusted collection certificate)" v-bind="validateInfos.attachs"  name="attachs" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="委托收款证明(entrusted certificate)" v-bind="validateInfos.attachs"  name="attachs" >
                   <JUpload v-model:value="formData.attachs"></JUpload>
 							</a-form-item>
 						</a-col>
@@ -99,7 +99,7 @@
       </a-tab-pane>
     </a-tabs>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
-    <SelectPurchaseOrderModal ref="SelectPurchaseOrderModalRef" ></SelectPurchaseOrderModal>
+    <SelectPurchaseOrderModal ref="SelectPurchaseOrderModalRef" @selectPurchaseOrder="addDetailList"></SelectPurchaseOrderModal>
   </a-spin>
 </template>
 
@@ -114,6 +114,7 @@
   import SelectPurchaseOrderModal from '../../../publicComponents/SelectPurchaseOrderModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { ApiSelect } from '/@/components/Form';
   import { JDictSelectTag} from '/@/components/Form';
   import { Form,message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
@@ -128,7 +129,8 @@
       JUpload,
       SelectProjectModal,
       JDictSelectTag,
-      SelectPurchaseOrderModal
+      SelectPurchaseOrderModal,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -318,6 +320,9 @@
       }
       function selectOrder(){
         SelectPurchaseOrderModalRef.value.getTableFromPurPayRequestForm()
+      }
+      function addDetailList(){
+
       }
       return {
         listSupplier,
@@ -344,7 +349,8 @@
         notAllowEdit,
         changeValues,
         SelectPurchaseOrderModalRef,
-        selectOrder
+        selectOrder,
+        addDetailList
       }
     }
   });

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

@@ -1,19 +1,19 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
-    <saleInvoiceForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></saleInvoiceForm>
+    <purPaymentRequestForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></purPaymentRequestForm>
   </BasicModal>
 </template>
 
 <script lang="ts">
   import { ref, unref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import saleInvoiceForm from './saleInvoiceForm.vue';
+  import purPaymentRequestForm from './purPaymentRequestForm.vue';
 
   export default {
     name: "purPaymentRequestFormModal",
     components:{
       BasicModal,
-      saleInvoiceForm
+      purPaymentRequestForm
     },
     emits:['register','success'],
     setup(_p, {emit}){

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

@@ -21,11 +21,13 @@ export const columns: BasicColumn[] = [
     title: '预计付款日期(expected payment date)',
     align:"center",
     dataIndex: 'expectedPaymentDate',
+    width:300,
     ellipsis:true
    },  
    {
     title: '供应商(supplier)',
     align:"center",
+    width:200,
     ellipsis:true,
     dataIndex: 'supplierName'
    },
@@ -104,7 +106,7 @@ export const paymentDetailColumns: JVxeColumn[] = [
     key: 'commissionMoney',
     type: JVxeTypes.normal,
     placeholder: '请输入${title}',
-    width:"200px",
+    width:"250px",
     defaultValue:'',
   },
   {
@@ -112,7 +114,7 @@ export const paymentDetailColumns: JVxeColumn[] = [
     key: 'applyMoney',
     type: JVxeTypes.inputNumber,
     placeholder: '请输入${title}',
-    width:"200px",
+    width:"250px",
     defaultValue:'',
   },
   {