运费采购订单

src/views/purchase/freightPurchaseOrder/FreightPurOrder.api.ts

@@ -14,7 +14,7 @@ enum Api {
   exportXls = '/purCode/purShippingFee/exportXls',
   queryDataById = '/purCode/purShippingFee/queryById',
   DeliveryNoticeList = '/purCode/purShippingFee/queryPurShippingFeeNoticeByMainId',
-  FreightProDetails = 'purCode/purDeliveryNote/queryPurDeliveryNoteArrivalByMainId',
+  FreightProDetails = '/purCode/purShippingFee/queryPurShippingFeeProdeuctByMainId',
   submitBatch='/purCode/purShippingFee/submitBatch',
   cancelSubmitBatch='/purCode/purShippingFee/returnSubmitBatch',
   closeBatch='/purCode/purShippingFee/submitClose',

src/views/purchase/freightPurchaseOrder/FreightPurOrderForm.data.ts

@@ -24,7 +24,7 @@ export const columns: BasicColumn[] = [
    {
     title: '币种(cerrency)',
     align:"center",
-    dataIndex: 'cerrency'
+    dataIndex: 'currency_dictText'
    },
    {
     title: '供应商(supplier)',
@@ -36,13 +36,28 @@ export const columns: BasicColumn[] = [
       align:"center",
       dataIndex: 'notes',
     },
+    {
+      title: '提交(submit)',
+      align:"center",
+      dataIndex: 'submit_dictText',
+    },
+    {
+      title: '关闭(close)',
+      align:"center",
+      dataIndex: 'close_dictText',
+    },
+    {
+      title: '确认(confirm)',
+      align:"center",
+      dataIndex: 'status_dictText',
+    },
 ];
 
 //子表表格配置
 export const ShippingNoticeColumns: JVxeColumn[] = [
     {
       title: '通知单号(bill code)',
-      key: 'billcode',
+      key: 'billCode',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -56,14 +71,14 @@ export const ShippingNoticeColumns: JVxeColumn[] = [
     },
     {
       title: '项目(project)',
-      key: 'project',
+      key: 'projectName',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
       defaultValue:'',
     },
     {
       title: '客户(customer)',
-      key: 'customer',
+      key: 'customerName',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -88,7 +103,6 @@ export const FreightProDetailsColumns: JVxeColumn[] = [
       key: 'productClass',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
-      width:"200px",
       defaultValue:'',
     },
     {
@@ -96,7 +110,6 @@ export const FreightProDetailsColumns: JVxeColumn[] = [
       key: 'productCode',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
-      width:"200px",
       defaultValue:'',
     },
     {
@@ -104,7 +117,6 @@ export const FreightProDetailsColumns: JVxeColumn[] = [
       key: 'chineseName',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
-      width:"200px",
       defaultValue:'',
     },
     {
@@ -112,7 +124,6 @@ export const FreightProDetailsColumns: JVxeColumn[] = [
       key: 'englishName',
       type: JVxeTypes.normal,
       placeholder: '请输入${title}',
-      width:"200px",
       defaultValue:'',
     },
     {
@@ -121,12 +132,11 @@ export const FreightProDetailsColumns: JVxeColumn[] = [
       type: JVxeTypes.input,
       placeholder: '请输入${title}',
       defaultValue:'',  
-      width:"200px",
     },
     {
       title: '操作(operation)',
       key: 'action',
-      width:"200px",
+      width:"300px",
       // 固定在右侧
       fixed: 'right',
       // 对齐方式为居中

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

@@ -11,7 +11,7 @@
               </a-form-item>
           </a-col>
           <a-col :lg="8">
-              <a-form-item name="arrivalDate">
+              <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>
@@ -19,7 +19,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
               <a-form-item name="currency">
-                <template #label><span title="币种(currency)">提交(currency)</span></template>
+                <template #label><span title="币种(currency)">币种(currency)</span></template>
                 <JDictSelectTag v-model:value="queryParam.currency" placeholder="请选择" dictCode="currency"/>
               </a-form-item>
             </a-col>
@@ -57,8 +57,8 @@
    <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small" >
      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary"  @click="handleAdd" preIcon="ant-design:plus-outlined" v-auth="'purCode:pur_delivery_note:add'"> 新增(add)</a-button>
-          <a-button  type="primary"   preIcon="ant-design:export-outlined" @click="onExportXls" v-auth="'purCode:pur_delivery_note:exportXls'"> 导出(export)</a-button>
+          <a-button type="primary"  @click="handleAdd" preIcon="ant-design:plus-outlined" v-auth="'purCode:pur_shipping_fee:add'"> 新增(add)</a-button>
+          <a-button  type="primary"   preIcon="ant-design:export-outlined" @click="onExportXls" v-auth="'purCode:pur_shipping_fee:exportXls'"> 导出(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"  @click="close" > 关闭(close)</a-button>
@@ -123,7 +123,7 @@
                fixed:'right'
            },
            scroll:{
-            x:'3000px'
+            x:'1500px'
            },
            beforeFetch: async (params) => {
              let rangerQuery = await setRangeQuery();
@@ -233,7 +233,7 @@
         {
            label: '编辑(edit)',
            onClick: handleEdit.bind(null, record),
-           auth: 'purCode:pur_inquiry_form:edit',
+           auth: 'purCode:pur_shipping_fee:edit',
            ifShow: record.submit=='0'|| record.submit==''
          },
          {
@@ -260,7 +260,7 @@
              confirm: handleDelete.bind(null, record),
              placement: 'topLeft'
            },
-           auth: 'purCode:pur_delivery_note:delete',
+           auth: 'purCode:pur_shipping_fee:delete',
            ifShow: record.submit=='0'|| record.submit=='',
            
          }
@@ -326,19 +326,10 @@
     xs: 24,
     sm: 16,
   });
-  const labelCol1 = reactive({
-    xs:24,
-    sm:10,
-  });
-  const wrapperCol1 = reactive({
-    xs: 24,
-    sm: 14,
-  });
   /**
    * 重置
    */
   function searchReset() {
-    debugger
     formRef.value.resetFields();
     queryParam.supplier = '';
     selectedRowKeys.value = [];

src/views/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -10,7 +10,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="单据日期(arrival date)" v-bind="validateInfos.billDate" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-billDate" name="billDate">
+							<a-form-item label="单据日期(arrival date)" v-bind="validateInfos.billDate" id="SaleOrderForm-billDate" name="billDate">
 								<a-date-picker placeholder="请选择单据日期(arrival date)"  v-model:value="formData.billDate"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
 							</a-form-item>
 						</a-col>	
@@ -20,12 +20,10 @@
 							</a-form-item>
 						</a-col>	
 						<a-col :span="12">
-							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplierName" name="supplierName">
-                <JSelectInput   v-model:value="formData.inquirySuppiler"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
+							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierName"  id="SaleOrderForm-supplierName" name="supplierName">
+                <JSelectInput   v-model:value="formData.supplier"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
-						</a-col>
             <a-col :span="12">
 							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
 								<a-input v-model:value="formData.notes"></a-input>
@@ -71,7 +69,6 @@
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
-          asyncRemove
           >
             <template #action="props">
               <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
@@ -138,30 +135,12 @@
         id: '',
         status: undefined,
         delFlag: undefined,
-        sourceCode:'',
-        submit:'',
         billCode:'',
         billDate: moment(new Date()).format('YYYY-MM-DD'),   
-        project: '', 
-        projectName:'',  
         supplier:"",
         supplierName:'',
-        priority: '',   
-        productionClass: '',   
-        model: '',   
-        maker: '',
-        delivery:'',
-        waybillNumber:'',
-        packagebRequirement:'',
-        recipient:'',
-        recipientTel:'',
-        recipientAddress:'',
-        warrantyTerms:'',
-        purchaseDepartment:'',
-        purchaseman:'',
-        invoiceDate:'',
+        currency:'',
         notes:'',
-        arrivalDetails:"",
       });
       var supplierOption = ref([]);
       //表单验证