diff --git a/src/views/erp/sale/customer/CustomerForm.vue b/src/views/erp/sale/customer/CustomerForm.vue index 9edfcad..8ec0864 100644 --- a/src/views/erp/sale/customer/CustomerForm.vue +++ b/src/views/erp/sale/customer/CustomerForm.vue @@ -1,71 +1,50 @@ - diff --git a/src/views/erp/sale/customer/index.vue b/src/views/erp/sale/customer/index.vue index 4ed5340..4da0997 100644 --- a/src/views/erp/sale/customer/index.vue +++ b/src/views/erp/sale/customer/index.vue @@ -1,118 +1,101 @@ + + diff --git a/src/views/erp/sale/order/SaleOrderForm.vue b/src/views/erp/sale/order/SaleOrderForm.vue index 790684c..83a6320 100644 --- a/src/views/erp/sale/order/SaleOrderForm.vue +++ b/src/views/erp/sale/order/SaleOrderForm.vue @@ -1,92 +1,64 @@ + + diff --git a/src/views/erp/sale/order/components/SaleOrderItemForm.vue b/src/views/erp/sale/order/components/SaleOrderItemForm.vue index f165dcf..da68209 100644 --- a/src/views/erp/sale/order/components/SaleOrderItemForm.vue +++ b/src/views/erp/sale/order/components/SaleOrderItemForm.vue @@ -4,21 +4,42 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="0px" + label-position="top" :inline-message="true" :disabled="disabled" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+
+ 合计数量 + {{ erpCountInputFormatter(summaryData.count) }} +
+
+ 合计金额 + {{ erpPriceInputFormatter(summaryData.totalProductPrice) }} +
+
+ 合计税额 + {{ erpPriceInputFormatter(summaryData.taxPrice) }} +
+
+ 税额合计 + {{ erpPriceInputFormatter(summaryData.totalPrice) }} +
+
+ + +
+ + 添加销售产品 +
+ - - + 添加销售产品 - + + diff --git a/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue b/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue index 38dcac4..b989cd5 100644 --- a/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue +++ b/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue @@ -1,44 +1,93 @@ + + diff --git a/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue b/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue index 75d925d..fde2a84 100644 --- a/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue +++ b/src/views/erp/sale/order/components/SaleOrderReturnEnableList.vue @@ -1,44 +1,97 @@ + + diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue index 7451ad7..a65f4c5 100644 --- a/src/views/erp/sale/order/index.vue +++ b/src/views/erp/sale/order/index.vue @@ -1,333 +1,186 @@ + + diff --git a/src/views/erp/sale/out/SaleOutForm.vue b/src/views/erp/sale/out/SaleOutForm.vue index f390964..b9bd1e2 100644 --- a/src/views/erp/sale/out/SaleOutForm.vue +++ b/src/views/erp/sale/out/SaleOutForm.vue @@ -1,42 +1,35 @@ - - - - + + - - - - + + - - - + - - - - - - - - - - - - - - + + + +
+
出库产品清单
+ +
+ + +
+
价格信息
- + - - - + - - - + - - - + - - - - + + - - - - - +
+ + + + - + @@ -365,3 +282,31 @@ const resetForm = () => { formRef.value?.resetFields() } + + diff --git a/src/views/erp/sale/out/components/SaleOutItemForm.vue b/src/views/erp/sale/out/components/SaleOutItemForm.vue index 76d0540..f012c9d 100644 --- a/src/views/erp/sale/out/components/SaleOutItemForm.vue +++ b/src/views/erp/sale/out/components/SaleOutItemForm.vue @@ -4,18 +4,34 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="0px" + label-position="top" :inline-message="true" :disabled="disabled" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+
+ 合计数量 + {{ erpCountInputFormatter(summaryData.count) }} +
+
+ 合计金额 + {{ erpPriceInputFormatter(summaryData.totalProductPrice) }} +
+
+ 毛利润 + {{ erpPriceInputFormatter(summaryData.grossProfit) }} +
+
+ 税额合计 + {{ erpPriceInputFormatter(summaryData.totalPrice) }} +
+
+ + + diff --git a/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue b/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue index bab79ab..2c9878d 100644 --- a/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue +++ b/src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue @@ -1,149 +1,148 @@ + + + diff --git a/src/views/erp/sale/out/index.vue b/src/views/erp/sale/out/index.vue index 0a3cfd2..3389676 100644 --- a/src/views/erp/sale/out/index.vue +++ b/src/views/erp/sale/out/index.vue @@ -1,314 +1,158 @@ + + diff --git a/src/views/erp/sale/outwarehouse/SaleOutwarehouseForm.vue b/src/views/erp/sale/outwarehouse/SaleOutwarehouseForm.vue index 8e93761..d4ad3eb 100644 --- a/src/views/erp/sale/outwarehouse/SaleOutwarehouseForm.vue +++ b/src/views/erp/sale/outwarehouse/SaleOutwarehouseForm.vue @@ -1,209 +1,109 @@ + + diff --git a/src/views/erp/sale/outwarehouse/index.vue b/src/views/erp/sale/outwarehouse/index.vue index eebfd97..9fe00bc 100644 --- a/src/views/erp/sale/outwarehouse/index.vue +++ b/src/views/erp/sale/outwarehouse/index.vue @@ -1,381 +1,231 @@ + + diff --git a/src/views/erp/sale/plan/SalePlanForm.vue b/src/views/erp/sale/plan/SalePlanForm.vue index 1f526e9..93ed0a1 100644 --- a/src/views/erp/sale/plan/SalePlanForm.vue +++ b/src/views/erp/sale/plan/SalePlanForm.vue @@ -1,128 +1,81 @@ + + diff --git a/src/views/erp/sale/plan/components/SalePlanItemForm.vue b/src/views/erp/sale/plan/components/SalePlanItemForm.vue index 52b5f3f..2d3e437 100644 --- a/src/views/erp/sale/plan/components/SalePlanItemForm.vue +++ b/src/views/erp/sale/plan/components/SalePlanItemForm.vue @@ -4,21 +4,42 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="0px" + label-position="top" :inline-message="true" :disabled="disabled" > - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+
+ 合计数量 + {{ erpPriceInputFormatter(summaryData.planCount) }} +
+
+ 合计金额 + {{ erpPriceInputFormatter(summaryData.totalPrice) }} +
+
+ + +
+ + 添加计划产品 +
+ - - + 添加计划产品 - + + diff --git a/src/views/erp/sale/plan/index.vue b/src/views/erp/sale/plan/index.vue index 7f92a6b..17ba00e 100644 --- a/src/views/erp/sale/plan/index.vue +++ b/src/views/erp/sale/plan/index.vue @@ -1,295 +1,168 @@ + + diff --git a/src/views/erp/sale/return/SaleReturnForm.vue b/src/views/erp/sale/return/SaleReturnForm.vue index 58e2a5b..15e41f8 100644 --- a/src/views/erp/sale/return/SaleReturnForm.vue +++ b/src/views/erp/sale/return/SaleReturnForm.vue @@ -1,40 +1,35 @@ -
- - - + + - - - - + + - - - + - - - -
- - - - - - - - - - + + + +
+
退货产品清单
+ +
+ + +
+
价格信息
- + - - - + - - - + - - - + - - - - + + - - - - - +
+ + + + - + @@ -361,3 +280,31 @@ const resetForm = () => { formRef.value?.resetFields() } + + diff --git a/src/views/erp/sale/return/components/SaleReturnItemForm.vue b/src/views/erp/sale/return/components/SaleReturnItemForm.vue index c81354b..417ddd1 100644 --- a/src/views/erp/sale/return/components/SaleReturnItemForm.vue +++ b/src/views/erp/sale/return/components/SaleReturnItemForm.vue @@ -4,18 +4,34 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="0px" + label-position="top" :inline-message="true" :disabled="disabled" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+
+ 合计数量 + {{ erpCountInputFormatter(summaryData.count) }} +
+
+ 合计金额 + {{ erpPriceInputFormatter(summaryData.totalProductPrice) }} +
+
+ 税额合计 + {{ erpPriceInputFormatter(summaryData.totalPrice) }} +
+
+ + + diff --git a/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue b/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue index dc875e6..6587478 100644 --- a/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue +++ b/src/views/erp/sale/return/components/SaleReturnRefundEnableList.vue @@ -1,134 +1,141 @@ + + + diff --git a/src/views/erp/sale/return/index.vue b/src/views/erp/sale/return/index.vue index 50b6cdc..ff3ad5e 100644 --- a/src/views/erp/sale/return/index.vue +++ b/src/views/erp/sale/return/index.vue @@ -1,310 +1,153 @@ + +