采购订单-文档bug修改

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -63,11 +63,11 @@
                                 <ApiSelect
                                     :api="supplierOption"
                                     showSearch
-                                    v-model:value="queryParams.supplierId"
+                                    v-model:value="queryParams.supplierName"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
-                                    valueField="id"
+                                    valueField="name"
                                     :params='{pageSize:-1}'
                                     />
                             </a-form-item>

src/views/purchase/purchaseOrder/PurchaseOrderyForm.api.ts

@@ -24,7 +24,8 @@ enum Api {
   cancelBatchClose = '/purCode/purOrder/returnClose',
   confirmBatch='/purCode/purOrder/submitConfirm',
   cancelBatchConfirm = '/purCode/purOrder/returnSubmitConfirm',
-  classList='baseCode/baseProductClass/list'
+  classList='baseCode/baseProductClass/list',
+  supplierList='/cuspCode/cuspSupplierProfile/list',
 }
 /**
  * 导出api
@@ -209,4 +210,7 @@ export const cancelBatchConfirm = (params, handleSuccess) => {
       });
     }
   });
-}
+}
+
+//获取供应商列表
+export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -22,7 +22,17 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplier" name="supplier">
-                <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear   :disabled="notAllowEdit" AutoComplete="off"></a-input>
+                <ApiSelect
+                  :api="supplierOption"
+                  showSearch
+                  v-model:value="formData.supplier"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  :disabled="notAllowEdit"
+                  @change = 'getSupplierDetail'
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -75,8 +85,8 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="收件人电话(recipient tel)" v-bind="validateInfos.recipientTel" id="SaleOrderForm-recipientTel" name="recipientTel">
-                <a-input v-model:value="formData.recipientTel" placeholder="请输入"  AutoComplete="off"/>
+							<a-form-item label="运输方式(transport)" v-bind="validateInfos.transport"  id="SaleOrderForm-transport" name="transport">
+                <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -90,10 +100,11 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="运输方式(transport)" v-bind="validateInfos.transport" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-transport" name="transport">
-                <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
+							<a-form-item label="收件人电话(recipient tel)" v-bind="validateInfos.recipientTel" id="SaleOrderForm-recipientTel" name="recipientTel" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
+                <a-input v-model:value="formData.recipientTel" placeholder="请输入"  AutoComplete="off"/>
 							</a-form-item>
 						</a-col>
+           
             <a-col :span="12">
 							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery"  id="SaleOrderForm-delivery" name="delivery">
                 <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
@@ -197,7 +208,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId,ClassList, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId} from '../PurchaseOrderyForm.api';
+  import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId,ClassList, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId,supplierOption} from '../PurchaseOrderyForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {purchaseOrderShipColumns, purchaseOrderProductColumns} from '../PurchaseOrderForm.data';
   import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
@@ -485,7 +496,6 @@
           })
       }
       function addFromQuotation(data){
-        debugger
         data.map(item=>{
           item.fatherModel = item.model
           item.model = item.childModel
@@ -507,6 +517,7 @@
           formData.model =data[0].fatherModel
           formData.maker =data[0].maker
           getShipList(data[0].headId,'quotation')
+          getSupplierDetail(data[0].selectionSupplier)
         }
       }
       function addFormSaleOrder(data){
@@ -533,6 +544,7 @@
           formData.model =data[0].headModel
           formData.maker =data[0].maker
           getShipList(data[0].headId,'contract')
+          getSupplierDetail(data[0].supplierId)
         }
       }
       function addProject(data){
@@ -598,6 +610,11 @@
       function handleFormChange(key, value) {
         formData[key] = value;
       }
+      async function getSupplierDetail(id){
+        var param = {id:id}
+        var obj = await supplierOption(param)
+        formData.currency =obj.records[0].currency
+      }
       return {
         PurOrderFormShipFormShipTableRef,
         PurOrderFormShipFormShipTable,
@@ -635,7 +652,9 @@
         notAllowEdit,
         selectSaleOrderList,
         addFormSaleOrder,
-        ClassList
+        ClassList,
+        getSupplierDetail,
+        supplierOption
       }
     }
   });