czg_team/management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突data_forms.vue

Browse Source
This commit is contained in:
魏啾
2024-10-25 09:54:51 +08:00
parent bf20edf7ef 7acc762d59
commit 5a8a45143b
12 changed files with 875 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/views/product/components/bindCons.vue
View File

@@ -1,5 +1,5 @@
<template>
<el-dialog width="80%" :visible.sync="dialogVisible" :show-close="false" @close="reset">
<el-dialog top="5vh" :visible.sync="dialogVisible" :show-close="false" @close="reset">
<div class="header_wrap">
<div class="title">耗材信息</div>
<div class="btn_wrap">
@@ -23,8 +23,7 @@
<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)">
<el-option v-for="item in options" :key="item.id" :label="item.conName"
:value="item.id">
<el-option v-for="item in options" :key="item.id" :label="item.conName" :value="item.id">
</el-option>
</el-select>
<div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div>
@@ -41,13 +40,15 @@
<el-input-number v-model="scope.row.surplusStock" :min="0" />
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="100">
<template v-slot="scope">
<div class="table_btn_wrap">
<div class="btn sub" v-if="scope.$index > 0" @click="tableData.cons.splice(scope.$index, 1)">
<div class="btn sub" v-if="tableData.cons.length > 1"
@click="tableData.cons.splice(scope.$index, 1)">
<i class="el-icon-remove-outline"></i>
</div>
<div class="btn add" @click="createItem(scope.row)">
<div class="btn add" v-if="scope.$index == tableData.cons.length - 1"
@click="createItem(scope.row)">
<i class="el-icon-circle-plus-outline"></i>
</div>
</div>
@@ -86,18 +87,20 @@
<el-table-column label="消耗量">
<template v-slot="scope">
<div class="sku_table_item" v-for="(item, index) in scope.row.consList" :key="index">
<el-input-number v-model="item.surplusStock" :min="0" />
<el-input-number v-model="item.surplusStock" :min="1" />
</div>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="100">
<template v-slot="scope">
<div class="sku_table_item" v-for="(item, index) in scope.row.consList" :key="index">
<div class="table_btn_wrap t">
<div class="btn sub" v-if="index > 0" @click="scope.row.consList.splice(index, 1)">
<div class="btn sub" v-if="scope.row.consList.length > 1"
@click="scope.row.consList.splice(index, 1)">
<i class="el-icon-remove-outline"></i>
</div>
<div class="btn add" @click="skuCreateItem(scope.$index)">
<div class="btn add" v-if="index == scope.row.consList.length - 1"
@click="skuCreateItem(scope.$index)">
<i class="el-icon-circle-plus-outline"></i>
</div>
</div>
@@ -247,7 +250,7 @@ export default {
item.conInfoId = ''
item.name = ''
item.conUnit = ''
item.surplusStock = 0
item.surplusStock = 1
item.status = 1
this.tableData.cons.push(item)
} else {
@@ -278,7 +281,7 @@ export default {
item.conInfoId = ''
item.name = ''
item.conUnit = ''
item.surplusStock = 0
item.surplusStock = 1
item.status = 1
this.tableData.cons.push(item)
}
@@ -295,7 +298,7 @@ export default {
item.conInfoId = ''
item.name = ''
item.conUnit = ''
item.surplusStock = 0
item.surplusStock = 1
item.status = 1
item.specSnap = val.name
@@ -315,13 +318,24 @@ export default {
this.tableData.cons.map(val => {
this.goodsDetail.conInfos.map(item => {
if (item.productSkuId == val.productSkuId) {
val.consList.unshift({
id: item.id,
surplusStock: item.surplusStock,
conInfoId: item.conInfoId,
name: item.conName,
conUnit: item.conUnit
})
if (val.consList.length == 1 && val.consList[0].conInfoId == '') {
val.consList = []
val.consList.push({
id: item.id,
surplusStock: item.surplusStock,
conInfoId: item.conInfoId,
name: item.conName,
conUnit: item.conUnit
})
} else {
val.consList.push({
id: item.id,
surplusStock: item.surplusStock,
conInfoId: item.conInfoId,
name: item.conName,
conUnit: item.conUnit
})
}
}
})
})
@@ -339,7 +353,7 @@ export default {
item.conInfoId = ''
item.name = ''
item.conUnit = ''
item.surplusStock = 0
item.surplusStock = 1
item.status = 1
this.tableData.cons.push(item)