From 9afe58b2eece02fe7054aafdb71a5a9e50ba97a4 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期一, 22 十二月 2025 13:19:21 +0800
Subject: [PATCH] 海川开心-相关字段修复
---
src/views/equipmentManagement/upkeep/index.vue | 3 +
src/views/index.vue | 24 +++++++++++
src/api/viewIndex.js | 8 +++
src/views/equipmentManagement/repair/index.vue | 3 +
src/views/collaborativeApproval/approvalProcess/index.vue | 5 ++
src/views/equipmentManagement/repair/Form/RepairForm.vue | 16 ++++++++
src/views/productionManagement/operationScheduling/index.vue | 10 ++--
src/views/equipmentManagement/upkeep/Form/PlanForm.vue | 9 ++++
8 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 2b4d883..6931110 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -52,4 +52,10 @@
url: '/home/approveAndDeviceTodos',
method: 'get'
})
-}
\ No newline at end of file
+}
+export const noticesCount = () => {
+ return request({
+ url: '/home/noticesCount',
+ method: 'get'
+ })
+}
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 8b95df1..78d21fb 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -130,6 +130,11 @@
width: 120
},
{
+ label: "閲戦锛堝厓锛�",
+ prop: "price",
+ width: 120
+ },
+ {
label: props.approveType === 2 ? "寮�濮嬫棩鏈�" : "鐢宠鏃ユ湡",
prop: props.approveType === 2 ? "startDate" : "approveTime",
width: 200
diff --git a/src/views/equipmentManagement/repair/Form/RepairForm.vue b/src/views/equipmentManagement/repair/Form/RepairForm.vue
index 1fadde4..c8ba436 100644
--- a/src/views/equipmentManagement/repair/Form/RepairForm.vue
+++ b/src/views/equipmentManagement/repair/Form/RepairForm.vue
@@ -40,6 +40,19 @@
<el-input v-model="form.repairName" placeholder="璇疯緭鍏ユ姤淇汉" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎶ヤ慨鐘舵��">
+ <el-select v-model="form.status">
+ <el-option label="寰呯淮淇�" :value="0"></el-option>
+ <el-option label="瀹岀粨" :value="1"></el-option>
+ <el-option label="澶辫触" :value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="24">
<el-form-item label="鏁呴殰鐜拌薄">
<el-input
@@ -58,6 +71,7 @@
import useFormData from "@/hooks/useFormData";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
import useUserStore from "@/store/modules/user";
+import { el } from "element-plus/es/locale/index.mjs";
defineOptions({
name: "璁惧鎶ヤ慨琛ㄥ崟",
@@ -78,6 +92,7 @@
repairTime: undefined, // 鎶ヤ慨鏃ユ湡
repairName: userStore.nickName, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
+ status: 0, // 鎶ヤ慨鐘舵��
});
const setDeviceModel = (id) => {
@@ -96,6 +111,7 @@
form.repairTime = data.repairTime;
form.repairName = data.repairName;
form.remark = data.remark;
+ form.status = data.status;
};
// onMounted(() => {
diff --git a/src/views/equipmentManagement/repair/index.vue b/src/views/equipmentManagement/repair/index.vue
index 1a2ff1e..08cbcc2 100644
--- a/src/views/equipmentManagement/repair/index.vue
+++ b/src/views/equipmentManagement/repair/index.vue
@@ -106,8 +106,9 @@
@pagination="changePage"
>
<template #statusRef="{ row }">
+ <el-tag v-if="row.status === 2" type="danger">澶辫触</el-tag>
<el-tag v-if="row.status === 1" type="success">瀹岀粨</el-tag>
- <el-tag v-if="row.status === 0" type="danger">寰呯淮淇�</el-tag>
+ <el-tag v-if="row.status === 0" type="warning">寰呯淮淇�</el-tag>
</template>
<template #operation="{ row }">
<el-button
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanForm.vue b/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
index 6d27f8a..e90bfad 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanForm.vue
@@ -41,6 +41,13 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="淇濅慨鐘舵��">
+ <el-select v-model="form.status">
+ <el-option label="寰呬繚淇�" :value="0"></el-option>
+ <el-option label="瀹岀粨" :value="1"></el-option>
+ <el-option label="澶辫触" :value="2"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="璁″垝淇濆吇鏃ユ湡">
<el-date-picker
style="width: 100%"
@@ -78,6 +85,7 @@
deviceModel: undefined, // 瑙勬牸鍨嬪彿
maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
createUser: undefined, // 褰曞叆浜�
+ status: 0, //淇濅慨鐘舵��
});
const setDeviceModel = (id) => {
@@ -98,6 +106,7 @@
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
form.createUser = Number(data.createUser);
+ form.status = data.status;
form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
"YYYY-MM-DD HH:mm:ss"
);
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 9a84f3e..cc6396b 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -95,8 +95,9 @@
</el-tag> -->
</template>
<template #statusRef="{ row }">
+ <el-tag v-if="row.status === 2" type="danger">澶辫触</el-tag>
<el-tag v-if="row.status === 1" type="success">瀹岀粨</el-tag>
- <el-tag v-if="row.status === 0" type="danger">寰呬繚鍏�</el-tag>
+ <el-tag v-if="row.status === 0" type="warning">寰呬繚鍏�</el-tag>
</template>
<template #operation="{ row }">
<el-button
diff --git a/src/views/index.vue b/src/views/index.vue
index 3618550..e6b22c5 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -181,7 +181,8 @@
homeTodos,
qualityStatistics,
statisticsReceivablePayable,
- approveAndDeviceTodos
+ approveAndDeviceTodos,
+ noticesCount
} from "@/api/viewIndex.js";
import { getCurrentUserLatestScheduling } from "@/api/personnelManagement/scheduling.js";
import dayjs from "dayjs";
@@ -373,6 +374,7 @@
getAmountHalfYearNum()
getCurrentUserSchedule()
getApproveAndDeviceTodos()
+ getOngoingAnnouncementNoticeNumber()
})
// 鏁版嵁缁熻
const getBusinessData = () => {
@@ -546,6 +548,26 @@
console.error('鑾峰彇鍗忓悓寰呭姙浜嬮」澶辫触:', error)
}
}
+// 杩涜涓叕鍛婇�氱煡
+const getOngoingAnnouncementNoticeNumber = async () => {
+ try {
+ const res = await noticesCount()
+ // const { approveTodo, deviceRepairTodo } = res.data
+ const _noticesCount = res.data
+ if(!_noticesCount){
+ return
+ }
+ // 鏄剧ず閫氱煡
+ ElNotification({
+ title: '閫氱煡鍏憡閫氱煡',
+ message: `褰撳墠鏈�${_noticesCount}鏉″叕鍛婇�氱煡锛屾敞鎰忔煡鐪媊,
+ type: 'warning',
+ duration: 5000
+ })
+ } catch (error) {
+ console.error('鑾峰彇鍗忓悓寰呭姙浜嬮」澶辫触:', error)
+ }
+}
</script>
<style scoped>
diff --git a/src/views/productionManagement/operationScheduling/index.vue b/src/views/productionManagement/operationScheduling/index.vue
index a11721d..a9c06fb 100644
--- a/src/views/productionManagement/operationScheduling/index.vue
+++ b/src/views/productionManagement/operationScheduling/index.vue
@@ -142,11 +142,11 @@
prop: "speculativeTradingName",
width: 220,
},
- {
- label: "浜х嚎",
- prop: "productionLine",
- width: 220,
- },
+ // {
+ // label: "浜х嚎",
+ // prop: "productionLine",
+ // width: 220,
+ // },
{
label: "鍗曚綅",
prop: "unit",
--
Gitblit v1.9.3