cd965655 by lihua

解决盘点按文件新建字段匹配分级分类

1 parent cb1e3a93
...@@ -842,7 +842,7 @@ export const getBizRuleConfigDetail = (params) => request({ ...@@ -842,7 +842,7 @@ export const getBizRuleConfigDetail = (params) => request({
842 // }) 842 // })
843 843
844 export const getFidldEnName = (data) => request({ 844 export const getFidldEnName = (data) => request({
845 url: `${import.meta.env.VITE_APP_COMMON_URL}/common/convert-field-ch-name`, 845 url: `${import.meta.env.VITE_APP_CHECK_BASEURL}/db-dir/convert-field-ch-name`,
846 method: 'post', 846 method: 'post',
847 data 847 data
848 }) 848 })
......
...@@ -115,7 +115,10 @@ const uploadFileRef = ref(); ...@@ -115,7 +115,10 @@ const uploadFileRef = ref();
115 115
116 const getSubjectField = () => { 116 const getSubjectField = () => {
117 tableFieldsLoading.value = true; 117 tableFieldsLoading.value = true;
118 getFidldEnName(fileTableFields.value.map(f => f.chName)).then(async (res: any) => { 118 getFidldEnName({
119 fieldName: fileTableFields.value.map(f => f.chName),
120 execGuid: execGuid.value
121 }).then(async (res: any) => {
119 tableFieldsLoading.value = false; 122 tableFieldsLoading.value = false;
120 if (res.code == proxy.$passCode) { 123 if (res.code == proxy.$passCode) {
121 tableCreateInfo.value.tableFields = res.data?.map((field, i) => { 124 tableCreateInfo.value.tableFields = res.data?.map((field, i) => {
...@@ -134,39 +137,6 @@ const getSubjectField = () => { ...@@ -134,39 +137,6 @@ const getSubjectField = () => {
134 tableCreateInfo.value.tableFields.forEach((item: any) => { 137 tableCreateInfo.value.tableFields.forEach((item: any) => {
135 tempFileNames.push(item.fieldName); 138 tempFileNames.push(item.fieldName);
136 }); 139 });
137 const classify: any = await getFieldClassifyAndGrade({
138 fieldName: tempFileNames,
139 execGuid: execGuid.value,
140 type: 'C'
141 })
142 const grade: any = await getFieldClassifyAndGrade({
143 fieldName: tempFileNames,
144 execGuid: execGuid.value,
145 type: 'G'
146 })
147 // 通过分类数据和分级数据赋值给 tableFields 的每一项
148 tableCreateInfo.value.tableFields.forEach((item: any) => {
149 // 在分类数据中查找对应 fieldName 的项
150 const classifyItem = classify.find((classify: any) => classify.fieldName === item.fieldName);
151
152 // 在分级数据中查找对应 fieldName 的项
153 const gradeItem = grade.find((grade: any) => grade.fieldName === item.fieldName);
154
155 // 如果找到对应的分类数据,赋值给 tableFields 的相应项
156 if (classifyItem) {
157 item.classifyDetailGuid = classifyItem.classifyDetailGuid || null;
158 item.classifyDetailName = classifyItem.classifyDetailName || null;
159 item.classifyDetailGuidRoutes = classifyItem.classifyDetailGuidRoutes || null;
160 item.classifyDetailNameRoutes = classifyItem.classifyDetailNameRoutes || null;
161 }
162
163 // 如果找到对应的分级数据,赋值给 tableFields 的相应项
164 if (gradeItem) {
165 item.gradeDetailGuid = gradeItem.gradeDetailGuid || null;
166 item.gradeDetailName = gradeItem.gradeDetailName || null;
167 }
168 });
169
170 } else { 140 } else {
171 ElMessage.error(res.msg); 141 ElMessage.error(res.msg);
172 } 142 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!