From f80d798b83fabb038cf10d745acd34c9c42fed4c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 22 九月 2025 15:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywx' into dev
---
src/api/salesManagement/salesQuotation.js | 4
src/api/inventoryManagement/stockReport.js | 13 +-
src/views/inventoryManagement/stockManagement/index.vue | 89 ++++++++++----
src/views/salesManagement/salesQuotation/index.vue | 137 ++++++++++------------
src/views/inventoryManagement/stockReport/index.vue | 91 +++++++++++----
5 files changed, 201 insertions(+), 133 deletions(-)
diff --git a/src/api/inventoryManagement/stockReport.js b/src/api/inventoryManagement/stockReport.js
index 580933b..6d1a3ce 100644
--- a/src/api/inventoryManagement/stockReport.js
+++ b/src/api/inventoryManagement/stockReport.js
@@ -3,16 +3,15 @@
// 鑾峰彇搴撳瓨鏃ユ姤缁熻
export const getStockDailyReport = (params) => {
return request({
- url: "/stockreport/daily",
+ url: "/stockin/getReportList",
method: "get",
params,
});
};
-
// 鑾峰彇搴撳瓨鏈堟姤缁熻
export const getStockMonthlyReport = (params) => {
return request({
- url: "/stockreport/monthly",
+ url: "/stockin/getReportList",
method: "get",
params,
});
@@ -21,7 +20,7 @@
// 鑾峰彇浣滀笟鎶ヨ〃缁熻
export const getWorkReport = (params) => {
return request({
- url: "/stockreport/work",
+ url: "/stockin/getReportList",
method: "get",
params,
});
@@ -30,7 +29,7 @@
// 鑾峰彇搴撳瓨杩涘嚭瀛樼粺璁�
export const getStockInOutReport = (params) => {
return request({
- url: "/stockreport/inout",
+ url: "/stockin/getReportList",
method: "get",
params,
});
@@ -39,8 +38,8 @@
// 瀵煎嚭搴撳瓨鎶ヨ〃
export const exportStockReport = (params) => {
return request({
- url: "/stockreport/export",
- method: "get",
+ url: "/stockin/exportCopy",
+ method: "post",
params,
responseType: 'blob'
});
diff --git a/src/api/salesManagement/salesQuotation.js b/src/api/salesManagement/salesQuotation.js
index aae54cb..4329dd9 100644
--- a/src/api/salesManagement/salesQuotation.js
+++ b/src/api/salesManagement/salesQuotation.js
@@ -2,7 +2,7 @@
import request from "@/utils/request";
// 鍒嗛〉鏌ヨ鎶ヤ环鍗曞垪琛�
-export function quotationList(query) {
+export function getQuotationList(query) {
return request({
url: "/sales/quotation/list",
method: "get",
@@ -32,7 +32,7 @@
export function updateQuotation(data) {
return request({
url: "/sales/quotation/update",
- method: "put",
+ method: "post",
data: data,
});
}
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 59dd74c..f2687bf 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -122,11 +122,11 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鏈�浣庡簱瀛橈細" prop="minStock">
<el-input v-model="form.minStock" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<template #footer>
@@ -153,9 +153,11 @@
exportStockManage
} from "@/api/inventoryManagement/stockManage.js";
import {
- updateManagement,
-
+ updateManagement,addSutockIn,selectProductRecordListByPuechaserId
} from "@/api/inventoryManagement/stockIn.js";
+
+
+
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
@@ -235,11 +237,13 @@
getStockManagePage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
- console.log('res', res)
+ // console.log('res', res)
// tableData.value.map(item => {
// item.children = []
// })
total.value = res.data.total
+ // 鏁版嵁鍔犺浇瀹屾垚鍚庢鏌ュ簱瀛�
+ checkStockAndCreatePurchase();
}).catch(() => {
tableLoading.value = false
})
@@ -301,35 +305,61 @@
console.log(form.value)
proxy.$refs["formRef"].validate(valid => {
if (valid) {
- // if (productData.value.length > 0) {
- // form.value.productData = proxy.HaveJson(productData.value)
- // } else {
- // proxy.$modal.msgWarning('璇锋坊鍔犱骇鍝佷俊鎭�')
- // return
- // }
- // let tempFileIds = []
- // if (fileList.value.length > 0) {
- // tempFileIds = fileList.value.map(item => item.tempId)
- // }
- // form.value.tempFileIds = tempFileIds
- // form.value.type = 1
+
updateManagement(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
getList()
// 鎻愪氦鍚庢鏌ュ簱瀛樺苟灏濊瘯鍒涘缓璇疯喘鍗�
- checkStockAndAutoCreatePurchase();
+ checkStockAndCreatePurchase();
})
}
})
}
-// 妫�鏌ュ簱瀛樺苟鑷姩鍒涘缓璇疯喘鍗�
-const checkStockAndAutoCreatePurchase = async () => {
- try {
- await checkStockAndCreatePurchase();
- } catch (error) {
- console.error('鑷姩琛ヨ揣澶辫触:', error);
- proxy.$modal.msgError('鑷姩琛ヨ揣澶辫触锛岃鎵嬪姩澶勭悊');
+// const handList = () => {
+// selectProductRecordListByPuechaserId().then(res => {
+// productModelList.value = res.data.filter(item => item.productName === value)
+// console.log('productModelList.value', productModelList.value)
+// })
+// }
+// 妫�鏌ュ簱瀛樺苟鍒涘缓璇疯喘鍗�
+const checkStockAndCreatePurchase = async () => {
+ const stockList = tableData.value;
+ handList()
+ for (const item of stockList) {
+ if (item.inboundNum0 < item.minStock) {
+ try {
+ const stockInData = {
+ nickName: userStore.nickName,// 浣跨敤鏂版牸寮忓寲鍑芥暟
+ details: selectedRows.value.map(product => ({
+ id: product.id,
+ inboundQuantity: Number(product.quantityStock)
+ })),
+ };
+ console.log('鍑嗗鎻愪氦鐨勬暟鎹�:', JSON.parse(JSON.stringify(stockInData)));
+ // 璋冪敤API
+ loading.value = true
+ await addSutockIn(stockInData)
+
+ proxy.$modal.msgSuccess('鏂板鍏ュ簱鎴愬姛')
+ loading.value = false
+ // // 鐢熸垚璇疯喘鍗�
+ // const createRes = await createPurchaseRequest({
+ // productId: item.productId,
+ // requiredQuantity: item.minStock - item.inboundNum0,
+ // supplierId: item.supplierId
+ // });
+ // if (createRes.code === 200) {
+ // // 娴佽浆璇疯喘鍗曞埌閲囪喘妯″潡
+ // await transferPurchaseRequest({ requestId: createRes.data.id });
+ // proxy.$modal.msgSuccess(`浜у搧 ${item.productName} 璇疯喘鍗曞凡鐢熸垚骞舵祦杞琡);
+ // }
+ } catch (error) {
+ console.error(`浜у搧 ${item.productName} 鐢熸垚璇疯喘鍗曞け璐�:`, error);
+ proxy.$modal.msgError(`浜у搧 ${item.productName} 鐢熸垚璇疯喘鍗曞け璐ワ紝璇锋墜鍔ㄥ鐞哷);
+
+ }
+ }
}
};
// 鍏抽棴寮规
@@ -394,7 +424,14 @@
}
onMounted(() => {
getList()
- checkStockAndAutoCreatePurchase();
+ checkStockAndCreatePurchase();
+ // 姣忓皬鏃舵鏌ヤ竴娆″簱瀛�
+ const intervalId = setInterval(checkStockAndCreatePurchase, 60 * 60 * 1000);
+
+onUnmounted(() => {
+ // 缁勪欢鍗歌浇鏃舵竻闄ゅ畾鏃跺櫒
+ clearInterval(intervalId);
+});
})
</script>
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 79f1a02..354c775 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -33,8 +33,8 @@
range-separator="鑷�"
start-placeholder="寮�濮嬫湀浠�"
end-placeholder="缁撴潫鏈堜唤"
- format="YYYY-MM"
- value-format="YYYY-MM"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
style="width: 240px;"
/>
<el-date-picker
@@ -165,14 +165,14 @@
<el-table-column
v-if="searchForm.reportType === 'daily'"
label="鏃ユ湡"
- prop="date"
+ prop="createTime"
width="100"
align="center"
/>
<el-table-column
v-if="searchForm.reportType === 'monthly'"
label="鏈堜唤"
- prop="month"
+ prop="createTime"
width="100"
align="center"
/>
@@ -212,27 +212,27 @@
width="70"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="鏈熷垵搴撳瓨"
prop="beginStock"
width="100"
align="center"
- />
+ /> -->
<el-table-column
label="鍏ュ簱鏁伴噺"
prop="inboundNum"
width="100"
align="center"
/>
- <el-table-column
+ <!-- <el-table-column
label="鍑哄簱鏁伴噺"
- prop="outboundNum"
+ prop=""
width="100"
align="center"
- />
+ /> -->
<el-table-column
- label="鏈熸湯搴撳瓨"
- prop="endStock"
+ label="鐜板湪搴撳瓨"
+ prop="inboundNum0"
width="100"
align="center"
/>
@@ -298,6 +298,8 @@
exportStockReport
} from '@/api/inventoryManagement/stockReport'
+
+const { proxy } = getCurrentInstance()
// 鍝嶅簲寮忔暟鎹�
const tableLoading = ref(false)
const trendChart = ref(null)
@@ -365,10 +367,14 @@
}
if (response.code === 200) {
- reportData.value = response.data
+ // generateMockData()
+ reportData.value.tableData = response.data.tableData
+ reportData.value.summary = response.data.summary
+ reportData.value.chartData = response.data.chartData
nextTick(() => {
initCharts()
})
+
}
} catch (error) {
ElMessage.error('鏌ヨ澶辫触锛�' + error.message)
@@ -376,7 +382,37 @@
tableLoading.value = false
}
}
+// // 鐢熸垚鍋囨暟鎹�
+// const generateMockData = () => {
+// // 鐢熸垚缁熻鍗＄墖鍋囨暟鎹�
+// const summary = {
+// totalIn: 1000,
+// totalOut: 600,
+// currentStock: 400,
+// turnoverRate: 30
+// }
+// // 鐢熸垚鍥捐〃鍋囨暟鎹�
+// const trendDates = ['2025-09-15', '2025-09-16', '2025-09-17', '2025-09-18', '2025-09-19']
+// const trendValues = [300, 350, 400, 380, 420]
+// const comparisonDates = ['2025-09-15', '2025-09-16', '2025-09-17']
+// const inValues = [100, 150, 200]
+// const outValues = [80, 120, 100]
+
+// const chartData = {
+// trendDates,
+// trendValues,
+// comparisonDates,
+// inValues,
+// outValues
+// }
+
+// reportData.value = {
+// summary,
+// chartData,
+// tableData: []
+// }
+// }
// 楠岃瘉鎼滅储琛ㄥ崟
const validateSearchForm = () => {
if (searchForm.reportType === 'daily') {
@@ -401,7 +437,12 @@
// 鑾峰彇鏌ヨ鍙傛暟
const getQueryParams = () => {
const params = {
- reportType: searchForm.reportType
+ reportType: searchForm.reportType,
+ reportDate: "",
+ startMonth: "",
+ endMonth: "",
+ startDate: "",
+ endDate: ""
}
if (searchForm.reportType === 'daily') {
@@ -438,20 +479,20 @@
try {
const params = getQueryParams()
- const response = await exportStockReport(params)
-
+ // const response = await exportStockReport(params)
+ proxy.download("/stockin/exportCopy", params, '搴撳瓨鎶ヨ〃.xlsx')
// 鍒涘缓涓嬭浇閾炬帴
- const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
- const url = window.URL.createObjectURL(blob)
- const link = document.createElement('a')
- link.href = url
- link.download = `${getTableTitle()}_${new Date().getTime()}.xlsx`
- document.body.appendChild(link)
- link.click()
- document.body.removeChild(link)
- window.URL.revokeObjectURL(url)
+ // const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+ // const url = window.URL.createObjectURL(blob)
+ // const link = document.createElement('a')
+ // link.href = url
+ // link.download = `${getTableTitle()}_${new Date().getTime()}.xlsx`
+ // document.body.appendChild(link)
+ // link.click()
+ // document.body.removeChild(link)
+ // window.URL.revokeObjectURL(url)
- ElMessage.success('瀵煎嚭鎴愬姛')
+ // ElMessage.success('瀵煎嚭鎴愬姛')
} catch (error) {
ElMessage.error('瀵煎嚭澶辫触锛�' + error.message)
}
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index b89dad1..4d20405 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -166,9 +166,9 @@
</div>
</template>
<el-table :data="form.products" border style="width: 100%">
- <el-table-column prop="productName" label="浜у搧鍚嶇О" width="200">
+ <el-table-column prop="product" label="浜у搧鍚嶇О" width="200">
<template #default="scope">
- <el-input v-model="scope.row.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <el-input v-model="scope.row.product" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
</template>
</el-table-column>
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="150">
@@ -284,7 +284,7 @@
<div style="margin-top: 20px;">
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products" border style="width: 100%">
- <el-table-column prop="productName" label="浜у搧鍚嶇О" />
+ <el-table-column prop="product" label="浜у搧鍚嶇О" />
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="quantity" label="鏁伴噺" />
<el-table-column prop="unit" label="鍗曚綅" />
@@ -310,10 +310,11 @@
</template>
<script setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed,onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search } from '@element-plus/icons-vue'
-import Pagination from '@/components/PIMTable/Pagination.vue'
+// import Pagination from '@/components/PIMTable/Pagination.vue'
+import {getQuotationList,addQuotation,updateQuotation,deleteQuotation} from '@/api/salesManagement/salesQuotation.js'
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -323,56 +324,7 @@
status: ''
})
-const quotationList = ref([
- {
- id: 1,
- quotationNo: 'QT202312001',
- customer: '涓婃捣绉戞妧鏈夐檺鍏徃',
- salesperson: '闄堝織寮�',
- quotationDate: '2023-12-01',
- validDate: '2023-12-31',
- totalAmount: 50000.00,
- paymentMethod: '鍏ㄦ鍒颁粯',
- deliveryPeriod: '30澶�',
- status: '宸插彂閫�',
- remark: '閲嶈瀹㈡埛鎶ヤ环',
- products: [
- { productName: '宸ヤ笟浼犳劅鍣�', specification: 'SEN-001', quantity: 10, unit: '涓�', unitPrice: 5000, amount: 50000 }
- ]
- },
- {
- id: 2,
- quotationNo: 'QT202312002',
- customer: '娣卞湷鐢靛瓙鏈夐檺鍏徃',
- salesperson: '鍒橀泤濠�',
- quotationDate: '2023-12-02',
- validDate: '2023-12-31',
- totalAmount: 35000.00,
- paymentMethod: '鍒嗘湡浠樻',
- deliveryPeriod: '20澶�',
- status: '瀹㈡埛纭',
- remark: '甯歌鎶ヤ环',
- products: [
- { productName: '鎺у埗妯″潡', specification: 'CTL-002', quantity: 5, unit: '涓�', unitPrice: 7000, amount: 35000 }
- ]
- },
- {
- id: 3,
- quotationNo: 'QT202312003',
- customer: '鍖椾含璐告槗鍏徃',
- salesperson: '鐜嬪缓鍥�',
- quotationDate: '2023-12-03',
- validDate: '2023-12-31',
- totalAmount: 28000.00,
- paymentMethod: '鏈堢粨',
- deliveryPeriod: '15澶�',
- status: '鑽夌',
- remark: '鏂板鎴锋姤浠�',
- products: [
- { productName: '鏁版嵁閲囬泦鍣�', specification: 'DAQ-003', quantity: 4, unit: '涓�', unitPrice: 7000, amount: 28000 }
- ]
- }
-])
+const quotationList = ref([])
const pagination = reactive({
total: 3,
@@ -384,6 +336,7 @@
const viewDialogVisible = ref(false)
const dialogTitle = ref('鏂板鎶ヤ环')
const form = reactive({
+ quotationNo: '',
customer: '',
salesperson: '',
quotationDate: '',
@@ -441,10 +394,6 @@
return statusMap[status] || 'info'
}
-const handleSearch = () => {
- // 鎼滅储閫昏緫宸插湪computed涓鐞�
-}
-
const resetSearch = () => {
searchForm.quotationNo = ''
searchForm.customer = ''
@@ -480,9 +429,16 @@
}).then(() => {
const index = quotationList.value.findIndex(item => item.id === row.id)
if (index > -1) {
- quotationList.value.splice(index, 1)
- pagination.total--
- ElMessage.success('鍒犻櫎鎴愬姛')
+ deleteQuotation(row.id).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ ElMessage.success('鍒犻櫎鎴愬姛')
+ handleSearch()
+ }
+ })
+ // quotationList.value.splice(index, 1)
+ // pagination.total--
+ // ElMessage.success('鍒犻櫎鎴愬姛')
}
})
}
@@ -552,22 +508,40 @@
// 缂栬緫
const index = quotationList.value.findIndex(item => item.id === editId.value)
if (index > -1) {
- quotationList.value[index] = { ...form, id: editId.value }
- ElMessage.success('缂栬緫鎴愬姛')
+ updateQuotation(form).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ ElMessage.success('缂栬緫鎴愬姛')
+ dialogVisible.value = false
+ handleSearch()
+ }
+ })
+ // quotationList.value[index] = { ...form, id: editId.value }
+ // ElMessage.success('缂栬緫鎴愬姛')
}
} else {
// 鏂板
- const newId = Math.max(...quotationList.value.map(item => item.id)) + 1
- const quotationNo = `QT${new Date().getFullYear()}${String(new Date().getMonth() + 1).padStart(2, '0')}${String(new Date().getDate()).padStart(2, '0')}${String(newId).padStart(3, '0')}`
- quotationList.value.push({
- ...form,
- id: newId,
- quotationNo: quotationNo
+ // const newId = Math.max(...quotationList.value.map(item => item.id)) + 1
+ form.quotationNo = `QT${new Date().getFullYear()}${String(new Date().getMonth() + 1).padStart(2, '0')}${String(new Date().getDate()).padStart(2, '0')}`
+
+ addQuotation(form).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ ElMessage.success('鏂板鎴愬姛')
+ dialogVisible.value = false
+ handleSearch()
+ }
})
- pagination.total++
- ElMessage.success('鏂板鎴愬姛')
+
+ // quotationList.value.push({
+ // ...form,
+ // // id: newId,
+ // quotationNo: quotationNo
+ // })
+ // pagination.total++
+ // ElMessage.success('鏂板鎴愬姛')
}
- dialogVisible.value = false
+
}
})
}
@@ -576,6 +550,23 @@
pagination.currentPage = val.page
pagination.pageSize = val.limit
}
+const handleSearch = ()=>{
+ const params = {
+ page:pagination,
+ ...searchForm
+ }
+ getQuotationList(params).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ quotationList.value = res.data.records
+ pagination.total = res.data.total
+ }
+ })
+}
+
+onMounted(()=>{
+ handleSearch()
+})
</script>
<style scoped>
--
Gitblit v1.9.3