订单列表优化

ghs/src/views/order/components/order-detail.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="order-detail">
-		<el-drawer :visible.sync="showOrderDetail" size="1000px" :before-close="closeFn" custom-class="order-draw-wrap" >
+		<el-drawer :visible.sync="showOrderDetail" size="1000px" :before-close="closeFn" custom-class="order-draw-wrap" direction="ltr">
 			<div class="order-manage-wrap" v-if="!$util.isEmpty(data)">
-
 				<div class="card-wrap" style="margin-top:0px;">
 					<div class="card-tit">备注</div>
 					<div class="card-body">
@@ -12,55 +11,20 @@
 					<el-button @click.stop="modifyRemark()" size="small" type="primary" style="margin:0 auto;">修改</el-button>
 					</div>
 				</div>
-
 				<div class="card-wrap">
 					<div class="card-tit">花材信息</div>
 					<div class="card-body">
-						<el-table :data="data[0].product" show-summary>
-							<el-table-column label="花材图片">
+						<el-table :data="data[0].product">
+							<el-table-column label="图片">
 								<template slot-scope="scope">
-									<cl-avatar shape="square" :size="30" :src="scope.row.cover" ></cl-avatar>
+									<cl-avatar shape="square" :size="30" :src="scope.row.cover"></cl-avatar>
 								</template>
 							</el-table-column>
-							<el-table-column property="name" label="花材名称"></el-table-column>
-							<el-table-column property="num" label="数量"></el-table-column>
-							<el-table-column property="refundNum" label="已退数量"></el-table-column>
+							<el-table-column property="name" label="名称"></el-table-column>
 							<el-table-column property="xhUnitPrice" label="单价"></el-table-column>
-						</el-table>
-					</div>
-				</div>
-				<div class="card-wrap">
-					<div class="card-tit">客户</div>
-					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column property="customName" label="名称"></el-table-column>
-							<el-table-column property="customMobile" label="手机号"></el-table-column>
-							<el-table-column property="fullAddress" label="地址" width="280px"></el-table-column>
-							<el-table-column property="showAddress" label="完整地址" width="280px"></el-table-column>
-						</el-table>
-					</div>
-				</div>
-				<div class="card-wrap">
-					<div class="card-tit">基本信息</div>
-					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column property="orderSn" label="单号" width="180px"></el-table-column>
-							<el-table-column property="sendNum" label="编号"></el-table-column>
-							<el-table-column property="sendCost" label="运费"></el-table-column>
-							<el-table-column property="packCost" label="打包费"></el-table-column>
-							<el-table-column property="prePrice" label="原价"></el-table-column>
-							<el-table-column property="tkPrice" label="退款"></el-table-column>
-							<el-table-column property="actPrice" label="实际金额"></el-table-column>
-							<el-table-column property="debt" label="欠款">
-								<template slot-scope="scope">
-									<div v-if="scope.row.debt == 1">是</div><div v-else>-</div>
-								</template>
-							</el-table-column>
-							<el-table-column property="status" label="状态">
-								<template slot-scope="scope">
-									<span>{{ scope.row.status | constantfilter('ORDER_STATUS') }}</span>
-								</template>
-							</el-table-column>
+							<el-table-column property="num" label="数量"></el-table-column>
+							<el-table-column property="refundNum" label="已退数"></el-table-column>
+							<el-table-column property="remark" label="备注"></el-table-column>
 						</el-table>
 					</div>
 				</div>

ghs/src/views/order/list.vue

@@ -93,8 +93,8 @@
       </template>
 
       <template #slot-column-option="{scope}">
-        <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="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>
@@ -102,19 +102,23 @@
         <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>
 
         <el-button @click.stop="allDown(scope.row)" size="small" type="primary" v-if="scope.row.status!=5 && scope.row.status!=1 && scope.row.sameTimeIdsNum>1">全下载</el-button>
         <el-button size="small" v-else>全下载</el-button>
 
+        <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-button size="small" type="primary" slot="reference">确认发货</el-button>
           </el-popconfirm>
         </template>
 
-        <el-button size="small" v-else>发货</el-button>
+        <el-button size="small" v-else>确认发货</el-button>
 
       </template>
 
@@ -597,7 +601,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 455,
+                width: 600,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'