确认发货

ghs/src/views/order/list.vue

@@ -93,17 +93,41 @@
       </template>
 
       <template #slot-column-option="{scope}">
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="primary" v-if="scope.row.status != 1 && scope.row.status != 5">详情</el-button>
+        <el-button v-else size="small" @click.stop="detailShowFn(scope.row)">详情</el-button>
+        
+        <template v-if="scope.row.book == 0">
+          <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" @onConfirm="confirmSend(scope.row)" style="margin-left:10px;" v-if="scope.row.status!=5 && scope.row.status==2">
+            <el-button size="small" type="primary" slot="reference">确认发货</el-button>
+          </el-popconfirm>
+          <el-button size="small" v-else>确认发货</el-button>
+        </template>
+        <template v-else>
+          <el-button @click.stop="" size="small" type="primary" v-if="scope.row.status == 2">确认发货</el-button>
+          <el-button size="small" v-else>确认发货</el-button>
+        </template>
+
+        <template v-if="scope.row.status == 4">
+          <el-button size="small" type="primary">发起售后</el-button>
+        </template>
+        <template v-else-if="scope.row.status == 1 || scope.row.status == 5">
+          <el-button size="small">发起售后</el-button>
+        </template>
+        <template v-else>
+          <template v-if="scope.row.book == 0">
+            <el-button size="small" type="primary">确认送达</el-button>
+          </template>
+          <template v-else>
+            <el-button size="small">发起售后</el-button>
+          </template>
+        </template>
+
         <el-button v-if="scope.row.status != 1 && scope.row.status != 5" @click.stop="beginPrint(scope.row)" size="small" type="primary">打票</el-button>
         <el-button v-else size="small">打票</el-button>
 
         <el-button v-if="scope.row.status != 1 && scope.row.status != 5" @click.stop="printOrder(scope.row)" size="small" type="primary">打A4</el-button>
         <el-button v-else size="small">打A4</el-button>
 
-        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="primary" v-if="scope.row.status != 1 && scope.row.status != 5">详情</el-button>
-        <el-button v-else size="small" @click.stop="detailShowFn(scope.row)">详情</el-button>
-        
-        <el-button size="small">售后</el-button>
-
         <el-button @click.stop="down(scope.row)" size="small" type="primary" v-if="scope.row.status!=5 && scope.row.status!=1">下载</el-button>
         <el-button size="small" v-else>下载</el-button>
 
@@ -112,14 +136,6 @@
 
         <el-button size="small">取消</el-button>
 
-        <template v-if="scope.row.status!=5 && scope.row.status==2">
-          <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" @onConfirm="confirmSend(scope.row)" style="margin-left:10px;">
-            <el-button size="small" type="primary" slot="reference">确认发货</el-button>
-          </el-popconfirm>
-        </template>
-
-        <el-button size="small" v-else>确认发货</el-button>
-
       </template>
 
       <template #slot-search-option="{scope}">
@@ -601,7 +617,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 600,
+                width: 615,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'