1.处理切换手工，传参问题

2.处理班组报工默认传未报工 0

1.处理切换手工，传参问题
2.处理班组报工默认传未报工 0
Min
1 parent cd17f112
Showing 2 changed files with 7 additions and 5 deletions
src/mes/common/commonModelComponent/index.js
src/mes/indexMes/index.js
@@ -2126,7 +2126,7 @@ const RunningStatusConditionComponent = props =&gt; {
         : now
   );
  
-  const [iShowType, setShowType] = useState(1);
+  const [iShowType, setShowType] = useState(0);
  
   const flag = useRef(false);
   useEffect(
@@ -869,10 +869,14 @@ const SystemFunComponent = () =&gt; {
   // 调用通用过程
   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 = () =&gt; {
                 <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 = () =&gt; {
         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() {