Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -389,6 +389,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		} else {
 			return {
@@ -399,6 +400,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		}
 	})

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -394,6 +394,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		} else {
 			return {
@@ -404,6 +405,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		}
 	})

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -420,6 +420,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: storePrice(Number(unitObj?.realPrice || 0) * item.quantity),
 				remark: item.remark,
 				unitId: unitObj.id,
+				orderType: baseDataForm.orderType,
 			}
 		} else {
 			return {
@@ -431,6 +432,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: item?.realPrice && item.quantity ? storePrice(Number(item.realPrice) * item.quantity) : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		}
 	})

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -314,6 +314,7 @@ const cgPlanSpuItems = computed(() => {
 			totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 			remark: item.remark,
 			unitId: item.unitId,
+			orderType: baseDataForm.orderType,
 		}
 	})
 })

src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue

@@ -435,6 +435,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		} else {
 			return {
@@ -445,6 +446,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		}
 	})

src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue

@@ -427,6 +427,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		} else {
 			return {
@@ -437,6 +438,7 @@ const cgPlanSpuItems = computed(() => {
 				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
+				orderType: baseDataForm.orderType,
 			}
 		}
 	})