Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/pages/Customer/Client/components/ClientDetail/TabList.jsx

@@ -124,15 +124,15 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
     const { code = -1 } = await apiAddService({ ...values, clientId })
     if (code === consts.RET_CODE.SUCCESS) {
       message.success('新增成功')
+      // 刷新数据
+      dispatch({
+        type: 'refresh/commitAction',
+        payload: updatePayload
+      })
       setState({ ...state, data: values })
     }
     // 请求完了
     setAddService({ ...addService, loading: false, visible: false })
-    // 刷新数据
-    dispatch({
-      type: 'refresh/commitAction',
-      payload: updatePayload
-    })
     return code === consts.RET_CODE.SUCCESS
   }
   useEffect(() => {

src/pages/Workbench/Dashboard/components/RatioPanels.jsx

@@ -105,6 +105,7 @@ const ServiceRatioPanels = ({ dispatchModal, staffIds, cyclical, dataPermission
       rowKey={record => record.id}
       scroll={{ y: 400 }}
       bordered={true}
+      cardProps={{ bodyStyle: { padding: 0 } }}
       columns={columns}
       search={false}
       toolbar={{
@@ -334,6 +335,7 @@ const RatioPanels = ({ dataType, staffIds, retioCyclical, dataPermission, ...res
           <ProTable
             size="small"
             bordered={true}
+            cardProps={{ bodyStyle: { padding: 0 } }}
             pagination={{ defaultPageSize: 10 }}
             rowKey={record => record.id}
             scroll={{ y: 400 }}

src/pages/Workbench/Dashboard/components/ReminderList.jsx

@@ -210,7 +210,6 @@ const ReminderList = props => {
           rowKey={record => record.id}
           columns={dataMap[dataType].columns}
           params={{ dataType, reminderCyclical }}
-          scroll={{ y: 400 }}
           request={async params => {
             const { code = -1, data } = await queryReminderList({ ...params })
             return {

src/pages/Workbench/Dashboard/index.jsx

@@ -317,7 +317,7 @@ const Dashboard = ({ dispatch, departments = [] }) => {
               dataType="workbench"
             />
           </span>
-          {!isMobile() && state.params.dataPermission === 'all' ? (
+          {state.params.dataPermission === 'all' ? (
             <TreeSelect
               size="middle"
               style={{ width: 150 }}

src/services/product.js

@@ -190,3 +190,10 @@ export async function apiRoadPricingUnLinkCustomer(params) {
 export async function apiRoadUpdateCompany(payload) {
   return request('/RoadPricingv2/company/update', { method: 'POST', data: { ...payload } })
 }
+
+/** 根据客户id获得云版所有账号信息 */
+export async function queryRoadPricingListByClientId(params) {
+  return request('/Roadpricing/all/rp/account', {
+    params
+  })
+}