diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index d564a797..4617c23e 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -278,9 +278,9 @@
-
+
-
+
-
+
-
+
item.supplierId == this.codeForm.codeFactory)?.supplier || ''
- // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
- let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
- if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
- // 下次检验日期: codeForm.nextCheckFixTime
- let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
- if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
+ // 检验日期: codeForm.thisCheckTime
+ const thisCheckTime = this.codeForm.nextCheckTime
+ // 下次检验日期: codeForm.nextCheckTime
+ const nextCheckTime = this.codeForm.nextCheckTime
// 单价: codeForm.buyPrice
const buyPrice = this.codeForm.buyPrice || 0
this.codeTableList.push({
maCode,
outFacCode,
maVender,
- thisCheckFixTime,
- nextCheckFixTime,
+ thisCheckTime,
+ nextCheckTime,
buyPrice
})
}
@@ -774,8 +773,8 @@ export default {
row.maCode = ''
row.outFacCode = ''
row.maVender = ''
- row.thisCheckFixTime = ''
- row.nextCheckFixTime = ''
+ row.thisCheckTime = ''
+ row.nextCheckTime = ''
row.buyPrice = 0
},
@@ -792,6 +791,9 @@ export default {
this.codeOpen = true;
this.title = "数量盘点入库";
this.resetCodeForm()
+ this.$nextTick(() => {
+ this.$refs['codeForm'].clearValidate()
+ })
},
/** 新增编号盘点按钮操作 */
handleCodeAdd() {
@@ -800,6 +802,9 @@ export default {
this.codeOpen = true;
this.title = "编码盘点入库";
this.resetCodeForm()
+ this.$nextTick(() => {
+ this.$refs['codeForm'].clearValidate()
+ })
},
// 多选框选中数据
handleSelectionChange(selection) {
@@ -822,9 +827,9 @@ export default {
this.$refs['codeForm'].validate(valid => {
if (valid) {
let SavePutInfoDto = {}
- console.log('🚀 ~ this.codeForm:', this.codeForm);
- console.log('🚀 ~ this.codeTableList:', this.codeTableList);
- console.log('🚀 ~ this.numTableList:', this.numTableList);
+ // console.log('🚀 ~ this.codeForm:', this.codeForm);
+ // console.log('🚀 ~ this.numTableList:', this.numTableList);
+ // console.log('🚀 ~ this.codeTableList:', this.codeTableList);
if (this.isNumCheck) {
// 提交数据
SavePutInfoDto = {
@@ -844,6 +849,11 @@ export default {
this.getList()
})
} else {
+ // 统一处理时间格式为 yyyy-MM-dd
+ this.codeTableList.forEach(item => {
+ item.thisCheckTime = new Date(item.thisCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+ item.nextCheckTime = new Date(item.nextCheckTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+ })
// 提交数据
SavePutInfoDto = {
isCode: true, // 是否编码盘点