Sfoglia il codice sorgente

修改订单部分发货确认收货

YY 2 anni fa
parent
commit
31fe36cd3a

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

@@ -32,7 +32,7 @@
             </el-col>
           </el-col>
           <!-- 添加修改快递信息 -->
-          <el-col v-if="(form.status == '1' || form.status == '2-') && form.transport_type == '0'">
+          <el-col v-if="(form.status == '1' || form.status == '2-' || form.status == '2') && form.transport_type == '0'">
             <el-radio-group v-model="status" @change="onstatus">
               <el-radio :label="0" border>全部发货</el-radio>
               <el-radio :label="1" border>部分发货</el-radio>
@@ -80,7 +80,7 @@
                     添加保存
                   </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('3', '是否确认收货')" v-if="form.status == '2' && transport.length <= 1"> 确认收货 </el-button>
                   <el-button type="warning" @click="onConfirm('2', '是否确认全部发货')" v-if="form.status == '2-'"> 确认全部发货 </el-button>
                 </el-col>
               </el-form-item>
@@ -164,7 +164,6 @@ export default {
       },
       listForm: {},
       buy_num: '',
-      // status: '0',
       // 商品
       goodsList: [],
       // 添加发货商品表单
@@ -323,7 +322,14 @@ export default {
                 let transport = [];
                 transport.push({ id: moment(new Date()).valueOf(), goods, shop_transport_no, shop_transport_type });
                 form.transport = transport;
-              } else if ((val == '2' || val == '3') && form.transport_type == '0') {
+              } else if (val == '2' && !form.transport && form.transport_type == '0') {
+                let transport = [];
+                transport.push({ shop_transport_no, shop_transport_type });
+                form.transport = transport;
+              } else if (val == '2' && form.transport && form.transport_type == '0' && this.status == '1') {
+                let goods = this.goodsList;
+                form.transport.push({ id: moment(new Date()).valueOf(), goods, shop_transport_no, shop_transport_type });
+              } else if (val == '2' && form.transport && form.transport_type == '0' && this.status == '0') {
                 let transport = [];
                 transport.push({ shop_transport_no, shop_transport_type });
                 form.transport = transport;

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

@@ -32,7 +32,7 @@
             </el-col>
           </el-col>
           <!-- 添加修改快递信息 -->
-          <el-col v-if="(form.status == '1' || form.status == '2-') && form.transport_type == '0'">
+          <el-col v-if="(form.status == '1' || form.status == '2-' || form.status == '2') && form.transport_type == '0'">
             <el-radio-group v-model="status" @change="onstatus">
               <el-radio :label="0" border>全部发货</el-radio>
               <el-radio :label="1" border>部分发货</el-radio>
@@ -80,7 +80,7 @@
                     添加保存
                   </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('3', '是否确认收货')" v-if="form.status == '2' && transport.length <= 1"> 确认收货 </el-button>
                   <el-button type="warning" @click="onConfirm('2', '是否确认全部发货')" v-if="form.status == '2-'"> 确认全部发货 </el-button>
                 </el-col>
               </el-form-item>
@@ -164,7 +164,6 @@ export default {
       },
       listForm: {},
       buy_num: '',
-      // status: '0',
       // 商品
       goodsList: [],
       // 添加发货商品表单
@@ -323,7 +322,14 @@ export default {
                 let transport = [];
                 transport.push({ id: moment(new Date()).valueOf(), goods, shop_transport_no, shop_transport_type });
                 form.transport = transport;
-              } else if ((val == '2' || val == '3') && form.transport_type == '0') {
+              } else if (val == '2' && !form.transport && form.transport_type == '0') {
+                let transport = [];
+                transport.push({ shop_transport_no, shop_transport_type });
+                form.transport = transport;
+              } else if (val == '2' && form.transport && form.transport_type == '0' && this.status == '1') {
+                let goods = this.goodsList;
+                form.transport.push({ id: moment(new Date()).valueOf(), goods, shop_transport_no, shop_transport_type });
+              } else if (val == '2' && form.transport && form.transport_type == '0' && this.status == '0') {
                 let transport = [];
                 transport.push({ shop_transport_no, shop_transport_type });
                 form.transport = transport;