1

mini-pro-web/src/components/ProductItem/index.vue

@@ -48,7 +48,6 @@ export default{
        }
    },
    created() {
        console.log(this.data)
        this.isActive = this.data.isActive
    },
    methods:{

mini-pro-web/src/views/replenishment/start/deviceDetail.vue

@@ -4,13 +4,13 @@
            <div v-if="!isView" class="bgc-17b3ec c-fff">
                <div class="pt10 plr15 ellipsis_1">当前货柜：{{deviceInfo.device.equName}}</div>
                <van-row>
                    <van-col span="6">
                    <van-col span="8">
                        <div class="tc pt10 pb10">
                            <div class="fs-20">{{deviceInfo.deviceCapacity||0}}</div>
                            <div class="fs-12 pt5">设备容量</div>
                        </div>
                    </van-col>
                    <van-col span="6">
                    <van-col span="8">
                        <div class="tc pt10 pb10">
                            <div class="fs-20">
                                <span>{{deviceInfo.inStock||0}}</span>
@@ -19,18 +19,12 @@
                            <div class="fs-12 pt5">在架库存</div>
                        </div>
                    </van-col>
                    <van-col span="6">
                    <van-col span="8">
                        <div class="tc pt10 pb10">
                            <div class="fs-20">{{deviceInfo.outOfStock||0}}</div>
                            <div class="fs-12 pt5">缺药库存</div>
                        </div>
                    </van-col>
                    <van-col span="6">
                        <div class="tc pt10 pb10">
                            <div class="fs-20">{{deviceInfo.earlyWarningCargo||0}}</div>
                            <div class="fs-12 pt5">预警货道</div>
                        </div>
                    </van-col>
                </van-row>
                <div class="kitbox fs-12 plr10 pb5">
                    <div class="box-flex-1"> 共:{{deviceInfo.device.layer}}层</div>
@@ -449,10 +443,19 @@ export default{
            }
            this.checkOpenOrClose().then(cargoState=>{
                this.$nextTick(()=>{
                    var ids = _.map(this.selItemList, v=>{
                        return v.id
                    })
                    this.$loading('保存中..')
                    var ids = []
                    this.selItemList.forEach(v=>{
                        if(v.state == 21){
                            var cargoIds = v.merge.split(',')
                            cargoIds.forEach(m => {
                                ids.push(this.list[Number(v.layerNo)].list[Number(m)-1].id)
                            })
                        } else {
                            ids.push(v.id)
                        }
                    })
                    console.log('ids', ids)
                    let p = {
                        cargoIds: ids.join(','),//必穿		货道id，多个id，英文逗号隔开，例如   1,2 		4,5,6
                        cargoState 		//必传		1开启，0关闭
@@ -589,6 +592,7 @@ export default{
                    if(res.status == 200){
                        this.selItemList = []
                        this.$toast('操作成功')
                        this.findDeviceById()
                        this.$refreshData()
                    } 
                })

mini-pro-web/src/views/replenishment/start/quick.vue

@@ -42,7 +42,7 @@
                <div class="list box-flex-1 bgc-fff">
                    <template v-if="curItem">
                        <template v-for="(item, k) in curItem.list">
                            <div class="item" v-if="item.state!=20" :key="k">
                            <div class="item" v-if="item.state!=20 && (item.drugCode == query.drugCode || !item.drugCode)" :key="k">
                                <ProductItem v-longpress="()=>{gotoDetail(item)}" bussuness="quick" @onChange="onChange($event, item)" :data="item" :index="k"/>
                            </div>
                        </template>
@@ -175,6 +175,7 @@ export default{
                                    m.layerNo = Number(m.layerNo)
                                    m.wayerNo = Number(m.wayerNo)
                                    m.isActive = false
                                    return true
                                    return m.drugCode == this.query.drugCode || !m.drugCode
                                }),
                            }
@@ -330,10 +331,19 @@ export default{
            }
            this.checkOpenOrClose().then(cargoState=>{
                this.$nextTick(()=>{
                    var ids = _.map(this.selItemList, v=>{
                        return v.id
                    })
                    this.$loading('保存中..')
                    var ids = []
                    this.selItemList.forEach(v=>{
                        if(v.state == 21){
                            var cargoIds = v.merge.split(',')
                            cargoIds.forEach(m => {
                                ids.push(this.list[Number(v.layerNo)-1].list[Number(m)-1].id)
                            })
                        } else {
                            ids.push(v.id)
                        }
                    })
                    console.log('ids', ids)
                    let p = {
                        cargoIds: ids.join(','),//必穿		货道id，多个id，英文逗号隔开，例如   1,2 		4,5,6
                        cargoState 		//必传		1开启，0关闭