canrd-main / canrd-erp-front · Commits

Commit 702fac0f5023b9e28163602e8fca5290c847584b

Authored by 曾国涛
2 parents 2818573a cfbeebda
build: skipped

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
#	src/pages/ResearchGroup/constant.tsx
#	src/services/definition.ts
#	src/services/request.ts
Inline Side-by-side
Showing 3 changed files with 20 additions and 3 deletions
.idea/UniappTool.xml 0 → 100644
  View file @702fac0
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="cn.fjdmy.uniapp.UniappProjectDataService">
  4 + <option name="generalBasePath" value="$PROJECT_DIR$" />
  5 + <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
  6 + <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
  7 + <option name="scanNum" value="1" />
  8 + <option name="type" value="store" />
  9 + </component>
  10 +</project>
0 \ No newline at end of file 11 \ No newline at end of file
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
  View file @702fac0
@@ -285,8 +285,9 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; { @@ -285,8 +285,9 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
285 form.setFieldValue('accounts', accountIds); 285 form.setFieldValue('accounts', accountIds);
286 } 286 }
287 287
288 - form.setFieldValue('group', researchGroupInfo.groupName);  
289 - form.setFieldValue('leader', researchGroupInfo.leaderName); 288 + form.setFieldValue('groupName', researchGroupInfo.groupName);
  289 + form.setFieldValue('leaderName', researchGroupInfo.leaderName);
  290 + form.setFieldValue('companyName', researchGroupInfo.companyName);
290 }; 291 };
291 292
292 useEffect(() => { 293 useEffect(() => {
@@ -344,7 +345,7 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; { @@ -344,7 +345,7 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
344 /> 345 />
345 <ProFormSelect 346 <ProFormSelect
346 name="leaderName" 347 name="leaderName"
347 - key="leader" 348 + key="leaderName"
348 width="lg" 349 width="lg"
349 showSearch 350 showSearch
350 label="负责人" 351 label="负责人"
src/pages/ResearchGroup/constant.tsx
  View file @702fac0
@@ -138,6 +138,12 @@ export const RESEARCH_GROUP_COLUMNS = [ @@ -138,6 +138,12 @@ export const RESEARCH_GROUP_COLUMNS = [
138 }, 138 },
139 hideInSearch: true, 139 hideInSearch: true,
140 }, 140 },
  141 + {
  142 + title: '公司名称',
  143 + dataIndex: 'companyNameLike',
  144 + key: 'companyNameLike',
  145 + hideInTable: true,
  146 + },
141 ]; 147 ];
142 148
143 export const RESEARCH_GROUP_MEMBER_REQUEST_COLUMNS = [ 149 export const RESEARCH_GROUP_MEMBER_REQUEST_COLUMNS = [