|
@@ -78,14 +78,20 @@ export default {
|
78
|
78
|
// 开始配药,完成配药,,,1是待配药,2是配药中
|
79
|
79
|
dispensing(type) {
|
80
|
80
|
this.isLoading = true;
|
|
81
|
+ uni.showLoading({
|
|
82
|
+ title: "加载中",
|
|
83
|
+ mask: true,
|
|
84
|
+ });
|
81
|
85
|
if (type == 1) {
|
82
|
86
|
post("/drugsBag/changeToIng", {
|
83
|
87
|
id: this.infoDATA.id,
|
84
|
88
|
}).then((result) => {
|
85
|
89
|
this.isLoading = false;
|
|
90
|
+ uni.hideLoading();
|
86
|
91
|
if (result.state == 200) {
|
87
|
92
|
uni.showToast({
|
88
|
93
|
title: result.info || "开始配药成功!",
|
|
94
|
+ duration: 5000,
|
89
|
95
|
success() {
|
90
|
96
|
uni.navigateTo({
|
91
|
97
|
url: "../pharmacy/pharmacy",
|
|
@@ -137,9 +143,11 @@ export default {
|
137
|
143
|
id: this.infoDATA.id,
|
138
|
144
|
}).then((result) => {
|
139
|
145
|
this.isLoading = false;
|
|
146
|
+ uni.hideLoading();
|
140
|
147
|
if (result.state == 200) {
|
141
|
148
|
uni.showToast({
|
142
|
149
|
title: result.info || "完成配药成功!",
|
|
150
|
+ duration: 5000,
|
143
|
151
|
success() {
|
144
|
152
|
uni.navigateTo({
|
145
|
153
|
url: "../pharmacy/pharmacy",
|
|
@@ -377,7 +385,7 @@ export default {
|
377
|
385
|
line-height: 68rpx;
|
378
|
386
|
position: fixed;
|
379
|
387
|
left: 20rpx;
|
380
|
|
- bottom: 32rpx;
|
|
388
|
+ bottom: 160rpx;
|
381
|
389
|
border-radius: 8rpx;
|
382
|
390
|
background: linear-gradient(to right, #72c172, #3bb197);
|
383
|
391
|
font-size: 36rpx;
|