1

mini-pro-web/src/api/api-medicineAbinet.js

@@ -5,7 +5,7 @@ let service = {
	//备货单相关接口 start
	//备药单相关接口 start
	replenishList: function(params) {
		return request({
			url: `${BASE}/baseUp/docFullInfo`,
@@ -48,7 +48,7 @@ let service = {
			params
		});
    },
	// 生成备货单
	// 生成备药单
	baseUpCreateUp: function(data) {
		return request({
			url: `${BASE}/baseUp/createUp`,
@@ -71,7 +71,7 @@ let service = {
			params
		});
    },
	//备货单相关接口 end
	//备药单相关接口 end
	//出库单相关接口 start
@@ -193,7 +193,7 @@ let service = {
			data
		});
    },
	// 获取缺货列表
	// 获取缺药列表
	getOutOfStockDeviceList: function(params) {
		return request({
			url: `${BASE}/baseDevice/getOutOfStockDeviceList`,
@@ -201,7 +201,7 @@ let service = {
			params
		});
    },
	// 获取缺货信息
	// 获取缺药信息
	getDetialOutOfStock: function(data) {
		return request({
			url: `${BASE}/baseDevice/getDetialOutOfStock`,
@@ -439,7 +439,7 @@ let service = {
		});
    },
	// 更换商品，或者设定商品
	// 更换药品，或者设定药品
	updateMediicinecabineInventory: function(data) {
		return request({
			url: `${BASE}/baseDevice/updateMediicinecabineInventory`,
@@ -457,7 +457,7 @@ let service = {
		});
    },
	// 矫正库存\\ 更新容量 \\下架商品
	// 矫正库存\\ 更新容量 \\下架药品
	updateMediicinecabineInventoryInfoById: function(data) {
		return request({
			url: `${BASE}/baseDevice/updateMediicinecabineInventoryInfoById`,
@@ -466,7 +466,7 @@ let service = {
		});
    },
	// 通过userId, 获取缺货列表
	// 通过userId, 获取缺药列表
	getOutOfStockDeviceListByUserId: function(params) {
		return request({
			url: `${BASE}/baseDevice/getOutOfStockDeviceListByUserId`,
@@ -579,7 +579,7 @@ let service = {
	},
	// 通过设备id获取该设备的缺货信息
	// 通过设备id获取该设备的缺药信息
	getOutOfStockInfoByDeviceWithPage: function(data) {
		return request({
			url: `${BASE}/baseDevice/getOutOfStockInfoByDeviceWithPage`,
@@ -607,14 +607,22 @@ let service = {
    },
	// 批量补货
	batchAddInventory: function(params) {
	batchAddInventory: function(data) {
		return request({
			url: `${BASE}/baseDevice/batchAddInventory`,
			method: "post",
			params
			data
		});
    },
	
	//设备出货日志
	getDeviceOrderInfoPage: function(params) {
		return request({
			url: `${BASE}/baseDevice/getDeviceOrderInfoPage`,
			method: "get",
			params
		});
    },
};
export default service;

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

@@ -11,7 +11,7 @@
                <div class="ellipsis tc pt8">{{data.drugName}}</div>
                <div class="tc pt5">￥{{data.price}}</div>
            </template>
            <div v-else class="ellipsis tc pt8 ">未设商品</div>
            <div v-else class="ellipsis tc pt8 ">未设药品</div>
        </div>
        <div class="tag" v-if="data.state==21">主</div>
        <div class="tag" v-else-if="data.state==20">副</div>
@@ -20,7 +20,7 @@
</template>
<script>
export default{
    props: ['data', 'index', 'bussuness'],//bussuness quick快速补货
    props: ['data', 'index', 'bussuness', 'isView'],//bussuness quick快速补货  isView
    data(){
        return {
            isActive: false
@@ -45,6 +45,9 @@ export default{
    },
    methods:{
        toSet(){
            if(this.isView){
                return
            }
            if(this.bussuness == 'quick'){
                this.isActive = !this.isActive
                this.$emit('onChange', this.isActive)

mini-pro-web/src/router/device.js

@@ -27,6 +27,17 @@ const device = [
                    // hasTop: false
                }
            },
            {
                path: "/device/stock",
                name: "deviceStock",
                component: () => import('@/views/device/stock.vue'),
                meta: {
                    title: '药品概况',
                    hasBot: false,
                    // hasTop: false
                }
            },
            
            {
                path: "/device/temperature/index",
                name: "temperatureIndex",
@@ -82,7 +93,7 @@ const device = [
                name: "cargoLaneSetting",
                component: () => import('@/views/device/cargoLane/setting.vue'),
                meta: {
                    title: '货道状态',
                    title: '货道设置',
                    hasBot: false,
                    // hasTop: false
                }
@@ -122,7 +133,7 @@ const device = [
                name: "deviceSell",
                component: () => import('@/views/device/sell.vue'),
                meta: {
                    title: '在售停售',
                    title: '维护/上架',
                    hasBot: false,
                    // hasTop: false
                }

mini-pro-web/src/router/replenishment.js

@@ -19,7 +19,7 @@ const routeMap = [
                path: "/replenishment/device/list",
                name: "replenishmentDeviceList",
                meta: {
                    title: "设备商品概况",
                    title: "设备药品概况",
                    // hasTop: false,
                    hasBot: false
                },
@@ -29,7 +29,7 @@ const routeMap = [
                path: "/replenishment/device/detail",
                name: "replenishmentDeviceDetail",
                meta: {
                    title: "设备商品概况",
                    title: "设备药品概况",
                    // hasTop: false,
                    hasBot: false
                },
@@ -39,7 +39,7 @@ const routeMap = [
                path: "/replenishment/record/list",
                name: "replenishmentRecordList",
                meta: {
                    title: "补货记录",
                    title: "入库记录",
                    // hasTop: false,
                    hasBot: false
                },
@@ -49,7 +49,7 @@ const routeMap = [
                path: "/replenishment/record/detail",
                name: "replenishmentRecordDetail",
                meta: {
                    title: "补货记录详情",
                    title: "入库记录详情",
                    // hasTop: false,
                    hasBot: false
                },
@@ -59,7 +59,7 @@ const routeMap = [
                path: "/replenishment/picking/list",
                name: "replenishmentPickingList",
                meta: {
                    title: "备货单",
                    title: "备药单详情",
                    // hasTop: false,
                    hasBot: false
                },
@@ -69,7 +69,7 @@ const routeMap = [
                path: "/replenishment/picking/detail",
                name: "replenishmentPickingDetail",
                meta: {
                    title: "备货单详情",
                    title: "备药单详情",
                    // hasTop: false,
                    hasBot: false
                },
@@ -79,7 +79,7 @@ const routeMap = [
                path: "/replenishment/stockUp/deviceList",
                name: "replenishmentStockUpDeviceList",
                meta: {
                    title: "查看缺货设备",
                    title: "查看缺药设备",
                    // hasTop: false,
                    hasBot: false
                },
@@ -89,7 +89,7 @@ const routeMap = [
                path: "/replenishment/stockUp/detail",
                name: "replenishmentStockUpDetail",
                meta: {
                    title: "查看缺货汇总",
                    title: "查看缺药汇总",
                    // hasTop: false,
                    hasBot: false
                },
@@ -110,7 +110,7 @@ const routeMap = [
                path: "/replenishment/start/deviceDetail",
                name: "replenishmentStartDeviceDetail",
                meta: {
                    title: "补货",
                    title: "药品入库",
                    // hasTop: false,
                    hasBot: false
                },
@@ -130,7 +130,7 @@ const routeMap = [
                path: "/replenishment/start/productDetail",
                name: "replenishmentStartProductDetail",
                meta: {
                    title: "商品详情",
                    title: "药品详情",
                    // hasTop: false,
                    hasBot: false
                },
@@ -140,7 +140,7 @@ const routeMap = [
                path: "/replenishment/start/selProduct",
                name: "replenishmentStartSelProduct",
                meta: {
                    title: "选择商品",
                    title: "选择药品",
                    // hasTop: false,
                    hasBot: false
                },

mini-pro-web/src/views/device/cargoLane/setting.vue

@@ -198,7 +198,7 @@ export default{
            return new Promise((resolve, reject)=>{
                this.$toast.clear()
                this.$dialog.confirm({
                    message: '货道拆分后请取下货道上的商品',
                    message: '货道拆分后请取下货道上的药品',
                    confirmButtonText: '继续拆分'
                })
                .then(() => {

mini-pro-web/src/views/device/detail.vue

@@ -29,10 +29,10 @@
        </div>
        <div class="mt10 bgc-fff c-border-tb">
            <div class="panel-title">补货</div>
            <div class="panel-title">药品管理</div>
            <div class='grid-4 c-f14 c-333 ptb15'>
                <!-- @click='gotoUrl("/device/temperature/index", {id: id})' -->
                <div class='c-t-center' >
                <div class='c-t-center' @click='gotoUrl("/device/stock", {deviceId: id})'>
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/yaopingaikuang.png")'/>
                    </div>
@@ -42,13 +42,13 @@
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/beihuo.png")'/>
                    </div>
                    <div>备货</div>
                    <div>药品申领</div>
                </div>
                <div v-if="hasAuth('replenish')" class='c-t-center' @click='gotoUrl("/replenishment/start/deviceDetail", {deviceId: id})'>
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/buhuo.png")'/>
                    </div>
                    <div>补货</div>
                    <div>药品入库</div>
                </div>
            </div>
        </div>
@@ -78,7 +78,7 @@
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/zaishoutingshou.png")'/>
                    </div>
                    <div>在售停售</div>
                    <div>维护/上架</div>
                </div>
                <!-- <div class='c-t-center' @click='gotoUrl("/device/temperature/index", {id: $route.query.id})'>
@@ -111,7 +111,7 @@
        <div class="mt10 bgc-fff c-border-tb">
            <div class="panel-title">操作日志</div>
            <div class='grid-4 c-f14 c-333 ptb15'>
                <div class='c-t-center' @click='gotoUrl("/device/infoLog/index")'>
                <div class='c-t-center' @click='gotoUrl("/device/infoLog/index", {deviceId: id, equNum: info.equNum})'>
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/xinxirizhi.png")'/>
                    </div>
@@ -121,13 +121,13 @@
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/beihuojilu.png")'/>
                    </div>
                    <div>备货记录</div>
                    <div>申领记录</div>
                </div>
                <div class='c-t-center' @click='gotoUrl("/replenishment/record/list", {deviceId: id})'>
                    <div>
                        <van-image class='ability' :src='require("@/assets/images/buhuojilu.png")'/>
                    </div>
                    <div>补货记录</div>
                    <div>入库记录</div>
                </div>
                <!-- <div class='c-t-center' @click='gotoUrl("/device/status", {id: info.id})'>
                    <div>

mini-pro-web/src/views/device/index.vue

@@ -3,7 +3,7 @@
    <van-sticky :offset-top="offsetTop">
        <van-tabs v-model="active">
            <van-tab :name="1" title="全部设备"></van-tab>
            <van-tab :name="0" title="缺货设备"></van-tab>
            <van-tab :name="0" title="缺药设备"></van-tab>
        </van-tabs>
    </van-sticky>
    <CustomList 
@@ -31,8 +31,8 @@
                    </div>
                    <div class="lh20 ptb10 kitbox">
                        <div class="box-flex-1">
                            <div>待补商品数量：{{item.daibushangpinshuliang}}</div>
                            <div>未设商品货道：{{item.weishezhishangpinhuodao}}</div>
                            <div>待补药品数量：{{item.daibushangpinshuliang}}</div>
                            <div>未设药品货道：{{item.weishezhishangpinhuodao}}</div>
                            <div>设备所属：{{item.community}}</div>
                            <div >设备编号：{{item.equNum}}</div>
                            <!-- <div>上次补货时间：{{item.shangyicibuhuoshijian}}</div> -->

mini-pro-web/src/views/device/infoLog/TimePicker.vue

@@ -0,0 +1,79 @@
<template>
    <div class='infoLog-filter-panel flex f_y_c p10 c-f14 c-border-b'>
        <div style='flex:1' class='flex f_y_c'>
            <div class='bgc-fff c-border lh44 h44 cbr date-box' :class="{'c-999': !startDate}" @click="show1=true">{{!startDate? '请选择' : $moment(startDate).format('YYYY-MM-DD')}}</div>
            <div class='mlr15 c-333'>至</div>
            <div class='bgc-fff c-border lh44 h44 cbr date-box' :class="{'c-999': !endDate}" @click="show2=true">{{!endDate? '请选择' : $moment(endDate).format('YYYY-MM-DD')}}</div>
        </div>
        <van-button class='c-border-r-5 w80' type="info" @click="onSearch">搜索</van-button>
        <van-overlay :show="show1||show2" @click="show1=false,show2 = false" >
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show1'
                v-model="startDate"
                type="date"
                :min-date="minDate"
                :max-date="maxDate"
            />
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show2'
                v-model="endDate"
                type="date"
                :min-date="minDate"
                :max-date="maxDate"
            />
        </van-overlay>
    </div>
</template>
<script>
export default{
    data(){
        return {
            show1: false,
            show2: false,
            minDate: this.$moment('2021-01-01').toDate(),
            maxDate: new Date(),
            startDate: '',
            endDate: ''
        }
    },
    methods:{
        onSearch(){
            var { startDate,endDate } = this
            this.$emit('onSearch', {
                startDate,
                endDate
            })
        },
    },
}
</script>
<style scoped lang='scss'>
.infoLog-filter-panel{
    position: fixed;
    top: 0;
    left: 0;
    width: 100%;
    background: #fff;
    z-index: 2;
    .cbr{
        border-radius: 22px;
    }
    .date-box{
        width: 100px;
        text-align: center;
    }
}
</style>
<style lang="scss">
.mainNobotHasTop{
    .infoLog-filter-panel{
        top: 96px;
    }
}
</style>

mini-pro-web/src/views/device/infoLog/deviceLog.vue

@@ -1,84 +1,119 @@
<template>
    <div class='deviceLog'>
        <div class='flex f_y_c p10 c-f14 c-border-b'>
            <div style='flex:1' class='flex f_y_c'>
                <div class='bgc-fff c-border lh44 h44 plr15 cbr' @click="show1=true">{{$moment(beginDate).format('YYYY-MM-DD')}}</div>
                <div class='mlr15 c-333'>至</div>
                <div class='bgc-fff c-border lh44 h44 plr15 cbr' @click="show2=true">{{$moment(endDate).format('YYYY-MM-DD')}}</div>
            </div>
            <van-button class='c-border-r-5 w80' type="info" @click="onSearch">搜索</van-button>
        </div>
        <!-- <CustomList 
        <TimePicker @onSearch="onSearch"/>
        <CustomList 
			ref="customList"
            :searchfun='false'
			@onLoad="onLoad"> -->
            <div v-for='(item, index) in list'>
                <div class='c-border-b bgc-fff p10 c-333 c-f14 flex f_y_c'>
                    <div style='flex: 1' class='flex f_y_c f_x_s mr30'>
                        <div>{{item.content}}</div>
                        <div>{{item.title}}</div>
                    </div>
                    <div>{{item.time}}</div>
                </div>
            :searchfun="false"
			@onLoad="onLoad">
			<div class="list plr15 mt10">
                <van-collapse v-model="activeNames">
                    <van-collapse-item 
                        v-for='(item) in list' :key="item.id"
                        :title="item.orderNum+'('+ item.name +')'" :name="item.id" :value="item.shippingTime">
                            <div v-for='(citem) in item.shipmentLogs' :key="citem.id" class='item bgc-fff plr10 c-333 c-f14  '>
                                <div class=''>
                                    <div>药品名称：{{citem.drugName}}</div>
                                    <div>出货状态：<span>{{citem.status==1? '未出货' : citem.status==2? '已出货' : citem.status==3? '出货故障' : ""}}</span></div>
                                    <div>货道信息：{{citem.layerNo}}层 {{citem.wayerNo}}道</div>
                                    <div>出货时间：{{citem.outTime}}</div>
                                    <div>出货日志详情：{{citem.description}}</div>
                                    <div>出货图片：<span v-if="!citem.pic">无出货照片</span>
                                        <van-image
                                            v-else
                                            width="100"
                                            height="100"
                                            :src="setImgUrl(citem.pic)"/>
                                    </div>
                                </div>
                            </div>
                        </van-collapse-item>
                </van-collapse>
                
            </div>
        <!-- </CustomList> -->
        <van-overlay :show="show1||show2" @click="show1=false,show2 = false" >
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show1'
                v-model="beginDate"
                type="date"
                title="选择开始日期"
                :min-date="minDate"
                :max-date="maxDate"
            />
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show2'
                v-model="endDate"
                type="date"
                title="选择截止日期"
                :min-date="minDate"
                :max-date="maxDate"
            />
        </van-overlay>
		</CustomList>
    </div>
</template>
<script>
import TimePicker from './TimePicker'
import medicineAbinetApi from '@/api/api-medicineAbinet'
export default{
    name: 'deviceLog',
    components: {
        TimePicker
    },
    props: ['deviceId', 'equNum'],
    data(){
        return {
            beginDate: new Date(),
            endDate: new Date(),
            minDate: this.$moment().add(-1,'years').toDate(),
            maxDate: new Date(),
            currentDate: '',
            list: [],
            show1: false,
            show2: false,
            startDate: '',
            endDate: '',
            activeNames: []
        }
    },
    methods:{
        onSearch(){
        onLoad({page, pageSize, searchText}){
            var { startDate, endDate } = this
            var p = {
                deviceId: this.deviceId,
                // idDevice: '',
                // lowT: this.min,
                // heightT: this.max,
				// equType: searchForm.equType,
                // networkStatus: searchForm.networkStatusName,
				// content: searchForm.deviceSearch,
                // community: len? this.community[len-1] : '',
				startTime: startDate? this.$moment(startDate).format('YYYY-MM-DD 00:00:00') : '',
				endTime: endDate? this.$moment(endDate).format('YYYY-MM-DD 23:59:59') : '',
                page: page,
                size: 30
            }
            console.log('getDeviceOrderInfoPage', p)
            medicineAbinetApi
                .getDeviceOrderInfoPage(p)
                .then(res=>{
                    console.log('getDeviceOrderInfoPage', res)
                    if(res.status == 200){
                        var list = res.detailModelList || []
                        this.list = page==1? list : this.list.concat(list)
                        this.$refs.customList.endLoad(list.length===0 || res.totalPage<=page, this.list.length)
                    } else {
                        this.onLoadError()
                    }
                }).catch(err=>{
                    console.error(err)
                    this.onLoadError()
                })
        },
        onSearch(data){
            if(data){
                this.startDate = data.startDate
                this.endDate = data.endDate
            }
            this.$refs.customList.refresh(true)
        },
        onLoadError(){
            this.$refs.customList.endLoad(false, true)
        },
        onLoad({}){
            
        }
    },
    onLoad(){
        this.list = [{content:'改变设备销售状态',title:'设备补货',time:'2020/09/01 10:03:00'},{content:'改变设备销售状态',title:'设备补货',time:'2020/09/01 10:03:00'}]
    }
}
</script>
<style scoped lang='scss'>
.deviceLog{
    .cbr{
        border-radius: 22px;
    .item{
        border-bottom: 1px solid #e1e1e1;
        padding: 10px 0;
        .van-image{
            vertical-align: text-top;
        }
        &:last-child{
            padding-bottom: 0;
            border-bottom: 0;
        }
        &:first-child{
            padding-top: 0;
        }
    }
}
</style>

mini-pro-web/src/views/device/infoLog/faultInfo.vue

@@ -1,91 +1,88 @@
<template>
    <div class='faultInfo'>
        <div class='p15 c-f14 bgc-fff c-333 grid-2 c-border-b'>
            <van-field
                v-model="f_event"
                readonly
                class='c-border'
                placeholder="请选择"
                @click="show1 = true">
                <template #right-icon>
                    <van-icon name="arrow-down" />
                </template>
            </van-field>
            <van-cell class='c-border' @click="show2 = true">
                <template #default>
                    <div class='c-t-center'>{{$moment(currenDate).format('YYYY-MM-DD')}}</div>
                </template>
            </van-cell>
        </div>
        <div v-for='(item, index) in list'>
            <div class='flex c-border-b c-333 c-f14 p10 bgc-fff f_y_c f_x_s'>
                <div style='flex:1;width:0' class='text-overhidd mr20'>{{item.content}}</div>
                <div>{{item.time}}</div>
        <TimePicker @onSearch="onSearch"/>
        <CustomList 
			ref="customList"
            :searchfun="false"
			@onLoad="onLoad">
			<div class="list plr15 mt10">
                <div v-for='(item, index) in list' :key="item.id" >
                    <div class=' c-border-b c-333 c-f14 p10 bgc-fff f_y_c f_x_s'>
                        <div  class='mr20'>{{item.type}}：{{item.remark}}</div>
                        <div class="pt5">{{item.logTime}}</div>
                    </div>
                </div>
            </div>
        </div>
        <van-overlay :show="show1||show2" @click="show1=false,show2 = false" >
            <van-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show1'
                show-toolbar
                :columns="eventList"
                value-key='dictValue'
                @confirm="onConfirm"
                @cancel="show1=false"
            />
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show2'
                v-model="endDate"
                type="date"
                :min-date="minDate"
                :max-date="maxDate"
            />
        </van-overlay>
		</CustomList>
    </div>
</template>
<script>
import TimePicker from './TimePicker'
import medicineAbinetApi from '@/api/api-medicineAbinet'
export default{
    name: 'faultInfo',
    components: {
        TimePicker
    },
    props: ['deviceId', 'equNum'],
    data(){
        return {
            f_event: '',
            eventList: [],
            show1: false,
            show2: false,
            currenDate: new Date(),
            minDate: this.$moment().add(-1,'years').toDate(),
            maxDate: new Date(),
            list: [{content:'货道电机超时',time:'10:03:00'}]
            list: [],
            startDate: '',
            endDate: ''
        }
    },
    mounted(){
        this.onSearch()
    },
    methods:{
        onConfirm(obj, index){
        onLoad({page, pageSize, searchText}){
            var { startDate, endDate } = this
            var p = {
                idDevice: this.equNum,
				// equClass: searchForm.equType,
                // networkStatus: searchForm.networkStatusName || '',
				// content: searchForm.deviceSearch,
                // community: len? this.community[len-1] : '',
				startTime: startDate? this.$moment(startDate).format('YYYY-MM-DD 00:00:00') : '',
				endTime: endDate? this.$moment(endDate).format('YYYY-MM-DD 23:59:59') : '',
                page: page,
                size: 30
            }
            console.log('params', p)
            medicineAbinetApi
                .warrayGetFault(p)
                .then(res=>{
                    console.log('warrayGetFault', res)
                    if(res.status == 200){
                        this.totalCount = res.totalCount
                        var list = res.detailModelList
                        this.list = page==1? list : this.list.concat(list)
                        this.$refs.customList.endLoad(res.totalPage<=page, this.list.length)
                    } else {
                        this.onLoadError()
                    }
                }).catch(err=>{
                    console.error(err)
                    this.onLoadError()
                })
        },
        onSearch(data){
            if(data){
                this.startDate = data.startDate
                this.endDate = data.endDate
            }
            this.$refs.customList.refresh(true)
        },
        onLoadError(){
            this.$refs.customList.endLoad(false, true)
        },
        initMain(){
        }
    },
    created(){
        this.eventList = [{dictValue:'全部事件',dictCode:'all'}]
    }
    
}
</script>
<style scoped lang='scss'>
.faultInfo{
    .grid-2{
        display: grid;
        grid-template-columns: 1fr 1fr;
        grid-column-gap: 20px;
    }
    .text-overhidd{
        overflow: hidden;
        text-overflow: ellipsis;
        white-space: nowrap;
        word-break: break-all;
    }
 
}
</style>
</style>

mini-pro-web/src/views/device/infoLog/index.vue

@@ -1,13 +1,15 @@
<template>
    <div class='device-infoLog-index'>
        <van-tabs v-model="active">
            <van-tab title="设备日志"></van-tab>
            <van-tab title="故障信息"></van-tab>
            <van-tab title="离线日志"></van-tab>
        </van-tabs>
        <device-log v-show='active==0'></device-log>
        <fault-info v-show='active==1'></fault-info>
        <offline-log v-show='active==2'></offline-log>
        <van-sticky :offset-top="offsetTop">
            <van-tabs v-model="active">
                <van-tab title="出货日志"></van-tab>
                <van-tab title="故障日志"></van-tab>
                <van-tab title="离线日志"></van-tab>
            </van-tabs>
        </van-sticky>
        <device-log v-show='active==0' :deviceId="deviceId" :equNum="equNum"></device-log>
        <fault-info v-show='active==1' :deviceId="deviceId" :equNum="equNum"></fault-info>
        <offline-log v-show='active==2' :deviceId="deviceId" :equNum="equNum"></offline-log>
    </div>
</template>
<script>
@@ -24,6 +26,8 @@ export default{
    data(){
        return {
            active: 0,
            deviceId: this.$route.query.deviceId,
            equNum: this.$route.query.equNum,
        }
    },
    methods:{
@@ -34,8 +38,24 @@ export default{
    }
}
</script>
<style scoped lang='scss'>
<style lang='scss'>
.device-infoLog-index{
    .van-overlay{
        z-index: 999;
    }
    .custom-list{
        height: calc(100vh - 50px);
        padding-top: 66px;
    }
}
.mainNobotHasTop{
    .device-infoLog-index{
        .custom-list {
            height: calc(100vh - 96px);
            .search{
                top: 96px;
            }
        }
    }
}
</style>
</style>

mini-pro-web/src/views/device/infoLog/offlineLog.vue

@@ -1,74 +1,85 @@
<template>
    <div class='offlineLog'>
        <div class='flex f_y_c p10 c-f14 c-border-b'>
            <div style='flex:1' class='flex f_y_c'>
                <div class='bgc-fff c-border lh44 h44 plr15 cbr' @click="show1=true">{{$moment(beginDate).format('YYYY-MM-DD')}}</div>
                <div class='mlr15 c-333'>至</div>
                <div class='bgc-fff c-border lh44 h44 plr15 cbr' @click="show2=true">{{$moment(endDate).format('YYYY-MM-DD')}}</div>
            </div>
            <van-button class='c-border-r-5 w80' type="info" @click="onSearch">搜索</van-button>
        </div>
        <div v-for='(item, index) in list'>
            <div class='c-border-b bgc-fff p10 c-333 c-f14 flex f_y_c'>
                <div style='flex: 1;width:0;' class='mr20'>
                    <div>{{item.time}}</div>
        <TimePicker @onSearch="onSearch"/>
        <CustomList 
			ref="customList"
            :searchfun="false"
			@onLoad="onLoad">
			<div class="list plr15 mt10">
                <div v-for='(item, index) in list' :key="item.id">
                    <div class='c-border-b bgc-fff p10 c-333 c-f14 flex f_y_c'>
                        <div style='flex: 1;width:0;' class='mr20'>
                            <div>{{item.logTime}}</div>
                        </div>
                        <div>{{item.type}}</div>
                    </div>
                </div>
                <div>{{item.online}}</div>
            </div>
        </div>
        <van-overlay :show="show1||show2" @click="show1=false,show2 = false" >
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show1'
                v-model="beginDate"
                type="date"
                title="选择开始日期"
                :min-date="minDate"
                :max-date="maxDate"
            />
            <van-datetime-picker
                class='c-position-a'
                style='bottom:0;width:100%'
                v-show='show2'
                v-model="endDate"
                type="date"
                title="选择截止日期"
                :min-date="minDate"
                :max-date="maxDate"
            />
        </van-overlay>
		</CustomList>
    </div>
</template>
<script>
import TimePicker from './TimePicker'
import medicineAbinetApi from '@/api/api-medicineAbinet'
export default{
    name: 'offlineLog',
    components: {
        TimePicker
    },
    props: ['deviceId', 'equNum'],
    data(){
        return {
            beginDate: new Date(),
            endDate: new Date(),
            minDate: this.$moment().add(-1,'years').toDate(),
            maxDate: new Date(),
            currentDate: '',
            list: [],
            show1: false,
            show2: false,
            startDate: '',
            endDate: ''
        }
    },
    mounted(){
        this.onSearch()
    },
    methods:{
        onSearch(){
        onLoad({page, pageSize, searchText}){
            var { startDate, endDate } = this
            var p = {
                idDevice: this.equNum,
                // networkStatus: searchForm.networkStatusName,
				startTime: startDate? this.$moment(startDate).format('YYYY-MM-DD 00:00:00') : '',
				endTime: endDate? this.$moment(endDate).format('YYYY-MM-DD 23:59:59') : '',
                page: page,
                size: 30
            }
            console.log('warrayGetOffline', p)
            medicineAbinetApi
                .warrayGetOffline(p)
                .then(res=>{
                    console.log('warrayGetOffline', res)
                    if(res.status == 200){
                        var list = res.detailModelList || []
                        this.list = page==1? list : this.list.concat(list)
                        this.$refs.customList.endLoad(list.length===0 || res.totalPage<=page, this.list.length)
                    } else {
                        this.onLoadError()
                    }
                }).catch(err=>{
                    console.error(err)
                    this.onLoadError()
                })
        },
        onSearch(data){
            if(data){
                this.startDate = data.startDate
                this.endDate = data.endDate
            }
            this.$refs.customList.refresh(true)
        },
        onLoadError(){
            this.$refs.customList.endLoad(false, true)
        },
    },
    created(){
        this.list = [{online:'离线',time:'2020/09/01 10:03:00'},{online:'离线',time:'2020/09/01 10:03:00'}]
    }
}
</script>
<style scoped lang='scss'>
.offlineLog{
    .cbr{
        border-radius: 22px;
    }
    
}
</style>

mini-pro-web/src/views/device/sell.vue

@@ -1,7 +1,7 @@
<template>
    <div class='deviceSell'>
        <div class='plr15 ptb20 c-333 c-f14 bgc-fff c-border-b flex f_y_c f_x_s'>
            <div>当前售货状态：<span>{{status? '在售' : '停售'}}</span></div>
            <div>当前售货状态：<span>{{status? '设备上架' : '设备维护'}}</span></div>
            <van-switch @change="switchSell" inactive-color='#ccc' active-color='#17b3ec' v-model="status" />
        </div>
    </div>

mini-pro-web/src/views/device/stock.vue

@@ -0,0 +1,30 @@
<template>
<div class="device-stock">
    <DeviceDetail :isView="true"/>
</div>
</template>
<script>
import DeviceDetail from '@/views/replenishment/start/deviceDetail'
export default {
    name: "deviceStock",
    components: {
        DeviceDetail
    },
    data() {
        return {
            deviceId: this.$route.query.id,
        };
    },
    created() {
        
    },
    methods: {
        
    },
};
</script>
<style scoped lang='scss'>
.device-stock {
    
}
</style>

mini-pro-web/src/views/device/temperature/index.vue

@@ -221,7 +221,7 @@ export default{
            medicineAbinetApi.findDeviceById({deviceId: this.$route.query.id}).then(res=>{
                this.$toast.clear()
                if(res.status==200){
                    console.log(res);
                    console.log('findDeviceById', res);
                    this.temperature = res.obj.device.nowTemperature;
                    this.humidity = res.obj.device.nowHumidity;

mini-pro-web/src/views/index/Index.vue

@@ -85,7 +85,7 @@ export default {
				"saleTotal": 0,						//在售数
				"onlineRate": 0,					//在线率
				"onlineTotal": 0,						//在线设备数
				"outCount": 0 						//缺货设备数
				"outCount": 0 						//缺药设备数
			}
    	}
  	},

mini-pro-web/src/views/order/detail/components/LogList.vue

@@ -3,7 +3,7 @@
        <div v-for="(item, i) in list" :key="i" class="item lh26 plr15 ptb10 break-all bgc-fff fs-14 bb-e1e1e1">
            <div>出货货道: <span>{{item.layerNo}}行{{item.wayerNo}}列</span></div>
            <div class="kitbox">
                <div class="box-flex-1">商品名称: <span>{{item.drugName}}</span></div>
                <div class="box-flex-1">药品名称: <span>{{item.drugName}}</span></div>
                <div>x1</div>
            </div>
            <div>设备日志: <span>{{item.status==2? '（无异常）出货成功' : item.description}}</span></div>

mini-pro-web/src/views/order/list.vue

@@ -107,7 +107,7 @@
                    共 {{totalCount}} 笔订单
                </div>
                <!-- <div class="box-flex-1 plr15 tr">
                    商品总金额 ￥{{totalMoney}}
                    药品总金额 ￥{{totalMoney}}
                </div> -->
            </div>
        </div>

mini-pro-web/src/views/replenishment/device/detail.vue

@@ -8,7 +8,7 @@
                <div class="color-block ml10 red"></div>
                <span class="ml5 fs-12">故障</span>
            </div>
            <div><van-button @click="gotoUrl('/replenishment/start/deviceDetail', {deviceId: deviceId})" type="info" size="small">点击设置商品</van-button></div>
            <div><van-button @click="gotoUrl('/replenishment/start/deviceDetail', {deviceId: deviceId})" type="info" size="small">点击设置药品</van-button></div>
        </div>
        <div class="list ">
@@ -27,7 +27,7 @@
                                <div class="ellipsis tc pt8">{{data.drugName}}</div>
                                <div class="tc pt5">￥{{data.price}}</div>
                            </template>
                            <div v-else class="ellipsis tc pt8 ">未设商品</div>
                            <div v-else class="ellipsis tc pt8 ">未设药品</div>
                        </div>
                    </div>
                </div>

mini-pro-web/src/views/replenishment/device/list.vue

@@ -15,7 +15,7 @@
                    <div class="lh20 ptb10 kitbox">
                        <div class="box-flex-1">
                            <div>药柜容量：{{item.capacity}}</div>
                            <div>商品库存：{{item.shangPinKuCun}}</div>
                            <div>药品库存：{{item.shangPinKuCun}}</div>
                            <div>设备所属：{{item.community}}</div>
                            <div>设备编号：{{item.equNum}}</div>
                        </div>

mini-pro-web/src/views/replenishment/index.vue

@@ -10,7 +10,7 @@
					<span class="ml5">台</span>
				</div>
				<div class="">
					<span class="v-middle">查看设备商品</span>
					<span class="v-middle">查看设备药品</span>
					<van-icon class="v-middle"  name="arrow" />
				</div>
			</div>
@@ -23,18 +23,18 @@
		<div class="mt10"></div>
		<div class="panel plr15 c-fff fs-14">
			<div class=" pt15 ">
				<div class="fs-16 f-bold">缺货设备  |  实时</div>
				<div class="fs-16 f-bold">缺药设备  |  实时</div>
			</div>
			<div class="  pt10">
				<span class="fs-23">{{countObj.outCount}}</span>
				<span class="ml5">台</span>
			</div>
			<div class="pt10 ">
				以上统计的缺货设备为实时数据
				以上统计的缺药设备为实时数据
			</div>
			<div class="kitbox ptb10">
				<div class="box-flex-1 mr10">
					<van-button @click="gotoUrl('/replenishment/stockUp/deviceList')" plain block round size="small" type="info">去备货</van-button>
					<van-button @click="gotoUrl('/replenishment/stockUp/deviceList')" plain block round size="small" type="info">去备药</van-button>
				</div>
				<div class="box-flex-1 ml10">
					<van-button @click="gotoUrl('/replenishment/start/deviceList')" plain block round size="small" type="info">去补货</van-button>
@@ -51,7 +51,7 @@
					<van-row class="">
						<van-col @click="gotoUrl('/replenishment/picking/list')" span="6" class="tc ">
							<div class="fs-23 c-17b3ec"><img src="@/assets/images/dingdanguanli.png" alt=""></div>
							<div class="fs-14 c-666 pt5">备货单</div>
							<div class="fs-14 c-666 pt5">备药单</div>
						</van-col>
						<van-col @click="gotoUrl('/replenishment/record/list')" span="6" class="tc">
							<div class="fs-23 c-ff9526"><img src="@/assets/images/shebeiguanli.png" alt=""></div>
@@ -80,7 +80,7 @@ export default {
				"saleTotal": 0,						//在售数
				"onlineRate": 0,					//在线率
				"onlineTotal": 0,						//在线设备数
				"outCount": 0 						//缺货设备数
				"outCount": 0 						//缺药设备数
			}
			
    	}

mini-pro-web/src/views/replenishment/picking/detail.vue

@@ -2,7 +2,7 @@
    <div class='replenishment-picking-detail fs-14'>
        <div class="list bgc-fff">
            <div class="row kitbox">
                <div class="box-flex-1 pl10">商品名称</div>
                <div class="box-flex-1 pl10">药品名称</div>
                <div class="tc">领料数量</div>
            </div>
            <div class="row kitbox" v-for="(item, i) in drugList" :key="i">

mini-pro-web/src/views/replenishment/picking/list.vue

@@ -3,14 +3,14 @@
        <van-sticky :offset-top="offsetTop">
            <van-tabs v-model="active" @change="onChange">
                <!-- <van-tab title="全部"></van-tab> -->
                <van-tab title="备货中"></van-tab>
                <van-tab title="备药中"></van-tab>
                <van-tab title="">
                    <div slot="title">
                        <van-badge v-if="waitCount" :content="waitCount">待领料</van-badge>
                        <span v-else>待领料</span>
                        <van-badge v-if="waitCount" :content="waitCount">待领药</van-badge>
                        <span v-else>待领药</span>
                    </div>
                </van-tab>
                <van-tab title="已领料"></van-tab>
                <van-tab title="已领药"></van-tab>
                <!-- <van-tab title="已驳回"></van-tab> -->
            </van-tabs>
        </van-sticky>
@@ -21,10 +21,10 @@
			<div class="list plr15 pt10">
                <div @click="gotoDetail(item)" v-for="(item, i) in list" :key="i" class="item bgc-fff plr15 c-333 fs-14">
                    <div class=" ptb10 kitbox bb-e1e1e1">
                        <div class="box-flex-1 fs-14">备货单号:{{item.docNum}}</div>
                        <div class="box-flex-1 fs-14">备药单号:{{item.docNum}}</div>
                        <div class="">
                            <span v-if="active===0&&item.state==2" class="c-ff9526">备货中</span>
                            <span v-if="active===0&&item.state==1" class="c-17b3ec">已备货</span>
                            <span v-if="active===0&&item.state==2" class="c-ff9526">未生成</span>
                            <span v-if="active===0&&item.state==1" class="c-17b3ec">已生成</span>
                            <span v-else-if="active===1" class="c-17b3ec">待领料</span>
                            <span v-else-if="active===2" class="c-999">已领料</span>
                            <!-- <span class="c-ff5e6c">已驳回</span> -->

mini-pro-web/src/views/replenishment/record/detail.vue

@@ -6,7 +6,7 @@
                <template>
                    <div>补货时间：2020-08-24 17:15:19</div>
                    <div>设备编号：149122021070000</div>
                    <div>商品数量：2</div>
                    <div>药品数量：2</div>
                    <div>补货人员：张三</div>
                </template>
                <!-- <template>
@@ -25,7 +25,7 @@
        <div class="mt10 table fs-14 break">
            <div class="kitbox row tc fs-14">
                <div class=" ">图片</div>
                <div class="box-flex-1">商品名/条码</div>
                <div class="box-flex-1">药品名/条码</div>
                <div class=" ">数量</div>
            </div>
            <div class="kitbox row tc ptb10">
@@ -47,9 +47,9 @@
                    </div>
                </div>
                <div class="box-flex-1 ">
                    <div class="lh30 ellipsis">商品名/条码商品名/条码商品名/条码</div>
                    <div class="lh30 ellipsis">药品名/条码药品名/条码药品名/条码</div>
                    <div><van-icon name="arrow-down" /></div>
                    <div class="lh30 ellipsis">商品名/条码商品名/条码商品名/条码</div>
                    <div class="lh30 ellipsis">药品名/条码药品名/条码药品名/条码</div>
                </div>
                <div class=" ">
                    <div class="lh30">2</div>

mini-pro-web/src/views/replenishment/record/list.vue

@@ -41,7 +41,7 @@
                            <template>
                                <div>操作时间：{{citem.createTime}}</div>
                                <div>设备编号：{{citem.equNum}}</div>
                                <div>商品数量：{{citem.quantity}}</div>
                                <div>药品数量：{{citem.quantity}}</div>
                                <div>操作人员：{{citem.createUserName}}</div>
                            </template>
                            <template>

mini-pro-web/src/views/replenishment/start/components/SetStockDialog.vue

@@ -35,7 +35,7 @@ export default{
    props:{
        value: {},
        bussiness: {
            default: 1 //1修改容量 2矫正库存 4设置库存 5选择商品后 设置库存  6备货时选择药品
            default: 1 //1修改容量 2矫正库存 4设置库存 5选择药品后 设置库存  6备药时选择药品
        },
        data: {
            default: function(){

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

@@ -1,6 +1,6 @@
<template>
    <div class='replenishment-start-device-detail fs-14'>
        <van-sticky :offset-top="offsetTop">
    <div class='replenishment-start-device-detail fs-14' :class="{'is-view': isView}">
        <van-sticky v-if="!isView" :offset-top="offsetTop">
            <div class="bgc-17b3ec c-fff">
                <div class="pt10 plr15 ellipsis_1">当前货柜：{{deviceInfo.device.equName}}</div>
                <van-row>
@@ -22,7 +22,7 @@
                    <van-col span="6">
                        <div class="tc pt10 pb10">
                            <div class="fs-20">{{deviceInfo.outOfStock||0}}</div>
                            <div class="fs-12 pt5">缺货库存</div>
                            <div class="fs-12 pt5">缺药库存</div>
                        </div>
                    </van-col>
                    <van-col span="6">
@@ -48,8 +48,8 @@
                <div class="color-block ml10 red"></div>
                <span class="ml5 fs-12">故障</span>
            </div>
            <div class="plr15" v-if="this.outDetailList&&this.outDetailList.length">
                <van-button @click="changeShowDrug" type="primary" color="#17b3ec" size="mini">{{showDeviceDrug? '备货单药品' : '设备库存药品'}}</van-button>
            <div class="plr15" v-if="!isView&&this.outDetailList&&this.outDetailList.length">
                <van-button @click="changeShowDrug" type="primary" color="#17b3ec" size="mini">{{showDeviceDrug? '备药单药品' : '设备库存药品'}}</van-button>
            </div>
        </div>
        <div class="kitbox">
@@ -75,7 +75,7 @@
                </div>
                <template v-else>
                    <div class="item" v-for="(item, k) in curItem.list" :key="k">
                        <ProductItem :data="item" :index="k"/>
                        <ProductItem :data="item" :index="k" :isView="isView"/>
                    </div>
                </template>
            </div>
@@ -90,6 +90,7 @@ export default{
    components: {
        ProductItem
    },
    props: ['isView'],
    data(){
        return {
            deviceInfo: {device: ''},
@@ -224,6 +225,9 @@ export default{
            this.list[0].list = this.showDeviceDrug? this.deviceDrugList : this.outDetailList
        },
        toQuick(item){
            if(this.isView){
                return
            }
            console.log(item)
            this.gotoUrl('/replenishment/start/quick', {
                deviceId: this.deviceId,
@@ -245,9 +249,7 @@ export default{
    .list{
        display: flex;
        flex-wrap: wrap;
        height: calc(100vh - 153px);
        overflow-y: auto;
        // min-height: calc(100vh - 130px);
        .item{
            margin-left: 5px;
            margin-bottom: 5px;
@@ -263,8 +265,8 @@ export default{
            }
        }
    }
    .left-list{
        height: calc(100vh - 153px);
    .left-list, .list{
        height: calc(100vh - 158px);
    }
    .color-block{
        background: #ff9526;
@@ -277,6 +279,12 @@ export default{
            background: #ff5e6c;
        }
    }
    &.is-view{
        .list, .left-list{
            height: calc(100vh - 44px);
        }
    }
}
</style>
@@ -286,6 +294,11 @@ export default{
        .list, .left-list{
            height: calc(100vh - 206px);
        }
        &.is-view{
            .list, .left-list{
                height: calc(100vh - 91px);
            }
        }
    }
}
</style>

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

@@ -2,7 +2,7 @@
<div class='replenishment-start-device-list'>
    <van-sticky :offset-top="offsetTop">
        <van-tabs v-model="active">
            <van-tab title="缺货设备"></van-tab>
            <van-tab title="缺药设备"></van-tab>
            <van-tab title="全部设备"></van-tab>
        </van-tabs>
    </van-sticky>

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

@@ -7,7 +7,7 @@
            />
        </div>
        <div class="tc c-333 pt20 pb10 plr15 break-all">{{info.drugName}}</div>
        <div class="c-17b3ec tc" @click="gotoUrl('/drugList', {deviceId: info.idDevice})">更换商品</div>
        <div class="c-17b3ec tc" @click="gotoUrl('/drugList', {deviceId: info.idDevice})">更换药品</div>
        <div class=" tc pt20">
            <span class="mr10">现有数量：{{info.qty}} </span>
            <span class="ml10">货道容量：{{info.cargoCapacity}} </span>
@@ -22,7 +22,7 @@
            <div><van-button type="info" @click="bussiness=2;setStockShow=true" round block size="small">矫正库存</van-button></div>
            <div class="kitbox pt10">
                <div class="box-flex-1 pr10"><van-button @click="bussiness=1;setStockShow=true" type="info" round block plain size="small">修改容量</van-button></div>
                <div class="box-flex-1 pl10"><van-button @click="checkRemoveDrug()" type="info" round block plain class="red" size="small">下架商品</van-button></div>
                <div class="box-flex-1 pl10"><van-button @click="checkRemoveDrug()" type="info" round block plain class="red" size="small">下架药品</van-button></div>
            </div>
        </div>
        <!-- 修改容量 -->

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

@@ -335,7 +335,7 @@ export default{
            return new Promise((resolve, reject)=>{
                this.$toast.clear()
                this.$dialog.confirm({
                    message: '货道拆分后请取下货道上的商品',
                    message: '货道拆分后请取下货道上的药品',
                    confirmButtonText: '继续拆分'
                })
                .then(() => {
@@ -458,7 +458,6 @@ export default{
    .list{
        display: flex;
        flex-wrap: wrap;
        height: calc(100vh - 153px);
        overflow-y: auto;
        // min-height: calc(100vh - 130px);
        .item{
@@ -470,8 +469,8 @@ export default{
        }
        
    }
    .left-list{
        height: calc(100vh - 153px);
    .left-list, .list{
        height: calc(100vh - 178px);
    }
    .color-block{
        background: #ff9526;
@@ -503,7 +502,7 @@ export default{
.mainNobotHasTop{
    .replenishment-start-quick{
        .list, .left-list{
            height: calc(100vh - 174px);
            height: calc(100vh - 225px);
        }
    }
}

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

@@ -4,7 +4,7 @@
            <van-search
                v-model="searchText"
                show-action
                placeholder="请输入商品名称搜索"
                placeholder="请输入药品名称搜索"
                @search="onSearch"
                @cancel="onCancel"
            />
@@ -25,7 +25,7 @@
                        <div class="box-flex-1 pl10 right" >
                            <div class="fs-14 c-333">J氯化钠注射液(90mg）</div>
                            <div class="fs-12 c-999">
                                <div>商品条码：12464</div>
                                <div>药品条码：12464</div>
                                <div>价格：￥27.00  <span class="ml5">规格：0.33g*27</span></div>
                            </div>
                        </div>
@@ -43,7 +43,7 @@
                    <div class="box-flex-1 pl10 right" >
                        <div class="fs-14 c-333">J氯化钠注射液(90mg）</div>
                        <div class="fs-12 c-999">
                            <div>商品条码：12464</div>
                            <div>药品条码：12464</div>
                            <div>价格：￥27.00  <span class="ml5">规格：0.33g*27</span></div>
                        </div>
                    </div>

mini-pro-web/src/views/replenishment/stockUp/detail.vue

@@ -3,7 +3,7 @@
        <div class="list bgc-fff ">
            <van-sticky :offset-top="offsetTop">
                <div class="row kitbox bgc-fff"  >
                    <div class="box-flex-1 pl10">商品名称</div>
                    <div class="box-flex-1 pl10">药品名称</div>
                    <div class="tc">现料数</div>
                    <div class="tc">缺料数</div>
                    <div class="tc">操作</div>
@@ -19,14 +19,14 @@
        <div class="btns">
            <div class="pl15 pr8">
                <van-button plain @click="toAdd" block round type="info">新增商品</van-button>
                <van-button plain @click="toAdd" block round type="info">新增药品</van-button>
            </div>
            <div class="pl8 pr15">
                <van-button  block @click="submit" round type="info">生成备货单</van-button>
                <van-button  block @click="submit" round type="info">生成备药单</van-button>
            </div>
        </div>
        <!-- <BotFloatButton :fix="true">下一步，生成备货单</BotFloatButton> -->
        <!-- <BotFloatButton :fix="true">下一步，生成备药单</BotFloatButton> -->
    </div>
</template>
<script>

mini-pro-web/src/views/replenishment/stockUp/deviceList.vue

@@ -2,7 +2,7 @@
<div class='replenishment-stock-up-device-list'>
    <van-sticky :offset-top="offsetTop">
        <van-tabs v-model="active">
            <van-tab title="缺货设备"></van-tab>
            <van-tab title="缺药设备"></van-tab>
            <van-tab title="全部设备"></van-tab>
        </van-tabs>
    </van-sticky>
@@ -31,8 +31,8 @@
                    </div>
                    <div class="lh20 ptb10 kitbox">
                        <div class="box-flex-1">
                            <div>待补商品数量：{{item.daibushangpinshuliang}}</div>
                            <div>未设商品货道：{{item.weishezhishangpinhuodao}}</div>
                            <div>待补药品数量：{{item.daibushangpinshuliang}}</div>
                            <div>未设药品货道：{{item.weishezhishangpinhuodao}}</div>
                            <div>设备所属：{{item.community}}</div>
                            <div >设备编号：{{item.equNum}}</div>
                            <!-- <div>上次补货时间：{{item.shangyicibuhuoshijian}}</div> -->