Forráskód Böngészése

Merge branch 'master' of http://192.168.1.220:10080/Amoy2/intelligent-medicine-cabinet

chenyue 3 éve
szülő
commit
168de8c1d9

+ 1 - 1
mini-pro-web/public/index.html

@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title>智能药房</title>
    <title>智慧药房</title>
    <script src="<%= BASE_URL %>js/touch-simulator/touch-simulator.js"></script>
  </head>
  <body>

+ 1 - 1
mini-pro-web/src/store/modules/app.js

@ -6,7 +6,7 @@ const app = {
			wxId: process.env.VUE_APP_WXID
        },
        loading: false,
        pageTitle: "智能药房",
        pageTitle: "智慧药房",
		platform: 'web',  //网页web   
		noTop: false,
		authMenu: [],

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

@ -1,7 +1,7 @@
<template>
	<div class="index-wrap">
        <!-- <div class="home-text">首页</div> -->
        <div class="select" v-if="false">
        <div class="select" >
            
        </div>
        <!-- 设备概况 -->

+ 2 - 2
mini-pro-web/src/views/machine/components/Dialog.vue

@ -1,11 +1,11 @@
<template>
	<div class="machine-index-dialog">
		<van-popup v-model="show" >
		<van-popup v-model="show" :close-on-click-overlay="false">
			<div class="fs-14 c-646566 tc pt20 pb20">
				打印完成
			</div>
			<div class="btn tc  fs-16 c-17b3ec">
				<van-button @click="close" type="default" block>返回首页({{times}}s)</van-button>
				<van-button @click="close" type="default" block>返回上一页({{times}}s)</van-button>
			</div>
		</van-popup>
	</div>

+ 7 - 8
mini-pro-web/src/views/machine/index.vue

@ -134,6 +134,7 @@ export default {
	watch:{
		step(n){
			if(n==2){
				clearInterval(countDownFunc)
				this.countDown()
			}else if(n!=3){
				this.rsType = 0
@ -214,7 +215,7 @@ export default {
			this.$toast.clear()
            this.$loading('加载中..')
			this.shippingType = pickUpNum? 1 : 2
			this.oldCardNo = cardNum? cardNo : ''
			this.oldCardNo = cardNum || ''
            let p = {
                deviceId: this.deviceNum, //设备编号
				pickUpNum, //取药码
@ -390,10 +391,8 @@ export default {
				try{
					if (msgobj.mess.indexOf("异常") != -1 || msgobj.mess.indexOf("读取信息失败") != -1) {
						if(this.nextOrderDetail){
							this.$toast.loading({
								duration: 0,
							this.$toast({
								forbidClick: true, // 禁用背景点击
								loadingType: 'loading',
								message: msgobj.mess,
								onClose: ()=>{
									this.onPrev()
@ -414,16 +413,15 @@ export default {
					var cardNo = json['卡号']
					if(this.nextOrderDetail){
						if(cardNo != this.oldCardNo){
							this.$toast.loading({
								duration: 0,
							this.$toast({
								forbidClick: true, // 禁用背景点击
								loadingType: 'loading',
								message: "医保卡信息不匹配,请重新操作",
								onClose: ()=>{
									this.onPrev()
								}
							});
						} else {
							this.$toast.clear()
							var order = this.nextOrderDetail
							this.nextOrderDetail = ''
							this.showOrderDetail(order)
@ -544,6 +542,7 @@ export default {
			this.socket.send(JSON.stringify(obj));
		},
		SetPrintPage: function() {
			debugger
			// string type; //text 文本 |line 间隔行|barcode 条码|qrcode 二维码|reset 重置打印机 |nline 走纸【进行【
			// string text;  //文本内容
			// int nLan;//文本编码类型0:GBK   1:UTF-8
@ -563,7 +562,7 @@ export default {
			var printcon =[
				{type:"reset"},
				{type:"nline"},
				{type:"text", text:"智能药房\n小票凭据\n",nLan:0,nOrgx:-2,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0},
				{type:"text", text:"智慧药房\n小票凭据\n",nLan:0,nOrgx:-2,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0},
				{type:"text", text:"--------------------------------\n",nLan:0,nOrgx:-2,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0},
			];
			var allPrice = 0, allcount = 0

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

@ -1,7 +1,7 @@
<template>
    <div class='replenishment-stock-up-detail fs-14'>
        <div class="list bgc-fff mb10 ">
            <van-sticky :offset-top="offsetTop">
            <van-sticky v-if="createOutAuth" :offset-top="offsetTop">
                <van-field 
                    v-model="replenisherName"
                    @click="showPicker=true"