From fc0c361e944d789e559cf2d6853bddc4ae01fdba Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 5 Jul 2024 11:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=91=E5=AE=9A=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicing/consumable/specifications.vue   | 78 ++++++++++++-------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue
index 2935003..df628b7 100644
--- a/src/views/invoicing/consumable/specifications.vue
+++ b/src/views/invoicing/consumable/specifications.vue
@@ -82,8 +82,15 @@
         </div>
         <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="1000px">
             <el-form ref="addSelect" :inline="true">
+                <el-form-item label="商品名称">
+                    {{ addSelect.length ? addSelect[0].name : '' }}
+                </el-form-item><br />
                 <template v-if="addSelect.length">
-                    <template v-if="addSelect[0].isDistribute == 1 || addSelect[0].typeEnum == '单规格'">
+                    <!-- 
+                    isDistribute为1是共享库存，展示商品
+                    为0是展示规格
+                      -->
+                    <template v-if="addSelect[0].isDistribute == 1">
                         <el-form-item label="商品规格">
                             <el-input v-model="addSelect[0].specSnap" style="width: 130px;" placeholder="请选择商品规格"
                                 disabled></el-input>
@@ -103,7 +110,9 @@
                         <template v-if="addSelect[0]">
                             <template v-for="(item, i) in addSelect[0].skuList">
                                 <el-form-item label="商品规格">
-                                    <el-input v-model="item.specSnap" style="width: 130px;" placeholder="请选择商品规格"
+                                    <el-input v-if="addSelect[0].typeEnum == '单规格'" v-model="addSelect[0].specSnap"
+                                        style="width: 130px;" placeholder="请选择商品规格" disabled></el-input>
+                                    <el-input v-else v-model="item.specSnap" style="width: 130px;" placeholder="请选择商品规格"
                                         disabled></el-input>
                                 </el-form-item>
                                 <el-form-item label="耗材信息" prop="conName">
@@ -284,7 +293,7 @@ export default {
     },
     methods: {
         selectShop(res) {
-            console.log(res,'调试1')
+            console.log(res, '调试1')
             this.addSelect = res
             res[0]['specSnap'] = res[0].name
             this.clickdialogframe('add')
@@ -422,7 +431,7 @@ export default {
                     shopId: localStorage.getItem('shopId'),
                     specSnap: this.querytableDatasku.specSnap,
                     name: this.querytableDatasku.name,
-                    sort:'id.desc',
+                    sort: 'id.desc',
                     shopName: this.querytableDatasku.shopName
                 })
                 this.tableDatasku.loading = false
@@ -463,39 +472,46 @@ export default {
                 });
                 this.informationdialogshowedit = false
             } else {
+
+
                 let { id, consInfoId, surplusStock } = this.addSelect[0]
+                // 1为共享库存
+                if (this.addSelect[0].isDistribute != 1) {
+                    surplusStock = this.addSelect[0].skuList[0].surplusStock
+                }
                 let obj = {
                     productId: id,
                     consInfoId: consInfoId,
                     skuInfos: null,
                     surplusStock: surplusStock
                 }
-                // 1为共享库存
-                if (this.addSelect[0].isDistribute != 1) {
-                    let isgongx = false
-                    this.addSelect[0].skuList.forEach(ele => {
-                        if (!ele.skuId || !ele.surplusStock) {
-                            isgongx = true
-                        } else {
-                            isgongx = false
-                        }
-                    })
-                    if (isgongx) {
-                        this.$message.error('请选择耗材信息与输入耗材值')
-                        return
-                    }
-                    obj.skuInfos = this.addSelect[0].skuList
-                } else {
-
-                    if (!consInfoId) {
-                        this.$message.error('请选择耗材信息')
-                        return
-                    }
-                    if (!surplusStock) {
-                        this.$message.error('请输入耗材值')
-                        return
+                let isgongx = false
+                this.addSelect[0].skuList.forEach(ele => {
+                    ele.skuId = ele.id
+                    ele.conInfoId = consInfoId
+                    // ele.surplusStock = surplusStock
+                    if (!ele.skuId || !ele.surplusStock) {
+                        isgongx = true
+                    } else {
+                        isgongx = false
                     }
+                })
+                if (isgongx) {
+                    this.$message.error('请选择耗材信息与输入耗材值')
+                    return
                 }
+                obj.skuInfos = this.addSelect[0].skuList
+                // } else {
+
+                // if (!consInfoId) {
+                //     this.$message.error('请选择耗材信息')
+                //     return
+                // }
+                // if (!surplusStock) {
+                //     this.$message.error('请输入耗材值')
+                //     return
+                // }
+                // }
                 await posttbProskuCons(obj)
                 this.$message({
                     message: '新增成功',
@@ -503,6 +519,12 @@ export default {
                 });
                 this.ALLisDistribute = null
                 this.dialogshow = false
+
+
+
+
+
+
             }
             this.$refs[formName].resetFields()
             this.getTableData()