seimin 1 year ago
parent
commit
3741eaf01a

+ 14 - 4
pages/quiltWashing/quiltWashingGetEndCheck/quiltWashingGetEndCheck.vue

@@ -84,8 +84,18 @@
84
         }).then((res) => {
84
         }).then((res) => {
85
           uni.hideLoading();
85
           uni.hideLoading();
86
           if (res.state == 200) {
86
           if (res.state == 200) {
87
-            uni.navigateTo({
88
-              url: `../../receiptpage/receiptpage`,
87
+            uni.showModal({
88
+              title: "提示",
89
+              content: "操作成功",
90
+              showCancel: false,
91
+              success: (result) => {
92
+                if (result.confirm) {
93
+                  console.log("用户点击确定");
94
+                  uni.navigateTo({
95
+                    url: `../../receiptpage/receiptpage`,
96
+                  });
97
+                }
98
+              },
89
             });
99
             });
90
           }else{
100
           }else{
91
             uni.showToast({
101
             uni.showToast({
@@ -194,7 +204,7 @@
194
       width: 710rpx;
204
       width: 710rpx;
195
       margin: 0 20rpx;
205
       margin: 0 20rpx;
196
       background-color: #fff;
206
       background-color: #fff;
197
-      
207
+
198
       .Scanning_cont_head{
208
       .Scanning_cont_head{
199
         flex-shrink: 0;
209
         flex-shrink: 0;
200
         height: 78rpx;
210
         height: 78rpx;
@@ -238,7 +248,7 @@
238
           }
248
           }
239
         }
249
         }
240
       }
250
       }
241
-      
251
+
242
       .Scanning_cont_list{
252
       .Scanning_cont_list{
243
         flex: 1;
253
         flex: 1;
244
         min-height: 0;
254
         min-height: 0;

+ 27 - 7
pages/quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn.vue

@@ -16,7 +16,7 @@
16
           {{item.name}}
16
           {{item.name}}
17
         </view>
17
         </view>
18
       </view>
18
       </view>
19
-      
19
+
20
       <view class="Scanning_cont_list">
20
       <view class="Scanning_cont_list">
21
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
21
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
22
           <view class="name">
22
           <view class="name">
@@ -105,8 +105,18 @@
105
         }).then((res) => {
105
         }).then((res) => {
106
           uni.hideLoading();
106
           uni.hideLoading();
107
           if (res.state == 200) {
107
           if (res.state == 200) {
108
-            uni.navigateTo({
109
-              url: `../../receiptpage/receiptpage`,
108
+            uni.showModal({
109
+              title: "提示",
110
+              content: "交接成功",
111
+              showCancel: false,
112
+              success: (result) => {
113
+                if (result.confirm) {
114
+                  console.log("用户点击确定");
115
+                  uni.navigateTo({
116
+                    url: `../../receiptpage/receiptpage`,
117
+                  });
118
+                }
119
+              },
110
             });
120
             });
111
           }else{
121
           }else{
112
             uni.showToast({
122
             uni.showToast({
@@ -151,8 +161,18 @@
151
         }).then((res) => {
161
         }).then((res) => {
152
           uni.hideLoading();
162
           uni.hideLoading();
153
           if (res.state == 200) {
163
           if (res.state == 200) {
154
-            uni.navigateTo({
155
-              url: `../../receiptpage/receiptpage`,
164
+            uni.showModal({
165
+              title: "提示",
166
+              content: "交接成功",
167
+              showCancel: false,
168
+              success: (result) => {
169
+                if (result.confirm) {
170
+                  console.log("用户点击确定");
171
+                  uni.navigateTo({
172
+                    url: `../../receiptpage/receiptpage`,
173
+                  });
174
+                }
175
+              },
156
             });
176
             });
157
           }else{
177
           }else{
158
             uni.showToast({
178
             uni.showToast({
@@ -331,7 +351,7 @@
331
       width: 710rpx;
351
       width: 710rpx;
332
       margin: 0 20rpx;
352
       margin: 0 20rpx;
333
       background-color: #fff;
353
       background-color: #fff;
334
-      
354
+
335
       .Scanning_cont_head{
355
       .Scanning_cont_head{
336
         flex-shrink: 0;
356
         flex-shrink: 0;
337
         height: 78rpx;
357
         height: 78rpx;
@@ -375,7 +395,7 @@
375
           }
395
           }
376
         }
396
         }
377
       }
397
       }
378
-      
398
+
379
       .Scanning_cont_list{
399
       .Scanning_cont_list{
380
         flex: 1;
400
         flex: 1;
381
         min-height: 0;
401
         min-height: 0;

+ 16 - 6
pages/quiltWashing/quiltWashingSendSignIn/quiltWashingSendSignIn.vue

@@ -16,7 +16,7 @@
16
           {{item.name}}
16
           {{item.name}}
17
         </view>
17
         </view>
18
       </view>
18
       </view>
19
-      
19
+
20
       <view class="Scanning_cont_list">
20
       <view class="Scanning_cont_list">
21
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
21
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
22
           <view class="name">
22
           <view class="name">
@@ -102,7 +102,7 @@
102
                 let data = {
102
                 let data = {
103
                   code: accountCode, //二维码
103
                   code: accountCode, //二维码
104
                 };
104
                 };
105
-                post("/transflow/checkComplete", { 
105
+                post("/transflow/checkComplete", {
106
                     type: 'clothingSend',
106
                     type: 'clothingSend',
107
                     orderId: this.queryObj.orderId,
107
                     orderId: this.queryObj.orderId,
108
                     code: accountCode,
108
                     code: accountCode,
@@ -110,8 +110,18 @@
110
                   .then((res) => {
110
                   .then((res) => {
111
                     uni.hideLoading();
111
                     uni.hideLoading();
112
                     if (res.data && res.data.state == 200) {
112
                     if (res.data && res.data.state == 200) {
113
-                      uni.navigateTo({
114
-                        url: `../../receiptpage/receiptpage`,
113
+                      uni.showModal({
114
+                        title: "提示",
115
+                        content: "操作成功",
116
+                        showCancel: false,
117
+                        success: (result) => {
118
+                          if (result.confirm) {
119
+                            console.log("用户点击确定");
120
+                            uni.navigateTo({
121
+                              url: `../../receiptpage/receiptpage`,
122
+                            });
123
+                          }
124
+                        },
115
                       });
125
                       });
116
                     } else {
126
                     } else {
117
                       uni.navigateTo({
127
                       uni.navigateTo({
@@ -218,7 +228,7 @@
218
       width: 710rpx;
228
       width: 710rpx;
219
       margin: 0 20rpx;
229
       margin: 0 20rpx;
220
       background-color: #fff;
230
       background-color: #fff;
221
-      
231
+
222
       .Scanning_cont_head{
232
       .Scanning_cont_head{
223
         flex-shrink: 0;
233
         flex-shrink: 0;
224
         height: 78rpx;
234
         height: 78rpx;
@@ -262,7 +272,7 @@
262
           }
272
           }
263
         }
273
         }
264
       }
274
       }
265
-      
275
+
266
       .Scanning_cont_list{
276
       .Scanning_cont_list{
267
         flex: 1;
277
         flex: 1;
268
         min-height: 0;
278
         min-height: 0;