|
|
@@ -333,7 +333,6 @@ import ChooseAddress from './components/chooseAddress.vue';
|
|
|
import AddAddress from './components/addressDialog.vue';
|
|
|
import ChooseProduct from './components/chooseProduct.vue';
|
|
|
import SelectProductDetail from './components/selectProductDetail.vue';
|
|
|
-import { BaseVO } from '@/api/product/base/types';
|
|
|
|
|
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
const { order_status, fee_type, pay_method } = toRefs<any>(proxy?.useDict('order_status', 'fee_type', 'pay_method'));
|
|
|
@@ -572,6 +571,7 @@ const cancel = () => {
|
|
|
const reset = () => {
|
|
|
form.value = { ...initFormData };
|
|
|
orderMainFormRef.value?.resetFields();
|
|
|
+ productList.value = [];
|
|
|
};
|
|
|
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -627,6 +627,7 @@ const submitForm = () => {
|
|
|
productId: product.id,
|
|
|
productNo: product.productCode, // 产品编号
|
|
|
productName: product.productName, // 产品名称
|
|
|
+ productUnitId: product.productUnitId,
|
|
|
productUnit: product.unitName, // 产品单位
|
|
|
productImage: product.productImage, // 产品图片
|
|
|
platformPrice: product.price, // 平台价格(单价)
|
|
|
@@ -661,7 +662,7 @@ const submitForm = () => {
|
|
|
} else {
|
|
|
await addOrderMain(submitData);
|
|
|
}
|
|
|
-
|
|
|
+ reset();
|
|
|
proxy?.$modal.msgSuccess('操作成功');
|
|
|
// 可以在这里添加跳转逻辑,比如返回列表页
|
|
|
router.push('/order-manage/order-list');
|
|
|
@@ -734,6 +735,7 @@ const handleProductConfirm = (product: any) => {
|
|
|
productName: product.itemName, // 产品信息
|
|
|
taxRate: product.taxRate || 0, // 税率
|
|
|
marketPrice: product.marketPrice || 0,
|
|
|
+ productUnitId: product.unitId,
|
|
|
unitName: product.unitName, // 单位
|
|
|
price: product.standardPrice || 0, // 单价(使用平档价)
|
|
|
certificatePrice: product.minSellingPrice || 0, // 最低售价
|