From cd17f112ae74e633b985d3745636be86572cd911 Mon Sep 17 00:00:00 2001
From: qmj <37242163+qmj666@users.noreply.github.com>
Date: Tue, 23 Dec 2025 09:28:36 +0800
Subject: [PATCH] 同步劲嘉

---
 src/mes/common/RunningStatus/index.js |  7 +++++++
 src/mes/indexMes/index.js             | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/mes/common/RunningStatus/index.js b/src/mes/common/RunningStatus/index.js
index 4cfa956..6956b0f 100644
--- a/src/mes/common/RunningStatus/index.js
+++ b/src/mes/common/RunningStatus/index.js
@@ -26,6 +26,13 @@ const sTypeJson = {
   sType7: ["不正常待机", "red", "redTd"],
   sType8: ["设备保养(协助类)", "blue", "blueTd"],
   sType9: ["设备维修", "blue", "blueTd"],
+  sType10: ["设备保养", "blue", "blueTd"],
+  sType11: ["材料异常", "red", "redTd"],
+  sType12: ["工艺异常", "red", "redTd"],
+  sType13: ["其他异常", "red", "redTd"],
+  sType14: ["设备异常", "red", "redTd"],
+  sType15: ["其他类型", "blue", "blueTd"],
+  sType16: ["制程异常", "red", "red"],
   "": ["其它", "blue", "blueTd"]
 };
 
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index cf113c9..dabceed 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -869,11 +869,10 @@ const SystemFunComponent = () => {
   // 调用通用过程
   const [form] = Form.useForm();
   const handleProcedureCall = async (params, iFlag) => {
-
     const extraValues = await new Promise(resolve => {
       form.setFieldsValue({
         tReportDate: moment(),
-        sTeamType: props.app.sShift
+        // sTeamType: props.app.sShift
       });
       Modal.confirm({
         title: "切换手动",
@@ -888,7 +887,12 @@ const SystemFunComponent = () => {
                 />
               </Form.Item>
               <Form.Item label="班次" name="sTeamType">
-                <Select placeholder="请选择">
+                <Select
+                  placeholder="请选择"
+                  labelInValue
+                  // 或者使用defaultValue确保初始显示正确
+                  defaultValue={{ value: props.app.sShift, label: props.app.sShift === 1 || props.app.sShift === '1' ? '白班' : '夜班' }}
+                >
                   <Select.Option value="1">白班</Select.Option>
                   <Select.Option value="2">夜班</Select.Option>
                 </Select>
--
libgit2 0.22.2