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/dispatchLog/Record.vue | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 313 insertions(+), 42 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 4fb41f0..be732c6 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -12,14 +12,24 @@
clearable
@change="handleQuery"
/>
+ <span class="search_title ml10">鏉ユ簮锛�</span>
+ <el-select v-model="searchForm.recordType"
+ style="width: 240px"
+ placeholder="璇烽�夋嫨"
+ clearable>
+ <el-option v-for="item in stockRecordTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"/>
+ </el-select>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
>鎼滅储</el-button
>
</div>
<div>
<el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</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>
<div class="table_list">
@@ -32,46 +42,244 @@
:row-key="(row) => row.id"
style="width: 100%"
height="calc(100vh - 18.5em)"
+ :fit="true"
>
- <el-table-column align="center" type="selection" width="55" />
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column
- label="鍑哄簱鎵规"
- prop="outboundBatches"
- min-width="100"
- show-overflow-tooltip
- />
+ <el-table-column align="center" type="selection" min-width="55" fixed="left" />
+ <el-table-column align="center" label="搴忓彿" type="index" min-width="60" fixed="left" />
<el-table-column
- label="鍑哄簱鏃ユ湡"
- prop="createTime"
+ label="浜у搧绫诲瀷"
+ prop="parentName"
+ min-width="100"
show-overflow-tooltip
/>
<el-table-column
- label="浜у搧澶х被"
+ label="杞︾墝鍙�"
+ prop="licensePlateNo"
+ min-width="120"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="浜у搧鍚嶇О"
prop="productName"
+ min-width="120"
show-overflow-tooltip
/>
<el-table-column
label="瑙勬牸鍨嬪彿"
prop="model"
- show-overflow-tooltip
- />
- <el-table-column
- label="鍗曚綅"
- prop="unit"
+ min-width="150"
show-overflow-tooltip
/>
<el-table-column
label="鍑哄簱鏁伴噺"
prop="stockOutNum"
+ min-width="100"
show-overflow-tooltip
/>
<el-table-column
- label="鍑哄簱浜�"
- prop="createBy"
+ label="姣涢噸"
+ prop="grossWeight"
+ min-width="100"
show-overflow-tooltip
/>
+ <el-table-column
+ label="鐨噸"
+ prop="tareWeight"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍑�閲�"
+ prop="netWeight"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍗曚綅"
+ prop="unit"
+ min-width="80"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ min-width="120"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="杩囩鍛�"
+ prop="weighingOperator"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍑哄簱浜�"
+ prop="createBy"
+ min-width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍑哄簱鎵规"
+ prop="outboundBatches"
+ min-width="150"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="鍑哄簱鏃堕棿"
+ prop="createTime"
+ min-width="160"
+ 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="鎿嶄綔"
+ min-width="200"
+ align="center"
+ fixed="right">
+ <template #default="scope">
+ <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' && 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="stockOutNum"
+ >
+ <el-input-number
+ v-model="editForm.stockOutNum"
+ :min="0"
+ :step="1"
+ :precision="0"
+ controls-position="right"
+ style="width: 100%"
+ />
+ </el-form-item>
+ </template>
+
+ <!-- 鍘熸潗鏂欐樉绀鸿繃纾呯浉鍏冲瓧娈� -->
+ <template v-if="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>
<pagination
v-show="total > 0"
:total="total"
@@ -86,20 +294,27 @@
<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,
+} from "@/api/basicData/enum.js";
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
+// 鏉ユ簮绫诲瀷閫夐」
+const stockRecordTypeOptions = ref([]);
const page = reactive({
current: 1,
size: 100,
@@ -114,6 +329,9 @@
}
})
+const hasDispatchEdit = computed(() => checkPermi(['dispatch_edit']));
+const hasDispatchCancel = computed(() => checkPermi(['dispatch_cancel']));
+
// 鎵撳嵃鐩稿叧
const printPreviewVisible = ref(false);
const printData = ref([]);
@@ -123,26 +341,8 @@
searchForm: {
supplierName: "",
timeStr: "",
- },
- form: {
- supplierId: null,
- supplierName: '',
- productId: null,
- productName: '',
- userId: userStore.userId,
- nickName: '',
- model: '',
- productModelId: null,
- unit: '',
- productrecordId: null,
- taxInclusiveUnitPrice: '',
- taxInclusiveTotalPrice: '',
- taxRate: '',
- taxExclusiveTotalPrice: '',
- inboundTime: '',
- inboundBatch: '',
- inboundQuantity: ''
- },
+ recordType: "",
+ }
});
const { searchForm } = toRefs(data);
@@ -173,6 +373,25 @@
});
};
+const getRecordType = (recordType) => {
+ return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
+}
+
+// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
+const fetchStockRecordTypeOptions = () => {
+ if (props.type === '0') {
+ findAllQualifiedStockOutRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+ return
+ }
+ findAllUnQualifiedStockOutRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+}
+
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
// 杩囨护鎺夊瓙鏁版嵁
@@ -180,6 +399,57 @@
console.log("selection", selectedRows.value);
};
const expandedRowKeys = ref([]);
+
+// 瀵煎嚭杩囩鍗�
+const handlePreview = (row) => {
+ 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 submitData = {
+ ...editForm.value,
+ productType: editForm.value.parentName === '鍘熸潗鏂�' ? 0 : 1,
+ netWeight: editForm.value.parentName === '鍘熸潗鏂�' ? editForm.value.netWeight : editForm.value.stockOutNum
+ };
+ editStockOut(submitData).then(() => {
+ closeEditModal();
+ proxy.$modal.msgSuccess("缂栬緫鎴愬姛");
+ getList();
+ });
+ });
+};
// 瀵煎嚭
const handleOut = () => {
@@ -189,7 +459,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/stockmanagement/export", {}, "鍑哄簱鍙拌处.xlsx");
+ proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍑哄簱鍙拌处.xlsx" : "涓嶅悎鏍煎嚭搴撳彴璐�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -512,6 +782,7 @@
};
onMounted(() => {
getList();
+ fetchStockRecordTypeOptions();
});
</script>
--
Gitblit v1.9.3