1

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

@@ -28,7 +28,7 @@ export default{
                this.$loading('保存中')
                var p = {
                    deviceId: this.$route.query.id,
                    saleStatus: flag? 1 : 0
                    saleStatus: flag? 1 : 2
                }
				medicineAbinetApi
					.updateSaleStatus(p)

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

@@ -95,7 +95,8 @@ export default {
			curImg: '',
			illustrationMskShow: false,
			socketUrl: '',
			path: "wss://zb.xmtyw.cn/cabinet/websocket/",
			// path: "wss://zb.xmtyw.cn/cabinet/websocket/",
			path: "ws://yik.ab-inbev.vip/c/websocket/",
			socket: "",
			layerNo: "0",
			wayerNo: "0",
@@ -128,9 +129,17 @@ export default {
		}
	},
	created(){
		if(process.env.VUE_APP_BASE_API.indexOf('http://ehr.yihu.com') != -1){
			//测试线
			this.path = "ws://yik.ab-inbev.vip/c/websocket/"
		} else {
			//正式线
			this.path = "wss://zb.xmtyw.cn/cabinet/websocket/"
		}
		if(this.deviceNum){
			this.init()
		}
		window.SetPrintPage = this.SetPrintPage
	},
  	methods: {
		onPrev(){
@@ -205,6 +214,7 @@ export default {
									this.rsType = 5
									this.step = 3
								}
								this.inCheckBarcode = false
								return
							}
						}
@@ -300,6 +310,7 @@ export default {
						})
				}
			} else if (msgobj.type == 'BarCodeInfo') {
				debugger
				if (msgobj.mess.indexOf("异常") != -1) {
					this.$toast(msgobj.mess)
					console.log(msgobj.mess)
@@ -516,6 +527,7 @@ export default {
			printcon.push({type:"nline"})
			printcon.push({type:"nline"})
			printcon.push({type:"nline"})
			console.log('printcon', printcon)
			var obj = {
				type: "PrintPage",
				mess: JSON.stringify(printcon),

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

@@ -8,10 +8,12 @@
            </div>
            <div>设备日志: <span>{{item.status==2? '（无异常）出货成功' : item.description}}</span></div>
            <div>设备名称: <span>{{item.equName}}</span></div>
            <div class="out-img"><span>出货图片: </span><img @click="preview(item.pic)" :src="setImgUrl(item.pic)" alt=""></div>
        </div>
    </div>
</template>
<script>
import { ImagePreview } from 'vant';
export default{
    props: ['list'],
    data(){
@@ -23,12 +25,19 @@ export default{
        
    },
    methods:{
        
        preview(src){
            ImagePreview([this.setImgUrl(src)]);
        }
    },
}
</script>
<style lang='scss' scoped>
.order-detail-log-list{
    
    .out-img{
        img{
            width: 200px;
            vertical-align: text-top;
        }
    }
}
</style>

mini-pro-web/src/views/order/detail/index.vue

@@ -41,10 +41,20 @@
            <van-tab title="设备信息" v-if="info.device">
                <DeviceInfo :data="info.device"/>
            </van-tab>
            <van-tab title="出货拍照" v-if="info.outList&&info.outList.length">
                <div class="pl10">
                    <div class="pic-list" >
                        <div class="pic-item" v-for="(item, i) in info.outList" :key="i">
                            <img @click="preview(i)" :src="item.pic" alt="">
                        </div>
                    </div>
                </div>
            </van-tab>
        </van-tabs>
    </div>
</template>
<script>
import { ImagePreview } from 'vant';
import medicineAbinetApi from '@/api/api-medicineAbinet'
import DeviceInfo from './components/DeviceInfo'
import LogList from './components/LogList'
@@ -77,37 +87,27 @@ export default{
                    this.$toast.clear()
                    console.log('getOrderDetailById', res)
                    if(res.status == 200){
                        if(res.obj.outList){
                            res.obj.outList.forEach(v => {
                                v.pic = this.setImgUrl(v.pic)
                            });
                        }
                        this.info = res.obj
                    } 
                })
                .catch(err=>{
                    console.error(err)
                })
        },
        preview(startPosition){
            var images = _.map(this.info.outList, v=>{
                return v.pic
            })
            ImagePreview({
                images,
                startPosition
            });
        }
        // getOrderDetailById(){
        //     if(!this.id){
        //         return
        //     }
        //     this.loadingForm = true
        //     console.log('this.id.id', this.id)
        //     medicineAbinetApi
        //         .getOrderDetailById({
        //             orderId: this.id
        //         })
        //         .then(res => {
        //             if(res.obj.drugList){
        //                 res.obj.drugList.forEach(v => {
        //                     v.total = ((v.price * v.drugNum) || 0).toFixed(2)
        //                 });
        //             }
        //             this.model = _.assign(this.model, res.obj)
        //             console.log('getOrderDetailById', this.model)
        //             this.loadingForm = false
        //         }).catch(err=>{
        //             this.loadingForm = false
        //             console.error(err)
        //         })
        // },
    },
}
</script>
@@ -132,5 +132,19 @@ export default{
            }
        }
    }
    .pic-list{
        padding: 10px 0;
        display: flex;
        flex-wrap: wrap;
        .pic-item{
            width: calc(100% / 4 - 10px);
            margin-right: 10px;
            margin-bottom: 10px;
            img{
                width: 100%;
                display: block;
            }
        }
    }
}
</style>

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

@@ -67,10 +67,11 @@ export default{
                    page: page,
                    size: pageSize
                };
            
            console.log('getDeviceInventoryRecordListWithUserId', params)
            medicineAbinetApi
                .getDeviceInventoryRecordListWithUserId(params)
                .then(res=>{
                    console.log('getDeviceInventoryRecordListWithUserId', res)
                   if(res.status == 200){
                        var list = res.detailModelList
                        this.list = page==1? list : this.list.concat(list)