From 2b1cc85f7f9755fad9f7b3774f87c6a5bdbe70cb Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 23 三月 2026 16:26:35 +0800
Subject: [PATCH] fix: 仓储物流，出库/入库可编辑
---
src/views/inventoryManagement/dispatchLog/Record.vue | 178 ++++++++++++++++++++++++-
src/api/inventoryManagement/stockOut.js | 9 +
src/api/inventoryManagement/stockInRecord.js | 9 +
src/views/inventoryManagement/stockManagement/Qualified.vue | 2
src/views/inventoryManagement/stockManagement/Subtract.vue | 8 +
src/views/inventoryManagement/receiptManagement/Record.vue | 170 +++++++++++++++++++++++
6 files changed, 362 insertions(+), 14 deletions(-)
diff --git a/src/api/inventoryManagement/stockInRecord.js b/src/api/inventoryManagement/stockInRecord.js
index 1746bfe..353fa86 100644
--- a/src/api/inventoryManagement/stockInRecord.js
+++ b/src/api/inventoryManagement/stockInRecord.js
@@ -18,6 +18,15 @@
});
};
+// 缂栬緫鍏ュ簱锛堢敤浜庡簱瀛樺彴璐︾紪杈戯級
+export const editStockInStock = (data) => {
+ return request({
+ url: "/stockInRecord/editStockInStock",
+ method: "post",
+ data,
+ });
+};
+
export const batchDeleteStockInRecords = (ids) => {
return request({
url: "/stockInRecord",
diff --git a/src/api/inventoryManagement/stockOut.js b/src/api/inventoryManagement/stockOut.js
index 3d260b3..2954aff 100644
--- a/src/api/inventoryManagement/stockOut.js
+++ b/src/api/inventoryManagement/stockOut.js
@@ -17,3 +17,12 @@
data: ids,
});
}
+
+// 缂栬緫鍑哄簱锛堝簱瀛樺彴璐︾紪杈戯級
+export const editStockOut = (data) => {
+ return request({
+ url: "/stockOutRecord/editStockOut",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index ac648c1..2353f54 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -28,7 +28,7 @@
</div>
<div>
<el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+ <el-button type="danger" plain @click="handleDelete" v-if="hasDispatchCancel">鍒犻櫎</el-button>
<!-- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button> -->
</div>
</div>
@@ -71,11 +71,11 @@
prop="unit"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="鍑哄簱鏁伴噺"
prop="stockOutNum"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
label="杞︾墝鍙�"
prop="licensePlateNo"
@@ -119,15 +119,128 @@
show-overflow-tooltip
/>
<el-table-column label="鎿嶄綔"
- width="120"
+ width="260"
align="center">
<template #default="scope">
- <el-button type="primary"
- size="mini"
- @click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
+ <el-button
+ v-if="scope.row.recordType === '0' && hasDispatchEdit"
+ type="primary"
+ size="mini"
+ @click="handleEdit(scope.row)"
+ >缂栬緫</el-button>
+ <el-button
+ v-if="scope.row.recordType === '0'"
+ type="primary"
+ size="mini"
+ @click="handlePreview(scope.row)"
+ >瀵煎嚭杩囩鍗�</el-button>
</template>
- </el-table-column>
+ </el-table-column>
</el-table>
+ <el-dialog
+ v-model="isShowEditModal"
+ title="缂栬緫鍑哄簱"
+ width="800"
+ @close="closeEditModal"
+ >
+ <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
+ <!-- <el-form-item
+ label="鍑哄簱鏁伴噺"
+ prop="stockOutNum"
+ >
+ <el-input-number
+ v-model="editForm.stockOutNum"
+ :min="0"
+ :step="1"
+ :precision="0"
+ controls-position="right"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item> -->
+
+ <el-form-item
+ label="杞︾墝鍙�"
+ prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
+ >
+ <el-input v-model="editForm.licensePlateNo" />
+ </el-form-item>
+
+ <el-form-item
+ label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.grossWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeightEdit"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鐨噸(鍚�)"
+ prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.tareWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeightEdit"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.netWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
+ >
+ <el-date-picker
+ style="width: 100%"
+ v-model="editForm.weighingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鍛�"
+ prop="weighingOperator"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
+ >
+ <el-input v-model="editForm.weighingOperator" />
+ </el-form-item>
+ </el-form>
+
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleEditSubmit">纭</el-button>
+ <el-button @click="closeEditModal">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
<pagination
v-show="total > 0"
:total="total"
@@ -142,13 +255,15 @@
<script setup>
import pagination from "@/components/PIMTable/Pagination.vue";
-import { ref } from "vue";
+import { ref, computed } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
+import { checkPermi } from "@/utils/permission.js";
import {
getStockOutPage,
delStockOut,
+ editStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
@@ -174,6 +289,9 @@
default: '0'
}
})
+
+const hasDispatchEdit = computed(() => checkPermi(['dispatch_edit']));
+const hasDispatchCancel = computed(() => checkPermi(['dispatch_cancel']));
// 鎵撳嵃鐩稿叧
const printPreviewVisible = ref(false);
@@ -248,6 +366,48 @@
proxy.$download.name(row.weighbridgeDocPath);
}
+// 缂栬緫鍑哄簱
+const isShowEditModal = ref(false);
+const editFormRef = ref(null);
+const editForm = ref({});
+
+// 姣涢噸 - 鐨噸 璁＄畻鍑�閲嶏紙淇濈暀涓や綅灏忔暟锛屼笖涓嶄负璐燂級
+const computeNetWeightEdit = () => {
+ const gross = Number(editForm.value?.grossWeight ?? NaN);
+ const tare = Number(editForm.value?.tareWeight ?? NaN);
+ if (Number.isFinite(gross) && Number.isFinite(tare)) {
+ const net = gross - tare;
+ const safeNet = Number(net.toFixed(2));
+ editForm.value.netWeight = safeNet > 0 ? safeNet : 0;
+ } else {
+ editForm.value.netWeight = undefined;
+ }
+};
+
+const handleEdit = (row) => {
+ editForm.value = { ...row };
+ computeNetWeightEdit();
+ isShowEditModal.value = true;
+};
+
+const closeEditModal = () => {
+ isShowEditModal.value = false;
+ editForm.value = {};
+ editFormRef.value?.clearValidate?.();
+};
+
+const handleEditSubmit = () => {
+ editFormRef.value?.validate?.((valid) => {
+ if (!valid) return;
+ const { stockOutNum, ...payload } = editForm.value || {};
+ editStockOut(payload).then(() => {
+ closeEditModal();
+ proxy.$modal.msgSuccess("缂栬緫鎴愬姛");
+ getList();
+ });
+ });
+};
+
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 9de4963..95f543d 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -34,7 +34,8 @@
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
- @click="handleDelete">鍒犻櫎
+ @click="handleDelete"
+ v-if="hasReceiptCancel">鍒犻櫎
</el-button>
</div>
</div>
@@ -74,9 +75,9 @@
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏁伴噺"
+ <!-- <el-table-column label="鍏ュ簱鏁伴噺"
prop="stockInNum"
- show-overflow-tooltip/>
+ show-overflow-tooltip/> -->
<el-table-column label="杞︾墝鍙�"
prop="licensePlateNo"
v-if="type === '0'"
@@ -112,9 +113,14 @@
v-if="type === '0'"
show-overflow-tooltip/>
<el-table-column label="鎿嶄綔"
- width="120"
+ width="260"
align="center">
<template #default="scope">
+ <el-button v-if="scope.row.recordType === '0' && hasReceiptEdit"
+ type="primary"
+ size="mini"
+ @click="handleEdit(scope.row)"
+ >缂栬緫</el-button>
<el-button v-if="scope.row.recordType === '0'"
type="primary"
size="mini"
@@ -122,6 +128,112 @@
</template>
</el-table-column>
</el-table>
+ <el-dialog
+ v-model="isShowEditModal"
+ title="缂栬緫鍏ュ簱"
+ width="800"
+ @close="closeEditModal"
+ >
+ <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
+ <!-- <el-form-item
+ label="鍏ュ簱鏁伴噺"
+ prop="stockInNum"
+ >
+ <el-input-number
+ v-model="editForm.stockInNum"
+ :min="0"
+ :step="1"
+ :precision="0"
+ controls-position="right"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item> -->
+
+ <template v-if="type === '0'">
+ <el-form-item
+ label="杞︾墝鍙�"
+ prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur', 'change'] }]"
+ >
+ <el-input v-model="editForm.licensePlateNo" />
+ </el-form-item>
+
+ <el-form-item
+ label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur', 'change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.grossWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeightEdit"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鐨噸(鍚�)"
+ prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur', 'change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.tareWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeightEdit"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ュ噣閲�', trigger: ['blur', 'change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.netWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
+ >
+ <el-date-picker
+ style="width: 100%"
+ v-model="editForm.weighingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鍛�"
+ prop="weighingOperator"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur', 'change'] }]"
+ >
+ <el-input v-model="editForm.weighingOperator" />
+ </el-form-item>
+ </template>
+ </el-form>
+
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleEditSubmit">纭</el-button>
+ <el-button @click="closeEditModal">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
<div style="margin-top: 12px; display: flex; justify-content: flex-end;">
<pagination v-show="total > 0"
:total="total"
@@ -142,11 +254,14 @@
toRefs,
onMounted,
getCurrentInstance,
+ computed,
} from "vue";
import {ElMessageBox} from "element-plus";
+import { checkPermi } from "@/utils/permission.js";
import {
getStockInRecordListPage,
batchDeleteStockInRecords,
+ editStockInStock,
} from "@/api/inventoryManagement/stockInRecord.js";
import {
findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
@@ -161,6 +276,9 @@
default: '0'
}
})
+
+const hasReceiptEdit = computed(() => checkPermi(['receipt_edit']));
+const hasReceiptCancel = computed(() => checkPermi(['receipt_cancel']));
const tableData = ref([]);
const selectedRows = ref([]);
@@ -240,6 +358,50 @@
proxy.$download.name(row.weighbridgeDocPath);
}
+// 缂栬緫
+const isShowEditModal = ref(false);
+const editFormRef = ref(null);
+const editForm = ref({});
+
+// 姣涢噸 - 鐨噸 璁＄畻鍑�閲嶏紙淇濈暀涓や綅灏忔暟锛屼笖涓嶄负璐燂級
+const computeNetWeightEdit = () => {
+ const gross = Number(editForm.value?.grossWeight ?? NaN);
+ const tare = Number(editForm.value?.tareWeight ?? NaN);
+ if (Number.isFinite(gross) && Number.isFinite(tare)) {
+ const net = gross - tare;
+ const safeNet = Number(net.toFixed(2));
+ editForm.value.netWeight = safeNet > 0 ? safeNet : 0;
+ } else {
+ editForm.value.netWeight = undefined;
+ }
+};
+
+const handleEdit = (row) => {
+ editForm.value = { ...row };
+ if (props.type === '0') {
+ computeNetWeightEdit();
+ }
+ isShowEditModal.value = true;
+};
+
+const closeEditModal = () => {
+ isShowEditModal.value = false;
+ editForm.value = {};
+ // 娓呯悊琛ㄥ崟鏍￠獙鐘舵�侊紙鏈� ref 鏃讹級
+ editFormRef.value?.clearValidate?.();
+};
+
+const handleEditSubmit = () => {
+ editFormRef.value?.validate?.((valid) => {
+ if (!valid) return;
+ editStockInStock(editForm.value).then(() => {
+ closeEditModal();
+ proxy.$modal.msgSuccess("缂栬緫鎴愬姛");
+ getList();
+ });
+ });
+};
+
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 9f9e1d7..d95304c 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -30,7 +30,7 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip /> -->
- <el-table-column label="鍑�閲�(鍚�)" prop="netWeight" show-overflow-tooltip />
+ <!-- <el-table-column label="鍑�閲�(鍚�)" prop="netWeight" show-overflow-tooltip /> -->
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 2766910..f709c2d 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -40,6 +40,7 @@
<el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.licensePlateNo" />
</el-form-item>
@@ -47,6 +48,7 @@
<el-form-item
label="姣涢噸(鍚�)"
prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.grossWeight"
@@ -60,6 +62,7 @@
<el-form-item
label="鐨噸(鍚�)"
prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.tareWeight"
@@ -73,6 +76,7 @@
<el-form-item
label="鍑�閲�(鍚�)"
prop="netWeight"
+ :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.netWeight"
@@ -86,6 +90,7 @@
<el-form-item
label="杩囩鏃ユ湡"
prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
>
<el-date-picker
style="width: 100%"
@@ -101,6 +106,7 @@
<el-form-item
label="杩囩鍛�"
prop="weighingOperator"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.weighingOperator" />
</el-form-item>
@@ -168,6 +174,8 @@
formState.value = {
...props.record,
}
+ // 鍒濆鍖栨椂涔熻Е鍙戜竴娆″噣閲嶈绠楋紝閬垮厤鎺ュ彛鍥炲～鍚庡噣閲嶄负绌�
+ computeNetWeight()
}
}
--
Gitblit v1.9.3