Browse Source

促销品

lilei 1 year ago
parent
commit
edfc7c6401

+ 269 - 0
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="productInfoList-wrap">
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchForm">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="出库仓库" prop="warehouseSn" required>
+              <chooseWarehouse ref="warehouse" :allowClear="false" v-model="queryParam.warehouseSn" :isDefault="true" @load="loadWarehouse"></chooseWarehouse>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="productInfoList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="原厂编码">
+                <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品品牌">
+                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品分类">
+                <ProductType id="productInfoList-productType" v-model="productType" @change="changeProductType"></ProductType>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin: 0 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+            <a-popover>
+              <template slot="content">双击列表配件可快速选中添加</template>
+              <a-icon type="question-circle" theme="twoTone" />
+            </a-popover>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <a-tabs type="card" @change="changeTab">
+      <a-tab-pane key="1" tab="门槛产品"></a-tab-pane>
+      <a-tab-pane key="2" tab="正价产品"></a-tab-pane>
+      <a-tab-pane key="3" tab="促销产品"></a-tab-pane>
+      <a-tab-pane key="4" tab="特价产品"></a-tab-pane>
+    </a-tabs>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="small"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :customRow="handleClickRow"
+      :scroll="{ y: 500 }"
+      :defaultLoadData="false"
+      bordered>
+      <!-- 销售数量 -->
+      <template slot="nums" slot-scope="text, record">
+        <div @dblclick.stop>
+          <a-input-number
+            size="small"
+            v-model="record.salesNums"
+            :precision="0"
+            :min="1"
+            :max="999999"
+            style="width: 100%;"
+            placeholder="请输入" />
+        </div>
+      </template>
+      <!-- 产品名称 -->
+      <template slot="productName" slot-scope="text, record">
+        <div class="ellipsisCon">
+          <a-tooltip placement="rightBottom">
+            <template slot="title">
+              <span>{{ text }}</span>
+            </template>
+            <span class="ellipsisText">{{ text }}</span>
+          </a-tooltip>
+          <a-badge :number-style="{ backgroundColor: '#52c41a' }" count="活动" v-if="record.isJoinActivityProduct == 1"></a-badge>
+        </div>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button
+          size="small"
+          type="link"
+          class="button-info"
+          :loading="newLoading"
+          @click="handleAdd(record)"
+          :disabled="!record.productPrice || record.productPrice<=0"
+          id="productInfoList-edit-btn">添加</a-button>
+      </template>
+    </s-table>
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { queryStockProductPage } from '@/api/stock'
+import ProductType from '@/views/common/productType.js'
+import ProductBrand from '@/views/common/productBrand.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
+import { STable, VSelect } from '@/components'
+export default {
+  name: 'ActiveQueryPart',
+  mixins: [commonMixin],
+  components: { STable, VSelect, ProductBrand, ProductType, chooseWarehouse },
+  props: {
+    newLoading: Boolean
+  },
+  data () {
+    return {
+      advanced: false, // 高级搜索 展开/关闭
+      showSetting: false, // 设置弹框
+      productType: [],
+      buyerSn: '',
+      queryParam: { //  查询条件
+        productCode: '', //  产品编码
+        productName: '', //  产品名称
+        productOrigCode: '', //  原厂编码
+        productBrandSn: undefined, //  产品品牌
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '', //  产品三级分类
+        warehouseSn: undefined
+      },
+      defaultWarehouseSn: undefined, // 默认仓库sn
+      disabled: false, //  查询、重置按钮是否可操作
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.queryParam.dealerSn = this.buyerSn
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1', pricingState: 'PRICED' })).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            data.list = data.list.filter(item => item != null)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].salesNums = 1
+              data.list[i].currentStockQty = data.list[i].currentStockQty || 0
+              const productPackQty = (data.list[i].productPackQty || data.list[i].productPackQty == 0) ? data.list[i].productPackQty : '--'
+              const productUnit = data.list[i].productUnit || '--'
+              const productPackQtyUnit = data.list[i].productPackQtyUnit || '--'
+              data.list[i].packQtyV = productPackQty + productUnit + '/' + productPackQtyUnit
+            }
+            this.disabled = false
+          }
+          return data
+        })
+      }
+    }
+  },
+  computed: {
+    columns () {
+      const arr = [
+        { title: '产品编码', dataIndex: 'productCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, width: '18%', align: 'left' },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '品牌', dataIndex: 'productBrandName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '库存数量', dataIndex: 'currentStockQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '售价', dataIndex: 'productPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '包装数', dataIndex: 'packQtyV', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '起订量', dataIndex: 'packQtyV', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '下单数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: '8%', align: 'center' },
+        { title: '实际数量', dataIndex: 'packQtyV', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+      ]
+      if (this.$hasPermissions('B_salesEdit_salesPrice')) { // 售价权限
+        arr.splice(6, 0, { title: '售价', dataIndex: 'productPrice', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+      }
+      return arr
+    }
+  },
+  methods: {
+    loadWarehouse (sn) {
+      this.defaultWarehouseSn = sn
+      this.queryParam.warehouseSn = sn
+      this.resetSearchForm()
+    },
+    // 切换tab
+    changeTab(e){
+      console.log(e)
+    },
+    // 双击列表
+    handleClickRow (record) {
+      const _this = this
+      return {
+        on: {
+          dblclick: (event) => {
+            if (!record.productPrice || record.productPrice <= 0) {
+              _this.$message.info('该产品暂时不能添加')
+            } else {
+              event.stopPropagation()
+              _this.$emit('add', record, 0)
+            }
+          }
+        }
+      }
+    },
+    // 查询
+    searchForm () {
+      if (this.queryParam.warehouseSn) {
+        this.$refs.table.refresh(true)
+      } else {
+        this.$message.info('请选择仓库')
+      }
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.productCode = ''
+      this.queryParam.productName = ''
+      this.queryParam.productOrigCode = ''
+      this.queryParam.productBrandSn = undefined
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.productType = []
+      this.queryParam.warehouseSn = this.defaultWarehouseSn
+      this.$refs.table.refresh(true)
+    },
+    pageInit (buyerSn, warehouseSn) {
+      this.buyerSn = buyerSn
+    },
+    // 刷新当前页面
+    resetCurForm () {
+      const _this = this
+      _this.$nextTick(() => {
+        _this.$refs.table.refresh()
+      })
+    },
+    // 选择配件
+    handleAdd (row) {
+      this.$emit('add', row, 0)
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .productInfoList-wrap{
+    /deep/ .ant-tabs-bar{
+      margin-bottom: 5px!important;
+    }
+  }
+</style>

+ 8 - 2
src/views/salesManagement/salesQueryNew/comps/chooseProduct.vue

@@ -12,7 +12,8 @@
       <div class="products-con">
         <div>
           <!-- 查询配件列表 -->
-          <queryPart ref="partQuery" :newLoading="isInster" @add="insterProduct"></queryPart>
+          <queryPart v-if="type==0" ref="partQuery" :newLoading="isInster" @add="insterProduct"></queryPart>
+          <activeQueryPart v-else ref="partQuery" :newLoading="isInster" @add="insterProduct"></activeQueryPart>
         </div>
       </div>
     </a-spin>
@@ -21,9 +22,10 @@
 
 <script>
 import queryPart from './queryPart.vue'
+import activeQueryPart from './activeQueryPart.vue'
 export default {
   name: 'ChooseProductsModal',
-  components: { queryPart },
+  components: { queryPart, activeQueryPart },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -42,6 +44,10 @@ export default {
     isInster: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    type: {
+      type: String,
+      default: '0'
     }
   },
   data () {

+ 57 - 52
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -24,45 +24,23 @@
         </a-descriptions>
       </div>
     </div>
-    <!-- 筛选条件 -->
-    <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">
-            <a-form-item label="出库仓库" prop="warehouseSn">
-              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" @load="warehouseLoad"></chooseWarehouse>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="产品编码" prop="productCode">
-              <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="产品名称" prop="productName">
-              <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="品牌">
-              <ProductBrand id="salesEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="产品分类">
-              <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <div>
-      <a-row :gutter="15">
+    <div class="table-page-search-wrapper">
+      <a-row :gutter="15" type="flex" justify="space-between" align="middle">
         <a-col :md="12" :sm="24" style="text-align:left;">
+          <!-- 总计 -->
+          <a-alert type="info" style="width:auto;display: inline-block;" banner :showIcon="false">
+            <div slot="message">
+              <div style="margin-bottom: 5px;">
+                已满足1000元门槛金额,已选择180元正价产品配额,<strong>再满2件产品,可享受满赠优惠/已满足促销要求,可享受优惠</strong>
+              </div>
+              <div>
+                <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+                <span v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
+              </div>
+            </div>
+          </a-alert>
+        </a-col>
+        <a-col :md="12" :sm="24" style="text-align:right;">
           <span style="margin-right:5px;">已选{{ selectTotal }}项</span>
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick">
@@ -81,8 +59,10 @@
               class="button-info"
             > 批量操作 <a-icon type="down" /> </a-button>
           </a-dropdown>
-        </a-col>
-        <a-col :md="12" :sm="24" style="text-align:right;">
+          <a-button
+            type="link"
+            class="button-info"
+             @click="showSearchBox=!showSearchBox" ><a-icon type="search"/> 筛选</a-button>
           <a-button
             type="link"
             class="button-info"
@@ -98,18 +78,42 @@
         </a-col>
       </a-row>
     </div>
-    <!-- 总计 -->
-    <a-alert type="info" style="margin-bottom: 5px;" banner :showIcon="false">
-      <div slot="message" class="total-bar">
-        <div>
-          已满足1000元门槛金额,已选择180元正价产品配额,<strong>再满2件产品,可享受满赠优惠/已满足促销要求,可享受优惠</strong>
-        </div>
-        <div>
-          <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
-          <span v-if="$hasPermissions('B_salesEdit_salesPrice')">优惠金额:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? toThousands(detailData.totalCommonAmount) : '--' }}</strong>;</span>
-        </div>
-      </div>
-    </a-alert>
+   <!-- 筛选条件 -->
+   <div class="table-page-search-wrapper" style="margin:0" v-show="showSearchBox">
+     <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+       <a-row :gutter="15">
+         <a-col :md="4" :sm="24">
+           <a-form-item label="出库仓库" prop="warehouseSn">
+             <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" @load="warehouseLoad"></chooseWarehouse>
+           </a-form-item>
+         </a-col>
+         <a-col :md="4" :sm="24">
+           <a-form-item label="产品编码" prop="productCode">
+             <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+           </a-form-item>
+         </a-col>
+         <a-col :md="4" :sm="24">
+           <a-form-item label="产品名称" prop="productName">
+             <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
+           </a-form-item>
+         </a-col>
+         <a-col :md="4" :sm="24">
+           <a-form-item label="品牌">
+             <ProductBrand id="salesEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+           </a-form-item>
+         </a-col>
+         <a-col :md="4" :sm="24">
+           <a-form-item label="产品分类">
+             <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
+           </a-form-item>
+         </a-col>
+         <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+           <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
+           <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
+         </a-col>
+       </a-row>
+     </a-form>
+   </div>
     <!-- 已选配件列表 -->
     <s-table
       class="sTable"
@@ -191,6 +195,7 @@
       <chooseProduct
         ref="chooseProduct"
         :openModal="openCpModal"
+        :type="1"
         :buyerSn="detailData&&detailData.buyerSn||''"
         @close="openCpModal=false"
         @addProduct="insterProduct"></chooseProduct>

+ 50 - 46
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -1,7 +1,53 @@
 <template>
   <div>
-    <!-- 筛选条件 -->
     <div class="table-page-search-wrapper">
+      <a-row :gutter="15" type="flex" justify="space-between" align="middle">
+        <a-col :md="12" :sm="24" style="text-align:left;">
+          <!-- 总计 -->
+          <a-alert type="info" style="width:auto;display: inline-block;" banner :showIcon="false">
+            <div slot="message">
+               <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>
+          </a-alert>
+        </a-col>
+        <a-col :md="12" :sm="24" style="text-align:right;">
+          <span style="margin-right:5px;">已选{{ selectTotal }}项</span>
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleMenuClick">
+              <a-menu-item key="0">
+                仓库设置
+              </a-menu-item>
+              <a-menu-item key="1">
+                删除已选项
+              </a-menu-item>
+              <a-menu-item key="2">
+                全部删除
+              </a-menu-item>
+            </a-menu>
+            <a-button
+              type="link"
+              class="button-info"
+            > 批量操作 <a-icon type="down" /> </a-button>
+          </a-dropdown>
+          <a-button
+            type="link"
+            class="button-info"
+             @click="showSearch=!showSearch" ><a-icon type="search"/> 筛选</a-button>
+          <a-button
+            type="link"
+            class="button-info"
+            @click="openGuideModal=true"><a-icon type="login" /> 导入产品</a-button>
+          <a-button
+            type="link"
+            class="button-info"
+            @click="openCpModal=true"><a-icon type="plus" /> 添加产品</a-button>
+        </a-col>
+      </a-row>
+    </div>
+    <!-- 筛选条件 -->
+    <div class="table-page-search-wrapper" style="margin:0" v-if="showSearch">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
           <a-col :md="4" :sm="24">
@@ -36,50 +82,6 @@
         </a-row>
       </a-form>
     </div>
-    <div>
-      <a-row :gutter="15">
-        <a-col :md="12" :sm="24" style="text-align:left;">
-          <span style="margin-right:5px;">已选{{ selectTotal }}项</span>
-          <a-dropdown>
-            <a-menu slot="overlay" @click="handleMenuClick">
-              <a-menu-item key="0">
-                仓库设置
-              </a-menu-item>
-              <a-menu-item key="1">
-                删除已选项
-              </a-menu-item>
-              <a-menu-item key="2">
-                全部删除
-              </a-menu-item>
-            </a-menu>
-            <a-button
-              type="link"
-              class="button-info"
-            > 批量操作 <a-icon type="down" /> </a-button>
-          </a-dropdown>
-        </a-col>
-        <a-col :md="12" :sm="24" style="text-align:right;">
-          <a-button
-            type="link"
-            class="button-info"
-            @click="openGuideModal=true"><a-icon type="login" /> 导入产品</a-button>
-          <a-button
-            type="link"
-            class="button-info"
-            @click="openCpModal=true"><a-icon type="plus" /> 添加产品</a-button>
-        </a-col>
-      </a-row>
-    </div>
-    <!-- 总计 -->
-    <a-alert type="info" style="margin-bottom: 5px;" banner :showIcon="false">
-      <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>
     <!-- 已选配件列表 -->
     <s-table
       class="sTable"
@@ -237,6 +239,7 @@
             return data
           })
         },
+        showSearch: false,
         openCpModal: false,
         openWarehouseModal: false, // 打开仓库设置
         openGuideModal: false, //  导入产品引导
@@ -254,7 +257,8 @@
         },
         productType: [],
         rowSelectionInfo: null,
-        warehouseDataList: []
+        warehouseDataList: [],
+        isInster: false
       }
     },
     computed: {

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

@@ -13,7 +13,7 @@
         <productNormalList ref="productNormalList" :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productNormalList>
       </a-card>
       <!-- 活动产品 -->
-      <a-collapse v-model="activeKey" style="background: #f8f8f8;border-color: #f8f8f8;">
+      <a-collapse v-model="activeKey" expand-icon-position="right" style="background: #f8f8f8;border-color: #f8f8f8;">
         <a-collapse-panel 
         v-for="item in activeList" 
         :key="item.activeId" 
@@ -27,9 +27,6 @@
               </span>
             </div>
           </div>
-          <span slot="extra" style="margin-right:10px;color:#00aaff;" @click="(event) => {showSearch(event, item.activeId)}" >
-            <a-icon style="margin-top:13px;" type="search"/> 筛选
-          </span>
           <productList :ref="'productList-'+item.activeId" :detailData="detailData" :warehouseSn="warehouseSn" :salesBillSn="salesBillSn"></productList>
         </a-collapse-panel>
       </a-collapse>
@@ -281,6 +278,9 @@ export default {
         -webkit-box-orient: vertical;
       }
     }
+    .ant-collapse .ant-collapse-header {
+        padding: 3px 0 5px 8px!important;
+    }
     .affix-cont{
       padding: 5px 15px;
       text-align: right;