Merge branch 'dev_hxz' into test

src/views/system/order/components/orderDetail.vue

@@ -60,7 +60,7 @@
               <template slot-scope="scope">
                 <span style="font-size:12px;padding: 0 15px 0 0;" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '已补单'">已补单</span>
                 <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去补单'" @click="goShipping(4,scope.row.id)">去补单</el-button>
-                <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去发货'" @click="goShipping(3,scope.row.id)">去发货</el-button>
+                <el-button size="mini" type="text" v-if="deliveryTypeText(scope.row.goods_status,scope.row.is_reissue) == '去发货'" @click="goShipping(3,scope.row.id,scope.row.goods_order_sn)">去发货</el-button>
                 <el-divider direction="vertical"></el-divider>
                 <el-button size="mini" type="text" @click="getExpressInfoNew(scope.row)">查看物流</el-button>
               </template>
@@ -361,7 +361,7 @@ export default {
      * val 发货类型：1-商品的批量发货；2-批量补单发货；3-单商品发货；4-单格个商品订单 补单发货
      * */
     // 发货，补单，补单发货
-    goShipping(val, id) {
+    goShipping(val, id, goods_order_sn) {
       //console.log(361,this.multipleSelection);
       this.goShippingNum = val
       this.goods_ids = []
@@ -382,13 +382,14 @@ export default {
             isContinue = false
             break;
           }else {
-            let idNum = Number(this.multipleSelection[i].id);
+            // let idNum = Number(this.multipleSelection[i].id);
+            let idNum = this.multipleSelection[i].goods_order_sn;
             this.goods_ids.push(idNum);
           }
         }
 
         if(!isContinue) {
-          // 批量发货时候，goods_ids 为数组 [3,4,5]
+          // 批量发货时候，goods_order_sn 为数组 [3,4,5]
           this.goods_ids = []
           return;
         }
@@ -435,7 +436,7 @@ export default {
 
       // 单商品订单 发货
       if(this.goShippingNum === 3) {
-        this.goods_ids = id;
+        this.goods_ids = goods_order_sn;
         this.titleInfo = '去发货'
         this.goShippingDialog = true
       }
@@ -496,7 +497,7 @@ export default {
 
       // 批量 补单发货
       if (this.goShippingNum === 2 ) {
-        debugger
+        // debugger
         let listObj = { list: [] }
         this.goods_ids.forEach((item,index)=> {
           item['express_name'] = expressName;
@@ -578,6 +579,7 @@ export default {
     // 选中的表格
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      // console.log(555,this.multipleSelection);
     },
     /** 修改 买家信息 */
     modifyinfo() {