From 04ecdbfb7be63ca4a3d49d3575847e728e3e9ae7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 三月 2026 17:44:13 +0800
Subject: [PATCH] fix:1.耗材选择产品优化
---
src/views/inventoryManagement/receiptManagement/Record.vue | 277 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 241 insertions(+), 36 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 8e65c3c..d89b115 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>
@@ -46,77 +47,226 @@
:expand-row-keys="expandedRowKeys"
:row-key="row => row.id"
style="width: 100%"
- height="calc(100vh - 18.5em)">
+ height="calc(100vh - 18.5em)"
+ :fit="true">
<el-table-column align="center"
type="selection"
- width="55"/>
+ min-width="55"
+ fixed="left"/>
<el-table-column align="center"
label="搴忓彿"
type="index"
- width="60"/>
- <el-table-column label="鍏ュ簱鎵规"
- prop="inboundBatches"
- width="280"
- show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏃堕棿"
- prop="createTime"
- show-overflow-tooltip/>
- <el-table-column label="浜у搧澶х被"
- prop="productName"
- show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿"
- prop="model"
- show-overflow-tooltip/>
- <el-table-column label="鍗曚綅"
- prop="unit"
- show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏁伴噺"
- prop="stockInNum"
+ min-width="60"
+ fixed="left"/>
+ <el-table-column label="浜у搧绫诲瀷"
+ prop="parentName"
+ min-width="100"
show-overflow-tooltip/>
<el-table-column label="杞︾墝鍙�"
prop="licensePlateNo"
v-if="type === '0'"
+ min-width="120"
show-overflow-tooltip/>
- <el-table-column label="姣涢噸(鍚�)"
+ <el-table-column label="浜у搧鍚嶇О"
+ prop="productName"
+ min-width="120"
+ show-overflow-tooltip/>
+ <el-table-column label="瑙勬牸鍨嬪彿"
+ prop="model"
+ min-width="150"
+ show-overflow-tooltip/>
+ <el-table-column label="鍏ュ簱鏁伴噺"
+ prop="stockInNum"
+ min-width="100"
+ show-overflow-tooltip/>
+ <el-table-column label="姣涢噸"
prop="grossWeight"
v-if="type === '0'"
+ min-width="100"
show-overflow-tooltip/>
- <el-table-column label="鐨噸(鍚�)"
+ <el-table-column label="鐨噸"
prop="tareWeight"
v-if="type === '0'"
+ min-width="100"
show-overflow-tooltip/>
- <el-table-column label="鍑�閲�(鍚�)"
+ <el-table-column label="鍑�閲�"
prop="netWeight"
v-if="type === '0'"
+ min-width="100"
+ show-overflow-tooltip/>
+ <el-table-column label="鍗曚綅"
+ prop="unit"
+ min-width="80"
+ show-overflow-tooltip/>
+ <el-table-column label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ v-if="type === '0'"
+ min-width="160"
+ show-overflow-tooltip/>
+ <el-table-column label="杩囩鍛�"
+ prop="weighingOperator"
+ v-if="type === '0'"
+ min-width="100"
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
+ min-width="100"
+ show-overflow-tooltip/>
+ <el-table-column label="鍏ュ簱鏃堕棿"
+ prop="createTime"
+ min-width="160"
+ show-overflow-tooltip/>
+ <el-table-column label="鍏ュ簱鎵规"
+ prop="inboundBatches"
+ min-width="150"
show-overflow-tooltip/>
<el-table-column label="鏉ユ簮"
prop="recordType"
+ min-width="100"
show-overflow-tooltip>
<template #default="scope">
{{ getRecordType(scope.row.recordType) }}
</template>
</el-table-column>
- <el-table-column label="杩囩鏃ユ湡"
- prop="weighingDate"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="杩囩鍛�"
- prop="weighingOperator"
- v-if="type === '0'"
- show-overflow-tooltip/>
<el-table-column label="鎿嶄綔"
- width="120"
- align="center">
+ min-width="200"
+ align="center"
+ fixed="right">
<template #default="scope">
- <el-button type="primary"
+ <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' && scope.row.parentName === '鍘熸潗鏂�'"
+ type="primary"
size="mini"
@click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
</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">
+ <!-- 鍘熸潗鏂欐樉绀哄叆搴撴暟閲� -->
+ <template v-if="editForm.parentName !== '鍘熸潗鏂�'">
+ <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%"
+ />
+ </el-form-item>
+ </template>
+
+ <!-- 闈炲師鏉愭枡鏄剧ず杩囩鐩稿叧瀛楁 -->
+ <template v-if="type === '0' && editForm.parentName === '鍘熸潗鏂�'">
+ <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="unit"
+ >
+ <el-select
+ v-model="editForm.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </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"
@@ -137,11 +287,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,
@@ -156,6 +309,9 @@
default: '0'
}
})
+
+const hasReceiptEdit = computed(() => checkPermi(['receipt_edit']));
+const hasReceiptCancel = computed(() => checkPermi(['receipt_cancel']));
const tableData = ref([]);
const selectedRows = ref([]);
@@ -235,6 +391,55 @@
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;
+ const submitData = {
+ ...editForm.value,
+ productType: editForm.value.parentName === '鍘熸潗鏂�' ? 0 : 1,
+ netWeight: editForm.value.parentName === '鍘熸潗鏂�' ? editForm.value.netWeight : editForm.value.stockInNum
+ };
+ editStockInStock(submitData).then(() => {
+ closeEditModal();
+ proxy.$modal.msgSuccess("缂栬緫鎴愬姛");
+ getList();
+ });
+ });
+};
+
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
--
Gitblit v1.9.3