From 02dbdea14c91365b55e3665a93baf8f90b2ab134 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 17:31:24 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/index.vue | 4 ++--
src/views/basicData/product/index.vue | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 26d3600..98eaf75 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -163,6 +163,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鍗曚綅锛�" prop="unit">
+ <el-input
+ v-model="modelForm.unit"
+ placeholder="璇疯緭鍏ュ崟浣�"
+ clearable
+ @keydown.enter.prevent
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -213,6 +225,10 @@
formatData: (val) => formatThicknessTo15(val),
},
{
+ label: "鍗曚綅",
+ prop: "unit",
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
diff --git a/src/views/index.vue b/src/views/index.vue
index 4ae5fe4..55d5268 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -93,7 +93,7 @@
</div>
</div>
</div>
- <div class="dashboard-row">
+ <!-- <div class="dashboard-row">
<div class="main-panel process-panel">
<div class="process-panel__header">
<div class="section-title">宸ュ簭鏁版嵁鐢熶骇缁熻鏄庣粏</div>
@@ -148,7 +148,7 @@
</div>
</div>
</div>
- </div>
+ </div> -->
<!-- 宸ュ簭閫夋嫨寮圭獥 -->
<el-dialog v-model="processDialogVisible" title="閫夋嫨宸ュ簭" width="500px" append-to-body>
--
Gitblit v1.9.3