From 759946c50ace53d29c2463b9d3d661b357fff0b6 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期一, 07 四月 2025 09:53:08 +0800 Subject: [PATCH] 添加 --- src/views/purchase/person.vue | 2 src/views/purchase/danlingPerson.vue | 11 +++-- src/views/purchase/personPurchaseDetail/index.vue | 26 ++++++++++++- src/api/productPurchaseSearch.js | 22 +++++++++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/src/api/productPurchaseSearch.js b/src/api/productPurchaseSearch.js index 9137e8d..da4e8e2 100644 --- a/src/api/productPurchaseSearch.js +++ b/src/api/productPurchaseSearch.js @@ -82,6 +82,17 @@ }) } +export function getDLPersonDetailListData(data) { + return request({ + headers:{ + 'Authorization': getToken() + }, + url: process.env.BASE_API+ '/order/getDanLingPurchaseDetailInUnit ', + method: 'post', + data:data + }) +} + export function getProductListData(data) { return request({ headers:{ @@ -116,6 +127,17 @@ }) } +export function exportDLPerson(data) { + return request({ + headers:{ + 'Authorization': getToken() + }, + url: process.env.BASE_API+ '/order/export/danLingSaleRecord4', + method: 'post', + data:data + }) +} + export function exportArea(data) { return request({ headers:{ diff --git a/src/views/purchase/danlingPerson.vue b/src/views/purchase/danlingPerson.vue index b05ba4e..78c7c51 100644 --- a/src/views/purchase/danlingPerson.vue +++ b/src/views/purchase/danlingPerson.vue @@ -133,8 +133,8 @@ style="width: 100%;" > <el-table-column label="序号" type="index" align="center" width="60"/> - <el-table-column label="地区" prop="city" align="center" width="150"> - </el-table-column> +<!-- <el-table-column label="地区" prop="city" align="center" width="150">--> +<!-- </el-table-column>--> <el-table-column label="公司名称" prop="enterprisename" align="center" width="200"> </el-table-column> <el-table-column label="公司编号" prop="companynumber" align="center"> @@ -206,7 +206,7 @@ <script> import personPurchaseDetail from './personPurchaseDetail/index' import { computePageCount } from "../../utils"; -import {exportPerson, getDLPersonListData, getPersonListData} from "../../api/productPurchaseSearch"; +import {exportDLPerson, exportPerson, getDLPersonListData, getPersonListData} from "../../api/productPurchaseSearch"; import {getCityListData, getProvinceListData , } from "../../api/area"; import uploadDialog from "./customerPhoto/index"; import Cookies from "js-cookie"; @@ -287,6 +287,7 @@ } let res = await getDLPersonListData(this.listQuery) let data = JSON.parse(Base64.decode(res.data)) + console.log(data,'data') if(data.code === "200"){ this.recordTotal = data.result.total this.pageSize = data.result.size @@ -305,7 +306,7 @@ }, showPurchaseDetail(val){ - this.$refs.person.openPersonPurchaseDetail(this.listQuery.filter.starttime,this.listQuery.filter.endtime,val.identify,val.companynumber,this.listQuery.filter.directioncode) + this.$refs.person.openPersonPurchaseDetail(this.listQuery.filter.starttime,this.listQuery.filter.endtime,val.identify,val.companynumber,this.listQuery.filter.directioncode,2) }, showUploadDialogHandler(idCard) { this.$refs.upload.showDialog(idCard) @@ -323,7 +324,7 @@ this.listQuery.filter.starttime = '' this.listQuery.filter.endtime = '' } - let res = await exportPerson(this.listQuery) + let res = await exportDLPerson(this.listQuery) if(res.data.code === '200'){ this.reClickTip = false if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){ diff --git a/src/views/purchase/person.vue b/src/views/purchase/person.vue index 490b233..550a1b7 100644 --- a/src/views/purchase/person.vue +++ b/src/views/purchase/person.vue @@ -330,7 +330,7 @@ }, showPurchaseDetail(val){ - this.$refs.person.openPersonPurchaseDetail(this.listQuery.filter.starttime,this.listQuery.filter.endtime,val.identify,val.companynumber,this.listQuery.filter.directioncode) + this.$refs.person.openPersonPurchaseDetail(this.listQuery.filter.starttime,this.listQuery.filter.endtime,val.identify,val.companynumber,this.listQuery.filter.directioncode,1) }, showUploadDialogHandler(idCard) { this.$refs.upload.showDialog(idCard) diff --git a/src/views/purchase/personPurchaseDetail/index.vue b/src/views/purchase/personPurchaseDetail/index.vue index c9d99f9..dd154c0 100644 --- a/src/views/purchase/personPurchaseDetail/index.vue +++ b/src/views/purchase/personPurchaseDetail/index.vue @@ -56,6 +56,7 @@ <script> import {getPersonDetailListData} from "@/api/productPurchaseSearch"; import {computePageCount} from "../../../utils"; +import {getDLPersonDetailListData} from "../../../api/productPurchaseSearch"; export default { name: "index", @@ -86,7 +87,7 @@ }, methods:{ - openPersonPurchaseDetail(startTime,endTime,identify,enterpriseNumber,directionCode){ + openPersonPurchaseDetail(startTime,endTime,identify,enterpriseNumber,directionCode,type){ this.listQuery.filter.starttime = startTime this.listQuery.filter.endtime = endTime this.listQuery.filter.identify = identify @@ -95,7 +96,11 @@ this.listQuery.pageIndex = 1; this.listQuery.pageSize = 10; this.personPurchaseDetailVisible = true - this.getPersonProductDetailList() + if(type == 1){ + this.getPersonProductDetailList() + }else{ + this.getDLPersonProductDetailList() + } }, async getPersonProductDetailList(){ this.listLoading = true @@ -114,6 +119,23 @@ } this.listLoading = false }, + async getDLPersonProductDetailList(){ + this.listLoading = true + let res = await getDLPersonDetailListData(this.listQuery) + if(res.data.code === "200"){ + this.recordTotal = res.data.result.total + this.pageSize = res.data.result.size + this.pageTotal = computePageCount(res.data.result.total, res.data.result.size) + this.currentPage = res.data.result.current + this.personPurchaseDetailData = res.data.result.records + }else{ + this.$message({ + type:'warning', + message:res.data.message + }) + } + this.listLoading = false + }, handleSizeChange(val) { this.listQuery.pageSize = val this.getPersonProductDetailList() -- Gitblit v1.9.2