From dd2ca5062f357a2c03c82e0615108cbe63888c4e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 15 Dec 2025 11:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=BA=8C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=EF=BC=88=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E9=9A=90=E8=97=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 54521e9..d70ecb1 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -172,7 +172,18 @@
             <!-- <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div> -->
           </template>
         </el-table-column>
-        <el-table-column label="单位" prop="conUnit"></el-table-column>
+        <el-table-column label="单位" prop="conUnit">
+          <!-- <template v-slot="scope">
+            <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
+              <el-option
+                v-for="item in returnConUnits(scope.row.consInfoId)"
+                :key="item"
+                :label="item"
+                :value="item"
+              ></el-option>
+            </el-select>
+          </template> -->
+        </el-table-column>
         <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
           <template v-slot="scope">
             <el-input-number v-model="scope.row.surplusStock" :min="0" />
@@ -249,6 +260,20 @@ const myDialogRefhaocai = ref(null);
 const myDialogRefkucun = ref(null);
 let haocaiData = ref({});
 let options = ref([]);
+//选择耗材单位
+const returnConUnits = (consInfoId) => {
+  const arr = [];
+  const item = options.value.find((item) => item.id === consInfoId);
+  if (item) {
+    if (item.conUnit) {
+      arr.push(item.conUnit);
+    }
+    if (item.conUnitTwo) {
+      arr.push(item.conUnitTwo);
+    }
+  }
+  return arr;
+};
 let kucundata = ref(0);
 const form = reactive({
   warnLine: "",
@@ -357,6 +382,8 @@ async function confirmkucun() {
 }
 function editOpen(item: any) {
   haocaiData.value = item;
+  console.log(item);
+
   if (haocaiData.value.consList.length == 0) {
     let items = {
       productId: item.id,