lilei 1 éve
szülő
commit
d22a7b3b9d

+ 6 - 3
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 筛选条件 -->
-    <div class="table-page-search-wrapper">
+    <div class="table-page-search-wrapper" v-show="showSearchBox">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
           <a-col :md="4" :sm="24">
@@ -200,7 +200,7 @@
       salesBillSn: {
         type: String,
         default: ''
-      },
+      }
     },
     data () {
       return {
@@ -224,6 +224,7 @@
             return data
           })
         },
+        showSearchBox: false,
         openCpModal: false,
         openWarehouseModal: false, // 打开仓库设置
         openGuideModal: false, //  导入产品引导
@@ -269,11 +270,13 @@
     },
     watch: {
       salesBillSn(newValue, oldValue) {
-        console.log(newValue)
         this.resetSearchForm()
       }
     },
     methods: {
+      showSearch(){
+        this.showSearchBox = !this.showSearchBox
+      },
       // 表格选中项
       rowSelectionFun (obj) {
         this.rowSelectionInfo = obj || null

+ 65 - 20
src/views/salesManagement/salesQueryNew/edit.vue

@@ -24,25 +24,31 @@
         </div>
         
         <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>
-          </a-collapse-panel>
-          <a-collapse-panel key="2" forceRender>
-            <div slot="header" style="font-size:14px;"><strong>五一超优惠活动</strong>(满5000打9折)</div>
-            <productList :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
-          </a-collapse-panel>
-          <a-collapse-panel key="3" forceRender>
-            <div slot="header" style="font-size:14px;"><strong>夏季大促销活动</strong>(满5000打9折)</div>
-            <productList :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
-          </a-collapse-panel>
-          <a-collapse-panel key="4" forceRender>
-            <div slot="header" style="font-size:14px;"><strong>国庆10天热门活动</strong>(满5000打9折)</div>
-            <productList :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
-          </a-collapse-panel>
-          <a-collapse-panel key="5" forceRender>
-            <div slot="header" style="font-size:14px;"><strong>春节滤清器特价活动</strong>(满5000打9折)</div>
-            <productList :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
+          <a-collapse-panel v-for="item in activeList" :key="item.activeId" forceRender>
+            <div slot="header" style="font-size:14px;display: inline-block;">
+              <strong>{{item.activeName}}</strong>({{item.activeDesc}})
+            </div>
+            <a-icon slot="extra" style="margin-right:10px;" type="search" @click="(event) => {showSearch(event, item.activeId)}" />
+            <div>
+              <a-descriptions>
+                  <a-descriptions-item label="UserName">
+                    Zhou Maomao
+                  </a-descriptions-item>
+                  <a-descriptions-item label="Telephone">
+                    1810000000
+                  </a-descriptions-item>
+                  <a-descriptions-item label="Live">
+                    Hangzhou, Zhejiang
+                  </a-descriptions-item>
+                  <a-descriptions-item label="Remark">
+                    empty
+                  </a-descriptions-item>
+                  <a-descriptions-item label="Address">
+                    No. 18, Wantang Road, Xihu District, Hangzhou, Zhejiang, China
+                  </a-descriptions-item>
+                </a-descriptions>
+            </div>
+            <productList :ref="'productList-'+item.activeId" :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -77,7 +83,9 @@ export default {
   data () {
     return {
       spinning: false,
-      activeKey: [1,2,3,4,5],
+      activeList:[], // 活动列表
+      activeKey: [], // 默认展开的活动
+      activeDesKey: {},
       salesBillSn: null, // 销售单sn
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       warehouseSn: undefined,
@@ -158,7 +166,44 @@ export default {
         }
       })
     },
+    // 展开收缩查询
+    showSearch(e,id){
+      e.stopPropagation()
+      const row = this.$refs['productList-'+id][0]
+      console.log(row)
+      row&&row.showSearch()
+    },
+    // 获取活动列表
+    getActive(){
+      this.activeList = [
+        {
+          activeId: '102312313',
+          activeName: "五一超优惠活动",
+          activeDesc: "满5000减300"
+        },
+        {
+          activeId: '02342341',
+          activeName: "夏季清爽502优惠活动",
+          activeDesc: "满8000减500"
+        },
+        {
+          activeId: '22558888',
+          activeName: "国庆10天热门活动",
+          activeDesc: "满5000减300"
+        },
+        {
+          activeId: '856688774',
+          activeName: "春节滤清器特价活动",
+          activeDesc: "滤清器8款特价产品优惠"
+        }
+      ]
+      this.activeList.map(item => {
+        this.activeKey.push(item.activeId)
+        this.activeDesKey['search-'+item.activeId] = false
+      })
+    },
     pageInit () {
+      this.getActive()
       this.getOrderDetail(true)
       this.salesBillSn = this.$route.params.sn
       this.warehouseSn = this.$route.params.sn ? this.$route.params.wSn : ''