diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue index f36bbb6..8389f66 100644 --- a/src/views/erp/stock/in/StockInForm.vue +++ b/src/views/erp/stock/in/StockInForm.vue @@ -1,38 +1,44 @@ + + diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue index 4268c76..593fe9d 100644 --- a/src/views/erp/stock/in/components/StockInItemForm.vue +++ b/src/views/erp/stock/in/components/StockInItemForm.vue @@ -4,24 +4,41 @@ :model="formData" :rules="formRules" v-loading="formLoading" - label-width="0px" + label-position="top" :inline-message="true" :disabled="disabled" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+ 合计数量 + {{ erpCountInputFormatter(summaryData.count) }} +
+
+ 合计金额 + {{ erpPriceInputFormatter(summaryData.totalPrice) }} +
+
+ - - + 添加入库产品 - +
+ + 添加入库产品 +
+ + diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue index e09d397..9ba432a 100644 --- a/src/views/erp/stock/in/index.vue +++ b/src/views/erp/stock/in/index.vue @@ -1,255 +1,125 @@ + + diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue index a13e729..58219eb 100644 --- a/src/views/erp/stock/record/index.vue +++ b/src/views/erp/stock/record/index.vue @@ -92,15 +92,15 @@
出入库日期 - {{ dateFormatter({ createTime: item.createTime }) }} + {{ formatDate(item.createTime) }}
出入库数量 - {{ erpCountTableColumnFormatter({ count: item.count }) }} + {{ erpCountTableColumnFormatter(null, null, item.count, null ) }}
库存量 - {{ erpCountTableColumnFormatter({ count: item.totalCount }) }} + {{ erpCountTableColumnFormatter(null, null, item.totalCount, null ) }}
单价 @@ -404,6 +404,14 @@ onMounted(async () => { // 加载列表 await getList() }) + +const formatDate = (timestamp?: number) => { + if (!timestamp) return '-' + const d = new Date(timestamp) + const pad = (n: number) => n.toString().padStart(2, '0') + return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ` + + `${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}` +}