lilei 1 year ago
parent
commit
f215527ff0

+ 10 - 10
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -1,15 +1,5 @@
 <template>
   <div>
-    <!-- 总计 -->
-    <a-alert type="info" style="margin-bottom: 10px;">
-      <div slot="message" class="total-bar">
-        <div>
-          <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
-          总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
-          总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
-        </div>
-      </div>
-    </a-alert>
     <!-- 筛选条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -145,6 +135,16 @@
         >删除</a-button>
       </template>
     </s-table>
+    <!-- 总计 -->
+    <a-alert type="info" style="margin-top: 10px;">
+      <div slot="message" class="total-bar">
+        <div>
+          <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+          总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
+          总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
+        </div>
+      </div>
+    </a-alert>
       <!-- 添加产品 -->
       <chooseProduct
         ref="chooseProduct"

+ 4 - 4
src/views/salesManagement/salesQueryNew/edit.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15" type="flex">
             <a-col :span="2">
               <div class="p-title">
-                已选产品
+                促销产品
               </div>
             </a-col>
             <a-col :span="16">
@@ -23,7 +23,7 @@
           </a-row>
         </div>
         
-        <a-collapse v-model="activeKey" accordion>
+        <a-collapse v-model="activeKey">
           <a-collapse-panel key="1" forceRender>
             <div slot="header" style="font-size:14px;"><strong>端午节活动</strong>(满5000送500)</div>
             <productList :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
@@ -47,7 +47,7 @@
         </a-collapse>
       </a-card>
     </a-spin>
-    <div class="affix-cont1">
+    <div class="affix-cont">
       <a-button
         size="large"
         style="padding: 0 60px;"
@@ -77,7 +77,7 @@ export default {
   data () {
     return {
       spinning: false,
-      activeKey: 1,
+      activeKey: [1,2,3,4,5],
       salesBillSn: null, // 销售单sn
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       warehouseSn: undefined,