diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js
index 108ab73..7735c7b 100644
--- a/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js
+++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js
@@ -21,6 +21,7 @@ import commonConfig from "@/utils/config";
 import * as commonUtils from "@/utils/utils";
 import moment from "moment";
 import WorkOrderSystemService from "./WorkOrderSystemService";
+import WorkOrderSystemConfig from "./WorkOrderSystemConfig";
 
 let _dispatch, _props;
 const reducer = (state, action) => {
@@ -43,7 +44,7 @@ const reducer = (state, action) => {
 const WorkOrderSystemAdd = props => {
   const [state, dispatch] = useReducer(reducer, {
     sType: 4,
-    bBug: false,
+    sBug: '0',
     bVsersion: false
   });
   const { customerData, moduleData, userData, loading = false } = state;
@@ -53,24 +54,7 @@ const WorkOrderSystemAdd = props => {
   const [customerOption, setCustomerOption] = useState([]); // 【所属客户】下拉选项
   const [moduleOption, setModuleOption] = useState([]); // 【所属模块】下拉选项
   const [userOption, setUserOption] = useState([]); // 【处理人、抄送人】下拉选项
-  const priorityOption = [
-    {
-      label: "严重",
-      value: 1
-    },
-    {
-      label: "紧急",
-      value: 2
-    },
-    {
-      label: "一般",
-      value: 3
-    },
-    {
-      label: "优化",
-      value: 4
-    }
-  ];
+  const { priorityOption, sBugOption } = WorkOrderSystemConfig; // 各种固定下拉选项
 
   // 初始化加载数据
   useEffect(() => {
@@ -291,10 +275,13 @@ const WorkOrderSystemAdd = props => {
         </Form.Item>
         <Form.Item
           className={styles.formItemBug}
-          name="bBug"
-          valuePropName="checked"
+          name="sBug"
+          label="是否bug"
         >
-          <Switch checkedChildren="bug" unCheckedChildren="需求" />
+          <Select
+            options={sBugOption}
+            optionFilterProp="label"
+          />
         </Form.Item>
         <Form.Item name="sType" label="优先级">
           <Select
diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemConfig/index.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemConfig/index.js
index 361b3c2..474856e 100644
--- a/src/components/Common/WorkOrderSystem/WorkOrderSystemConfig/index.js
+++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemConfig/index.js
@@ -20,6 +20,23 @@ const priorityOption = [
   }
 ];
 
+// 是否bug下拉数据
+const sBugOption = [
+  // {
+  //   label: "",
+  //   value: ""
+  // },
+  {
+    label: "需求",
+    value: "0"
+  },
+  {
+    label: "BUG",
+    value: "1"
+  }
+];
+
 export default {
-  priorityOption
+  priorityOption,
+  sBugOption
 };
diff --git a/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js b/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js
index b2d49f9..c6a0459 100644
--- a/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js
+++ b/src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js
@@ -1,27 +1,7 @@
 /* eslint-disable */
-import React, { useEffect, useState, useRef } from "react";
-import {
-  Button,
-  Form,
-  Space,
-  Upload,
-  Select,
-  Switch,
-  message,
-  DatePicker,
-  Modal,
-  Spin,
-  Input,
-  Image
-} from "antd-v4";
-import {
-  CheckOutlined,
-  CloseCircleOutlined,
-  EditOutlined,
-  SendOutlined,
-  SaveOutlined,
-  MinusOutlined
-} from "@ant-design/icons";
+import { useEffect, useState, useRef } from "react";
+import { Button, Form, Space, Upload, Select, Switch, message, DatePicker, Modal, Spin, Input, Image, InputNumber } from "antd-v4";
+import { CheckOutlined, CloseCircleOutlined, EditOutlined, SendOutlined, SaveOutlined, MinusOutlined, ThunderboltOutlined } from "@ant-design/icons";
 import BackIcon from "@/assets/back.svg";
 import CopyAllIcon from "@/assets/copyallWhite.svg";
 import moment from "moment";
@@ -39,12 +19,7 @@ import WorkOrderSystemConfig from "./WorkOrderSystemConfig";
 const WorkOrderSystemDetail = props => {
   const [loading, setLoading] = useState(false);
   // 详情弹窗id
-  const { current: detailModalId } = useRef(
-    "detailModalId_" +
-      Math.random()
-        .toString(36)
-        .substring(2)
-  );
+  const { current: detailModalId } = useRef("detailModalId_" + Math.random().toString(36).substring(2));
 
   // 最小化状态
   const [bMin, setBMin] = useState(false);
@@ -77,21 +52,22 @@ const WorkOrderSystemDetail = props => {
     sHanldeId,
     sCopyHanldeId,
     bVsersion,
-    bBug,
+    sBug,
     sType,
     tDevHandleDate,
     tHandleDate,
-    sStatus
+    sStatus,
   } = detailData;
 
   const [customerOption, setCustomerOption] = useState([]); // 【所属客户】下拉选项
   const [moduleOption, setModuleOption] = useState([]); // 【所属模块】下拉选项
   const [userOption, setUserOption] = useState([]); // 【处理人、抄送人】下拉选项
-  const { priorityOption } = WorkOrderSystemConfig; // 【优先级】下拉选项
+  const { priorityOption, sBugOption } = WorkOrderSystemConfig; // 各种固定下拉选项
   const [replyModalVisible, setReplyModalVisible] = useState(false); // 回复弹窗状态
   const [assignmentModalVisible, setAssignmentModalVisible] = useState(false); // 指派弹窗状态
   const [resolutionModalVisible, setResolutionModalVisible] = useState(false); // 解决弹窗状态
   const enabled = !["已关闭"].includes(sStatus); // 是否可操作
+  const [bSoluted, setSolutedState] = useState(false); // 是否已解决状态
 
   // 富文本看点击图片事件
   const [imageVisible, setImageVisible] = useState(false);
@@ -113,228 +89,235 @@ const WorkOrderSystemDetail = props => {
     };
   }, []);
 
+  // 判断是否已解决
+  useEffect(() => {
+    let result = ["已解决"].includes(sStatus);
+    if (!result) {
+      // 如果状态不是已解决，查看历史记录中最后一个非已指派的是否是已解决
+      replyData.forEach(item => {
+        const { sResult } = item;
+        if (sResult === "已解决") {
+          result = true;
+        } else if (sResult === "已激活") {
+          result = false;
+        }
+      });
+    }
+    setSolutedState(result);
+  }, [detailData]);
+
   // 显示的按钮
   const [btnShowData, setBtnShowData] = useState([]);
   // 过滤掉没有权限的按钮
-  useEffect(
-    () => {
-      if (!enabled) {
-        setBtnShowData([]);
-        return;
-      }
-      const defaultBtnData = [
-        "BtnReplyd",
-        "BtnEdit",
-        "BtnAssign",
-        "BtnSolve",
-        "BtnClose"
-      ];
-      if (gdsjurisdiction) {
-        gdsjurisdiction.forEach(child => {
-          const index = defaultBtnData.findIndex(
-            item => item === child.sAction
-          );
-          if (index > -1) {
-            defaultBtnData.splice(index, 1);
-          }
-        });
-      }
-      setBtnShowData(defaultBtnData);
-    },
-    [gdsjurisdiction, enabled]
-  );
+  useEffect(() => {
+    let defaultBtnData = ["BtnReplyd", "BtnEdit", "BtnAssign", "BtnSolve", "BtnClose"];
+    if (!enabled) {
+      setBtnShowData([]);
+      return;
+    } else if (bSoluted) {
+      defaultBtnData = ["BtnAssign", "BtnActive", "BtnClose"];
+    }
+    // if (gdsjurisdiction) {
+    //   gdsjurisdiction.forEach(child => {
+    //     const index = defaultBtnData.findIndex(item => item === child.sAction);
+    //     if (index > -1) {
+    //       defaultBtnData.splice(index, 1);
+    //     }
+    //   });
+    // }
+    setBtnShowData(defaultBtnData);
+  }, [gdsjurisdiction, enabled, bSoluted]);
 
   // 指派/解决
   const addReplyHanle = async values => {
+    if (values.sContentMemo === "<p></p>") {
+      delete values.sContentMemo;
+    }
     const response = await WorkOrderSystemService.addReplyHanle({
       ...values,
       sId,
-      sMakePerson
+      sMakePerson,
     });
     setLoading(false);
     if (commonUtils.isNotEmptyObject(response)) {
       refreshSlaveTable();
-      props.onSaveState({
-        workOrderSystemDetailModalVisible: false
-      });
+      if (["已激活"].includes(values.sResult)) {
+        refresh();
+      } else {
+        props.onSaveState({
+          workOrderSystemDetailModalVisible: false,
+        });
+      }
     }
   };
 
   // 初始化加载数据
-  useEffect(
-    async () => {
+  useEffect(() => {
+    const handleDetailData = async () => {
       setDetailData(await WorkOrderSystemService.getDetailData({ sId }));
       setCustomerOption(
         (await WorkOrderSystemService.getsCustomerData()).map(item => ({
           label: item.sCustomerName,
           value: item.sCustomerId || item.sId,
-          item
+          item,
         }))
       );
       setModuleOption(
         (await WorkOrderSystemService.getsModuleData()).map(item => ({
           label: item.sModuleName,
           value: item.sModuleId,
-          item
+          item,
         }))
       );
       setUserOption(
         (await WorkOrderSystemService.getUserData()).map(item => ({
           label: item.sHanldeName,
           value: item.sHanldeId,
-          item
+          item,
         }))
       );
-    },
-    [refresher]
-  );
+    };
 
-  // detailData变化时，给表单赋值
-  useEffect(
-    () => {
-      if (
-        commonUtils.isNotEmptyArr(detailData) &&
-        commonUtils.isNotEmptyArr(customerOption) &&
-        commonUtils.isNotEmptyArr(moduleOption)
-      ) {
-        const temp = {};
-        replyData.forEach((item, index) => {
-          const {
-            tCreateDate,
-            sMakePerson: sMakePersonTemp,
-            sResult,
-            sContentMemo: sContentMemoTemp,
-            sAssignedBy
-          } = item;
-          temp[`reply${index}`] = (
-            <span>
-              {index + 1}.{tCreateDate} <span>由</span>{" "}
-              <strong>{sMakePersonTemp}</strong> {sResult.replace("已", "")}
-              {sAssignedBy ? (
-                <>
-                  <span>给 </span>
-                  <strong>{sAssignedBy}</strong>
-                </>
-              ) : (
-                ""
-              )}
-            </span>
-          );
-          if (sContentMemoTemp) {
-            temp[`replyContentMemo${index}`] = BraftEditor.createEditorState(
-              sContentMemoTemp
-            );
-          }
-        });
+    handleDetailData();
+  }, [refresher]);
 
-        const addState = {};
-        if (sCustomerId) {
-          if (customerOption.find(item => item.value === sCustomerId)) {
-            addState.sCustomerId = sCustomerId;
-          } else {
-            setCustomerOption(prevState => [
-              ...prevState,
-              {
-                value: sCustomerId,
-                label: sCustomerName,
-                item: {
-                  sCustomerId,
-                  sCustomerName
-                }
+  // detailData变化时，给表单赋值
+  useEffect(() => {
+    if (commonUtils.isNotEmptyArr(detailData) && commonUtils.isNotEmptyArr(customerOption) && commonUtils.isNotEmptyArr(moduleOption)) {
+      const temp = {};
+      replyData.forEach((item, index) => {
+        const { tCreateDate, sMakePerson: sMakePersonTemp, sResult, sContentMemo: sContentMemoTemp, sAssignedBy } = item;
+        temp[`reply${index}`] = (
+          <span>
+            {index + 1}.{tCreateDate} <span>由</span> <strong>{sMakePersonTemp}</strong> {sResult.replace("已", "")}
+            {[""].map(() => {
+              if (!sAssignedBy) {
+                return "";
+              } else if (sAssignedBy && sResult.includes("解决") && sMakePersonTemp === sAssignedBy) {
+                return "";
+              } else if (sAssignedBy && sResult.includes("解决")) {
+                return (
+                  <>
+                    <span>并指派给 </span>
+                    <strong>{sAssignedBy}</strong>
+                  </>
+                );
+              } else {
+                return (
+                  <>
+                    <span>给 </span>
+                    <strong>{sAssignedBy}</strong>
+                  </>
+                );
               }
-            ]);
-          }
+            })}
+          </span>
+        );
+        if (sContentMemoTemp) {
+          temp[`replyContentMemo${index}`] = BraftEditor.createEditorState(sContentMemoTemp);
         }
+      });
 
-        if (sModuleId) {
-          if (moduleOption.find(item => item.value === sModuleId)) {
-            addState.sModuleId = sModuleId;
-          } else {
-            setModuleOption(prevState => [
-              ...prevState,
-              {
-                value: sModuleId,
-                label: sModuleName,
-                item: {
-                  sModuleId,
-                  sModuleName
-                }
-              }
-            ]);
-          }
+      const addState = {};
+      if (sCustomerId) {
+        if (customerOption.find(item => item.value === sCustomerId)) {
+          addState.sCustomerId = sCustomerId;
+        } else {
+          setCustomerOption(prevState => [
+            ...prevState,
+            {
+              value: sCustomerId,
+              label: sCustomerName,
+              item: {
+                sCustomerId,
+                sCustomerName,
+              },
+            },
+          ]);
         }
+      }
 
-        form.setFieldsValue({
-          sTitle,
-          sContentMemo: BraftEditor.createEditorState(sContentMemo),
-          ...addState,
-          sHanldeId,
-          sCopyHanldeId: sCopyHanldeId ? sCopyHanldeId.split(",") : [],
-          bVsersion,
-          bBug,
-          sType: sType !== undefined ? parseInt(sType) : "",
-          tDevHandleDate: tDevHandleDate ? moment(tDevHandleDate) : "",
-          tHandleDate: tHandleDate ? moment(tHandleDate) : "",
-          ...temp
-        });
-        forceUpdate();
+      if (sModuleId) {
+        if (moduleOption.find(item => item.value === sModuleId)) {
+          addState.sModuleId = sModuleId;
+        } else {
+          setModuleOption(prevState => [
+            ...prevState,
+            {
+              value: sModuleId,
+              label: sModuleName,
+              item: {
+                sModuleId,
+                sModuleName,
+              },
+            },
+          ]);
+        }
       }
-    },
-    [detailData, customerOption, moduleOption]
-  );
+
+      form.setFieldsValue({
+        sTitle,
+        sContentMemo: BraftEditor.createEditorState(sContentMemo),
+        ...addState,
+        sHanldeId,
+        sCopyHanldeId: sCopyHanldeId ? sCopyHanldeId.split(",") : [],
+        bVsersion,
+        sBug,
+        sType: sType !== undefined ? parseInt(sType) : "",
+        tDevHandleDate: tDevHandleDate ? moment(tDevHandleDate) : "",
+        tHandleDate: tHandleDate ? moment(tHandleDate) : "",
+        ...temp,
+      });
+      forceUpdate();
+    }
+  }, [detailData, customerOption, moduleOption]);
 
   const [fileList, setFileList] = useState([]); // 附件列表
   const [fileAdd, setFileAdd] = useState([]); // 新增附件
 
   // fileData变化时，给附件列表赋值
-  useEffect(
-    () => {
-      setFileList(
-        [...fileData].map(item => {
+  useEffect(() => {
+    setFileList(
+      [...fileData].map(item => {
+        const { sId: uid, sPictureName: name, sPicturePath } = item;
+        return {
+          uid,
+          name,
+          url: `${commonConfig.feedback_host}file/download?savePathStr=${sPicturePath}&sModelsId=100`,
+          status: "done",
+          item,
+        };
+      })
+    );
+  }, [fileData]);
+
+  // fileAdd变化时，调用新增附件接口
+  useEffect(() => {
+    if (!fileAdd.length) return;
+
+    const handleFileAdd = async () => {
+      setFileAdd([]);
+      const _fileData = await WorkOrderSystemService.uploadAdd(fileAdd, {
+        sId,
+        sMakePerson,
+      });
+      setFileList([
+        ...fileList,
+        ..._fileData.map(item => {
           const { sId: uid, sPictureName: name, sPicturePath } = item;
           return {
             uid,
             name,
-            url: `${
-              commonConfig.feedback_host
-            }file/download?savePathStr=${sPicturePath}&sModelsId=100`,
+            url: `${commonConfig.feedback_host}file/download?savePathStr=${sPicturePath}&sModelsId=100`,
             status: "done",
-            item
+            item,
           };
-        })
-      );
-    },
-    [fileData]
-  );
+        }),
+      ]);
+    };
 
-  // fileAdd变化时，调用新增附件接口
-  useEffect(
-    async () => {
-      if (fileAdd.length) {
-        setFileAdd([]);
-        const _fileData = await WorkOrderSystemService.uploadAdd(fileAdd, {
-          sId,
-          sMakePerson
-        });
-        setFileList([
-          ...fileList,
-          ..._fileData.map(item => {
-            const { sId: uid, sPictureName: name, sPicturePath } = item;
-            return {
-              uid,
-              name,
-              url: `${
-                commonConfig.feedback_host
-              }file/download?savePathStr=${sPicturePath}&sModelsId=100`,
-              status: "done",
-              item
-            };
-          })
-        ]);
-      }
-    },
-    [fileAdd]
-  );
+    handleFileAdd();
+  }, [fileAdd]);
 
   // 附件props
   const uploadProps = {
@@ -354,9 +337,9 @@ const WorkOrderSystemDetail = props => {
             setFileList(fileList.filter(item => item.uid !== file.uid));
             message.success("附件删除成功");
           });
-        }
+        },
       });
-    }
+    },
   };
 
   // 回复props
@@ -368,7 +351,7 @@ const WorkOrderSystemDetail = props => {
     setReplyModalVisible,
     refresh,
     bMin,
-    setBMin
+    setBMin,
   };
 
   // 指派props
@@ -383,14 +366,10 @@ const WorkOrderSystemDetail = props => {
     onFinish: values => {
       setLoading(true);
       setAssignmentModalVisible(false);
-      const { value, label } = userOption.find(
-        item => item.value === values.sHanldeId
-      );
+      const { value, label } = userOption.find(item => item.value === values.sHanldeId);
 
       const copyDataAdd = {};
-      const copyData = userOption.filter(item =>
-        values.sCopyHanldeId.includes(item.value)
-      );
+      const copyData = userOption.filter(item => values.sCopyHanldeId.includes(item.value));
 
       if (commonUtils.isNotEmptyArr(copyData)) {
         copyDataAdd.sCopyFor = copyData.map(item => item.label).toString();
@@ -401,12 +380,10 @@ const WorkOrderSystemDetail = props => {
         sAssignedBy: label,
         sAssignedById: value,
         ...copyDataAdd,
-        sContentMemo: values.sContentMemo
-          ? values.sContentMemo.toHTML()
-          : "<p></p>",
-        sResult: "已指派"
+        sContentMemo: values.sContentMemo ? values.sContentMemo.toHTML() : "<p></p>",
+        sResult: "已指派",
       });
-    }
+    },
   };
 
   // 解决props
@@ -420,38 +397,41 @@ const WorkOrderSystemDetail = props => {
     bMin,
     setBMin,
     onFinish: values => {
+      setLoading(true);
       setResolutionModalVisible(false);
+      const { value, label } = userOption.find(item => item.value === values.sHanldeId);
+
+      const copyDataAdd = {};
+      const copyData = userOption.filter(item => values.sCopyHanldeId.includes(item.value));
+
+      if (commonUtils.isNotEmptyArr(copyData)) {
+        copyDataAdd.sCopyFor = copyData.map(item => item.label).toString();
+        copyDataAdd.sCopyForId = copyData.map(item => item.value).toString();
+      }
+
       addReplyHanle({
-        sContentMemo: values.sContentMemo
-          ? values.sContentMemo.toHTML()
-          : "<p></p>",
-        sResult: "已解决"
+        sAssignedBy: label,
+        sAssignedById: value,
+        dSolveHourSj: values.dSolveHourSj,
+        ...copyDataAdd,
+        sContentMemo: values.sContentMemo ? values.sContentMemo.toHTML() : "<p></p>",
+        sResult: "已解决",
       });
-    }
+    },
   };
 
   // 图片弹窗props
   const imageModalProps = {
     imageSrc,
     imageVisible,
-    setImageVisible
+    setImageVisible,
   };
 
   // 修改后保存
   const onFinish = async values => {
     setLoading(true);
-    const {
-      sContentMemo,
-      sCustomerId,
-      sModuleId,
-      sHanldeId,
-      sCopyHanldeId,
-      bVsersion,
-      bBug,
-      sType,
-      tDevHandleDate,
-      tHandleDate
-    } = values;
+    const { sContentMemo, sCustomerId, sModuleId, sHanldeId, sCopyHanldeId, bVsersion, sBug, sType, tDevHandleDate, tHandleDate, dSolveHour } =
+      values;
 
     const response = await WorkOrderSystemService.detailUpdate({
       sId,
@@ -467,18 +447,21 @@ const WorkOrderSystemDetail = props => {
         .map(item => item.label)
         .toString(),
       bVsersion,
-      bBug,
+      sBug,
       sType,
-      tDevHandleDate: tDevHandleDate
-        ? moment(tDevHandleDate).format("YYYY-MM-DD")
-        : undefined,
-      tHandleDate: tDevHandleDate
-        ? moment(tHandleDate).format("YYYY-MM-DD")
-        : undefined,
-      sStatus: "已修改"
+      tDevHandleDate: tDevHandleDate ? moment(tDevHandleDate).format("YYYY-MM-DD") : undefined,
+      tHandleDate: tDevHandleDate ? moment(tHandleDate).format("YYYY-MM-DD") : undefined,
+      dSolveHour,
+      sStatus: "已修改",
     });
 
     setLoading(false);
+
+    if (values.callback) {
+      values.callback();
+      return;
+    }
+
     if (commonUtils.isNotEmptyObject(response)) {
       setFormEnabled(false);
       refresh();
@@ -492,20 +475,20 @@ const WorkOrderSystemDetail = props => {
         form={form}
         onFinish={onFinish}
         labelCol={{
-          span: 3
+          span: 3,
         }}
         wrapperCol={{
-          span: 21
+          span: 21,
         }}
         className={`${styles.workOrderSystemDetail} ${detailModalId}`}
       >
         <Form.Item
           name="sTitle"
           labelCol={{
-            span: 0
+            span: 0,
           }}
           wrapperCol={{
-            span: 24
+            span: 24,
           }}
         >
           <Input.TextArea
@@ -516,32 +499,23 @@ const WorkOrderSystemDetail = props => {
               fontSize: 16,
               fontWeight: "bold",
               resize: "none",
-              color: "#000"
+              color: "#000",
             }}
           />
         </Form.Item>
         <Form.Item
           name="sContentMemo"
           labelCol={{
-            span: 0
+            span: 0,
           }}
           wrapperCol={{
-            span: 24
+            span: 24,
           }}
         >
-          <BraftEditor
-            className={styles.braftEditorReadOnly}
-            readOnly={true}
-            controls={[]}
-          />
+          <BraftEditor className={styles.braftEditorReadOnly} readOnly={true} controls={[]} />
         </Form.Item>
 
-        <Form.Item
-          className={styles.formItemHalf}
-          name="sCustomerId"
-          label="所属客户"
-          rules={[{ required: formEnabled }]}
-        >
+        <Form.Item className={styles.formItemHalf} name="sCustomerId" label="所属客户" rules={[{ required: formEnabled }]}>
           <Select
             allowClear
             showSearch={true}
@@ -551,12 +525,7 @@ const WorkOrderSystemDetail = props => {
             disabled={!formEnabled}
           />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemHalf}
-          name="sModuleId"
-          label="所属模块"
-          rules={[{ required: formEnabled }]}
-        >
+        <Form.Item className={styles.formItemHalf} name="sModuleId" label="所属模块" rules={[{ required: formEnabled }]}>
           <Select
             mode={formEnabled ? "tags" : ""}
             showSearch={true}
@@ -571,26 +540,10 @@ const WorkOrderSystemDetail = props => {
             }}
           />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemHalf}
-          name="sHanldeId"
-          label="处理人"
-          rules={[{ required: formEnabled }]}
-        >
-          <Select
-            allowClear
-            showSearch={true}
-            options={userOption}
-            optionFilterProp="label"
-            placeholder="请选择处理人"
-            disabled={!formEnabled}
-          />
+        <Form.Item className={styles.formItemHalf} name="sHanldeId" label="处理人" rules={[{ required: formEnabled }]}>
+          <Select allowClear showSearch={true} options={userOption} optionFilterProp="label" placeholder="请选择处理人" disabled={!formEnabled} />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemHalf}
-          name="sCopyHanldeId"
-          label="抄送人"
-        >
+        <Form.Item className={styles.formItemHalf} name="sCopyHanldeId" label="抄送人">
           <Select
             allowClear
             showSearch={true}
@@ -601,34 +554,13 @@ const WorkOrderSystemDetail = props => {
             disabled={!formEnabled}
           />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemAQuarter}
-          name="bVsersion"
-          label="标版同样问题"
-          valuePropName="checked"
-        >
-          <Switch
-            checkedChildren="是"
-            unCheckedChildren="否"
-            disabled={!formEnabled}
-          />
+        <Form.Item className={styles.formItemAQuarter} name="bVsersion" label="标版同样问题" valuePropName="checked">
+          <Switch checkedChildren="是" unCheckedChildren="否" disabled={!formEnabled} />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemBug}
-          name="bBug"
-          valuePropName="checked"
-        >
-          <Switch
-            checkedChildren="bug"
-            unCheckedChildren="需求"
-            disabled={!formEnabled}
-          />
+        <Form.Item className={styles.formItemBug} name="sBug" label="是否bug">
+          <Select options={sBugOption} optionFilterProp="label" disabled={!formEnabled} />
         </Form.Item>
-        <Form.Item
-          className={styles.formItemAQuarter}
-          name="sType"
-          label="优先级"
-        >
+        <Form.Item className={styles.formItemAQuarter} name="sType" label="优先级">
           <Select
             className={styles.sTypeSelect}
             popupClassName={styles.sTypedDropdown}
@@ -645,25 +577,16 @@ const WorkOrderSystemDetail = props => {
             {
               validator: (_, chooseDate) => {
                 const tHandleDate = form.getFieldValue().tHandleDate;
-                if (
-                  chooseDate &&
-                  tHandleDate &&
-                  chooseDate.isAfter(tHandleDate)
-                ) {
-                  return Promise.reject(
-                    new Error("【开发截止日期】不能晚于【截止日期】")
-                  );
+                if (chooseDate && tHandleDate && chooseDate.isAfter(tHandleDate)) {
+                  return Promise.reject(new Error("【开发截止日期】不能晚于【截止日期】"));
                 } else {
                   return Promise.resolve();
                 }
-              }
-            }
+              },
+            },
           ]}
         >
-          <DatePicker
-            placeholder={formEnabled ? "请选择开发截止日期" : ""}
-            disabled={!formEnabled}
-          />
+          <DatePicker placeholder={formEnabled ? "请选择开发截止日期" : ""} disabled={!formEnabled} />
         </Form.Item>
         <Form.Item
           className={styles.formItemAQuarter1}
@@ -673,25 +596,16 @@ const WorkOrderSystemDetail = props => {
             {
               validator: (_, chooseDate) => {
                 const tDevHandleDate = form.getFieldValue().tDevHandleDate;
-                if (
-                  chooseDate &&
-                  tDevHandleDate &&
-                  chooseDate.isBefore(tDevHandleDate)
-                ) {
-                  return Promise.reject(
-                    new Error("【截止日期】不能早于【开发截止日期】")
-                  );
+                if (chooseDate && tDevHandleDate && chooseDate.isBefore(tDevHandleDate)) {
+                  return Promise.reject(new Error("【截止日期】不能早于【开发截止日期】"));
                 } else {
                   return Promise.resolve();
                 }
-              }
-            }
+              },
+            },
           ]}
         >
-          <DatePicker
-            placeholder={formEnabled ? "请选择截止日期" : ""}
-            disabled={!formEnabled}
-          />
+          <DatePicker placeholder={formEnabled ? "请选择截止日期" : ""} disabled={!formEnabled} />
         </Form.Item>
         <div className={styles.replyDiv}>
           <div className={styles.replyTitle}>历史记录</div>
@@ -708,11 +622,7 @@ const WorkOrderSystemDetail = props => {
                   </Form.Item>
                   {sContentMemoTemp ? (
                     <Form.Item name={itemName1}>
-                      <BraftEditor
-                        className={styles.detailBraftEditorReply}
-                        readOnly={true}
-                        controls={[]}
-                      />
+                      <BraftEditor className={styles.detailBraftEditorReply} readOnly={true} controls={[]} />
                     </Form.Item>
                   ) : (
                     ""
@@ -723,9 +633,7 @@ const WorkOrderSystemDetail = props => {
           })}
         </div>
         <Form.Item name="fileData" label="附件" className={styles.annex}>
-          <Upload {...uploadProps}>
-            {btnShowData.includes("BtnEdit") && <a>添加附件</a>}
-          </Upload>
+          <Upload {...uploadProps}>{btnShowData.includes("BtnEdit") && <a>添加附件</a>}</Upload>
         </Form.Item>
         <Form.Item />
 
@@ -739,41 +647,39 @@ const WorkOrderSystemDetail = props => {
                 style={{ background: "#838A9D", borderColor: "#838A9D" }}
                 onClick={() => {
                   props.onSaveState({
-                    workOrderSystemDetailModalVisible: false
+                    workOrderSystemDetailModalVisible: false,
                   });
                 }}
               >
                 返回
               </Button>
             )}
-            {!formEnabled &&
-              btnShowData.includes("BtnReplyd") && (
-                <Button
-                  type="primary"
-                  icon={<img src={CopyAllIcon} />}
-                  className={styles.iconBtn}
-                  style={{ background: "#ff822d", borderColor: "#ff822d" }}
-                  onClick={() => {
-                    setReplyModalVisible(true);
-                  }}
-                >
-                  回复
-                </Button>
-              )}
-            {!formEnabled &&
-              btnShowData.includes("BtnEdit") && (
-                <Button
-                  type="primary"
-                  icon={<EditOutlined />}
-                  className={styles.iconBtn}
-                  onClick={() => {
-                    setFormEnabled(true);
-                    document.querySelector(`.${detailModalId}`).scrollTop = 0;
-                  }}
-                >
-                  修改
-                </Button>
-              )}
+            {!formEnabled && btnShowData.includes("BtnReplyd") && (
+              <Button
+                type="primary"
+                icon={<img src={CopyAllIcon} />}
+                className={styles.iconBtn}
+                style={{ background: "#ff822d", borderColor: "#ff822d" }}
+                onClick={() => {
+                  setReplyModalVisible(true);
+                }}
+              >
+                回复
+              </Button>
+            )}
+            {!formEnabled && btnShowData.includes("BtnEdit") && (
+              <Button
+                type="primary"
+                icon={<EditOutlined />}
+                className={styles.iconBtn}
+                onClick={() => {
+                  setFormEnabled(true);
+                  document.querySelector(`.${detailModalId}`).scrollTop = 0;
+                }}
+              >
+                修改
+              </Button>
+            )}
             {formEnabled && (
               <Button
                 type="primary"
@@ -798,64 +704,75 @@ const WorkOrderSystemDetail = props => {
                 取消
               </Button>
             )}
-            {!formEnabled &&
-              btnShowData.includes("BtnAssign") && (
-                <Button
-                  type="primary"
-                  icon={<SendOutlined />}
-                  className={styles.iconBtn}
-                  onClick={() => {
-                    setAssignmentModalVisible(true);
-                  }}
-                >
-                  指派
-                </Button>
-              )}
-            {!formEnabled &&
-              btnShowData.includes("BtnSolve") && (
-                <Button
-                  type="primary"
-                  icon={<CheckOutlined />}
-                  className={styles.iconBtn}
-                  onClick={() => {
-                    setResolutionModalVisible(true);
-                  }}
-                >
-                  解决
-                </Button>
-              )}
-            {!formEnabled &&
-              btnShowData.includes("BtnClose") && (
-                <Button
-                  type="primary"
-                  icon={<CloseCircleOutlined />}
-                  className={styles.iconBtn}
-                  onClick={() => {
-                    Modal.confirm({
-                      title: "确认关闭工单",
-                      onOk() {
-                        const evaluate = async () => {
-                          const result = await WorkOrderSystemService.evaluate({
-                            dEvaluate: 5,
-                            sId,
-                            sMakePerson
+            {!formEnabled && btnShowData.includes("BtnAssign") && (
+              <Button
+                type="primary"
+                icon={<SendOutlined />}
+                className={styles.iconBtn}
+                onClick={() => {
+                  setAssignmentModalVisible(true);
+                }}
+              >
+                指派
+              </Button>
+            )}
+            {!formEnabled && btnShowData.includes("BtnSolve") && (
+              <Button
+                type="primary"
+                icon={<CheckOutlined />}
+                className={styles.iconBtn}
+                onClick={() => {
+                  setResolutionModalVisible(true);
+                }}
+              >
+                解决
+              </Button>
+            )}
+            {!formEnabled && btnShowData.includes("BtnActive") && (
+              <Button
+                type="primary"
+                icon={<ThunderboltOutlined />}
+                className={styles.iconBtn}
+                onClick={() => {
+                  addReplyHanle({
+                    sResult: "已激活",
+                  });
+                }}
+              >
+                激活
+              </Button>
+            )}
+            {!formEnabled && btnShowData.includes("BtnClose") && (
+              <Button
+                type="primary"
+                icon={<CloseCircleOutlined />}
+                className={styles.iconBtn}
+                onClick={() => {
+                  Modal.confirm({
+                    title: "确认关闭工单",
+                    onOk() {
+                      const evaluate = async () => {
+                        const result = await WorkOrderSystemService.evaluate({
+                          dEvaluate: 5,
+                          sId,
+                          sMakePerson,
+                        });
+
+                        if (result) {
+                          refreshSlaveTable();
+                          props.onSaveState({
+                            workOrderSystemDetailModalVisible: false,
                           });
-
-                          if (result) {
-                            refreshSlaveTable();
-                            props.onSaveState({
-                              workOrderSystemDetailModalVisible: false
-                            });
-                          }
-                        };
-                        evaluate();
-                      }
-                    });
-                  }}
-                >
-                  关闭工单
-                </Button>
-              )}
+                        }
+                      };
+                      evaluate();
+                    },
+                  });
+                }}
+              >
+                关闭工单
+              </Button>
+            )}
           </Space>
         </Form.Item>
       </Form>
@@ -869,15 +786,7 @@ const WorkOrderSystemDetail = props => {
 
 // 回复弹窗
 const ReplyModal = props => {
-  const {
-    replyModalVisible,
-    detailData,
-    detailModalId,
-    setReplyModalVisible,
-    refresh,
-    bMin,
-    setBMin
-  } = props;
+  const { replyModalVisible, detailData, detailModalId, setReplyModalVisible, refresh, bMin, setBMin } = props;
   const { sId, sTitle } = detailData;
   const [loading, setLoading] = useState(false);
 
@@ -896,7 +805,7 @@ const ReplyModal = props => {
       sMakePerson,
       sLoginId,
       sId,
-      status: "回复"
+      status: "回复",
     });
     setLoading(false);
     if (commonUtils.isNotEmptyArr(returnData)) {
@@ -924,7 +833,7 @@ const ReplyModal = props => {
                 position: "absolute",
                 right: 30,
                 top: 6,
-                color: "#4a495f"
+                color: "#4a495f",
               }}
               onClick={() => {
                 props.onSaveState({ bMin: true }, () => {
@@ -957,15 +866,15 @@ const ReplyModal = props => {
                     } else {
                       return Promise.resolve();
                     }
-                  }
-                }
+                  },
+                },
               ]}
             >
               <BraftEditor
                 className={styles.replyBraftEditor}
                 readOnly={false}
                 media={{
-                  uploadFn: WorkOrderSystemService.uploadFn
+                  uploadFn: WorkOrderSystemService.uploadFn,
                 }}
               />
             </Form.Item>
@@ -986,19 +895,10 @@ const ReplyModal = props => {
 
 // 指派弹窗
 const AssignmentModal = props => {
-  const {
-    visible,
-    userOption,
-    detailData,
-    onFinish,
-    setVisible,
-    bResolution,
-    setBMin,
-    bMin
-  } = props;
+  const { visible, userOption, detailData, onFinish, setVisible, bResolution, setBMin, bMin } = props;
   const { sTitle, sCopyHanldeId } = detailData;
   const initialValues = {
-    sCopyHanldeId: sCopyHanldeId ? sCopyHanldeId.split(",") : []
+    sCopyHanldeId: sCopyHanldeId ? sCopyHanldeId.split(",") : [],
   };
 
   const closeModal = () => {
@@ -1017,7 +917,7 @@ const AssignmentModal = props => {
                 position: "absolute",
                 right: 30,
                 top: 6,
-                color: "#4a495f"
+                color: "#4a495f",
               }}
               onClick={() => {
                 props.onSaveState({ bMin: true }, () => {
@@ -1040,45 +940,31 @@ const AssignmentModal = props => {
           initialValues={initialValues}
           onFinish={onFinish}
           labelCol={{
-            span: 2
+            span: 2,
           }}
           wrapperCol={{
-            span: 22
+            span: 22,
           }}
         >
-          {!bResolution && (
-            <>
-              <Form.Item
-                name="sHanldeId"
-                label="指派人"
-                rules={[{ required: true }]}
-              >
-                <Select
-                  allowClear
-                  showSearch={true}
-                  options={userOption}
-                  optionFilterProp="label"
-                  placeholder="请选择指派人"
-                />
-              </Form.Item>
-              <Form.Item name="sCopyHanldeId" label="抄送人">
-                <Select
-                  allowClear
-                  mode="multiple"
-                  showSearch={true}
-                  options={userOption}
-                  optionFilterProp="label"
-                  placeholder="请选择抄送人"
-                />
-              </Form.Item>
-            </>
+          <Form.Item name="sHanldeId" label="指派人" rules={[{ required: true }]}>
+            <Select allowClear showSearch={true} options={userOption} optionFilterProp="label" placeholder="请选择指派人" />
+          </Form.Item>
+          <Form.Item name="sCopyHanldeId" label="抄送人">
+            <Select allowClear mode="multiple" showSearch={true} options={userOption} optionFilterProp="label" placeholder="请选择抄送人" />
+          </Form.Item>
+          {bResolution ? (
+            <Form.Item name="dSolveHour" label="研发时间" rules={[{ required: true }]}>
+              <InputNumber addonAfter="小时" style={{ width: 200 }} />
+            </Form.Item>
+          ) : (
+            ""
           )}
           <Form.Item name="sContentMemo" label="备注">
             <BraftEditor
               className={styles.replyBraftEditor}
               readOnly={false}
               media={{
-                uploadFn: WorkOrderSystemService.uploadFn
+                uploadFn: WorkOrderSystemService.uploadFn,
               }}
             />
           </Form.Item>
@@ -1108,7 +994,7 @@ const ImageModal = ({ imageSrc, imageVisible, setImageVisible }) => {
         src: imageSrc,
         onVisibleChange: () => {
           setImageVisible(false);
-        }
+        },
       }}
     />
   );
diff --git a/src/components/Common/WorkOrderSystem/index.less b/src/components/Common/WorkOrderSystem/index.less
index 2da5031..3728316 100644
--- a/src/components/Common/WorkOrderSystem/index.less
+++ b/src/components/Common/WorkOrderSystem/index.less
@@ -206,18 +206,18 @@
   }
 
   .formItemAQuarter {
-    width: 20%;
+    width: 18%;
 
     :global {
       .ant-form-item-label {
         align-items: center;
-        flex: 0 0 50%;
-        max-width: 50%;
+        flex: 0 0 60%;
+        max-width: 60%;
       }
 
       .ant-form-item-control {
-        flex: 0 0 50%;
-        max-width: 50%;
+        flex: 0 0 40%;
+        max-width: 40%;
       }
     }
   }
@@ -240,27 +240,27 @@
   }
 
   .formItemBug {
-    width: 10%;
+    width: 14%;
 
     :global {
       .ant-form-item-label {
         align-items: center;
-        flex: 0 0 0;
-        max-width: 0;
+        flex: 0 0 55%;
+        max-width: 55%;
       }
 
       .ant-form-item-control {
-        flex: 0 0 100%;
-        max-width: 100%;
+        flex: 0 0 45%;
+        max-width: 45%;
       }
 
-      .ant-switch {
-        background: @level-color-3;
-      }
+    //   .ant-switch {
+    //     background: @level-color-3;
+    //   }
 
-      .ant-switch-checked {
-        background: @level-color-1;
-      }
+    //   .ant-switch-checked {
+    //     background: @level-color-1;
+    //   }
     }
   }
 }
@@ -350,17 +350,17 @@
 
     .ant-form-item:nth-child(6),
     .ant-form-item:nth-child(8) {
-      width: 20%;
+      width: 18%;
 
       .ant-form-item-label {
         align-items: center;
-        flex: 0 0 50%;
-        max-width: 50%;
+        flex: 0 0 60%;
+        max-width: 60%;
       }
 
       .ant-form-item-control {
-        flex: 0 0 50%;
-        max-width: 50%;
+        flex: 0 0 40%;
+        max-width: 40%;
       }
 
     }
@@ -443,8 +443,8 @@
 }
 
 // 回复弹窗, 指派人弹窗
-.replyModal,
-.assignmentModal {
+.replyModal:not(.antdV5),
+.assignmentModal:not(.antdV5) {
   :global {
     .ant-modal-body {
       padding: 20px !important;
@@ -453,13 +453,13 @@
   }
 
   .replyBraftEditor {
-    height: calc(70vh - 110px);
+    height: calc(70vh - 160px);
     background-color: #f6f6f6;
     border: 1px solid #d9d9d9;
 
     :global {
       .bf-content {
-        height: calc(70vh - 204px);
+        height: calc(70vh - 254px);
         background-color: #fff;
       }
     }
diff --git a/src/index.less b/src/index.less
index 0d7ecb5..43378e6 100644
--- a/src/index.less
+++ b/src/index.less
@@ -4017,35 +4017,37 @@ table tr td .ant-select-auto-complete.ant-select .ant-input {
 
 
 // 工单系统弹窗样式
-.workOrderSystemModal {
-  .ant-modal-close {
-    color: #4a495f !important;
-  }
-
-  .ant-modal-close-x {
-    width: 30px;
-  }
-
-  .ant-modal-header {
-    background-color: #e1edfe !important;
-    border: 0;
-
-    .ant-modal-title {
-      font-size: 14px;
+.workOrderSystemModal:not(.antdV5) {
+  :global {
+    .ant-modal-close {
       color: #4a495f !important;
-
-      span:nth-child(1) {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        display: inline-block;
-        max-width: 30vw;
+    }
+  
+    .ant-modal-close-x {
+      width: 30px;
+    }
+  
+    .ant-modal-header {
+      background-color: #e1edfe !important;
+      border: 0;
+  
+      .ant-modal-title {
+        font-size: 14px;
+        color: #4a495f !important;
+  
+        span:nth-child(1) {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          display: inline-block;
+          max-width: 30vw;
+        }
       }
     }
-  }
-
-  .ant-modal-body {
-    padding: 0 !important;
+  
+    .ant-modal-body {
+      padding: 0 !important;
+    }
   }
 }