shish 2 лет назад
Родитель
Сommit
3db10bb27d
1 измененных файлов с 32 добавлено и 21 удалено
  1. 32 21
      ghs/src/views/order/list.vue

+ 32 - 21
ghs/src/views/order/list.vue

@@ -31,12 +31,15 @@
         </div>
       </template>
       
-
       <template #table-column-customMobile="{scope}">
         <div v-if="scope.row.customMobile == ''">-</div>
         <div v-else>{{ scope.row.customMobile }}</div>
       </template>
 
+      <template #table-column-sameTimeIdsNum="{scope}">
+        <div v-if="scope.row.sameTimeIdsNum>1" style="color:red;font-weight:bold;font-size:16px;">{{ scope.row.sameTimeIdsNum }}</div>
+      </template>
+
       <template #table-column-book="{scope}">
         <span v-if="scope.row.book ==1" style="color:green;font-weight:bold;font-size:13px;">预</span>
         <span></span>
@@ -59,6 +62,8 @@
         <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 disabled size="small">打A4</el-button>
         <el-button @click.stop="detailShowFn(scope.row)" size="small" type="success">详情</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="primary">下载</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="primary">全部下载</el-button>
       </template>
 
       <template #slot-order-book="{scope}">
@@ -260,22 +265,9 @@ export default {
                 prop: 'orderSn',
                 label: '单号',
                 align: 'center',
-                width: '160'
-              },
-              {
-                prop: 'prePrice',
-                label: '总价',
-                align: 'center',
-                width: '110'
+                width: '130'
               },
-              {
-                prop: 'actPrice',
-                label: '实付款',
-                align: 'center',
-                emptyText: '无',
-                width: '110'
-              },
-              {
+               {
                 prop: 'customName',
                 label: '客户',
                 align: 'center',
@@ -285,25 +277,44 @@ export default {
                 prop: 'customMobile',
                 label: '手机号',
                 align: 'center',
-                width: '120'
+                width: '110'
               },
               {
                 prop: 'bigNum',
                 label: '数量',
                 align: 'center',
-                width: '60'
+                width: '50'
               },
               {
                 prop: 'book',
                 label: '预订单',
                 align: 'center',
-                width: '150'
+                width: '70'
               },
               {
                 prop: 'sendTimeWant',
                 label: '预订发货',
                 align: 'center',
-                width: '150'
+                width: '90'
+              },
+              {
+                prop: 'sameTimeIdsNum',
+                label: '当天订单',
+                align: 'center',
+                width: '80'
+              },
+              {
+                prop: 'prePrice',
+                label: '总价',
+                align: 'center',
+                width: '90'
+              },
+              {
+                prop: 'actPrice',
+                label: '实付款',
+                align: 'center',
+                emptyText: '无',
+                width: '90'
               },
               {
                 prop: 'sendNum',
@@ -346,7 +357,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 220,
+                width: 350,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'