From acf055ee72469b4955186860791d316deb8475f4 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 15 Oct 2024 15:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=89=E9=99=90=E6=89=93=E5=BC=80=E5=A4=9A=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=90=8E=E5=8D=95=E8=A7=84=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/components/bindCons.vue | 100 ++++------------------
 1 file changed, 19 insertions(+), 81 deletions(-)

diff --git a/src/views/product/components/bindCons.vue b/src/views/product/components/bindCons.vue
index aca9035..c8c6aaf 100644
--- a/src/views/product/components/bindCons.vue
+++ b/src/views/product/components/bindCons.vue
@@ -17,10 +17,9 @@
             <div class="name">商品名：{{ goodsDetail.name }}</div>
         </div>
         <!-- 绑定到商品 -->
-        <el-table :data="tableData.cons" v-if="type == 1">
+        <el-table :data="tableData.cons" border v-show="type == 1">
             <el-table-column label="序号" type="index" width="50"></el-table-column>
-            <el-table-column label="规格名称" prop="specSnap" v-if="type == 2"></el-table-column>
-            <el-table-column label="耗材名称">
+            <el-table-column label="耗材名称" prop="conInfoId">
                 <template v-slot="scope">
                     <el-select v-model="scope.row.conInfoId" filterable remote reserve-keyword placeholder="请输入关键词"
                         :remote-method="remoteMethod" :loading="loading" @change="selectionChange($event, scope.row)">
@@ -31,18 +30,18 @@
                     <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="单位">
+            <el-table-column label="单位" prop="conUnit">
                 <template v-slot="scope">
                     <span v-if="scope.row.conInfoId">{{ scope.row.conUnit }}</span>
                     <span v-else>请选择耗材</span>
                 </template>
             </el-table-column>
-            <el-table-column label="使用数量">
+            <el-table-column label="使用数量" prop="surplusStock">
                 <template v-slot="scope">
                     <el-input-number v-model="scope.row.surplusStock" :min="0" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="100px">
+            <el-table-column label="操作">
                 <template v-slot="scope">
                     <div class="table_btn_wrap">
                         <div class="btn sub" @click="tableData.cons.splice(scope.$index, 1)">
@@ -56,7 +55,7 @@
             </el-table-column>
         </el-table>
         <!-- 绑定到规格 -->
-        <el-table :data="tableData.cons" border v-if="type == 2">
+        <el-table :data="tableData.cons" border v-show="type == 2">
             <el-table-column label="序号" type="index" width="100"></el-table-column>
             <el-table-column label="规格名称" prop="specSnap"></el-table-column>
             <el-table-column label="耗材" width="600">
@@ -94,7 +93,7 @@
                 <el-table-column label="操作">
                     <template v-slot="scope">
                         <div class="sku_table_item" v-for="(item, index) in scope.row.consList" :key="index">
-                            <div class="table_btn_wrap">
+                            <div class="table_btn_wrap t">
                                 <div class="btn sub" v-if="index > 0" @click="scope.row.consList.splice(index, 1)">
                                     <i class="el-icon-remove-outline"></i>
                                 </div>
@@ -105,39 +104,6 @@
                         </div>
                     </template>
                 </el-table-column>
-                <!-- <template v-slot="scope">
-                    <div class="cons_list_wrap">
-                        <div class="row" v-for="(item, index) in scope.row.consList" :key="index">
-                            <div class="item">
-                                <el-select v-model="item.conInfoId" filterable remote reserve-keyword
-                                    placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"
-                                    @change="skuSelectionChange($event, item)">
-                                    <el-option v-for="item in options" :key="item.consId" :label="item.conName"
-                                        :value="item.consId">
-                                    </el-option>
-                                </el-select>
-                                <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div>
-                            </div>
-                            <div class="item">
-                                <span v-if="item.conInfoId">{{ item.conUnit }}</span>
-                                <span v-else>请选择耗材</span>
-                            </div>
-                            <div class="item">
-                                <el-input-number v-model="item.surplusStock" :min="0" />
-                            </div>
-                            <div class="item">
-                                <div class="table_btn_wrap">
-                                    <div class="btn sub" v-if="index > 0" @click="scope.row.consList.splice(index, 1)">
-                                        <i class="el-icon-remove-outline"></i>
-                                    </div>
-                                    <div class="btn add" @click="skuCreateItem(scope.$index)">
-                                        <i class="el-icon-circle-plus-outline"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </template> -->
             </el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
@@ -345,8 +311,6 @@ export default {
                     this.tableData.cons.push(item)
                 })
 
-
-
                 if (this.goodsDetail.conInfos.length) {
                     this.tableData.cons.map(val => {
                         this.goodsDetail.conInfos.map(item => {
@@ -364,47 +328,21 @@ export default {
                 }
             }
         },
-        // 生成新关系项
+        // 生成新商品绑定耗材关系项
         createItem(val) {
-            if (this.type == 1) {
+            let item = {}
 
-                let item = {}
+            item.id = ''
+            item.shopId = localStorage.getItem('shopId')
+            item.productId = this.goodsDetail.id
+            item.productSkuId = 0
+            item.conInfoId = ''
+            item.name = ''
+            item.conUnit = ''
+            item.surplusStock = 0
+            item.status = 1
 
-                item.id = ''
-                item.shopId = localStorage.getItem('shopId')
-                item.productId = this.goodsDetail.id
-                item.productSkuId = 0
-                item.conInfoId = ''
-                item.name = ''
-                item.conUnit = ''
-                item.surplusStock = 0
-                item.status = 1
-
-                this.tableData.cons.push(item)
-            } else {
-                let item = {}
-
-                item.id = ''
-                item.shopId = localStorage.getItem('shopId')
-                item.productId = this.goodsDetail.id
-                item.productSkuId = val.productSkuId
-                item.conInfoId = ''
-                item.name = ''
-                item.conUnit = ''
-                item.surplusStock = 0
-                item.status = 1
-                item.specSnap = val.specSnap
-                item.consList = [
-                    {
-                        conInfoId: '',
-                        name: '',
-                        conUnit: '',
-                        surplusStock: 0
-                    }
-                ]
-
-                this.tableData.cons.push(item)
-            }
+            this.tableData.cons.push(item)
         },
         // 规格生成新关系项
         skuCreateItem($index) {