From 0f4dc4ea8a7de1ffdf34a640c79c29d55b79321c Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 13 六月 2025 17:53:27 +0800
Subject: [PATCH] 添加生产管理接口及优化表格字段
---
src/views/production/components/ProductionDialog.vue | 402 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 256 insertions(+), 146 deletions(-)
diff --git a/src/views/production/components/ProductionDialog.vue b/src/views/production/components/ProductionDialog.vue
index dedb7b3..b75a3e2 100644
--- a/src/views/production/components/ProductionDialog.vue
+++ b/src/views/production/components/ProductionDialog.vue
@@ -1,107 +1,159 @@
-<template>
- <el-dialog v-model="dialogVisible" :title="dialogType === 'add' ? '鏂板鐢熶骇鍔犲伐' : '缂栬緫鐢熶骇鍔犲伐'" width="1200px"
- :close-on-click-modal="false" @close="handleClose">
- <el-form ref="formRef" :model="formData" :rules="rules" class="production-form">
- <el-row :gutter="24">
- <el-col :span="6">
- <el-form-item label="鐓ょ" prop="category">
- <el-select v-model="formData.category" placeholder="璇烽�夋嫨鐓ょ" clearable style="width: 100%" @change="selectChange">
- <el-option label="鐐肩劍" value="鐐肩劍" />
- <el-option label="姘旂叅" value="姘旂叅" />
- <el-option label="鏃犵儫鐓�" value="鏃犵儫鐓�" />
- <el-option label="闀跨劙鐓�" value="闀跨劙鐓�" />
- <el-option label="璐叅" value="璐叅" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鐑��" prop="Calorific">
- <el-input v-model="formData.Calorific" placeholder="璇疯緭鍏ョ儹鍊�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="4" :offset="8">
- <el-button type="primary" @click="search">鏌ヨ</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </el-col>
- </el-row>
- </el-form>
- <ETable :columns="columns" height="200" @cell-edit="handleCellEdit" :showOperations="false" :tableData="tableData" @row-click="handleRowClick" :editableColumns="['used']" />
- <el-row :gutter="10">
- <el-col :span="4">
- <h1>鐢熶骇鏄庣粏</h1>
- </el-col>
+div<template>
+ <el-dialog
+ v-model="dialogVisible"
+ :title="dialogType === 'add' ? '鏂板鐢熶骇鍔犲伐' : '缂栬緫鐢熶骇鍔犲伐'"
+ width="1200px"
+ :close-on-click-modal="false"
+ @close="handleClose"
+ >
+ <el-button type="primary" @click="handlData">閫夋嫨鏁版嵁</el-button>
+ <ETableModify
+ :columns="columns"
+ height="200"
+ @cell-edit="handleCellEdit"
+ :showOperations="false"
+ :tableData="tableData"
+ @row-click="handleRowClick"
+ :editableColumns="['used']"
+ />
+ <div class="empty-table">
+ <h1>鐢熶骇鏄庣粏</h1>
+ <el-row :gutter="10">
+ <el-col :span="2">
+ <el-button type="primary" @click="addNewRow">
+ <el-icon>
+ <Plus />
+ </el-icon>
+ 鏂板
+ </el-button>
+ </el-col>
+ <el-col :span="2">
+ <el-button type="danger" @click="clearAllRows">
+ <el-icon>
+ <Delete />
+ </el-icon>
+ 娓呯┖
+ </el-button>
+ </el-col>
+ <!-- <el-col :span="2">
+ <el-button type="warning" @click="calculateAllCosts">
+ <el-icon>
+ <Warning />
+ </el-icon> 閲嶆柊璁＄畻
+ </el-button>
+ </el-col> -->
</el-row>
- <el-row :gutter="10">
- <el-col :span="2">
- <el-button type="primary">
- <el-icon><Plus /></el-icon> 鏂板
- </el-button>
- </el-col>
- <el-col :span="2"><el-button type="danger">
- <el-icon><Delete /></el-icon> 鍒犻櫎
- </el-button></el-col>
- <el-col :span="2">
- <el-button type="warning">
- <el-icon><Warning /></el-icon> 淇敼
- </el-button>
- </el-col>
- </el-row>
+ <ProductionDetailsTable
+ v-model="detailsTableData"
+ :border="false"
+ :show-operations="true"
+ :auto-calculate="true"
+ @input-change="handleDetailsChange"
+ @delete-row="handleDeleteRow"
+ />
+
+ </div>
+
<template #footer>
<div class="dialog-footer">
<el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" :loading="loading" @click="handleSubmit">纭� 瀹�</el-button>
+ <el-button type="primary" :loading="loading" @click="handleSubmit"
+ >纭� 瀹�</el-button
+ >
</div>
-
</template>
+ </el-dialog>
+ <el-dialog
+ v-model="innerVisible"
+ width="1000"
+ title="閫夋嫨閰嶇疆鏁版嵁"
+ center
+ append-to-body
+ >
+ <ETable
+ @selection-change="handleSelectionChange"
+ :showOperations="false"
+ :columns="formalDatabaseColumns"
+ :tableData="formalDatabaseData"
+ height="400"
+ @cell-edit="handleCellEdit"
+ :show-selection="true"
+ />
+ <el-row :gutter="24">
+ <el-col :span="2" :offset="22">
+ <el-button type="primary" @click="handleSelectData">纭畾</el-button>
+ </el-col>
+ </el-row>
</el-dialog>
</template>
<script setup>
-import { ref, reactive, watch } from 'vue'
-import ETable from '@/components/Table/ETable.vue'
-import { ElMessage } from 'element-plus'
-import { Delete, Warning } from '@element-plus/icons-vue'
+import { ref, reactive, watch } from "vue";
+import ETable from "@/components/Table/ETable.vue";
+import ETableModify from "@/components/Table/EtableModify.vue";
+import ProductionDetailsTable from "./ProductionDetailsTable.vue";
+import { ElMessage } from "element-plus";
+import { Delete, Warning, Plus } from "@element-plus/icons-vue";
+import { getOfficialAll } from "@/api/production/index.js";
const props = defineProps({
visible: {
type: Boolean,
- default: false
+ default: false,
},
type: {
type: String,
- default: 'add' // 'add' 鎴� 'edit'
+ default: "add", // 'add' 鎴� 'edit'
},
rowData: {
type: Object,
- default: () => ({})
- }
-})
-const dialogVisible = defineModel('visible', {
+ default: () => ({}),
+ },
+});
+const dialogVisible = defineModel("visible", {
type: Boolean,
- default: false
-})
-const emit = defineEmits(['update:visible', 'success'])
+ default: false,
+});
+const emit = defineEmits(["update:visible", "success"]);
-const dialogType = ref('add')
-const loading = ref(false)
-const formRef = ref(null)
-
-const tableData = ref([])
-const currentRow = ref(null)
+const innerVisible = ref(false);
+const dialogType = ref("add");
+const loading = ref(false);
+const formRef = ref(null);
+const tableData = ref([]);
+const currentRow = ref(null);
const columns = [
- { label: '鐓ょ', prop: 'category' },
- { label: '鐑��', prop: 'Calorific' },
- { label: '搴撳瓨鏁伴噺', prop: 'stock' },
- { label: '鏈浣跨敤鏁伴噺', prop: 'used' },
-]
+ { label: "渚涘簲鍟嗗悕绉�", prop: "supplierName" },
+ { label: "鐓ょ", prop: "coal" },
+ { label: "鍗曚环(涓嶅惈绋�)", prop: "priceExcludingTax" },
+ { label: "搴撳瓨鏁伴噺", prop: "inventoryQuantity" },
+ {
+ label: "浣跨敤鏁伴噺",
+ prop: "used",
+ editable: true,
+ width: 120,
+ editType: "number",
+ },
+
+];
+const detailsTableData = ref([
+
+]);
const handleRowClick = (row) => {
- currentRow.value = row
- console.log('褰撳墠琛屾暟鎹�:', currentRow.value)
-}
+ currentRow.value = row;
+};
+const formalDatabaseColumns = ref([
+ { prop: "supplierName", label: "渚涘簲鍟嗗悕绉�", minwidth: 150 },
+ { prop: "coal", label: "鐓ょ绫诲瀷", minwidth: 60 },
+ { prop: "inventoryQuantity", label: "搴撳瓨鏁伴噺", minwidth: 80 },
+ { prop: "unit", label: "鍗曚綅", minwidth: 100 },
+ { prop: "priceExcludingTax", label: "鍗曚环锛堜笉鍚◣锛�", minwidth: 80 },
+ { prop: "createTime", label: "鐧昏鏃ユ湡", minwidth: 400 },
+]);
// 琛ㄥ崟鏁版嵁
const formData = reactive({
- category: '',
- unit: '',
+ category: "",
+ unit: "",
productionVolume: 0,
laborCost: 0,
materialCost: 0,
@@ -109,68 +161,82 @@
totalCost: 0,
totalPrice: 0,
profit: 0,
- reviewer: '',
- date: ''
-})
-
-// 琛ㄥ崟楠岃瘉瑙勫垯
-const rules = {
- category: [{ required: true, message: '璇烽�夋嫨鐓ょ', trigger: 'change' }],
-}
-
-const search = () => {
- // 鏌ヨ閫昏緫
- if (!formData.category) {
- return this.$message.error('璇烽�夋嫨鐓ょ')
+ reviewer: "",
+ date: "",
+});
+const handlData =async () => {
+ innerVisible.value = true;
+ let res = await getOfficialAll();
+ console.log("鑾峰彇閰嶇疆鏁版嵁", res);
+ if (res.code === 200) {
+ formalDatabaseData.value = res.data;
+ } else {
+ ElMessage.error("鑾峰彇閰嶇疆鏁版嵁澶辫触");
}
- loading.value = true
- // 妯℃嫙鏌ヨ鏁版嵁
- setTimeout(() => {
- // 鍋囨暟鎹�
- tableData.value = [
- { category: '鐐肩劍', Calorific: '6000', stock: 100, used: 20 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '姘旂叅', Calorific: '5500', stock: 80, used: 15 },
- { category: '鏃犵儫鐓�', Calorific: '7000', stock: 120, used: 30 }
- ]
- loading.value = false
- }, 1000)
-}
-
+};
+const formalDatabaseData = ref([]);
+const formalDatabaseSelectedData = ref([]);
+formalDatabaseData.value = [
+];
+// 鍒濆鍖�
+const Initialization = () => {
+ tableData.value = [];
+};
+defineExpose({
+ Initialization
+});
+const handleSelectData = (row) => {
+ if (!innerVisible.value) return;
+ // 鑾峰彇閫変腑鐨勬暟鎹�
+ const selectedData = formalDatabaseSelectedData.value;
+ if (selectedData.length === 0) {
+ ElMessage.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ // 灏嗛�変腑鐨勬暟鎹牴鎹渶瑕佺瓫閫夊埌琛ㄦ牸涓�
+ selectedData.forEach((item) => {
+ const existingItem = tableData.value.find(
+ (row) => row.id === item.id
+ );
+ if (!existingItem) {
+ tableData.value.push(
+ Object.assign({}, item, {
+ used: 0, // 鍒濆浣跨敤鏁伴噺涓�0
+ })
+ );
+ }
+ });
+ innerVisible.value = false;
+};
+const handleSelectionChange = (selection) => {
+ formalDatabaseSelectedData.value = selection;
+};
const reset = () => {
// formRef
- formRef.value?.resetFields()
-}
+ formRef.value?.resetFields();
+};
-const selectChange = (value) => {
-}
+const selectChange = (value) => {};
// 鎻愪氦琛ㄥ崟
const handleSubmit = async () => {
- if (!formRef.value) return
-
- await formRef.value.validate((valid) => {
- if (valid) {
- loading.value = true
- // 瑙﹀彂鎴愬姛浜嬩欢锛屼紶閫掕〃鍗曟暟鎹�
- emit('success', { ...formData })
- loading.value = false
- handleClose()
- }
- })
-}
+ console.log("鎻愪氦琛ㄥ崟鏁版嵁:", tableData.value);
+ console.log(detailsTableData.value);
+ let data = {
+ productionList: detailsTableData.value,
+ productionInventoryList: tableData.value,
+ };
+ console.log("鎻愪氦鏁版嵁", data);
+ // dialogVisible.value = false;
+};
// 鍏抽棴寮圭獥
const handleClose = () => {
- dialogVisible.value = false
- formRef.value?.resetFields()
+ dialogVisible.value = false;
+ formRef.value?.resetFields();
Object.assign(formData, {
- category: '',
- unit: '',
+ category: "",
+ unit: "",
productionVolume: 0,
laborCost: 0,
materialCost: 0,
@@ -178,32 +244,76 @@
totalCost: 0,
totalPrice: 0,
profit: 0,
- reviewer: '',
- date: ''
- })
-}
+ reviewer: "",
+ date: "",
+ });
+};
// 娣诲姞鍗曞厓鏍肩紪杈戝鐞嗗嚱鏁�
const handleCellEdit = (row, prop, value) => {
- console.log('鍗曞厓鏍肩紪杈�:', prop)
- // console.log('鍗曞厓鏍肩紪杈戝畬鎴�:', row, prop, value)
- // 杩欓噷鍙互娣诲姞楠岃瘉閫昏緫锛屼緥濡傛鏌ヤ娇鐢ㄩ噺鏄惁澶т簬搴撳瓨
- if (prop === 'used' && Number(value) > Number(row.stock)) {
- ElMessage.warning('浣跨敤鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺锛�')
- // 鍙互鍦ㄨ繖閲岄噸缃��
- row.used = row.stock
+ if (prop === "used" && Number(value) > Number(row.stock)) {
+ ElMessage.warning("浣跨敤鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺锛�");
+ row.used = row.stock;
}
-}
+};
+
+// 澶勭悊鐢熶骇鏄庣粏琛ㄦ牸鐨勬搷浣�
+const addNewRow = () => {
+ detailsTableData.value.push({
+ coalType: "",
+ productionQuantity: "",
+ laborCost: "",
+ energyConsumptionCost: "",
+ equipmentDepreciation: "",
+ purchasePrice: "",
+ autoCalculate: "0.00",
+ producer:"",
+ });
+};
+
+const clearAllRows = () => {
+ detailsTableData.value = [];
+ ElMessage.success("宸叉竻绌烘墍鏈夋暟鎹�");
+};
+
+const calculateAllCosts = () => {
+ detailsTableData.value.forEach((row) => {
+ const laborCost = parseFloat(row.laborCost) || 0;
+ const energyCost = parseFloat(row.energyCost) || 0;
+ const equipmentDepreciation = parseFloat(row.equipmentDepreciation) || 0;
+ const purchasePrice = parseFloat(row.purchasePrice) || 0;
+
+ row.totalCost = (
+ laborCost +
+ energyCost +
+ equipmentDepreciation +
+ purchasePrice
+ ).toFixed(2);
+ });
+ ElMessage.success("閲嶆柊璁＄畻瀹屾垚");
+};
+
+const handleDetailsChange = (data) => {
+ console.log("鐢熶骇鏄庣粏鏁版嵁鍙樺寲:", data);
+};
+
+const handleDeleteRow = (index) => {
+ ElMessage.success(`宸插垹闄ょ ${index + 1} 琛屾暟鎹甡);
+};
</script>
-<style scoped lang="scss">
-.el-form{
+<style scoped lang="scss">
+.el-form {
.el-row {
padding-top: 20px;
- background: rgba($color: #F8FAFB, $alpha: 0.5) ;
+ background: rgba($color: #f8fafb, $alpha: 0.5);
}
}
-.el-row>.el-col>h1{
+
+.el-row > .el-col > h1 {
font-weight: bolder;
}
-</style>
\ No newline at end of file
+.empty-table > .el-row{
+ margin-bottom: 12px;
+}
+</style>
--
Gitblit v1.9.3