From a1aad7275882d7b350abb30bc6f671551d76c4ab Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Wed, 24 Dec 2025 09:45:02 +0800
Subject: [PATCH] 1.处理切换手工，传参问题 2.处理班组报工 默认传未报工 0

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

diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 5a599c9..e04c312 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -2126,7 +2126,7 @@ const RunningStatusConditionComponent = props => {
         : now
   );
 
-  const [iShowType, setShowType] = useState(1);
+  const [iShowType, setShowType] = useState(0);
 
   const flag = useRef(false);
   useEffect(
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index dabceed..b2b56f4 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -869,10 +869,14 @@ const SystemFunComponent = () => {
   // 调用通用过程
   const [form] = Form.useForm();
   const handleProcedureCall = async (params, iFlag) => {
+    const shiftValue = String(props.app.sShift || '1');
     const extraValues = await new Promise(resolve => {
       form.setFieldsValue({
         tReportDate: moment(),
-        // sTeamType: props.app.sShift
+        sTeamType: {
+          value: shiftValue, // 统一为字符串类型
+          label: shiftValue === '1' ? '白班' : '夜班'
+        }
       });
       Modal.confirm({
         title: "切换手动",
@@ -890,8 +894,6 @@ const SystemFunComponent = () => {
                 <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>
@@ -906,7 +908,7 @@ const SystemFunComponent = () => {
         onOk() {
           const values = form.getFieldsValue();
           const tReportDate = values?.tReportDate.format("YYYY-MM-DD") || "";
-          const sTeamType = values.sTeamType;
+          const sTeamType =  values.sTeamType?.value || '';
           resolve({ tReportDate, sTeamType });
         },
         onCancel() {
--
libgit2 0.22.2