Browse Source

修改订单部分发货后,确认全部发货

YY 2 years ago
parent
commit
c6d12fc476

+ 4 - 3
src/views/platmanag/order/parts/detail/parts/card-2.vue

@@ -79,8 +79,9 @@
                   <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'">
                   <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'">
                     添加保存
                     添加保存
                   </el-button>
                   </el-button>
-                  <el-button type="primary" @click="onConfirm('3')" v-if="form.status == '2'"> 确认收货 </el-button>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
+                  <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2'"> 确认收货 </el-button>
+                  <el-button type="warning" @click="onConfirm('2', '是否确认全部发货')" v-if="form.status == '2-'"> 确认全部发货 </el-button>
                 </el-col>
                 </el-col>
               </el-form-item>
               </el-form-item>
             </el-form>
             </el-form>
@@ -285,8 +286,8 @@ export default {
         }
         }
       });
       });
     },
     },
-    async onConfirm(val) {
-      this.$confirm('是否确认收货', '提示', {
+    async onConfirm(val, text = '是否确认') {
+      this.$confirm(text, '提示', {
         confirmButtonText: '确定',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning',
         type: 'warning',

+ 4 - 3
src/views/selfShop/order/parts/detail/parts/card-2.vue

@@ -79,8 +79,9 @@
                   <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'">
                   <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'">
                     添加保存
                     添加保存
                   </el-button>
                   </el-button>
-                  <el-button type="primary" @click="onConfirm('3')" v-if="form.status == '2'"> 确认收货 </el-button>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
+                  <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2'"> 确认收货 </el-button>
+                  <el-button type="warning" @click="onConfirm('2', '是否确认全部发货')" v-if="form.status == '2-'"> 确认全部发货 </el-button>
                 </el-col>
                 </el-col>
               </el-form-item>
               </el-form-item>
             </el-form>
             </el-form>
@@ -285,8 +286,8 @@ export default {
         }
         }
       });
       });
     },
     },
-    async onConfirm(val) {
-      this.$confirm('是否确认收货', '提示', {
+    async onConfirm(val, text = '是否确认') {
+      this.$confirm(text, '提示', {
         confirmButtonText: '确定',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning',
         type: 'warning',