处理建议反馈列表功能；

zhangzzzz
1 parent 400a5a6e
Showing 3 changed files with 42 additions and 20 deletions
src/components/Common/WorkOrderSystem/WorkOrderSystemAdd.js
src/components/Common/WorkOrderSystem/WorkOrderSystemDetail.js
src/components/Common/WorkOrderSystem/index.less
@@ -131,6 +131,11 @@ const WorkOrderSystemAdd = props =&gt; {
         .toString();
     }
  
+    if (values.sRDUserId) {
+      addState.sRDUserName = userData
+      .find(item => values.sRDUserId === item.sHanldeId).sHanldeName;
+    }
+
     if (values.sModuleId) {
       const iIndex = moduleData.findIndex(
         item => item.sModuleId === values.sModuleId
@@ -266,6 +271,15 @@ const WorkOrderSystemAdd = props =&gt; {
             placeholder="请选择抄送人"
           />
         </Form.Item>
+        <Form.Item name="sRDUserId" label="研发人员">
+          <Select
+            allowClear
+            showSearch={true}
+            options={userOption}
+            optionFilterProp="label"
+            placeholder="请选择研发人员"
+          />
+        </Form.Item>
         <Form.Item
           name="bVsersion"
           label="标版同样问题"
@@ -50,6 +50,7 @@ const WorkOrderSystemDetail = props =&gt; {
     sModuleId,
     sModuleName,
     sHanldeId,
+    sRDUserId,
     sCopyHanldeId,
     bVsersion,
     sBug,
@@ -117,14 +118,14 @@ const WorkOrderSystemDetail = props =&gt; {
     } 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);
-    //     }
-    //   });
-    // }
+    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]);
  
@@ -261,6 +262,7 @@ const WorkOrderSystemDetail = props =&gt; {
         ...addState,
         sHanldeId,
         sCopyHanldeId: sCopyHanldeId ? sCopyHanldeId.split(",") : [],
+        sRDUserId,
         bVsersion,
         sBug,
         sType: sType !== undefined ? parseInt(sType) : "",
@@ -446,6 +448,8 @@ const WorkOrderSystemDetail = props =&gt; {
         .filter(item => sCopyHanldeId.includes(item.value))
         .map(item => item.label)
         .toString(),
+      sRDUserId,
+      sRDUserName: userOption.find(item => sRDUserId === item.value)?.label,
       bVsersion,
       sBug,
       sType,
@@ -456,12 +460,6 @@ const WorkOrderSystemDetail = props =&gt; {
     });
  
     setLoading(false);
-
-    if (values.callback) {
-      values.callback();
-      return;
-    }
-
     if (commonUtils.isNotEmptyObject(response)) {
       setFormEnabled(false);
       refresh();
@@ -554,6 +552,13 @@ const WorkOrderSystemDetail = props =&gt; {
             disabled={!formEnabled}
           />
         </Form.Item>
+        <Form.Item
+          // className={styles.formItemHalf}
+          name="sRDUserId"
+          label="研发人员"
+        >
+          <Select allowClear showSearch={true} options={userOption} optionFilterProp="label" placeholder="请选择研发人员" disabled={!formEnabled} />
+        </Form.Item>
         <Form.Item className={styles.formItemAQuarter} name="bVsersion" label="标版同样问题" valuePropName="checked">
           <Switch checkedChildren="是" unCheckedChildren="否" disabled={!formEnabled} />
         </Form.Item>
 @modal-content-height: calc(100vh - 100px); // 弹窗内容高度
-@braft-height: 400px; // 富文本框高度
+@braft-height: 350px; // 富文本框高度
 @level-color-1: #d50000; // 严重
 @level-color-2: #ff9800; // 紧急
 @level-color-3: #2098ee; // 一般
@@ -151,7 +151,7 @@
  
     :global {
       .bf-content {
-        height: @braft-height - 94px;
+        height: calc(@braft-height - 94px);
         background-color: #fff;
       }
     }
@@ -265,6 +265,9 @@
   }
 }
  
+.workOrderSystem {
+  overflow: hidden;
+}
  
 // 居中布局
 .flexCener {
@@ -348,8 +351,8 @@
       }
     }
  
-    .ant-form-item:nth-child(6),
-    .ant-form-item:nth-child(8) {
+    .ant-form-item:nth-child(7),
+    .ant-form-item:nth-child(9) {
       width: 18%;
  
       .ant-form-item-label {
@@ -365,8 +368,8 @@
  
     }
  
-    .ant-form-item:nth-child(9),
-    .ant-form-item:nth-child(10) {
+    .ant-form-item:nth-child(10),
+    .ant-form-item:nth-child(11) {
       width: 25%;
  
       .ant-form-item-label {