From fda6d3c555fd317137a24e9a6c0d342eb50bfe57 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 四月 2026 09:33:38 +0800
Subject: [PATCH] 湟水峡 1.项目利润页面加上采购合同号字段。项目名称、增值税字段去掉 2.生产订单删掉404接口
---
src/views/productionManagement/workOrder/index.vue | 307 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 260 insertions(+), 47 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 291ca18..97333a9 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -24,10 +24,12 @@
:page="page"
:tableLoading="tableLoading"
@pagination="pagination">
- <template #completionStatus="{ row }">
- <el-progress :percentage="toProgressPercentage(row?.completionStatus)" :color="progressColor(toProgressPercentage(row?.completionStatus))" :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
- </template>
- </PIMTable>
+ <template #completionStatus="{ row }">
+ <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
+ </template>
+ </PIMTable>
</div>
<el-dialog v-model="editDialogVisible"
title="缂栬緫鏃堕棿"
@@ -104,7 +106,6 @@
transferCardRowData.status
}}</span>
</div> -->
-
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
<span class="info-value">{{ transferCardRowData.planStartTime }}</span>
@@ -166,26 +167,34 @@
<el-dialog v-model="reportDialogVisible"
title="鎶ュ伐"
width="500px">
- <el-form :model="reportForm"
+ <el-form ref="reportFormRef"
+ :model="reportForm"
+ :rules="reportFormRules"
label-width="120px">
<el-form-item label="寰呯敓浜ф暟閲�">
<el-input v-model="reportForm.planQuantity"
readonly
style="width: 300px" />
</el-form-item>
- <el-form-item label="鏈鐢熶骇鏁伴噺">
+ <el-form-item label="鏈鐢熶骇鏁伴噺"
+ prop="quantity">
<el-input v-model.number="reportForm.quantity"
type="number"
min="1"
+ step="1"
style="width: 300px"
- placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�" />
+ placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
+ @input="handleQuantityInput" />
</el-form-item>
- <el-form-item label="鎶ュ簾鏁伴噺">
+ <el-form-item label="鎶ュ簾鏁伴噺"
+ prop="scrapQty">
<el-input v-model.number="reportForm.scrapQty"
type="number"
- min="1"
+ min="0"
+ step="1"
style="width: 300px"
- placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+ placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
+ @input="handleScrapQtyInput" />
</el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
@@ -196,7 +205,7 @@
@change="handleUserChange">
<el-option v-for="user in userOptions"
:key="user.userId"
- :label="user.userName"
+ :label="user.nickName"
:value="user.userId" />
</el-select>
</el-form-item>
@@ -210,11 +219,52 @@
</template>
</el-dialog>
<FilesDia ref="workOrderFilesRef" />
+ <el-dialog v-model="allocationDialogVisible"
+ title="宸ュ崟鍒嗛厤"
+ width="500px">
+ <el-form :model="allocationForm"
+ :rules="allocationFormRules"
+ ref="allocationFormRef"
+ label-width="120px">
+ <el-form-item label="宸ュ崟缂栧彿">
+ <el-input v-model="allocationForm.workOrderNo"
+ readonly
+ disabled
+ style="width: 300px" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О">
+ <el-input v-model="allocationForm.productName"
+ readonly
+ disabled
+ style="width: 300px" />
+ </el-form-item>
+ <el-form-item label="鍒嗛厤浜哄憳" prop="userId">
+ <el-select v-model="allocationForm.userId"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨鐝粍淇℃伅"
+ clearable
+ filterable
+ @change="handleAllocationUserChange">
+ <el-option v-for="user in userOptions"
+ :key="user.userId"
+ :label="user.nickName"
+ :value="user.userId" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button type="primary"
+ @click="handleAllocationSubmit">纭畾</el-button>
+ <el-button @click="allocationDialogVisible = false">鍙栨秷</el-button>
+ </span>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup>
- import { onMounted, ref } from "vue";
+ import { onMounted, ref, nextTick } from "vue";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import {
@@ -229,7 +279,14 @@
import FilesDia from "./components/filesDia.vue";
const { proxy } = getCurrentInstance();
+ const allocationFormRef = ref(null);
+
const tableColumn = ref([
+ {
+ label: "宸ュ崟绫诲瀷",
+ prop: "workOrderType",
+ width: "80",
+ },
{
label: "宸ュ崟缂栧彿",
prop: "workOrderNo",
@@ -324,11 +381,25 @@
clickFun: row => {
showReportDialog(row);
},
+ disabled: row => row.planQuantity <= 0 || !canReportByUser(row),
+ },
+ {
+ name: "鍒嗛厤",
+ clickFun: row => {
+ allocationDialog(row);
+ },
disabled: row => row.planQuantity <= 0,
},
],
},
]);
+
+ // 璁＄畻灞炴�э細寰呯敓浜ф暟閲� = 璁″垝 - 宸插畬鎴�
+ const waitProduceQuantity = computed(() => {
+ const plan = Number(currentReportRowData.value?.planQuantity) || 0;
+ const complete = Number(currentReportRowData.value?.completeQuantity) || 0;
+ return plan - complete;
+ });
const tableData = ref([]);
const tableLoading = ref(false);
const qrCodeUrl = ref("");
@@ -339,7 +410,7 @@
const transferCardQrUrl = ref("");
const transferCardRowData = ref(null);
const reportDialogVisible = ref(false);
- const workOrderFilesRef = ref(null);
+ const allocationDialogVisible = ref(false);
const userOptions = ref([]);
const reportForm = reactive({
planQuantity: 0,
@@ -351,7 +422,18 @@
userId: "",
productMainId: null,
});
+ const allocationForm = reactive({
+ workOrderId: "",
+ workOrderNo: "",
+ productName: "",
+ currentReportWork: "",
+ nickName: "",
+ userId: "",
+ });
+ const currentAllocationRowData = ref(null);
const currentReportRowData = ref(null);
+ const currentUserId = ref("");
+ const currentUserName = ref("");
const page = reactive({
current: 1,
size: 100,
@@ -379,6 +461,12 @@
return "#67c23a";
};
let editrow = ref(null);
+
+ const allocationFormRules = {
+ userId: [
+ { required: true, message: '璇烽�夋嫨鍒嗛厤浜哄憳', trigger: 'change' }
+ ]
+ }
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -425,7 +513,9 @@
// 鍒涘缓 Blob URL
const fileBlob =
- blob instanceof Blob ? blob : new Blob([blob], { type: blob.type || "application/octet-stream" });
+ blob instanceof Blob
+ ? blob
+ : new Blob([blob], { type: blob.type || "application/octet-stream" });
const url = window.URL.createObjectURL(fileBlob);
// 鍒涘缓闅愯棌 iframe锛岀敤浜庤Е鍙戞祻瑙堝櫒鎵撳嵃
@@ -486,21 +576,100 @@
});
};
+ // 鍒嗛厤鍔熻兘
+ const allocationDialog = row => {
+ currentAllocationRowData.value = row;
+ allocationForm.workOrderId = row.id;
+ allocationForm.workOrderNo = row.workOrderNo || "";
+ allocationForm.productName = row.productName || "";
+ allocationForm.currentReportWork = row.reportWork || "";
+ allocationForm.nickName =row.nickName || "";
+ allocationForm.userId =row.userId || "";
+ allocationDialogVisible.value = true;
+ };
+
+ const canReportByUser = row => {
+ if (!row || !row.userId) {
+ return true;
+ }
+ if (!currentUserId.value) {
+ return false;
+ }
+ return String(row.userId) === String(currentUserId.value);
+ };
+
+ const handleAllocationUserChange = userId => {
+ if (!userId) {
+ allocationForm.nickName = "";
+ return;
+ }
+ const selectedUser = userOptions.value.find(user => user.userId === userId);
+ allocationForm.nickName = selectedUser ? selectedUser.nickName : "";
+ };
+
+ const handleAllocationSubmit = async () => {
+ if (!allocationFormRef.value) {
+ return;
+ }
+ try {
+ await allocationFormRef.value.validate();
+ } catch {
+ return;
+ }
+ if (!currentAllocationRowData.value) {
+ return;
+ }
+ const payload = {
+ ...currentAllocationRowData.value,
+ id: allocationForm.workOrderId,
+ userId: allocationForm.userId,
+ nickName: allocationForm.nickName,
+ };
+ try {
+ await updateProductWorkOrder(payload);
+ proxy.$modal.msgSuccess("鍒嗛厤鎴愬姛");
+ allocationDialogVisible.value = false;
+ getList();
+ } catch (err) {
+ const apiMsg =
+ err?.response?.data?.msg ||
+ err?.msg ||
+ (err?.userId && Array.isArray(err.userId)
+ ? (err.userId[0]?.message || err.userId[0] || "")
+ : "");
+ ElMessageBox.alert(apiMsg || "鍒嗛厤澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ }
+ };
+
+
const showReportDialog = row => {
+ if (!canReportByUser(row)) {
+ ElMessageBox.alert("璇ュ伐鍗曞凡鍒嗛厤缁欏叾浠栫彮缁勶紝褰撳墠鐢ㄦ埛鏃犳姤宸ユ潈闄�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
currentReportRowData.value = row;
- reportForm.planQuantity = row.planQuantity;
- reportForm.quantity = row.quantity;
+ reportForm.planQuantity = row.planQuantity - row.completeQuantity;
+ reportForm.quantity =
+ row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
- reportForm.scrapQty = row.scrapQty;
+ reportForm.scrapQty =
+ row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
+ nextTick(() => {
+ reportFormRef.value?.clearValidate();
+ });
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅锛岃缃负榛樿閫変腑
getUserProfile()
.then(res => {
if (res.code === 200) {
reportForm.userId = res.data.userId;
- reportForm.userName = res.data.userName;
+ reportForm.userName = res.data.nickName;
}
})
.catch(err => {
@@ -515,35 +684,79 @@
};
const handleReport = () => {
- if (reportForm.planQuantity <= 0) {
- ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
- if (!reportForm.quantity || reportForm.quantity <= 0) {
- ElMessageBox.alert("璇疯緭鍏ユ湁鏁堢殑鏈鐢熶骇鏁伴噺", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
- if (reportForm.quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
- // console.log(reportForm);
- addProductMain(reportForm).then(res => {
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
- reportDialogVisible.value = false;
- getList();
- } else {
- ElMessageBox.alert(res.msg || "鎶ュ伐澶辫触", "鎻愮ず", {
+ reportFormRef.value?.validate(valid => {
+ if (!valid) {
+ return false;
+ }
+
+ if (reportForm.planQuantity <= 0) {
+ ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
confirmButtonText: "纭畾",
});
+ return;
}
+
+ // 楠岃瘉鏈鐢熶骇鏁伴噺
+ if (
+ reportForm.quantity === null ||
+ reportForm.quantity === undefined ||
+ reportForm.quantity === ""
+ ) {
+ ElMessageBox.alert("璇疯緭鍏ユ湰娆＄敓浜ф暟閲�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ const quantity = Number(reportForm.quantity);
+ const scrapQty =
+ reportForm.scrapQty === null ||
+ reportForm.scrapQty === undefined ||
+ reportForm.scrapQty === ""
+ ? 0
+ : Number(reportForm.scrapQty);
+
+ // 鏈鐢熶骇鏁伴噺
+ if (isNaN(quantity) || !Number.isInteger(quantity) || quantity < 1) {
+ ElMessageBox.alert("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ // 鎶ュ簾鏁伴噺蹇呴』鏄暣鏁颁笖澶т簬绛変簬0
+ if (isNaN(scrapQty) || !Number.isInteger(scrapQty) || scrapQty < 0) {
+ ElMessageBox.alert("鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ if (quantity > reportForm.planQuantity) {
+ ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ const submitData = {
+ ...reportForm,
+ quantity: quantity,
+ scrapQty: scrapQty,
+ };
+
+ // console.log(submitData);
+ addProductMain(submitData).then(res => {
+ if (res.code === 200) {
+ proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
+ reportDialogVisible.value = false;
+ getList();
+ } else {
+ ElMessageBox.alert(res.msg || "鎶ュ伐澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ }
+ });
});
};
@@ -561,11 +774,11 @@
};
// 鐢ㄦ埛閫夋嫨鍙樺寲鏃舵洿鏂� userName
- const handleUserChange = (userId) => {
+ const handleUserChange = userId => {
if (userId) {
const selectedUser = userOptions.value.find(user => user.userId === userId);
if (selectedUser) {
- reportForm.userName = selectedUser.userName;
+ reportForm.userName = selectedUser.nickName;
}
} else {
reportForm.userName = "";
--
Gitblit v1.9.3