瀏覽代碼

经销商促销

chenrui 1 年之前
父節點
當前提交
51d6099920

+ 183 - 170
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -1,32 +1,32 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="searchBoxNormal">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="费用类型">
-              <expenseType
-                id="salesManagementList-expenseType"
-                :changeOnSelect="true"
-                v-model="expenseTypes"
-                @change="expenseChange"
-                placeholder="请选择费用类型"
-              ></expenseType>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="费用类型">
+                <expenseType
+                  id="salesManagementList-expenseType"
+                  :changeOnSelect="true"
+                  v-model="expenseTypes"
+                  @change="expenseChange"
+                  placeholder="请选择费用类型"
+                ></expenseType>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-form-item label="费用发生月份">
                 <a-month-picker
                   placeholder="请选择月份"
@@ -37,138 +37,149 @@
                   style="width: 100%;"/>
               </a-form-item>
             </a-col>
-          <template v-if="advanced">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="主题">
+                  <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="pushOrder-printStatus"
+                    code="EXPENSE_ACCOUNT_PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="salesManagementList-state"
+                    code="EXPENSE_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="销售单号">
+                  <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                </a-form-item>
+              </a-col>
+            </template>
             <a-col :md="6" :sm="24">
-              <a-form-item label="主题">
-                <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="打印状态">
-                <v-select
-                  v-model="queryParam.printStatus"
-                  ref="printStatus"
-                  id="pushOrder-printStatus"
-                  code="EXPENSE_ACCOUNT_PRINT_STATUS"
-                  placeholder="请选择打印状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="salesManagementList-state"
-                  code="EXPENSE_STATE"
-                  placeholder="请选择状态"
-                  allowClear></v-select>
-              </a-form-item>
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
+                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="salesManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
-        <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
-        <span style="margin-left: 8px">
-          <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-        </span>
+          </a-row>
+        </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
-        @rowSelection="rowSelectionFun"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="expenseAccountNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_eRdetail')" class="link-bule" @click="handleDetail(record)">{{ record.expenseAccountNo }}</span>
-          <div v-else>{{ record.expenseAccountNo||'--' }}</div>
-        </template>
-        <!-- 总数量 -->
-        <template slot="totalQty" slot-scope="text, record">
-          {{ record.totalQty }}
-        </template>
-        <!-- 费用类型 -->
-        <template slot="expenseType" slot-scope="text, record">
-          <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span></div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERtEdit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERDel')"
-            size="small"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-          >
-            删除
-          </a-button>
-          <a-button
-            v-if="record.state!='WAIT_SUBMIT'&&$hasPermissions('B_ERAudit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleSH(record)"
-          >
-            审核进度
-          </a-button>
-          <a-button
-            v-if="record.state=='AUDIT_REJECT'"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="againEdit(record)"
-          >
-            再次编辑
-          </a-button>
+    </a-card>
+    <a-card size="small" :bordered="false" class="salesManagementList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
+          <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
+          <span style="margin-left: 8px">
+            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+          </span>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
+          @rowSelection="rowSelectionFun"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="expenseAccountNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_eRdetail')" class="link-bule" @click="handleDetail(record)">{{ record.expenseAccountNo }}</span>
+            <div v-else>{{ record.expenseAccountNo||'--' }}</div>
+          </template>
+          <!-- 总数量 -->
+          <template slot="totalQty" slot-scope="text, record">
+            {{ record.totalQty }}
+          </template>
+          <!-- 费用类型 -->
+          <template slot="expenseType" slot-scope="text, record">
+            <div>{{ record.expenseTypeName || '--' }}<span v-if="record.expenseType2">/{{ record.expenseTypeName2 || '--' }}</span></div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERtEdit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              v-if="record.state=='WAIT_SUBMIT'&&$hasPermissions('B_ERDel')"
+              size="small"
+              type="link"
+              class="button-error"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
+            <a-button
+              v-if="record.state!='WAIT_SUBMIT'&&$hasPermissions('B_ERAudit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleSH(record)"
+            >
+              审核进度
+            </a-button>
+            <a-button
+              v-if="record.state=='AUDIT_REJECT'"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="againEdit(record)"
+            >
+              再次编辑
+            </a-button>
           <!-- <span v-if="record.state=='AUDIT_REJECT' || record.state=='AUDIT_PASS'">--</span> -->
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 审核进度 -->
-    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
-    <!-- 新增 -->
-    <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
-    <!-- 打印预览 -->
-    <commonModal modalTit="费用报销单打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModal.prints()">
-      <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
-    </commonModal>
-  </a-card>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 审核进度 -->
+      <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+      <!-- 新增 -->
+      <baseDataModal :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
+      <!-- 打印预览 -->
+      <commonModal
+        modalTit="费用报销单打印预览"
+        width="700pt"
+        okText="立即打印"
+        :openModal="showTipModal"
+        @cancel="showTipModal=false"
+        @ok="$refs.printModal.prints()">
+        <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
+      </commonModal>
+    </a-card>
   </div>
 </template>
 
@@ -191,7 +202,7 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal },
   data () {
-    let _this=this
+    const _this = this
     return {
       locale,
       spinning: false,
@@ -211,7 +222,8 @@ export default {
         expenseType: undefined, // 费用类型
         expenseType2: undefined, // 费用类型2
         printStatus: undefined, // 打印状态
-        state: undefined // 状态
+        state: undefined, // 状态
+        salesBillNo: ''// 销售单号
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -261,25 +273,25 @@ export default {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
     },
-    printOk(data){
-      if(data&&data.status == 200){
+    printOk (data) {
+      if (data && data.status == 200) {
         const rows = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows || []
         const ret = []
         rows.map(item => {
           ret.push({
             id: item.id,
-            printStatus:"PRINT"
+            printStatus: 'PRINT'
           })
         })
         expenseAccountUpdateBatch(ret).then(res => {
-          if(res.status == 200){
+          if (res.status == 200) {
             this.$refs.table.refresh()
             this.$refs.table.clearSelected()
           }
           this.spinning = false
           this.showTipModal = false
         })
-      }else{
+      } else {
         this.spinning = false
       }
     },
@@ -295,12 +307,12 @@ export default {
       this.spinning = true
       const pageData = []
       const businessSnList = []
-      
-      for(let i=0;i<rows.length;i++){
+
+      for (let i = 0; i < rows.length; i++) {
         // 费用明细
         const fyListData = await expenseAcctDetailFindList({ expenseAccountSn: rows[i].expenseAccountSn }).then(res => res.data)
         // 审核明细,待提交状态不获取
-        if(rows[i].state != 'WAIT_SUBMIT'){
+        if (rows[i].state != 'WAIT_SUBMIT') {
           businessSnList.push(rows[i].expenseAccountSn)
         }
         pageData.push({
@@ -312,7 +324,7 @@ export default {
       // 获取审核进度信息
       const spListData = await getBatchLastProcessInstance({ 'businessType': 'EXPENSES', 'businessSnList': businessSnList }).then(res => res.data)
       pageData.map(item => {
-        if(spListData){
+        if (spListData) {
           const sp = spListData[item.expenseInfo.expenseAccountSn]
           item.spListData = sp ? sp.taskVOList : []
         }
@@ -320,7 +332,7 @@ export default {
       console.log(pageData)
       // 打开预览弹框
       this.showTipModal = true
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.printModal.setData(pageData)
         this.spinning = false
       })
@@ -396,7 +408,7 @@ export default {
         }
       })
     },
-    searchForm(){
+    searchForm () {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
@@ -409,8 +421,9 @@ export default {
         expenseType: undefined, // 费用类型
         expenseType2: undefined, // 费用类型2
         state: undefined, // 状态
-        printStatus:undefined,
-        applyPersonSn: undefined
+        printStatus: undefined,
+        applyPersonSn: undefined,
+        salesBillNo: ''// 销售单号
       }
       this.expenseTypes = []
       this.searchForm()

+ 40 - 0
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -62,6 +62,44 @@
             </a-col>
           </a-row>
         </a-form-model-item>
+        <a-form-model-item label="订单起订金额" prop="minOrderFlag">
+          <a-select default-value="1" v-model="form.minOrderFlag" style="width: 180px" placeholder="请选择">
+            <a-select-option value="0">
+              不限
+            </a-select-option>
+            <a-select-option value="1">
+              限制
+            </a-select-option>
+          </a-select>
+          <a-input-number
+            v-show="form.minOrderFlag && form.minOrderFlag=='1'"
+            style="margin-left:10px;width:300px;"
+            v-model="form.minOrderAmount"
+            :min="0"
+            :step="1"
+            :max="999999"
+            :precision="2"
+            placeholder="请输入金额"/>
+        </a-form-model-item>
+        <a-form-model-item label="活动经费上限" prop="upperLimitFlag">
+          <a-select default-value="1" v-model="form.upperLimitFlag" style="width: 180px" placeholder="请选择">
+            <a-select-option value="0">
+              不限
+            </a-select-option>
+            <a-select-option value="1">
+              限制
+            </a-select-option>
+          </a-select>
+          <a-input-number
+            v-show="form.upperLimitFlag&&form.upperLimitFlag=='1'"
+            style="margin-left:10px;width:300px;"
+            v-model="form.upperLimitAmount"
+            :min="0"
+            :step="1"
+            :max="999999"
+            :precision="2"
+            placeholder="请输入金额"/>
+        </a-form-model-item>
         <a-form-model-item label="促销描述" prop="content">
           <a-textarea
             id="promotionList-content"
@@ -161,6 +199,8 @@ export default {
         expenseDepartmentSn: [{ required: true, message: '请选择费用所属部门', trigger: 'change' }],
         dealerScope: [{ required: true, message: '请选择参与客户', trigger: 'change' }],
         description: [{ required: true, message: '请输入促销简称', trigger: 'blur' }],
+        minOrderFlag: [{ required: true, message: '请选择订单起订金额', trigger: 'change' }],
+        upperLimitFlag: [{ required: true, message: '请选择活动经费上限', trigger: 'change' }],
         content: [{ required: true, message: '请输入促销描述', trigger: 'blur' }]
       },
       attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo',

+ 2 - 0
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -21,6 +21,8 @@
           <a-descriptions-item label="费用所属部门">{{ detailData.expenseDepartmentName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="参与客户" v-if="detailData.dealerScope!='ALL_DEALER'"><div @click="handleSee">共<span class="link-bule">{{ detailData.dealerQty }}</span>个</div></a-descriptions-item>
           <a-descriptions-item label="参与客户" v-else>全部客户</a-descriptions-item>
+          <a-descriptions-item label="活动订单起订金额(元)">不限</a-descriptions-item>
+          <a-descriptions-item label="活动经费上限(元)">不限</a-descriptions-item>
           <a-descriptions-item label="促销描述" :span="2">
             <div class="descItem">{{ detailData.content || '' }}</div>
           </a-descriptions-item>

+ 62 - 79
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -63,32 +63,45 @@
           </div>
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag">
-          <div class="ruleDescList">
-            <a-select default-value="1" v-model="form.regularSameFlag" style="width: 100px" size="small" @change="handleFullGift">
-              <a-select-option value="1">
-                同款
-              </a-select-option>
-              <a-select-option value="0">
-                不同款
-              </a-select-option>
-            </a-select>
-            产品购买满
-            <a-input-number
-              v-model="form.regularQty"
-              :min="0"
-              :step="1"
-              :max="999999"
-              :precision="0"
-              size="small"/>
-            个正价产品,送
-            <a-input-number
-              v-model="form.promotionQty"
-              :min="0"
-              :step="1"
-              :precision="0"
-              :max="999999"
-              size="small"/>
-            个促销产品
+          <div class="fullGiftRuleBox">
+            <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">
+              <span>{{ i*1+1 }}、</span>
+              <a-select default-value="1" v-model="con.regularSameFlag" style="width: 100px" size="small" @change="handleFullGift">
+                <a-select-option value="1">
+                  同款
+                </a-select-option>
+                <a-select-option value="0">
+                  不同款
+                </a-select-option>
+              </a-select>
+              产品购买满
+              <a-input-number
+                v-model="con.regularQty"
+                :min="0"
+                :step="1"
+                :max="999999"
+                :precision="0"
+                size="small"/>
+              <a-select default-value="1" v-model="con.regularSameFlag" style="width: 50px;margin-left:5px;" size="small" @change="handleFullGift">
+                <a-select-option value="1">
+                  元
+                </a-select-option>
+                <a-select-option value="0">
+                  个
+                </a-select-option>
+              </a-select>
+              正价产品,送
+              <a-input-number
+                v-model="con.promotionQty"
+                :min="0"
+                :step="1"
+                :precision="0"
+                :max="999999"
+                size="small"/>
+              个促销产品
+              <a-button type="link" v-if="i==0&&fullGiftRuleList&&fullGiftRuleList.length<5" class="button-info" @click="addFullGiftRule">+新增</a-button>
+              <a-button type="link" v-if="i!=0" class="button-error" @click="delFullGiftRule(i)">删除</a-button>
+            </div>
           </div>
           <div class="ruleDescList">
             <a-checkbox :checked="form.restrictFlag === '1'" size="small" @change="onChange">
@@ -101,7 +114,11 @@
               :step="1"
               :max="999999"
               :precision="0"
-              size="small"/>
+              size="small"
+              style="margin-right:10px;"/>
+            <a-checkbox :checked="form.restrictFlag === '1'" size="small" @change="onChange">
+              可转费用报销单
+            </a-checkbox>
           </div>
         </a-form-model-item>
         <a-form-model-item label="数量叠加" prop="accrualFlag">
@@ -115,58 +132,6 @@
           </a-radio-group>
           <span style="color:gray;">(如:满10送2,数量叠加则:满20送4,满30送6)</span>
         </a-form-model-item>
-        <a-form-model-item prop="minOrderFlag">
-          <span slot="label">
-            <!-- <a-tooltip title="What do you want others to call you?">
-              <a-icon type="info-circle" />
-            </a-tooltip> -->
-            订单起订金额
-          </span>
-          <a-select v-model="form.minOrderFlag" style="width: 160px" size="small">
-            <a-select-option value="0">
-              不限
-            </a-select-option>
-            <a-select-option value="1">
-              限制
-            </a-select-option>
-          </a-select>
-          <a-input-number
-            v-show="form.minOrderFlag && form.minOrderFlag=='1'"
-            size="small"
-            style="margin-left:10px;width:300px;"
-            v-model="form.minOrderAmount"
-            :min="0"
-            :max="999999"
-            :step="1"
-            :precision="2"
-            placeholder="请输入金额"/>
-        </a-form-model-item>
-        <a-form-model-item prop="upperLimitFlag">
-          <span slot="label">
-            <!-- <a-tooltip title="What do you want others to call you?">
-              <a-icon type="info-circle" />
-            </a-tooltip> -->
-            活动经费上限
-          </span>
-          <a-select v-model="form.upperLimitFlag" style="width: 160px" size="small">
-            <a-select-option value="0">
-              不限
-            </a-select-option>
-            <a-select-option value="1">
-              限制
-            </a-select-option>
-          </a-select>
-          <a-input-number
-            v-show="form.upperLimitFlag&&form.upperLimitFlag=='1'"
-            size="small"
-            style="margin-left:10px;width:300px;"
-            v-model="form.upperLimitAmount"
-            :min="0"
-            :step="1"
-            :max="999999"
-            :precision="2"
-            placeholder="请输入金额"/>
-        </a-form-model-item>
         <a-form-model-item label="促销品与正品一致" prop="regularPromotionSameFlag">
           <a-radio-group v-model="form.regularPromotionSameFlag" button-style="solid" size="small" :disabled="form.regularSameFlag==0">
             <a-radio value="1">
@@ -245,6 +210,11 @@ export default {
         labelCol: { span: 4 },
         wrapperCol: { span: 17 }
       },
+      fullGiftRuleList: [{
+        regularSameFlag: '1',
+        regularQty: undefined,
+        promotionQty: undefined
+      }],
       form: {
         promotionRuleType: 'BUY_PROD_GIVE_PROD', // 买产品送产品
         description: '', // 简称
@@ -278,6 +248,19 @@ export default {
     }
   },
   methods: {
+    // 新增  满减规则  最多能添加五个
+    addFullGiftRule () {
+      const obj = {
+        regularSameFlag: '1',
+        regularQty: undefined,
+        promotionQty: undefined
+      }
+      this.fullGiftRuleList.push(obj)
+    },
+    // 删除满减规则
+    delFullGiftRule (pos) {
+      this.fullGiftRuleList.splice(pos, 1)
+    },
     // 满赠  同款    促销品与正品一致  默认是 可修改
     //     不同款                   默认否 不可修改
     handleFullGift (e) {

+ 12 - 0
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -80,6 +80,17 @@
                         <AreaList id="promotionSalesRealTimeReport-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                       </a-form-model-item>
                     </a-col>
+                    <a-col :md="6" :sm="24">
+                      <a-form-model-item label="采购额">
+                        <v-select
+                          v-model="queryParam.buyerLevel"
+                          ref="buyerLevel"
+                          id="promotionSalesRealTimeReport-buyerLevel"
+                          code="DEALER_LEVEL"
+                          placeholder="请选择采购额"
+                          allowClear></v-select>
+                      </a-form-model-item>
+                    </a-col>
                   </template>
                   <a-col :md="6" :sm="24">
                     <span class="table-page-search-submitButtons">
@@ -240,6 +251,7 @@ export default {
         { title: '成本金额', dataIndex: 'totalRealCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '损失成本', dataIndex: 'lossCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '损失费用', dataIndex: 'lossAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '促销产品转采购额', dataIndex: 'lossAmount1', width: '130px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '采购额结余', dataIndex: 'surplusPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '采购额超出', dataIndex: 'outPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '促销品费用归属品牌', dataIndex: 'promoProductBrandName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },