修复冲突

src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -21,11 +21,8 @@ function CommitAuditModal(props) {
   const [data, setData] = useState([]);
   const [length, setLength] = useState(1);
   const [formData, setFromData] = useState({});
-<<<<<<< HEAD
-=======
   const [auditList, setAuditList] = useState([]); //用于创建Tabs表单
   const [formComponentValues, setFormComponentValues] = useState({}); //用于创建Tabs表单
->>>>>>> develop_0715
   const [form] = Form.useForm();
 
   useEffect(() => {
@@ -36,18 +33,12 @@ function CommitAuditModal(props) {
     const data = treeData(currentId);
     if (data.length <= 0) setAuditId(currentId);
     setData(data);
-<<<<<<< HEAD
-  }, [auditId, version.template_node_id]);
 
-  useEffect(() => {
-    form.resetFields();
-=======
   }, [auditId, version.template_node_id, visible]);
 
   useEffect(() => {
     form.resetFields();
     setAuditList([]);
->>>>>>> develop_0715
   }, [visible]);
 
   const treeData = currentId => {
@@ -60,10 +51,7 @@ function CommitAuditModal(props) {
       });
     };
     fun(list);
-<<<<<<< HEAD
-    console.log(list);
-=======
->>>>>>> develop_0715
+
     const fun2 = list => {
       const parents = list.filter(item => list.findIndex(node => node.Id == item.parentId) == -1);
       let translator = (parents, children) => {
@@ -110,11 +98,8 @@ function CommitAuditModal(props) {
     let targetIds = edges
       .filter(edge => edge.source.cell == currentId)
       .map(item => item.target.cell);
-<<<<<<< HEAD
-    console.log(edges.filter(edge => edge.source.cell == currentId));
-=======
+
     edges.filter(edge => edge.source.cell == currentId);
->>>>>>> develop_0715
     let auditNodes = nodes.filter(node => {
       if (type && node.name != type) {
         return false;
@@ -140,16 +125,11 @@ function CommitAuditModal(props) {
 
   const onChange = value => {
     changeAudit(value[value.length - 1]);
-<<<<<<< HEAD
-  };
 
-  const onFinish = async () => {
-=======
     setAuditListFun();
   };
   //处理tabs页
   const setAuditListFun = async () => {
->>>>>>> develop_0715
     var fieldsValue = await form.validateFields();
     let addAuditList = [];
     let result = Object.values(fieldsValue)
@@ -203,8 +183,7 @@ function CommitAuditModal(props) {
     setAuditList(addAuditList);
   };
 
-<<<<<<< HEAD
-=======
+
   const getFromData = idList => {
     const data = formComponentValues;
     const result = [];
@@ -246,7 +225,6 @@ function CommitAuditModal(props) {
     var fieldsValue = await form.validateFields();
     console.log(formComponentValues);
     let hasFlowId = true; //是否都绑定审批节点
->>>>>>> develop_0715
     const getFlowPath = node => {
       //[134, 135]
       let itemData = {};
@@ -279,8 +257,7 @@ function CommitAuditModal(props) {
       })
       .filter(item => item);
     let serviceNode = flowDetail.nodes.find?.(item => item.Id == fieldsValue.next_template_node_id);
-<<<<<<< HEAD
-=======
+
     if (!serviceNode) {
       message.error('请选择需要流转的业务节点。');
       return;
@@ -288,7 +265,6 @@ function CommitAuditModal(props) {
 
     const flowPath = result.map(item => getFlowPath(item));
     const formList = getFromData(result);
->>>>>>> develop_0715
     let params = {
       desc: fieldsValue.desc,
       // 审核流程id
@@ -314,24 +290,6 @@ function CommitAuditModal(props) {
       params.flow_id = approvalNode?.flow_id || 0;
       params.node_level_id = approvalNode?.flow_id ? 1 : 0;
       params.template_node_id = result[0][0]; // 将要流转的节点审批节点
-<<<<<<< HEAD
-    } else {
-      //多节点审批
-      params.template_node_id = result[0][0]; // 将要流转的节点审批节点
-      params.flow_path = result.map(item => getFlowPath(item));
-    }
-
-    //   if (approvalNode?.Id) {
-    //     if (!approvalNode?.flow_id) {
-    //       message.error('审批节点未绑定审批流程!请联系管理员。');
-    //       return;
-    //     }
-    //   }
-
-    // setAuditId();
-    onOk(params);
-  };
-=======
       params.form_list = formList; //创建钉钉表单所需数据
       if (approvalNode?.Id) {
         if (!approvalNode?.flow_id) {
@@ -357,7 +315,6 @@ function CommitAuditModal(props) {
   const onTabChange = key => {
     console.log('=====================', key);
   };
->>>>>>> develop_0715
 
   const CascaderNode = index => {
     return (
@@ -403,8 +360,6 @@ function CommitAuditModal(props) {
           <Input.TextArea />
         </Form.Item>
       </Form>
-<<<<<<< HEAD
-=======
       <Tabs defaultActiveKey="1" onChange={onTabChange}>
         {auditList.map((item, idx) => (
           // <TabPane tab={item.label} key={`${item.Id}_${item.label}`}>
@@ -419,7 +374,6 @@ function CommitAuditModal(props) {
           </TabPane>
         ))}
       </Tabs>
->>>>>>> develop_0715
     </Modal>
   );
 }

src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

@@ -128,10 +128,7 @@ function FlowModal(props) {
   const handleChangeClick = item => {
     let file = isOut ? 'newList' : 'detail';
     let type = item.flow_id ? '/queryAuditRecord' : '/queryAuditExcel';
-<<<<<<< HEAD
-=======
     console.log(`${file}${type}`, item);
->>>>>>> develop_0715
     dispatch({
       type: `${file}${type}`,
       payload: {