Merge branch '1.1.18' into test

src/views/system/goodsimport/index.vue

@@ -97,13 +97,13 @@ export default {
           label: 'title',
           leaf: 'leaf'
       },
+     
     };
   },
   components: {
     ImportDetail
   },
   created() {
-
     this.info()
   },
   watch: {},

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

@@ -220,6 +220,12 @@
       >
       <div style="margin: 0 10%">
         <el-form ref="form" label-width="100px">
+          <el-form-item label="发货类型：">
+            <el-radio-group v-model="radioshop" @change="radioshopclick()">
+              <el-radio :label="1">快递发货</el-radio>
+              <el-radio :label="2">自行配送</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="快递公司：">
             <el-select size="mini" v-model="expressNum" filterable placeholder="请选择快递公司" style="width: 100%;">
               <el-option
@@ -287,7 +293,7 @@
 </template>
 
 <script>
-import {orderInfo, sendOrder, expressInfoNew, remarkOrder, orderInfoEdit,deliveryOrder, deliveryOrderAgain, toReissueOrderData} from '@/api/module/order'
+import {orderInfo, sendOrder, expressInfoNew, remarkOrder, orderInfoEdit,deliveryOrder, deliveryOrderAgain, toReissueOrderData,expressList} from '@/api/module/order'
 import {dateFormat} from '@/utils'
 import {getAreaList} from '@/api/module/retreat/address'
 export default {
@@ -306,6 +312,7 @@ export default {
   },
   data() {
     return {
+      radioshop:1,
       expressNum: '',
       express_sn: '',
       remark: '',
@@ -343,6 +350,16 @@ export default {
   created() {},
   mounted() {},
   methods: {
+    radioshopclick(){
+        let data={
+          type:this.radioshop
+        }
+        expressList(data).then(res => {
+          if (res.code == 1) {
+            this.expressLists = res.data.expressLists
+          }
+        })
+      },
     /** 订单最终状态 */
     isShowOrderStatusInfo(status,settlementStatus) {
       let isShow  = (status == 3 && settlementStatus == 1) ? true : false;
@@ -506,6 +523,7 @@ export default {
       // 批量 去发货
       if( this.goShippingNum === 1) {
         let paramsObj = {
+          type:this.radioshop,
           goods_order_sn: this.goods_ids,
           express_company_name: expressName, // 快递公司 名称
           express_sn: this.express_sn,    // 快递单号
@@ -526,7 +544,7 @@ export default {
       // 批量 补单发货
       if (this.goShippingNum === 2 ) {
         // debugger
-        let listObj = { list: [] }
+        let listObj = { list: [], type:this.radioshop }
         this.goods_ids.forEach((item,index)=> {
           item['express_name'] = expressName;
           item['express_sn'] = this.express_sn;
@@ -550,6 +568,7 @@ export default {
       // 单商品订单 发货
       if(this.goShippingNum === 3) {
         let paramsObj = {
+          type:this.radioshop,
           goods_order_sn: [],//this.goods_ids,
           express_company_name: expressName, // 快递公司 名称
           express_sn: this.express_sn,    // 快递单号
@@ -571,7 +590,7 @@ export default {
 
       // 单个商品订单 补单发货
       if(this.goShippingNum === 4) {
-        let singleOrderObj = { list: []};
+        let singleOrderObj = { list: [],type:this.radioshop,};
         let orderObj = {
           id: 0,
           express_name: '',