Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/DataCenter

api/app/lib/controllers/customerContactsFollup/index.js

@@ -19,5 +19,5 @@ async function getCustomerContactsFollowup(ctx, next) {
 }
 
 module.exports = {
-    getCustomerContactsFollowup
+    getCustomerContactsFollowup,
 }

web/client/src/sections/business/actions/customerContactFollowup.js

@@ -0,0 +1,16 @@
+'use strict';
+
+import { ApiTable, basicAction } from '$utils'
+
+export function getCustomerContactsFollowup() {//查询
+    return (dispatch) => basicAction({
+        type: "get",
+        dispatch: dispatch,
+        actionType: "GET_CUSTOMER_CONTACT_FOLLOWUP",
+        url: `${ApiTable.getCustomerContactsFollowup}`,
+        msg: { option: "查询客户联系人对接跟进表" },
+        reducer: { name: "customerContactsFollowupList", params: { noClear: true } },
+    });
+}
+
+

web/client/src/sections/business/actions/index.js

@@ -2,8 +2,10 @@
 import * as reserveItem from './reserve-item';
 import * as salersReport from './salers-report';
 import * as achievementReport from './achievement-report';
+import * as getCustomerContactsFollowup from './customerContactFollowup'
 export default {
     ...reserveItem,
     ...salersReport,
-    ...achievementReport
+    ...achievementReport,
+    ...getCustomerContactsFollowup
 }

web/client/src/sections/business/containers/customer/customerContactFollowup.jsx

@@ -6,8 +6,10 @@ import '../../style.less'
 import moment from 'moment'
 
 const CustomerContactFollowup = (props) => {
-    const [downloadUrl, setDownloadUrl] = useState(null);
+    const { dispatch,actions } = props
-    const [warningBanner, setWarningBanner] = useState(null);
+    useEffect(() => {
+        dispatch(actions.businessManagement.getCustomerContactsFollowup());
+    }, []);
 
     const columns = [
         {
@@ -75,13 +77,7 @@ const CustomerContactFollowup = (props) => {
                             <div style={{ marginLeft: 6, fontSize: 12, color: '#969799', fontFamily: "DINExp", }}>CUSTOMER CONTACT FOLLOW UP</div>
                         </div>
                     </div>
-                    {
+
-                        warningBanner &&
-                        (<Banner
-                            type="danger"
-                            description={warningBanner}
-                            onClose={() => setWarningBanner(null)}
-                        />)}
                     <div style={{ display: 'flex', marginTop: 16, marginBottom: 17 }}>
                         <div style={{ marginLeft: 12, marginRight: 18 }}>
                             <Input suffix={<IconSearch />}
@@ -108,9 +104,7 @@ const CustomerContactFollowup = (props) => {
 
                     <Table columns={columns} dataSource={data} pagination={false} />
                 </div>
-                {
+
-                    downloadUrl ? <iframe key={downloadUrl} src={downloadUrl} style={{ display: 'none' }} /> : ''
-                }
             </div>
         </>
     )

web/client/src/utils/webapi.js

@@ -30,6 +30,8 @@ export const ApiTable = {
 
    getContractDetail: 'contract/detail',
    getInvoicingDetail: 'invoicing/detail',
+   //客户联系人对接跟进
+   getCustomerContactsFollowup:'customerContactsFollup'
 };
 export const RouteTable = {
    apiRoot: "/api/root",