chenrui 1 рік тому
батько
коміт
dbf27ea0a8

+ 9 - 9
src/api/reportData.js

@@ -257,9 +257,9 @@ export const salesReturnExport = (params) => {
     responseType: 'blob'
   })
 }
-//  销售明细(开单统计)报表
+//  销售明细(下推统计)报表
 export const reportSalesBillDetailList = (params) => {
-  const url = `/report/salesBillReport/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportDispatchBillDetail/reportPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -268,18 +268,18 @@ export const reportSalesBillDetailList = (params) => {
     method: 'post'
   })
 }
-//  销售明细(开单统计)报表  合计
+//  销售明细(下推统计)报表  合计
 export const reportSalesBillDetailCount = (params) => {
   return axios({
-    url: '/report/salesBillReport/detail/queryCount',
+    url: '/report/reportDispatchBillDetail/reportCount',
     data: params,
     method: 'post'
   })
 }
-// 销售明细(开单统计)报表 导出
+// 销售明细(下推统计)报表 导出
 export const reportSalesBillDetailExport = (params) => {
   return axios({
-    url: '/report/salesBillReport/detail/export',
+    url: '/report/reportDispatchBillDetail/reportExport',
     data: params,
     method: 'post',
     responseType: 'blob'
@@ -287,7 +287,7 @@ export const reportSalesBillDetailExport = (params) => {
 }
 //  销售(开单统计)报表
 export const reportSalesBillList = (params) => {
-  const url = `/report/reportSales/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportDispatchBill/reportPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -299,7 +299,7 @@ export const reportSalesBillList = (params) => {
 //  销售(开单统计)报表  合计
 export const reportSalesBillCount = (params) => {
   return axios({
-    url: '/report/reportSales/queryCount',
+    url: '/report/reportDispatchBill/reportCount',
     data: params,
     method: 'post'
   })
@@ -307,7 +307,7 @@ export const reportSalesBillCount = (params) => {
 // 销售(开单统计)报表 导出
 export const reportSalesBillExport = (params) => {
   return axios({
-    url: '/report/reportSales/exportExcel',
+    url: '/report/reportDispatchBill/reportExport',
     data: params,
     method: 'post',
     responseType: 'blob'

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -118,7 +118,7 @@
             size="small"
             style="width:90%;"
             v-model="record.cityDiscountPrice"
-            :min="0"
+            :min="record.provinceDiscountPrice || 0"
             :step="1"
             :precision="2"
             placeholder="请输入"
@@ -148,7 +148,7 @@
             size="small"
             style="width:90%;"
             v-model="record.specialDiscountPrice"
-            :min="0"
+            :min="record.cityDiscountPrice ||0"
             :step="1"
             :precision="2"
             placeholder="请输入"

+ 4 - 2
src/views/reportData/salesDetails/list.vue

@@ -24,7 +24,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="备货单号">
-                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入备货单号"/>
+                <a-input id="salesDetailsList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -102,7 +102,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="12" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button
                 type="primary"
                 class="button-info"
@@ -191,6 +191,7 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         salesBillNo: '',
+        dispatchBillNo: '', // 备货单号
         productCode: '',
         productName: '',
         dealerName: '',
@@ -346,6 +347,7 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesBillNo = ''
+      this.queryParam.dispatchBillNo = ''
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.dealerName = ''