Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

src/pages/contract/coordination/details/index.tsx

@@ -25,6 +25,7 @@ const Details = (props: any) => {
   const [form] = Form.useForm();
   const [Visible, setIsModalVisible] = useState<boolean>(false)
   const [isPass, setIsAllMember] = useState(1)
+  const [contractNo, setcontractNo] = useState();
   /* 合同id */
   const { location: { query: { contractId, type } } } = props;
   console.log(type, 'type')
@@ -90,6 +91,7 @@ const Details = (props: any) => {
         setinnerTaskStepList(innerTaskStepList)
         setpayPlanList(payPlanList)
         setcontractText(contractText)
+        setcontractNo(basics.contractNo)
         setcontractAbstract(contractAbstract)
       }
     })
@@ -273,7 +275,7 @@ const Details = (props: any) => {
                   marginLeft: '8px',
                 }}
               >
-                {contractAbstract}
+                {contractAbstract}  | {contractNo}
               </span>
             </div>
 

src/pages/contract/manage/details/index.tsx

 
+// import React, { useEffect, useState, useRef } from 'react';
+// import { Anchor, Radio, Steps, Row, Table, Space, Typography, Button } from 'antd';
+
+// import { ArrowLeftOutlined } from '@ant-design/icons';
+
+// import { PublicApi } from '@/services/api';
+// import { history } from 'umi'
+// import Basic from '../../components/detailCard/basic'
+
+// import style from './index.less';
+
+
+
 import React, { useEffect, useState, useRef } from 'react';
-import { Anchor, Radio, Steps, Row, Form, Input, Table, message, Space, Typography, Button, Modal } from 'antd';
+import { StandardTable } from 'god';
+import { Anchor, Radio, Steps, Row, Table, Space, Typography, Button } from 'antd';
 import style from './index.less';
 import { ArrowLeftOutlined } from '@ant-design/icons';
-import { StandardTable } from 'god';
+import { history } from 'umi';
 import { PublicApi } from '@/services/api';
-import { history } from 'umi'
-import Basic from '../../components/detailCard/basic'
 import ExamineFrom from '../../components/examine'
-
+import Basic from '../../components/detailCard/basic'
 import {
   FileWordFilled
 } from '@ant-design/icons'
 
-const { TextArea } = Input;
 const { Link } = Anchor;
 const { Step } = Steps;
 
@@ -22,11 +33,8 @@ const activeAnchorClassName = 'ant-anchor-link-active'
 const Details = (props: any) => {
   /* 合同id */
   const { location: { query: { contractId, type } } } = props;
-  console.log(type);
   const ref = useRef({});
   const [currLink, setCurrLink] = useState(activeAnchorClassName)
-  const [form] = Form.useForm();
-  const [isPass, setIsAllMember] = useState()
   /**
    * 渲染信息
    * @param basics 基础信息
@@ -266,7 +274,6 @@ const Details = (props: any) => {
   }
   /* 提交表单 */
   const submitExamine = async () => {
-
     if (type === 'Signacontract' && contractText.isUseElectronicContract == 1) {
       let res = await PublicApi.getContractSignatureGetHandSignatureUrl({ signatureLogId: 98 });
       if (res.code == 1000) {

src/pages/contract/manage/examine/index.tsx

@@ -2,7 +2,7 @@
 
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Card, Space, Button, Input, Form } from 'antd';
+import { Card } from 'antd';
 import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
@@ -20,9 +20,7 @@ import moment from 'moment';
 const Examine = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
-  const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
   const [Visible, setIsModalVisible] = useState<boolean>(false)
-  const [form] = Form.useForm();
   const [id, setid] = useState("")
   const getdate = (time) => {
     return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
@@ -135,7 +133,6 @@ const Examine = () => {
     setIsModalVisible(!Visible)
   }
 
-
   // 列表数据
   const fetchData = (params?: any) => {
     console.log(params)//可以直接打印参数
@@ -154,7 +151,6 @@ const Examine = () => {
     selectedRowKeys: selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setSelectedRowKeys(selectedRowKeys)
-      setSelectRow(selectedRows)
     }
   };
 
@@ -199,15 +195,6 @@ const Examine = () => {
               span: 24
             }
           }}
-        // formilyChilds={{
-        //   children: <Space>
-        //     <Button >批量提交审核</Button>
-
-        //   </Space>,
-        //   layouts: {
-        //     span: 8
-        //   }
-        // }}
         />
         <ExamineFrom
           ExamineFlag={Visible}

src/pages/contract/manage/levelexamine/index.tsx

 
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Card, Space, Button } from 'antd';
+import { Card } from 'antd';
 import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
@@ -26,8 +26,6 @@ const Levelexamine = () => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const [Visible, setIsModalVisible] = useState<boolean>(false)
   const [id, setid] = useState("")
-  const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
-
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -153,7 +151,6 @@ const Levelexamine = () => {
     selectedRowKeys: selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setSelectedRowKeys(selectedRowKeys)
-      setSelectRow(selectedRows)
     }
   };
   /* 提交审核的回调 */
@@ -197,15 +194,6 @@ const Levelexamine = () => {
               span: 24
             }
           }}
-        // formilyChilds={{
-        //   children: <Space>
-        //     <Button >批量提交审核</Button>
-
-        //   </Space>,
-        //   layouts: {
-        //     span: 8
-        //   }
-        // }}
         />
       </Card>
       <ExamineFrom

src/pages/contract/manage/secondaryexamine/index.tsx

 
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Card, Space, Button } from 'antd';
+import { Card } from 'antd';
 import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
@@ -21,7 +21,6 @@ const Secondaryexamine = () => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
   const [Visible, setIsModalVisible] = useState<boolean>(false)
   const [id, setid] = useState("")
-  const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -148,7 +147,6 @@ const Secondaryexamine = () => {
     selectedRowKeys: selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setSelectedRowKeys(selectedRowKeys)
-      setSelectRow(selectedRows)
     }
   };
   /* 提交审核的回调 */
@@ -192,14 +190,6 @@ const Secondaryexamine = () => {
               span: 24
             }
           }}
-        // formilyChilds={{
-        //   children: <Space>
-        //     <Button >批量提交审核</Button>
-        //   </Space>,
-        //   layouts: {
-        //     span: 8
-        //   }
-        // }}
         />
       </Card>
       <ExamineFrom
@@ -208,7 +198,7 @@ const Secondaryexamine = () => {
         applyId={id}
         type="PageToBeExamineStepTwo"
       />
-    </PageHeaderWrapper >
+    </PageHeaderWrapper>
   )
 }
 

src/pages/contract/manage/signacontract/index.tsx

 
 import React, { useRef, useState } from 'react'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Card, Space, Button, Input, Form } from 'antd';
+import { Card } from 'antd';
 import statuStyle from '../../common/colorTag'
 import { ColumnType } from 'antd/lib/table/interface';
 import { StandardTable } from 'god';
@@ -14,17 +14,11 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { PublicApi } from '@/services/api';
-import ExamineFrom from '../../components/examine'
 import moment from 'moment';
-
-
-
+import '../../constants/index.less'
 const Signacontract = () => {
   const ref = useRef<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
-  const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
-  const [Visible, setIsModalVisible] = useState<boolean>(false)
-  const [id, setid] = useState("")
   //表头
   const columns: ColumnType<any>[] = [{
     title: '合同编号/摘要',
@@ -74,9 +68,7 @@ const Signacontract = () => {
     title: '对应单据/寻源类型',
     dataIndex: 'sourceNo',
     align: 'left',
-
     render: (text, record) => {
-
       return (
         <div>
           {
@@ -98,7 +90,6 @@ const Signacontract = () => {
     title: '外部状态',
     dataIndex: 'outerStatus',
     align: 'left',
-
     render: (text, record) => {
       return (
         <StatusTag type="warning" title={record.outerStatusName} />
@@ -110,7 +101,6 @@ const Signacontract = () => {
     dataIndex: 'innerStatus',
     align: 'left',
     render: (text, record) => {
-
       return (
         <div>
           <span style={statuStyle.point}> </span>
@@ -118,7 +108,8 @@ const Signacontract = () => {
         </div>
       )
     }
-  }, {
+  },
+  {
     title: '操作',
     dataIndex: 'state',
     align: 'left',
@@ -144,21 +135,13 @@ const Signacontract = () => {
       })
     })
   }
+  // 多选操作
   const rowSelection: any = {
     selectedRowKeys: selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setSelectedRowKeys(selectedRowKeys)
-      setSelectRow(selectedRows)
     }
   };
-  /* 提交审核的回调 */
-  const getfetchData = (data) => {
-    console.log(data)
-    setIsModalVisible(data.ExamineFlag)
-    if (data.code === 1000) {
-      ref.current.reload()
-    }
-  }
   return (
     <PageHeaderWrapper>
       <Card>
@@ -194,15 +177,6 @@ const Signacontract = () => {
           }}
         />
       </Card>
-
-      <ExamineFrom
-        ExamineFlag={Visible}
-        getfetchData={getfetchData}
-        applyId={id}
-        type="Signacontract"
-        agreeText="同意签订"
-        disagree="不同意签订"
-      />
     </PageHeaderWrapper>
   )
 }

src/pages/editor/channelEdit/index.tsx

@@ -218,8 +218,8 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
     const firstCategory: any = await fetchFirstCategory()
 
     for (const item of firstCategory) {
-      if(item.id) {
-        const categoryDetail: any = await fetchCategoryById(item.id)
+      if(item.categoryId) {
+        const categoryDetail: any = await fetchCategoryById(item.categoryId)
 
         let floorLineConfigItem = {}
         floorLineKeys.push(String(initIndex + 1))
@@ -228,7 +228,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
           [String(initIndex + 1)]: {
             "componentName": "ShopFloorLine",
             "props": {
-              title: item.name
+              title: item.categoryName
             },
             "childNodes": [String(initIndex + 2), String(initIndex + 3)]
           }

src/pages/editor/shopEdit/index.tsx

@@ -166,8 +166,8 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
     const firstCategory: any = await fetchFirstCategory()
 
     for (const item of firstCategory) {
-      if (item.id ){
-        const categoryDetail: any = await fetchCategoryById(item.id)
+      if (item.categoryId ){
+        const categoryDetail: any = await fetchCategoryById(item.categoryId)
 
         let floorLineConfigItem = {}
         floorLineKeys.push(String(initIndex + 1))
@@ -176,7 +176,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
           [String(initIndex + 1)]: {
             "componentName": "ShopFloorLine",
             "props": {
-              title: item.name
+              title: item.categoryName
             },
             "childNodes": [String(initIndex + 2), String(initIndex + 3)]
           }