From b4660addf0c30b6d07ec826f0802d50998367db8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 24 三月 2026 16:12:04 +0800
Subject: [PATCH] fix:首页质量统计数据优化
---
src/views/inventoryManagement/receiptManagement/Record.vue | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 262 insertions(+), 17 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index ec64f17..95f543d 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -15,6 +15,16 @@
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
+ <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">鎼滅储
@@ -24,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>
@@ -44,6 +55,10 @@
label="搴忓彿"
type="index"
width="60"/>
+ <el-table-column label="浜у搧绫诲瀷"
+ prop="productType"
+ width="100"
+ show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
width="280"
@@ -60,19 +75,173 @@
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏁伴噺"
+ <!-- <el-table-column label="鍏ュ簱鏁伴噺"
prop="stockInNum"
+ show-overflow-tooltip/> -->
+ <el-table-column label="杞︾墝鍙�"
+ prop="licensePlateNo"
+ v-if="type === '0'"
+ show-overflow-tooltip/>
+ <el-table-column label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ v-if="type === '0'"
+ show-overflow-tooltip/>
+ <el-table-column label="鐨噸(鍚�)"
+ prop="tareWeight"
+ v-if="type === '0'"
+ show-overflow-tooltip/>
+ <el-table-column label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ v-if="type === '0'"
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
show-overflow-tooltip/>
+ <el-table-column label="鏉ユ簮"
+ prop="recordType"
+ 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="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"
+ @click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
+ </template>
+ </el-table-column>
</el-table>
- <pagination v-show="total > 0"
- :total="total"
- layout="total, sizes, prev, pager, next, jumper"
- :page="page.current"
- :limit="page.size"
- @pagination="pageProductChange"/>
+ <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"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="pageProductChange"/>
+ </div>
</div>
</div>
</template>
@@ -85,13 +254,18 @@
toRefs,
onMounted,
getCurrentInstance,
- nextTick,
+ 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,
+} from "@/api/basicData/enum.js";
const {proxy} = getCurrentInstance();
@@ -103,14 +277,17 @@
}
})
+const hasReceiptEdit = computed(() => checkPermi(['receipt_edit']));
+const hasReceiptCancel = computed(() => checkPermi(['receipt_cancel']));
+
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
-const activeTab = ref("production"); // 褰撳墠婵�娲荤殑 tab
-
+// 鏉ユ簮绫诲瀷閫夐」
+const stockRecordTypeOptions = ref([]);
const page = reactive({
current: 1,
- size: 100,
+ size: 10,
});
const total = ref(0);
@@ -118,6 +295,7 @@
searchForm: {
productName: "",
timeStr: "",
+ recordType: "",
},
});
const {searchForm} = toRefs(data);
@@ -127,6 +305,10 @@
page.current = 1;
getList();
};
+
+const getRecordType = (recordType) => {
+ return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
+}
const pageProductChange = obj => {
page.current = obj.page;
@@ -139,13 +321,30 @@
const params = {...page, type: props.type};
params.timeStr = searchForm.value.timeStr;
params.productName = searchForm.value.productName;
+ params.recordType = searchForm.value.recordType;
getStockInRecordListPage(params)
.then(res => {
tableData.value = res.data.records;
+ total.value = res.data.total ?? 0;
}).finally(() => {
tableLoading.value = false;
})
};
+
+// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
+const fetchStockRecordTypeOptions = () => {
+ if (props.type === '0') {
+ findAllQualifiedStockInRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+ return
+ }
+ findAllUnQualifiedStockInRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+}
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = selection => {
@@ -153,6 +352,55 @@
};
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 };
+ 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 = () => {
@@ -163,11 +411,7 @@
})
.then(() => {
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
- let exportUrl = "/stockin/export";
- if (activeTab.value === "production") {
- exportUrl = "/stockin/exportOne";
- }
- proxy.download(exportUrl, {}, "鍏ュ簱鍙拌处.xlsx");
+ proxy.download("/stockInRecord/exportStockInRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍏ュ簱.xlsx" : "涓嶅悎鏍煎叆搴�.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -204,6 +448,7 @@
onMounted(() => {
getList();
+ fetchStockRecordTypeOptions();
});
</script>
--
Gitblit v1.9.3