1

mini-pro-web/src/views/machine/components/Result.vue

@@ -1,11 +1,11 @@
<template>
	<div class="machine-index-Result">
		<div class="tips-img">
			<img v-show="rsType==1" class="bg-img" src="../img/order_info.png" alt="">
			<img v-show="rsType==2" class="bg-img" src="../img/order_err.png" alt="">
			<img v-show="rsType==3" class="bg-img" src="../img/order_suc.png" alt="">
			<img v-show="rsType==4" class="bg-img" src="../img/complete.png" alt="">
			<img v-show="rsType==5" class="bg-img" src="../img/order_list.png" alt="">
			<img v-show="rsType==1" draggable="false" class="bg-img" src="../img/order_info.png" alt="">
			<img v-show="rsType==2" draggable="false" class="bg-img" src="../img/order_err.png" alt="">
			<img v-show="rsType==3" draggable="false" class="bg-img" src="../img/order_suc.png" alt="">
			<img v-show="rsType==4" draggable="false" class="bg-img" src="../img/complete.png" alt="">
			<img v-show="rsType==5" draggable="false" class="bg-img" src="../img/order_list.png" alt="">
			<div class="order-list" v-if="rsType==5">
				<div>
					<div class="order-list-inner">
@@ -71,6 +71,13 @@ export default {
		width: calc(1995px / 6);
		margin: 0 auto;
		position: relative;
		.bg-img{
			user-select: none;
			-webkit-user-select: none;
			-moz-user-select: none;
			-ms-user-select: none;
		}
		.content{
			width: calc(1340px / 6);
			position: absolute;
@@ -153,11 +160,6 @@ export default {
		
	}
	.bg-img{
		user-select: none;
		-webkit-user-select: none;
		-moz-user-select: none;
		-ms-user-select: none;
	}
	
}
</style>

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

@@ -672,6 +672,7 @@ export default {
	}
	::v-deep img{
		-webkit-user-drag: none;
		user-select: none;
		-webkit-user-select: none;
		-moz-user-select: none;

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

@@ -1,24 +1,29 @@
<template>
    <div class='order-detail-device-info lh26 plr15 ptb10 break-all bgc-fff fs-14'>
        <div>出货设备：众健信联1号</div>
        <div>设备编号：14912202107000001500000000000000</div>
        <div>设备地址：厦门市湖里区金山街道101号101室</div>
        <div>出货设备：{{data.equName}}</div>
        <div>设备编号：{{data.equNum}}</div>
        <div>设备地址：{{data.deliveryAddress}}</div>
    </div>
</template>
<script>
    export default{
        data(){
            return {
                
            }
        },
        created() {
export default{
    props: {
        data: function(){
            return {}
        }
    },
    data(){
        return {
            
        },
        methods:{
            
        },
    }
        }
    },
    created() {
        
    },
    methods:{
        
    },
}
</script>
<style lang='scss' scoped>
.order-detail-device-info{

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

@@ -7,7 +7,7 @@
            </div>
            <div class="row">
                <div>订单类型</div>
                <div>{{info.orderTypeName}}</div>
                <div>{{info.orderTypeName || "线上订单"}}</div>
            </div>
            <div class="row">
                <div>开方时间</div>
@@ -23,7 +23,7 @@
            </div>
            <div class="row">
                <div>订单状态</div>
                <div>{{info.orderStateName}}</div>
                <div>{{info.sellStateName}}</div>
            </div>
            <div class="row">
                <div>存取信息</div>

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

@@ -28,9 +28,9 @@
                        <div v-else class="" >{{item.sellStatusName}}</div>
                    </div>
                    <div class="lh20 ptb10">
                        <div>订单类型：{{item.orderTypeName}}</div>
                        <div>订单类型：{{item.orderTypeName || "线上订单"}}</div>
                        <div>开方时间：{{formatDatetime(item.prescribeTime)}}</div>
                        <!-- <div>存取信息：取药码 {{item.pickUpNum}}</div> -->
                        <div>存取信息：取药码 {{item.pickUpNum}}</div>
                    </div>
                    <div class="ptb10 bt-e1e1e1">￥{{item.amount}}</div>
                </div>

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

@@ -23,7 +23,7 @@
                        <div class="lh20 ptb10 kitbox">
                            <div class="box-flex-1">
                                <div>待补商品数量：{{item.daibuQty}}</div>
                                <div>未设商品空货道：{{item.unusedAisles}}</div>
                                <div>未设商品货道：{{item.unusedAisles}}</div>
                                <div>设备所属：{{item.community}}</div>
                                <div>设备编号：{{item.equNum}}</div>
                                <div>上次补货时间：</div>