lilei 2 years ago
parent
commit
ae90e8d1a3
1 changed files with 50 additions and 17 deletions
  1. 50 17
      src/views/dataStatistics/orderDataSummary/list.vue

+ 50 - 17
src/views/dataStatistics/orderDataSummary/list.vue

@@ -47,7 +47,7 @@
                         placeholder="请输入最小值"/>
                       <a-input
                         style=" width: 16%; pointer-events: none; backgroundColor: #fff"
-                        placeholder=""
+                        placeholder="~"
                         disabled
                       />
                       <a-input-number
@@ -66,19 +66,19 @@
                       <a-input-number
                         :precision="0"
                         style=" width: 42%; text-align: center"
-                        v-model.trim="queryParam.qhslMin"
+                        v-model.trim="queryParam.xsslMin"
                         allowClear
                         placeholder="请输入最小值"/>
                       <a-input
                         style=" width: 16%; pointer-events: none; backgroundColor: #fff"
-                        placeholder=""
+                        placeholder="~"
                         disabled
                       />
                       <a-input-number
                         :precision="0"
-                        :min="queryParam.qhslMin"
+                        :min="queryParam.xsslMin"
                         style=" width: 42%; text-align: center"
-                        v-model.trim="queryParam.qhslMax"
+                        v-model.trim="queryParam.xsslMax"
                         allowClear
                         placeholder="请输入最大值"/>
                     </a-input-group>
@@ -101,9 +101,17 @@
           <a-alert type="info">
             <div slot="message" class="total-bar">
               <div>
-                门店数量:<strong>399</strong>;
+                货架数量:<strong>399</strong>;
                 铺货数量合计:<strong>399</strong>;
                 铺货金额合计:<strong>26545</strong>;
+                货架取货数量合计:<strong>399</strong>;
+                货架取货金额合计:<strong>26545</strong>;
+              </div>
+              <div>
+                急送数量合计:<strong>399</strong>;
+                急送金额合计:<strong>26545</strong>;
+                销售数量合计:<strong>399</strong>;
+                销售金额合计:<strong>26545</strong>;
               </div>
             </div>
           </a-alert>
@@ -122,11 +130,11 @@
           <span slot="customTitle">
             <a-popover>
               <template slot="content">
-                表示此修理厂最近一次从货架上取货的时间
+                货架铺货情况为实时数据,<br>与查询条件查询中的下单时间无关
               </template>
               <a-icon type="question-circle" theme="twoTone" />
             </a-popover>
-            最近下单时间
+            货架铺货情况
           </span>
         </s-table>
       </a-spin>
@@ -162,15 +170,40 @@ export default {
       openStatusModal: false, // 货架状态弹窗初始状态
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '货架创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '汽车修理厂', dataIndex: 'storeName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '配件经销商', dataIndex: 'dealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '所在地', dataIndex: 'createDate2', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货架状态', dataIndex: 'stateDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '铺货数量', dataIndex: 'bondAmount', width: '11%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
-        { title: '铺货金额', dataIndex: 'bondAmount', width: '11%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
-        { slots: { title: 'customTitle' }, dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '汽车修理厂', dataIndex: 'storeName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '配件经销商', dataIndex: 'dealerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '所在地', dataIndex: 'createDate2', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货架状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        {
+          slots: { title: 'customTitle' },
+          children: [
+            { title: '铺货数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
+            { title: '铺货金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+          ]
+        },
+        {
+          title: '货架订单',
+          children: [
+            { title: '取货数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
+            { title: '取货金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+          ]
+        },
+        {
+          title: '急送订单',
+          children: [
+            { title: '急送数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
+            { title: '急送金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+          ]
+        },
+        {
+          title: '销售单',
+          children: [
+            { title: '销售数量', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
+            { title: '销售金额', dataIndex: 'bondAmount', width: '6%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+          ]
+        }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -231,7 +264,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 205
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {