From 19f2e3bdbe04e7ea79c6a0bdc8c7318d4837b189 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:36:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_pro_山西_晋和园
---
src/views/productManagement/productIdentifier/index.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/views/productManagement/productIdentifier/index.vue b/src/views/productManagement/productIdentifier/index.vue
index 94359e4..d638e7a 100644
--- a/src/views/productManagement/productIdentifier/index.vue
+++ b/src/views/productManagement/productIdentifier/index.vue
@@ -239,6 +239,13 @@
<el-form-item label="鏍囪瘑绫诲瀷">
<span>{{ currentProduct.identifierType }}</span>
</el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿">
+ <el-date-picker v-model="createTimeDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ style="width: 100%"></el-date-picker>
+ </el-form-item>
<el-form-item label="鐢熸垚鏁伴噺"
prop="generateQuantity">
<el-input-number v-model="generateQuantity"
@@ -356,6 +363,7 @@
<script setup>
import { ref, reactive, computed } from "vue";
+ import dayjs from "dayjs";
import { ElMessage, ElMessageBox } from "element-plus";
import { Plus, Search, Loading, Download } from "@element-plus/icons-vue";
import Pagination from "@/components/PIMTable/Pagination.vue";
@@ -442,6 +450,13 @@
const generateQuantity = ref(1);
const codeRule = ref("");
const customPrefix = ref("");
+ const createTime = ref(dayjs().format("YYYY-MM-DD HH:mm:ss"));
+ const createTimeDate = computed({
+ get: () => (createTime.value ? String(createTime.value).split(" ")[0] : ""),
+ set: (value) => {
+ createTime.value = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ },
+ });
const newBatchNo = ref("");
const reassignReason = ref("");
const formRef = ref();
@@ -659,9 +674,9 @@
currentProduct.value.batchNo
}_${String(i).padStart(3, "0")}`;
} else if (codeRule.value === "鏃堕棿鎴�+闅忔満鏁�") {
- identifierCode = `TS_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
+ identifierCode = "";
} else if (codeRule.value === "鑷畾涔夎鍒�") {
- identifierCode = `${customPrefix.value || "CUSTOM"}_${Date.now()}_${i}`;
+ identifierCode = "";
}
newIdentifiers.push({
@@ -672,7 +687,7 @@
identifierType: currentProduct.value.identifierType,
identifierCode: identifierCode,
status: "宸茬敓鎴�",
- generateTime: new Date().toLocaleString(),
+ generateTime: createTime.value,
remark: "鎵归噺鐢熸垚",
});
}
--
Gitblit v1.9.3