diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index c4a328965bf21e6133bac6eaa70b5bdf9514b232..8a1cb6cedb04061836c15f3cdd95ad645e8505c0 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -126,6 +126,7 @@
             <el-table-column label="商品名称" align="center"></el-table-column>
             <el-table-column label="规格/数量/金额" align="center"></el-table-column>
             <el-table-column label="下单/发货/完成时间" align="center" width="180"></el-table-column>
+            <el-table-column label="发货类型" align="center" width="120"></el-table-column> 
             <el-table-column label="运费" align="center" width="100"></el-table-column>
             <el-table-column label="收货人" align="center" width="200"></el-table-column>
             <!-- <el-table-column label="联系电话" align="center" width="120"></el-table-column> -->
@@ -177,6 +178,15 @@
                     <span :class="{ 'red-text' : updatedTimeFormatter(scope.row.updated_time) == '未完成' }">{{
                       updatedTimeFormatter(scope.row.updated_time, scope.row.goods_status) }}</span>
                   </template>
+                </el-table-column>
+                 <el-table-column prop="dispatch_price" width="120" label="发货类型" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.send_time==0">-</div>
+                    <div v-else>
+                      <span v-if="scope.row.type==1">快递</span>
+                      <span v-if="scope.row.type==2">自行配送</span>
+                    </div>
+                  </template>
                 </el-table-column>
                 <el-table-column prop="dispatch_price" width="100" label="运费" align="center">
                   <template slot-scope="scope">
@@ -304,11 +314,20 @@
       :close-on-click-modal="false" :append-to-body="true">
       <div style="margin: 0 10%">
         <el-form ref="form" label-width="100px">
-          <el-form-item label="快递公司：">
+          <el-form-item label="发货类型：">
+            <el-radio-group v-model="radioshop">
+              <el-radio :label="1">快递发货</el-radio>
+              <el-radio :label="2">自行配送</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="快递公司：" v-if="radioshop == 1">
             <el-select size="mini" v-model="expressNum" filterable placeholder="请选择快递公司" style="width: 100%;">
               <el-option v-for="item in expressLists" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
+          </el-form-item>
+           <el-form-item label="快递公司：" v-if="radioshop == 2">
+            <el-input size="mini" v-model="expressNum1" placeholder="请输入快递公司"></el-input>
           </el-form-item>
           <el-form-item label="快递单号：">
             <el-input size="mini" v-model="express_sn" placeholder="请输入快递单号"></el-input>
@@ -359,7 +378,9 @@
     data() {
       return {
         goShippingDialog: false,
+        radioshop:1,
         expressNum: '',
+        expressNum1:'',
         express_sn: '',
         goods_ids: '',
         // channel_id
@@ -439,16 +460,13 @@
       goShipping(id, goods_order_sn) {
         this.goods_ids = goods_order_sn;
         this.titleInfo = '去发货'
+         this.expressNum = ''
+        this.expressNum1 = ''
+        this.express_sn = ''
         this.goShippingDialog = true
       },
       handleGoShipping() {
-        if (!this.expressNum) {
-          this.$message({
-            type: 'warning',
-            message: '请选择快递公司'
-          })
-          return
-        }
+       
         if (!this.express_sn) {
           this.$message({
             type: 'warning',
@@ -459,14 +477,34 @@
 
         // 物流公司，名称
         let expressName = ''
-        this.expressLists.map((item) => {
+        if(this.radioshop == 1){
+          if (!this.expressNum) {
+          this.$message({
+            type: 'warning',
+            message: '请选择快递公司'
+          })
+          return
+        }
+          this.expressLists.map((item) => {
           if (item.value == this.expressNum) {
             expressName = item.label
           }
         })
+        }else{
+          if (!this.expressNum1) {
+          this.$message({
+            type: 'warning',
+            message: '请输入快递公司'
+          })
+          return
+        }
+          expressName = this.expressNum1
+        }
+        
 
 
         let paramsObj = {
+          type:this.radioshop,
           goods_order_sn: [],//this.goods_ids,
           express_company_name: expressName, // 快递公司 名称
           express_sn: this.express_sn,    // 快递单号
@@ -514,7 +552,7 @@
       },
       /** 表格合并 列单元格 */
       arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex > 2 && columnIndex != 7 && columnIndex != 8) { // 用于设置要合并开始的列号
+        if (columnIndex > 3 && columnIndex != 8 && columnIndex != 9) { // 用于设置要合并开始的列号
           if (rowIndex === 0) { // 用于设置合并开始的行号
             return {
               rowspan: 100,　　　　　// 合并的行数