lincl 3 anos atrás
pai
commit
c4eac6841c

+ 18 - 3
mini-pro-web/src/assets/styles/index.scss

@ -3,10 +3,25 @@
@import '../../../public/js/vant/vantExt.css';
@import './resetVant.scss';
* {
    -webkit-box-sizing: border-box;
    -moz-box-sizing: border-box;
    box-sizing: border-box;
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
  box-sizing: border-box;
  -webkit-touch-callout:none; /*系统默认菜单被禁用*/
  -webkit-user-select:none; /*webkit浏览器*/
  -khtml-user-select:none; /*早期浏览器*/
  -moz-user-select:none;/*火狐*/
  -ms-user-select:none; /*IE10*/
  user-select:none;
}
input,textarea {
  -webkit-user-select:auto; /*webkit浏览器*/
  margin: 0px;
  padding: 0px;
  outline: none;
}
body {
  height: 100%;
  -moz-osx-font-smoothing: grayscale;

+ 4 - 3
mini-pro-web/src/components/ProductItem/index.vue

@ -8,10 +8,10 @@
                <div>{{data.qty}}/{{data.cargoCapacity}}</div>
            </div>
            <template v-if="data.shelfStatus==1">
                <div class="ellipsis tc pt8">{{data.drugName}}</div>
                <div class="tc pt5">¥{{data.price}}</div>
                <div class="ellipsis tc pt12">{{data.drugName}}</div>
                <div class="tc pt10">¥{{data.price}}</div>
            </template>
            <div v-else class="ellipsis tc pt8 ">未设药品</div>
            <div v-else class="ellipsis tc pt12 ">未设药品</div>
        </div>
        <div class="tag" v-if="data.state==21">主</div>
        <div class="tag" v-else-if="data.state==20">副</div>
@ -99,6 +99,7 @@ export default{
        position: relative;
        z-index: 1;
        background: transparent;
        line-height: 1.2;
    }
    .pitem-bg{
        background: #17b3ec;

+ 3 - 3
mini-pro-web/src/views/drug/list.vue

@ -25,16 +25,16 @@
                </van-row>
                <van-row class="lh25">
                    <van-col span="12" class="c-999">规格:<span class="c-333">{{item.specif}}</span></van-col>
                    <van-col span="12" class="c-999">零售价:<span class="c-333">{{item.price}}</span></van-col>
                    <!-- <van-col span="12" class="c-999">零售价:<span class="c-333">{{item.price}}</span></van-col> -->
                </van-row>
                <van-row class="lh25">
                <!-- <van-row class="lh25">
                    <van-col span="12" class="c-999">医保支付价:<span class="c-333"></span></van-col>
                    <van-col span="12" class="c-999">医保支付比例:<span class="c-333"></span></van-col>
                </van-row>
                <van-row class="lh25">
                    <van-col span="12" class="c-999">基药:<span class="c-333"></span></van-col>
                    <van-col span="12" class="c-999">药品类别:<span class="c-333"></span></van-col>
                </van-row>
                </van-row> -->
                <!-- <div class="c-ff5e6c fs-14 lh25">高危药品:</div> -->
            </div>
        </div>

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

@ -585,7 +585,7 @@ export default {
					type:"text", text: (v.drugName||v.goodsName)+"\n",nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
				})
				printcon.push({
					type:"text", text: `数量:${v.quantity}\n规格:${v.specif}\n用法:${v.useWay||''}  ${v.useDose||''}${v.unit||''}  ${v.useRate||''}`,nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
					type:"text", text: `数量:${v.quantity}${v.unit}\n规格:${v.specif}\n用法:${v.useWay||''}  ${v.useDose||''}${v.unit||''}  ${v.useRate||''}`,nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
				})
				printcon.push({type:"line"})
			})

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

@ -19,7 +19,15 @@
                    <div class="pt10 c-333 fs-16">{{data.drugName}}</div>
                    <div class="pt10 c-999">软件显示库存:{{data.qty}}</div>
                    <div class="pt10 pb20 ipt plr50">
                        <van-field v-model="stock" label="" type="digit" placeholder=" 请填写实际库存" />
                        <div class="tc  ">
                            <van-stepper 
                                placeholder="实际库存"
                                v-model="stock" 
                                min="1" 
                                max="99" 
                                button-size="36px" 
                                input-width="60px"/>
                            </div>
                    </div>
                </div>
                <div class="ptb10">

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

@ -72,6 +72,7 @@
                        <div class="box-flex-1 pl10">
                            <div class="fs-15 ellipsis_1 c-333">{{item.drugName}}</div>
                            <div class="fs-14 c-666">
                                <div>规格:{{item.specif}}</div>
                                <div>当前库存量:{{item.qty||item.inventoryNum||Number(item.total||0)}}</div>
                                <div v-if="curOrder">未放置数量:{{accessLeftNum(item)}}</div>
                            </div>
@ -390,7 +391,8 @@ export default{
                drugId: item.drugId,
                qty: item.qty||item.inventoryNum||Number(item.total||0),
                quantity: this.accessLeftNum(item),  
                outDetailId: item.id
                outDetailId: item.id,
                specif: encodeURIComponent(item.specif)
            })
        },
        accessLeftNum(item){

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

@ -7,6 +7,8 @@
            />
        </div>
        <div class="tc c-333 pt20 pb10 plr15 break-all">{{info.drugName}}</div>
        <div class="tc c-333 pt20 pb10 plr15 break-all">{{info.specif}}</div>
        <div class="c-17b3ec tc"><span @click="gotoUrl('/drugList', {deviceId: info.idDevice})">更换药品</span></div>
        <div class=" tc pt20">
            <span class="mr10">现有数量:{{info.qty}} </span>

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

@ -9,6 +9,7 @@
                    <div class="fs-15 ellipsis_1 c-333">{{query.drugName}}</div>
                    <div class="fs-14 c-666 kitbox">
                        <div class="box-flex-1">
                            <div>规格:{{decodeStr(query.specif)}}</div>
                            <div>当前库存量:{{query.qty}}</div>
                            <div v-if="outDetailId">未放置数量:{{query.quantity}}</div>
                        </div>
@ -103,6 +104,9 @@ export default{
        this.initPage()
    },
    methods:{
        decodeStr(str){
            return (str&&decodeURIComponent(str)) || ""
        },
        $refreshData(p){
            if(p){
                var oQty = this.curCargo.cargoCapacity - this.curCargo.qty
@ -510,7 +514,7 @@ export default{
            .text{
                position: absolute;
                background: #f2f3f5;
                width: 30px;
                width: 34px;
                text-align: center;
                left: 50%;
                transform: translateX(-50%);
@ -565,6 +569,7 @@ export default{
            }
        }
    }
}
</style>