From 5f18876241777adb7cacce4bc8316779cb16c237 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 10:04:58 +0800
Subject: [PATCH] 生产报表联调，并优化页面
---
src/views/consumablesLogistics/receiptManagement/Record.vue | 152 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 113 insertions(+), 39 deletions(-)
diff --git a/src/views/consumablesLogistics/receiptManagement/Record.vue b/src/views/consumablesLogistics/receiptManagement/Record.vue
index 6108498..018dbe2 100644
--- a/src/views/consumablesLogistics/receiptManagement/Record.vue
+++ b/src/views/consumablesLogistics/receiptManagement/Record.vue
@@ -15,16 +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>
+<!-- <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">鎼滅储
@@ -34,7 +34,8 @@
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
- @click="handleDelete">鍒犻櫎
+ @click="handleDelete"
+ v-if="hasCReceiptCancel">鍒犻櫎
</el-button>
</div>
</div>
@@ -70,50 +71,41 @@
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏁伴噺"
- prop="stockInNum"
+ <el-table-column label="鏁伴噺"
+ prop="qualitity"
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'"
+ <el-table-column label="閲囪喘鍛�"
+ prop="purchaser"
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
show-overflow-tooltip/>
- <el-table-column label="鏉ユ簮"
+ <!-- <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="鎿嶄綔"
+ </el-table-column> -->
+ <!-- <el-table-column label="鎿嶄綔"
width="120"
align="center">
<template #default="scope">
<el-button type="primary"
size="mini"
@click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
+ </template>
+ </el-table-column> -->
+ <el-table-column label="鎿嶄綔"
+ width="120"
+ align="center">
+ <template #default="scope">
+ <el-button
+ v-if="hasCReceiptEdit"
+ type="primary"
+ size="mini"
+ @click="handleEdit(scope.row)"
+ >缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
@@ -127,6 +119,51 @@
</div>
</div>
</div>
+
+ <el-dialog
+ v-model="isShowEditModal"
+ title="缂栬緫鍏ュ簱"
+ width="600"
+ @close="closeEditModal"
+ >
+ <el-form
+ label-width="100px"
+ :model="editForm"
+ label-position="top"
+ ref="editFormRef"
+ >
+ <el-form-item
+ label="鏁伴噺"
+ prop="qualitity"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }]"
+ >
+ <el-input-number
+ v-model="editForm.qualitity"
+ :min="0"
+ :step="1"
+ :precision="0"
+ controls-position="right"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="閲囪喘鍛�"
+ prop="purchaser"
+ :rules="[{ required: true, message: '璇疯緭鍏ラ噰璐憳', trigger: ['blur', 'change'] }]"
+ >
+ <el-input v-model="editForm.purchaser" placeholder="璇疯緭鍏ラ噰璐憳" />
+ </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>
</template>
<script setup>
@@ -137,15 +174,18 @@
toRefs,
onMounted,
getCurrentInstance,
+ computed,
} from "vue";
import {ElMessageBox} from "element-plus";
import {
getConsumablesInRecordListPage,
batchDeleteConsumablesInRecords,
+ editStockInStock,
} from "@/api/consumablesLogistics/consumablesInRecord.js";
import {
findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";
+import { checkPermi } from "@/utils/permission.js";
const {proxy} = getCurrentInstance();
@@ -156,6 +196,9 @@
default: '0'
}
})
+
+const hasCReceiptEdit = computed(() => checkPermi(['c_receipt_edit']));
+const hasCReceiptCancel = computed(() => checkPermi(['c_receipt_cancel']));
const tableData = ref([]);
const selectedRows = ref([]);
@@ -274,6 +317,37 @@
});
};
+// 缂栬緫鑰楁潗鍏ュ簱
+const isShowEditModal = ref(false);
+const editFormRef = ref(null);
+const editForm = ref({});
+
+const handleEdit = (row) => {
+ editForm.value = {
+ id: row.id,
+ qualitity: row.qualitity,
+ purchaser: row.purchaser,
+ };
+ isShowEditModal.value = true;
+};
+
+const closeEditModal = () => {
+ isShowEditModal.value = false;
+ editForm.value = {};
+ editFormRef.value?.clearValidate?.();
+};
+
+const handleEditSubmit = () => {
+ editFormRef.value?.validate?.((valid) => {
+ if (!valid) return;
+ editStockInStock(editForm.value).then(() => {
+ closeEditModal();
+ proxy.$modal.msgSuccess("缂栬緫鎴愬姛");
+ getList();
+ });
+ });
+};
+
onMounted(() => {
getList();
fetchStockRecordTypeOptions();
--
Gitblit v1.9.3