소스 검색

冲减对接

lilei 2 년 전
부모
커밋
8fbc905e3d
4개의 변경된 파일46개의 추가작업 그리고 31개의 파일을 삭제
  1. 1 1
      public/version.json
  2. 4 4
      src/api/reportData.js
  3. 39 24
      src/views/reportData/urgentItemsOffsetReport/detailList.vue
  4. 2 2
      src/views/reportData/urgentItemsOffsetReport/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1674960852515
+  "version": 1674962395610
 }

+ 4 - 4
src/api/reportData.js

@@ -175,7 +175,7 @@ export const reportSalesReturnDetailExport = params => {
 
 // 急件冲减-分页列表
 export const reportUrgentPageList = (params) => {
-  const url = `report/reportUrgent/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportUrgent/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -187,7 +187,7 @@ export const reportUrgentPageList = (params) => {
 // 急件冲减-列表合计
 export const reportUrgentQueryCount = (params) => {
   return axios({
-    url: 'report/reportUrgent/queryCount',
+    url: '/report/reportUrgent/queryCount',
     data: params,
     method: 'post'
   })
@@ -204,7 +204,7 @@ export const reportUrgentExport = params => {
 
 // 急件冲减明细-分页列表
 export const reportUrgentDetailQueryPage = (params) => {
-  const url = `report/reportUrgentDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/report/reportUrgentDetail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -216,7 +216,7 @@ export const reportUrgentDetailQueryPage = (params) => {
 // 急件冲减明细-列表合计
 export const reportUrgentDetailQueryCount = (params) => {
   return axios({
-    url: 'report/reportUrgentDetail/queryCount',
+    url: '/report/reportUrgentDetail/queryCount',
     data: params,
     method: 'post'
   })

+ 39 - 24
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="salesDetailReportList-form"
+        id="urgentItemsOffsetReport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -14,54 +14,70 @@
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间" prop="time">
+            <a-form-model-item label="冲减时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="销售退货单号">
-              <a-input id="salesDetailReportList-salesReturnNo" v-model.trim="queryParam.salesReturnNo" allowClear placeholder="请输入销售退货单号"/>
-            </a-form-model-item>
+            <a-form-item label="急件单号">
+              <a-input id="urgentItemsOffsetReport-urgentBillNo" v-model.trim="queryParam.urgentBillNo" allowClear placeholder="请输入急件单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关联单号">
+              <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
-              <a-input id="salesDetailReportList-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
+              <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="急件类型">
+              <v-select
+                v-model="queryParam.bizType"
+                ref="status"
+                id="urgentItemsOffsetReport-biztype"
+                code="URGENT_BIZ_TYPE"
+                placeholder="急件类型"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
-                <a-input id="salesDetailReportList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+                <a-input id="urgentItemsOffsetReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
-                <a-input id="salesDetailReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+                <a-input id="urgentItemsOffsetReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="salesDetailReportList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
+                <ProductBrand id="urgentItemsOffsetReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <ProductType id="salesDetailReportList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
+                <ProductType id="urgentItemsOffsetReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
             <a-button
               type="primary"
               style="margin-left: 5px"
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_salesReturnReportExport')"
+              v-if="$hasPermissions('M_urgentItemsOffsetReportExport')"
               class="button-warning"
-              id="salesDetailReportList-export-btn">导出</a-button>
+              id="urgentItemsOffsetReport-export-btn">导出</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -73,14 +89,9 @@
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
-        总退货数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
-        废品数量:<strong>{{ (totalData && (totalData.celQty || totalData.celQty==0)) ? totalData.celQty : '--' }}</strong>;
-        入库数量:<strong>{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</strong>;
-        退货金额:<strong>{{ (totalData && (totalData.price || totalData.price==0)) ? '¥'+totalData.price : '--' }}</strong>;
-        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? '¥'+totalData.discountAmount : '--' }}</strong>;
-        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? '¥'+totalData.discountedAmount : '--' }}</strong>;
+        产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? '¥'+totalData.cost : '--' }}</strong>。
+          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>。
         </div>
       </div>
     </a-alert>
@@ -120,8 +131,11 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
-        productType: undefined,
         buyerName: '',
+        bizBillNo: '',
+        urgentBillNo: '',
+        bizType: undefined,
+        productType: undefined,
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -130,7 +144,6 @@ export default {
           code: '', //  产品编码
           name: '' //  产品名称
         },
-        salesReturnNo: ''
       },
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -221,8 +234,10 @@ export default {
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
-      this.queryParam.salesReturnNo = ''
+      this.queryParam.bizBillNo = ''
       this.queryParam.buyerName = ''
+      this.queryParam.urgentBillNo = ''
+      this.queryParam.bizType = undefined
       this.queryParam.productEntity.productBrandSn = undefined
       this.queryParam.productEntity.productTypeSn1 = ''
       this.queryParam.productEntity.productTypeSn2 = ''

+ 2 - 2
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="salesReturnReportList-form"
+        id="urgentItemsOffsetReport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -53,7 +53,7 @@
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_salesReturnReportExport')"
+              v-if="$hasPermissions('M_urgentItemsOffsetReportExport')"
               class="button-warning"
               id="urgentItemsOffsetReport-export-btn">导出</a-button>
           </a-col>