修改待办配置，添加忽略未完成待办统计，并优化表单交互逻辑，对接接口；

王强
1 parent 6354f56c
Showing 2 changed files with 43 additions and 35 deletions
src/pages/backlog/TaskConfig/api.ts
src/pages/backlog/TaskConfig/components/CreateModal.tsx
 /*
  * @Date: 2021-12-29 15:35:12
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-01-05 17:53:12
+ * @LastEditTime: 2023-02-15 17:19:33
  */
 import request from "@/utils/request";
 import { common } from "@/typing/common";
@@ -51,7 +51,8 @@ export interface ListVO {
   customTempPath?: string; // 自定义模板路径
   closeStand?: boolean; // 是否关单站岗
   /** 工作类型 */
-  workType?:number;
+  workType?: number;
+  ignoreCount?: boolean; // 忽略未完成待办统计
 }
  
 export function getConfigListApi(params: ListParams): http.PromisePageResp<ListVO> {
@@ -50,9 +50,10 @@ export default function CreateModal({
         ...item,
         funcPage: item.funcPage,
         itemName: item.itemName,
-        dock: item.dock,
-        exShow: item.exShow,
-        assess: item.assess,
+        dock: checkNull(item.dock) ? true : item.dock,
+        exShow: checkNull(item.exShow) ? true : item.exShow,
+        assess: checkNull(item.assess) ? true : item.assess,
+        ignoreCount: checkNull(item.ignoreCount) ? false : item.ignoreCount,
         itemType: item.itemType || TodoTypeEnum["业务性"],
         listPage: item.listPage,
         detailPage: item.detailPage,
@@ -79,9 +80,6 @@ export default function CreateModal({
         pageParam[obj.key.trim()] = (obj.value || "").trim();
       }
     });
-    const dock = feildValue.dock;
-    const assess = feildValue.assess;
-    const exShow = feildValue.exShow;
     const params = {
       ...feildValue,
       itemName: (feildValue.itemName || "").trim(),
@@ -89,10 +87,6 @@ export default function CreateModal({
       funcPage: (feildValue.funcPage || "").trim(),
       detailPage: (feildValue.detailPage || "").trim(),
       pageParam: JSON.stringify(pageParam),
-      dock: JSON.parse(dock),
-      assess: JSON.parse(assess),
-      exShow: JSON.parse(exShow),
-      itemCode: item.itemCode,
       id: item.id,
       applySysId: feildValue.applySysId,
     };
@@ -122,8 +116,8 @@ export default function CreateModal({
       <Form
         form={form}
         onFinish={handleSave}
-        wrapperCol={{ span: 18 }}
-        labelCol={{ span: 6 }}
+        // wrapperCol={{ span: 18 }}
+        // labelCol={{ span: 6 }}
       >
         <Form.Item
           label="待办名称"
@@ -152,11 +146,32 @@ export default function CreateModal({
             <Radio value={false}>否</Radio>
           </Radio.Group>
         </Form.Item>
-        {/* 是否显示切换入口 */}
+        <Form.Item noStyle shouldUpdate={(prev, cur) => prev.dock !== cur.dock}>
+          {({ getFieldValue }) => {
+            const dock = getFieldValue("dock") || false;
+            if (dock) {
+              return (
+                // 是否显示切换入口
+                <Form.Item
+                  label="显示切换入口"
+                  name="exShow"
+                  rules={[
+                    { required: true, message: "请选择是否显示切换入口" },
+                  ]}
+                >
+                  <Radio.Group>
+                    <Radio value>是</Radio>
+                    <Radio value={false}>否</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            } else return null;
+          }}
+        </Form.Item>
         <Form.Item
-          label="显示切换入口"
-          name="exShow"
-          rules={[{ required: true, message: "请选择是否显示切换入口" }]}
+          label="待办时效考核"
+          name="assess"
+          rules={[{ required: true, message: "请选择是否对接待办时效考核" }]}
         >
           <Radio.Group>
             <Radio value>是</Radio>
@@ -164,9 +179,9 @@ export default function CreateModal({
           </Radio.Group>
         </Form.Item>
         <Form.Item
-          label="待办时效考核"
-          name="assess"
-          rules={[{ required: true, message: "请选择是否对接待办时效考核" }]}
+          label="忽略未完成待办统计"
+          name="ignoreCount"
+          rules={[{ required: true, message: "请选择是否忽略未完成待办统计" }]}
         >
           <Radio.Group>
             <Radio value>是</Radio>
@@ -189,9 +204,7 @@ export default function CreateModal({
  
         <Form.Item
           noStyle
-          shouldUpdate={(pre, cur) =>
-            pre.dock !== cur.dock || pre.itemType !== cur.itemType
-          }
+          shouldUpdate={(pre, cur) => pre.dock !== cur.dock || pre.itemType !== cur.itemType}
         >
           {({ getFieldValue }) => {
             const dock = getFieldValue("dock");
@@ -218,11 +231,9 @@ export default function CreateModal({
  
         <Form.Item
           noStyle
-          shouldUpdate={(pre, cur) =>
-            pre.customTemp !== cur.customTemp ||
+          shouldUpdate={(pre, cur) => pre.customTemp !== cur.customTemp ||
             pre.dock !== cur.dock ||
-            pre.itemType !== cur.itemType
-          }
+            pre.itemType !== cur.itemType}
         >
           {({ getFieldValue }) => {
             const dock = getFieldValue("dock");
@@ -255,11 +266,9 @@ export default function CreateModal({
  
         <Form.Item
           noStyle
-          shouldUpdate={(pre, cur) =>
-            pre.dock !== cur.dock ||
+          shouldUpdate={(pre, cur) => pre.dock !== cur.dock ||
             pre.itemType !== cur.itemType ||
-            pre.customTemp !== cur.customTemp
-          }
+            pre.customTemp !== cur.customTemp}
         >
           {({ getFieldValue }) => {
             const dock = getFieldValue("dock");
@@ -337,9 +346,7 @@ export default function CreateModal({
  
         <Form.Item
           noStyle
-          shouldUpdate={(pre, cur) =>
-            pre.itemType !== cur.itemType || pre.customTemp !== cur.customTemp
-          }
+          shouldUpdate={(pre, cur) => pre.itemType !== cur.itemType || pre.customTemp !== cur.customTemp}
         >
           {({ getFieldValue }) => {
             const itemType = getFieldValue("itemType");