Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/invoicing/consumable/specifications.vue

@@ -82,13 +82,23 @@
         </div>
         <el-dialog :title="dialogtitle" :visible.sync="dialogshow" width="1000px">
             <el-form ref="addSelect" :inline="true">
-                <el-form-item label="商品名称">
-                    <template v-for="(ele, index) in addSelect">
+                <!-- <el-form-item label="商品名称" v-for="(ele, index) in addSelect">
+                    <template >
                         {{ addSelect.length ? addSelect[index].name : '' }}
                     </template>
-                </el-form-item><br />
+                </el-form-item> -->
+
 
                 <template v-for="(ele, index) in commodityArr">
+                    <template v-if="ele.names">
+                        <br />
+                        <el-form-item label="商品名称">
+                            {{ ele.names }}
+                        </el-form-item>
+                        <br />
+                    </template>
+
+
                     <el-form-item label="商品规格">
                         <el-input v-model="ele.specSnap" style="width: 130px;" placeholder="请选择商品规格"
                             disabled></el-input>
@@ -100,7 +110,8 @@
                         <el-button type="primary" @click="selecthaocai(ele)">去选择耗材信息</el-button>
                     </el-form-item>
                     <el-form-item label="单位耗材值">
-                        <el-input v-model="ele.surplusStock" type=number placeholder="请输入单位耗材值"></el-input>
+                        <el-input v-model="ele.surplusStock" type=number placeholder="请输入单位耗材值"
+                            @input="handleKeyUp($event, index)"></el-input>
                     </el-form-item>
                 </template>
 
@@ -140,7 +151,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column label="单位耗材值" prop="surplusStock" />
+                <!-- <el-table-column label="单位耗材值" prop="surplusStock" /> -->
                 <el-table-column label="" width="200">
                     <template v-slot="scope">
                         <el-button @click="tableDatainformationtable(scope.row)">确定</el-button>
@@ -264,6 +275,12 @@ export default {
 
                 .match(/^\d*(\.?\d{0,2})/g)[0] || ''
         },
+        handleKeyUp(value, index) {
+            console.log(value, index, '体哦傲视1')
+            if (value < 0) {
+                this.commodityArr[index].surplusStock = (value * -1)
+            }
+        },
         selectShop(res) {
             this.commodityArr = []
             this.addSelect = res
@@ -276,15 +293,20 @@ export default {
                     ele.specSnap = ele.name
                     ele.conName = ele.conName
                     this.commodityArr.push(ele)
+                    ele.names = sname
                 } else {
                     // 规格数据处理
-                    ele.skuList.forEach(element => {
+                    ele.skuList.forEach((element, indexs) => {
+                        if (indexs == 0) {
+                            element.names = sname
+                        }
                         element.conInfoId = element.id
                         element.conName = element.conName
-                        this.commodityArr.push(element)
-                        if(element.specSnap==null){
-                            element.specSnap=sname
+                        if (element.specSnap == null) {
+                            element.specSnap = sname
                         }
+                        this.commodityArr.push(element)
+
                     })
                 }
             })
@@ -398,6 +420,7 @@ export default {
             this.commodityArr.forEach(ele => {
                 if (ele.id == this.ALLisDistribute.id) {
                     ele.consInfoId = item.id
+                    ele.conInfoId = item.id
                     ele.conName = item.conName
                     ele.skuId = ele.id
                 }