From 599acb85ecc54f9b579cabe77156a1cc578ed8d9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 29 一月 2026 09:51:57 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
/dev/null | 22 ----------------------
src/views/salesManagement/receiptPayment/index.vue | 8 +++++++-
src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue | 6 ++++++
src/views/productionManagement/productionDispatching/components/formDia.vue | 2 +-
src/views/safeProduction/dangerInvestigation/index.vue | 14 +++++++++++++-
5 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue b/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
index 699a52f..f65509a 100644
--- a/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
+++ b/src/views/personnelManagement/employeeRecord/components/NewOrEditFormDia.vue
@@ -215,6 +215,9 @@
if (form.value.sysPostId === 0) {
form.value.sysPostId = undefined
}
+ if (form.value.sysDeptId === 0) {
+ form.value.sysDeptId = undefined
+ }
// 缂栬緫鏃朵篃璁＄畻涓�娆″悎鍚屽勾闄�
calculateContractTerm();
})
@@ -259,6 +262,9 @@
if (!form.value.sysPostId) {
form.value.sysPostId = 0;
}
+ if (!form.value.sysDeptId) {
+ form.value.sysDeptId = 0;
+ }
proxy.$refs.formRef.validate(valid => {
if (valid) {
if (operationType.value === "add") {
diff --git a/src/views/productionManagement/productionDispatching/components/formDia.vue b/src/views/productionManagement/productionDispatching/components/formDia.vue
index 971bc6e..a514d9a 100644
--- a/src/views/productionManagement/productionDispatching/components/formDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -111,7 +111,7 @@
<script setup>
import {ref} from "vue";
-import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
+// import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {productionDispatch} from "@/api/productionManagement/productionOrder.js";
import useUserStore from "@/store/modules/user.js";
diff --git a/src/views/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index a918bef..eaa12bb 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -288,7 +288,9 @@
<span class="detail-title">{{ form.type }}</span>
</el-descriptions-item>
<el-descriptions-item label="闅愭偅椋庨櫓绛夌骇">
- <span class="detail-title">{{ form.riskLevel }}</span>
+ <el-tag :type="getTypeTagType(form.riskLevel)">
+ {{ form.riskLevel }}
+ </el-tag>
</el-descriptions-item>
<el-descriptions-item label="涓婃姤浜�">
<span class="detail-title">{{ form.createUserName }}</span>
@@ -466,6 +468,16 @@
return "楠屾敹椤甸潰";
}
};
+ // 鑾峰彇绫诲瀷鏍囩绫诲瀷
+ const getTypeTagType = type => {
+ const typeMap = {
+ 杈冨ぇ椋庨櫓: "warning",
+ 浣庨闄�: "info",
+ 涓�鑸闄�: "info",
+ 閲嶅ぇ椋庨櫓: "danger",
+ };
+ return typeMap[type] || "info";
+ };
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
const dialogFormVisible = ref(false);
diff --git a/src/views/safeProduction/safeWorkApproval/index1.vue b/src/views/safeProduction/safeWorkApproval/index1.vue
deleted file mode 100644
index e5ce4b4..0000000
--- a/src/views/safeProduction/safeWorkApproval/index1.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <div class="container">
- <!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
- <ApprovalProcessIndex :approveType="1" />
- </div>
-</template>
-
-<script setup>
- import ApprovalProcessIndex from "./index.vue";
-
- // 瀹氫箟缁勪欢鍚嶇О
- defineOptions({
- name: "ApprovalProcessIndex1",
- });
-</script>
-
-<style scoped>
- .container {
- width: 100%;
- height: 100%;
- }
-</style>
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index a2a0b2f..7b03d7d 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -421,7 +421,11 @@
proxy.$modal.msgError("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
return;
}
- const validRows = selectedRows.value.filter((item) => item.noReceiptAmount !== 0);
+ // 浠呭厑璁糕�滃緟鍥炴閲戦 > 0鈥濈殑璁板綍杩涘叆鏂板鍥炴寮圭獥锛屽苟杩囨护鎺夊彲鑳芥贩鍏ョ殑绌哄璞�
+ const validRows = selectedRows.value.filter((item) => {
+ if (!item || !item.id) return false;
+ return Number(item.pendingInvoiceTotal ?? 0) > 0;
+ });
if (validRows.length === 0) {
proxy.$modal.msgWarning("鎵�閫夎褰曞潎鏃犻渶鍥炴");
return;
@@ -485,6 +489,8 @@
const closeDia = () => {
forms.value = [];
dialogFormVisible.value = false;
+ // 閬垮厤浜屾鎵撳紑寮圭獥鏃朵粛鎼哄甫涓婁竴娆＄殑閫夋嫨瀵艰嚧鈥滃鍑轰竴琛�/鑴忔暟鎹��
+ selectedRows.value = [];
};
// 鍒犻櫎鍥炴璁板綍
--
Gitblit v1.9.3