Pārlūkot izejas kodu

bug fix:项目表单在查看、编辑状态下的bug

任一存 1 gadu atpakaļ
vecāks
revīzija
4cf845d21d

+ 5 - 0
src/pages/A1Project/A1Add/index.module.scss

@@ -24,6 +24,11 @@
           display: flex;
           align-items: center;
           gap: 20px;
+          >div {
+            flex: 1 0 auto;
+            max-width: 400px;
+            margin-bottom: 24px;
+          }
         }
   
         .form-item-group-title__porject-type{

+ 14 - 14
src/pages/A1Project/A1Add/index.tsx

@@ -66,6 +66,8 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
         ...info,
         province,
         dateScope: dateScope ? [dayjs(dateScope[0]), dayjs(dateScope[1])] : "",
+        dictProjectBusinessIds: Number(info.dictProjectBusinessIds), // 提交表单时这一项数据类型是 number,获取表单数据时这一项数据类型是string。
+        bidDate: dayjs(info.bidDate),
       });
 
       // 回显的时候闪动 问题
@@ -77,11 +79,14 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
     if (!pageType.id) {
       // 新增
       setIsOk(true);
-    } else {
-      // 编辑
+    } else if (pageType.txt === 'look') {
+      // 查看
       getInfoFu(pageType.id);
+    } else if (pageType.txt === 'edit') {
+      // 编辑
+      setIsBid(lookInfo.isBid);
     }
-  }, [getInfoFu, pageType.id]);
+  }, [getInfoFu, pageType.id, pageType.txt, lookInfo.isBid]);
 
   // 从仓库 获取 项目状态的下拉框 数据
   const statusArr = useSelector(
@@ -124,8 +129,6 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
   // 通过校验点击确定
   const onFinish = useCallback(
     async (value: any) => {
-      console.log('sadfljslfksdfjlk');
-      
       
       //  项目周期的处理
       let dateScope = "";
@@ -187,14 +190,7 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
 
   // 是否投标
   const [isBid, setIsBid] = useState<number | undefined>();
-  // 是否显示中标日期
-  const [isShowBidDate, setIsShowBidDate] = useState<number | undefined>();
 
-  useEffect(() => {
-    setIsShowBidDate(isBid);
-  }, [isBid]);
-  
-  
   return (
     <div className={styles.A1Add}>
       <div
@@ -348,7 +344,7 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
               </Radio.Group>
             </Form.Item>
             
-            {isShowBidDate === 1 ? (
+            {pageType.txt !== 'look' && isBid ? (
               <Form.Item label="中标日期" name="bidDate"
                 required={isBid === 1}
               >
@@ -357,7 +353,11 @@ function A1Add({ pageType, closeFu, addFu, editFu }: Props) {
                   disabled={isBid === 0}
                 />
               </Form.Item>
-            ) : null}
+            ) : (pageType.txt === "look" && lookInfo.isBid === 1) ? (
+                  <div>中标日期:{isOk ? lookInfo.bidDate : ""}</div>
+            ) : (
+              null
+            )}
           </div>
 
           {pageType.txt === "look" ? (

+ 18 - 2
src/types/api/A1Project.d.ts

@@ -17,8 +17,24 @@ export type A1TableType = {
   unit: string;
   updateTime: string;
   amount: string;
-  statusName:string
-  hasAuditStatus:0|1
+  statusName:string;
+  hasAuditStatus:0|1;
+  // 签订主体
+  dictMainId?: number; 
+  dictMainName?: string; 
+  // 业务部门
+  dictDeptId?: number;
+  dictDeptName?: string;
+  // 是否投标
+  isBid?: 0|1;
+  // 中标日期
+  bidDate?: string;
+  // 业务类型
+  dictProjectBusinessIds?: string;
+  // 项目范围
+  dictProjectScopeIds?: string;
+  // 客户端
+  dictProjectAppIds?: string;
 };
 
 export type A1OFileType = {