运费采购订单-参照发货通知单-接口调整

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

@@ -124,7 +124,7 @@
             </a-alert>
             <a-table
                 :columns="columns"
-                :row-key="record => record.id"
+                :row-key="record => record.childId"
                 :data-source="dataSource"
                 bordered
                 size="small"
@@ -194,8 +194,8 @@
         },
         {
             title: '机型(model)',
-            dataIndex: 'model',
-            key: 'model',
+            dataIndex: 'headModel',
+            key: 'headModel',
             align:"center"
         },
         {
@@ -254,8 +254,6 @@
         deliveryDate_end:'',
         saleDepartment:'',
         salesman:'',
-        submit:'1',
-        close:'0'
     });
     let pagination = ref({
       current: 1,
@@ -270,7 +268,7 @@
     });
     function loadData(){
         let params = getQueryParams();
-        defHttp.get({ url: '/saleCode/saleDelivery/list',params}, { isTransformResponse: false })
+        defHttp.get({ url: '/saleCode/saleDelivery/selectSaleDeliveryAlertFee',params}, { isTransformResponse: false })
         .then((res) => {
             if (res.success) {
                 dataSource.value = res.result.records;
@@ -316,8 +314,6 @@
             deliveryDate_end:'',
             saleDepartment:'',
             salesman:'',
-            submit:'1',
-            close:'0'
         }
         pagination.value.current =1;
         pagination.value.pageSize = 10; 
@@ -357,8 +353,6 @@
             deliveryDate_end:'',
             saleDepartment:'',
             salesman:'',
-            submit:'1',
-            close:'0'
         }
     }
     function getTable(){

src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -123,7 +123,15 @@
 							<a-form-item label="开票地址(invoice address)" v-bind="validateInfos.invoiceAddress" id="SaleOrderForm-invoiceAddress" name="invoiceAddress" >
                 <a-input v-model:value="formData.invoiceAddress" placeholder="请输入" AutoComplete="off"/>
 							</a-form-item>
-						</a-col>					
+						</a-col>	
+            <a-col :span="12">
+							<a-form-item label="是否有第三方运费(otherFee)" v-bind="validateInfos.otherFee" id="SaleOrderForm-otherFee" name="otherFee" >
+                <a-select v-model:value="formData.otherFee">
+                  <a-select-option value="是"> 是 </a-select-option>
+                  <a-select-option value="否"> 否 </a-select-option>
+                </a-select>
+							</a-form-item>
+						</a-col>			
             <a-col :span="12">
 							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="quotationFormForm-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear AutoComplete="off"></a-input>
@@ -285,6 +293,7 @@
         blno: '',   
         notes: '',   
         invoiceHeader:'',
+        otherFee  :''
       });
 
       //表单验证