From 045bf17bb31f9650294a228aef8c3f2194f0c5ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 09 七月 2025 13:57:06 +0800
Subject: [PATCH] yys
---
src/api/inventoryManagement/stockManage.js | 2
src/views/inventoryManagement/receiptManagement/index.vue | 2
src/views/inventoryManagement/issueManagement/index.vue | 2
src/views/inventoryManagement/stockManagement/index.vue | 42 +++++++++++---------
src/api/inventoryManagement/stockIn.js | 11 +++++
src/views/inventoryManagement/dispatchLog/index.vue | 2
6 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/api/inventoryManagement/stockIn.js b/src/api/inventoryManagement/stockIn.js
index f74c680..5e104f7 100644
--- a/src/api/inventoryManagement/stockIn.js
+++ b/src/api/inventoryManagement/stockIn.js
@@ -9,7 +9,7 @@
});
};
-// 淇敼搴撳瓨淇℃伅
+// 淇敼鍏ュ簱瀛樹俊鎭�
export const updateStockIn = (data) => {
return request({
url: "/stockin/update",
@@ -18,6 +18,15 @@
});
};
+// 淇敼搴撳瓨淇℃伅
+export const updateManagement = (data) => {
+ return request({
+ url: "/stockin/updateManagement",
+ method: "post",
+ data,
+ });
+};
+
// 鏂板鍟嗗搧鍏ュ簱淇℃伅
export function addSutockIn(data) {
return request({
diff --git a/src/api/inventoryManagement/stockManage.js b/src/api/inventoryManagement/stockManage.js
index 09a1150..bb2081b 100644
--- a/src/api/inventoryManagement/stockManage.js
+++ b/src/api/inventoryManagement/stockManage.js
@@ -3,7 +3,7 @@
// 鏌ヨ搴撳瓨淇℃伅鍒楄〃
export const getStockManagePage = (params) => {
return request({
- url: "/stockin/listPage",
+ url: "/stockin/listPageCopy",
method: "get",
params,
});
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index fe07789..807b56f 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -38,7 +38,7 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
label="鍑哄簱鏃ユ湡"
- prop="createDate"
+ prop="createTime"
width="100"
show-overflow-tooltip
/>
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 3fd7aae..9f5f098 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -19,7 +19,7 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍏ュ簱鏃堕棿" prop="createDate" width="100" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index b1e3e0e..1e7d6d3 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -19,7 +19,7 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍏ュ簱鏃堕棿" prop="createDate" width="100" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index b5526c5..20e5df3 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -19,8 +19,8 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="搴撳瓨鏃ユ湡" prop="createDate" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏃ユ湡" prop="createDate" width="100" show-overflow-tooltip />
+ <el-table-column label="搴撳瓨鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="100" show-overflow-tooltip />
@@ -46,12 +46,12 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable />
+ <el-input disabled v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="浜у搧澶х被锛�" prop="productId">
- <el-select v-model="form.productCategory" placeholder="璇烽�夋嫨" clearable filterable @change="handleProductChange">
+ <el-select disabled v-model="form.productCategory" placeholder="璇烽�夋嫨" clearable filterable @change="handleProductChange">
<el-option v-for="item in productList" :key="item.id" :label="item.productName"
:value="item.productName" />
</el-select>
@@ -61,7 +61,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId">
- <el-select v-model="form.specificationModel" placeholder="璇峰厛閫夋嫨浜у搧澶х被" clearable filterable :disabled="!form.productCategory"
+ <el-select disabled v-model="form.specificationModel" placeholder="璇峰厛閫夋嫨浜у搧澶х被" clearable filterable :disabled="!form.productCategory"
@change="handleModelChange">
<el-option v-for="item in productModelList" :key="item.id" :label="item.model"
:value="item.id" />
@@ -69,21 +69,21 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍗曚綅锛�" prop="customerId">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="鍗曚綅锛�" prop="customerId">
+ <el-input disabled v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="搴撳瓨鏃堕棿锛�" prop="projectName">
- <el-date-picker style="width: 100%" v-model="form.createDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+ <el-date-picker style="width: 100%" v-model="form.updateTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
type="date" placeholder="璇烽�夋嫨" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName">
- <el-date-picker style="width: 100%" v-model="form.createDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+ <el-date-picker style="width: 100%" v-model="form.createTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
type="date" placeholder="璇烽�夋嫨" clearable />
</el-form-item>
</el-col>
@@ -91,26 +91,26 @@
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
- <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
+ <el-input disabled v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo">
- <el-input v-model="form.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo">
+ <el-input disabled v-model="form.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="绋庣巼锛�" prop="customerId">
- <el-input v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="绋庣巼锛�" prop="customerId">
+ <el-input disabled v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate">
- <el-input v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
+ <el-input disabled v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -118,7 +118,7 @@
<el-col :span="12">
<el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
- <el-select v-model="form.createBy" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="form.createUser" placeholder="璇烽�夋嫨" clearable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
@@ -148,6 +148,9 @@
delStockManage,
exportStockManage
} from "@/api/inventoryManagement/stockManage.js";
+import {
+ updateManagement
+} from "@/api/inventoryManagement/stockIn.js";
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
@@ -288,6 +291,7 @@
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
+ console.log(form.value)
proxy.$refs["formRef"].validate(valid => {
if (valid) {
// if (productData.value.length > 0) {
@@ -302,7 +306,7 @@
// }
// form.value.tempFileIds = tempFileIds
// form.value.type = 1
- addOrUpdateSalesLedger(form.value).then(res => {
+ updateManagement(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
getList()
@@ -326,7 +330,7 @@
type: 'warning',
}
).then(() => {
- proxy.download("/stockmanagement/export", {}, '搴撳瓨淇℃伅.xlsx')
+ proxy.download("/stockin/exportCopy", {}, '搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
--
Gitblit v1.9.3