合并master

src/pages/ContractManager/component/Modal.jsx

@@ -707,7 +707,14 @@ const ContractModal = (props) => {
                   }}
                   disabled={disableds.contract}
                   dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                  treeData={companyDepList}
+                  treeData={
+                    data?.dep_id
+                      ? [
+                          ...companyDepList,
+                          { Name: data.dep_name, ID: data?.dep_id },
+                        ]
+                      : companyDepList
+                  }
                 />
               </Form.Item>
             </Col>
@@ -1066,13 +1073,15 @@ const ContractModal = (props) => {
                 ) : (
                   <ul>
                     {data?.attach_extend &&
-                      JSON.parse(data?.attach_extend)?.map((item, idx) => (
-                        <li key={`${idx}_${item.name}`}>
-                          <a onClick={() => handlePreViewSingle(item)}>
-                            {item.name}
-                          </a>
-                        </li>
-                      ))}
+                      JSON.parse(data?.attach_extend)
+                        ?.filter((item) => item)
+                        .map((item, idx) => (
+                          <li key={`${idx}_${item.name}`}>
+                            <a onClick={() => handlePreViewSingle(item)}>
+                              {item.name}
+                            </a>
+                          </li>
+                        ))}
                   </ul>
                 )}
               </Form.Item>

src/pages/PSRManage/detail.js

@@ -189,7 +189,7 @@ const PSRDetail = () => {
       setExcelData({ ...res.data[0], dayFormat: day });
       const data = JSON.parse(res.data[0].json_data);
       console.log(data);
-      if (data.cell_data) data.celldata = JSON.parse(data.cell_data);
+      if (data.celldata) data.celldata = JSON.parse(data.celldata);
       if (data.config) data.config = JSON.parse(data.config);
       renderSheet(
         Array.isArray(data) ? data : [data],
@@ -275,7 +275,6 @@ const PSRDetail = () => {
     };
     option.data.forEach((item) => {
       delete item.data;
-      delete item.cell_data;
       if (item.celldata) {
         item.celldata.forEach((cell) => {
           // 生成uuid