lilei 6 月之前
父節點
當前提交
661e79660f

+ 1 - 1
src/api/salesNew.js

@@ -128,7 +128,7 @@ export const salesPromoQueryList = (params) => {
     data: params,
     method: 'post',
     headers: {
-      'module': encodeURIComponent('查询销售单参加的活动')
+      'module': encodeURIComponent('查询销售单参加的活动统计信息')
     }
   })
 }

+ 1 - 1
src/config/easyPassManagement.js

@@ -155,7 +155,7 @@ export default {
           {
             path: '/easyPassManagement/homepageCarouselImg',
             redirect: '/easyPassManagement/homepageCarouselImg/list',
-            name: 'carouselImageList',
+            name: 'carouselImage',
             component: BlankLayout,
             meta: {
               title: '首页轮播图',

+ 2 - 2
src/config/home.js

@@ -19,7 +19,7 @@ export default {
         children: [
           {
             path: '/home',
-            name: 'home',
+            name: 'home0',
             redirect: '/home',
             component: BlankLayout,
             meta: {
@@ -31,7 +31,7 @@ export default {
             children: [
               {
                 path: '/home',
-                name: 'home',
+                name: 'home1',
                 component: () => import(/* webpackChunkName: "home" */ '@/views/Home'),
                 meta: {
                   title: '首页',

+ 2 - 2
src/config/report/purchasingReport.js

@@ -19,7 +19,7 @@ export default {
           {
             path: '/reportData/urchaseReturn',
             redirect: '/reportData/urchaseReturn/list',
-            name: 'urchaseReturnList',
+            name: 'urchaseReturn',
             component: BlankLayout,
             meta: {
               title: '采购退货单报表',
@@ -44,7 +44,7 @@ export default {
           {
             path: '/reportData/urchaseDetailReturn',
             redirect: '/reportData/urchaseDetailReturn/detailList',
-            name: 'urchaseDetailReturnList',
+            name: 'urchaseDetailReturn',
             component: BlankLayout,
             meta: {
               title: '采购退货单明细报表',

+ 1 - 1
src/config/report/spreadReport.js

@@ -69,7 +69,7 @@ export default {
           {
             path: '/productRebateReport/index',
             redirect: '/productRebateReport/index/list',
-            name: 'productRebateReportList',
+            name: 'productRebateReport',
             component: BlankLayout,
             meta: {
               title: '产品返利明细表',

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -215,7 +215,7 @@ export default {
               <div class="table-link-text" title={row[column.field]}>
                 <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{row[column.field]}</span>
               </div>
-              <div style="position:absolute;right:0;background:#fff;">
+              <div style="position:absolute;right:0;">
                 {row.promotion.stackFlag == 1 ? <a-badge count="叠" numberStyle={{ backgroundColor: '#00aa00', marginLeft: '2px', zoom: '0.7' }}/> : ''}
                 {row.promotion.borrowFlag == 1 ? <a-badge count="累" numberStyle={{ backgroundColor: '#F5222D', marginLeft: '2px', zoom: '0.7' }} /> : ''}
               </div>

+ 20 - 5
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -57,7 +57,7 @@
           </a-col>
           <a-col flex="1">
             <a-form-item label="累计产品">
-              <v-select code="FLAG" allowClear placeholder="请选择是否累计产品"></v-select>
+              <v-select code="FLAG" v-model="queryParam.borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
             </a-form-item>
           </a-col>
           <a-col flex="2" style="margin-bottom: 10px;">
@@ -73,13 +73,13 @@
         <a-col :md="8" :sm="24" style="text-align:left;">
           <a-dropdown>
             <a-menu slot="overlay" @click="handleMenuClick" :id="'salesEdit-menu-'+id">
-              <a-menu-item key="3" :id="'salesEdit-menu-3-'+id">
+              <!-- <a-menu-item key="3" :id="'salesEdit-menu-3-'+id">
                 全部仓库设置
               </a-menu-item>
               <a-menu-item key="2" :id="'salesEdit-menu-2-'+id">
                 全部删除
               </a-menu-item>
-              <a-menu-divider />
+              <a-menu-divider /> -->
               <a-menu-item key="0" :id="'salesEdit-menu-0-'+id">
                 部分仓库设置
               </a-menu-item>
@@ -97,7 +97,7 @@
               size="small"
             >批量操作<a-icon type="down" /> </a-button>
           </a-dropdown>
-          <span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
+          <span v-if="selectTotal" style="margin:0 10px;">已选 {{ selectTotal }} 项</span>
         </a-col>
         <a-col :md="12" :sm="24" style="text-align:right;">
           <a-button
@@ -105,6 +105,21 @@
             type="link"
             class="button-info"
             @click="showSearchBox=!showSearchBox" ><a-icon :type="showSearchBox?'close':'search'"/> 筛选</a-button>
+          <a-button
+            :id="'salesEdit-allSetWare-'+id"
+            type="link"
+            class="button-info"
+            size="small"
+            style="margin-right:10px;"
+            @click="handleMenuClick({key:3})"
+          ><a-icon type="setting"/> 全部仓库设置</a-button>
+          <a-button
+            :id="'salesEdit-allDel-'+id"
+            type="link"
+            class="button-error"
+            size="small"
+            @click="handleMenuClick({key:2})"
+          ><a-icon type="delete"/> 全部删除</a-button>
         </a-col>
       </a-row>
     </div>
@@ -241,7 +256,7 @@ export default {
     },
     tableHeight () {
       const len = this.dataSource.length
-      return len <= 10 ? ((len + 2) * 30 + 2) + 'px' : '302px'
+      return len <= 10 ? ((len + 1) * 35) + 'px' : '350px'
     },
     // 表格复选框设置
     checkboxOption () {

+ 23 - 11
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -55,13 +55,13 @@
               <a-menu-item key="1" id="salesEdit-pl-1">
                 删除已选项
               </a-menu-item>
-              <a-menu-divider />
+              <!-- <a-menu-divider />
               <a-menu-item key="3" id="salesEdit-pl-3">
                 全部仓库设置
               </a-menu-item>
               <a-menu-item key="2" id="salesEdit-pl-2">
                 全部删除
-              </a-menu-item>
+              </a-menu-item> -->
             </a-menu>
             <a-button
               type="default"
@@ -70,7 +70,7 @@
               size="small"
             > 批量操作 <a-icon type="down" /> </a-button>
           </a-dropdown>
-          <span v-if="selectTotal" style="margin-left:10px;">已选{{ selectTotal }}项</span>
+          <span v-if="selectTotal" style="margin-left:10px;">已选 {{ selectTotal }} 项</span>
         </a-col>
         <a-col :md="16" :sm="24" style="text-align:right;">
           <a-button
@@ -83,6 +83,20 @@
             type="link"
             class="button-info"
             @click="openCpModal"><a-icon type="plus" /> 添加产品</a-button>
+          <a-button
+            :id="'salesEdit-allSetWare'"
+            type="link"
+            class="button-info"
+            size="small"
+            @click="handleMenuClick({key:3})"
+          ><a-icon type="setting"/> 全部仓库设置</a-button>
+          <a-button
+            :id="'salesEdit-allDel'"
+            type="link"
+            class="button-error"
+            size="small"
+            @click="handleMenuClick({key:2})"
+          ><a-icon type="delete"/> 全部删除</a-button>
         </a-col>
       </a-row>
     </div>
@@ -177,13 +191,11 @@
       </template>
     </s-table>
     <!-- 总计 -->
-    <a-alert type="info" v-if="showTotal" banner :showIcon="false" style="width: auto;display: inline-block;bottom: 10px;position: absolute;">
-      <div slot="message">
-        款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
-        数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
-        <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
-      </div>
-    </a-alert>
+    <div v-if="showTotal" style="width: auto;display: inline-block;bottom: 10px;position: absolute;">
+      总款数:<strong>{{ countData&&(countData.totalCategory || countData.totalCategory==0) ? countData.totalCategory : 0 }}</strong>;
+      总数量:<strong>{{ countData&&(countData.totalQty || countData.totalQty==0) ? countData.totalQty : 0 }}</strong>;
+      <span v-if="$hasPermissions('B_salesEdit_salesPrice')">总金额:<strong>{{ countData&&(countData.totalAmount || countData.totalAmount==0) ? toThousands(countData.totalAmount) : '0.00' }}</strong>;</span>
+    </div>
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 仓库设置 -->
@@ -388,7 +400,7 @@ export default {
       }
       this.$confirm({
         title: '提示',
-        content: '确认要删除全部已选产品吗?',
+        content: '确认要删除全部产品吗?',
         centered: true,
         onOk () {
           _this.spinning = true

+ 2 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -275,7 +275,7 @@ import tipModal from './tipModal.vue'
 import vaildPriceModal from './vaildPriceModal.vue'
 // 接口
 import {
-  salesPromoQueryStatisticsList,
+  salesPromoQueryList,
   salesDetailBySn,
   salesDetailPrint,
   salesDetailExcel,
@@ -479,7 +479,7 @@ export default {
     // 获取销售单参与的活动列表
     async getActiveList () {
       // 已参与活动列表
-      const list = await salesPromoQueryStatisticsList({ salesBillSn: this.$route.params.sn || this.bizSn }).then(res => res.data || [])
+      const list = await salesPromoQueryList({ salesBillSn: this.$route.params.sn || this.bizSn }).then(res => res.data || [])
       this.activeList = list.filter(item => item.promotion && item.promotionRule)
       // 触发活动统计查询变量
       this.$nextTick(() => {

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

@@ -52,10 +52,12 @@
       <a-card
         size="small"
         :bordered="false"
-        title="活动产品"
         class="salesEdit-cont"
         v-if="activeList.length"
       >
+        <div slot="title">
+          <span>活动产品</span>
+        </div>
         <activeStatisticsList
           ref="activeTjList"
           @openCpModal="openProductModal"
@@ -178,7 +180,7 @@ import {
   salesDetailBySn,
   salesPromoQueryCount,
   salesWriteSubmit,
-  salesPromoQueryStatisticsList,
+  salesPromoQueryList,
   salesPromoDiscountSort,
   salesQueryUnPartPromo,
   salesPromoValidaSubmit,
@@ -289,7 +291,7 @@ export default {
     // 获取销售单参与的活动列表
     async getActiveList () {
       // 已参与活动列表
-      const list = await salesPromoQueryStatisticsList({ salesBillSn: this.$route.params.sn }).then(res => res.data || [])
+      const list = await salesPromoQueryList({ salesBillSn: this.$route.params.sn }).then(res => res.data || [])
       this.activeList = list.filter(item => item.promotion && item.promotionRule)
       // 触发活动统计查询变量
       this.$nextTick(() => {
@@ -331,7 +333,7 @@ export default {
       salesPromoDiscountSort({ salesBillSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.discountActiveList = res.data
-          this.showDiscountSortModal = true
+          this.showDiscountSortModal = res.data && res.data.length > 0
         }
         this.spinning = false
       })