diff --git a/src/api/api.js b/src/api/api.js index 73ded49a..c9fa8b17 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -118,6 +118,9 @@ const editCategoryItem = (params) => postAction('/sys/category/edit', params) // 通过文件的id获取文件的相应信息 const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params) +// 标准选择框,分页查询标准数据 +const getStandardList = (params) => getAction('', params) + export { addRole, editRole, @@ -184,5 +187,7 @@ export { addTag, editTag, addCategoryItem, - editCategoryItem + editCategoryItem, + + getStandardList } diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index d504cb5c..6b765100 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -475,7 +475,9 @@ module.exports = { }, // 标准选择器 standardSelect: { - standardSelection: 'Standard Selection' + standardSelection: 'Standard Selection', + source: 'Source', + standardNumOrName: 'Standard number/Standard name' }, // 用户/组织结构选择器 userOrOrganSelect: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 7c18ab72..eb0c1521 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -475,7 +475,9 @@ module.exports = { }, // 标准选择器 standardSelect: { - standardSelection: '标准选择' + standardSelection: '标准选择', + source: '来源', + standardNumOrName: '标准号/标准名称' }, // 用户/组织结构选择器 userOrOrganSelect: { diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 819a7360..e6d4b76f 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -215,7 +215,7 @@ style="width: 100%" :tree-data="item.tree" tree-checkable - :placeholder="$t('PleaseSelect')+item.dbFieldTxt" + :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> diff --git a/src/components/selection/CurrencySearch.vue b/src/components/selection/CurrencySearch.vue deleted file mode 100644 index 846b8daa..00000000 --- a/src/components/selection/CurrencySearch.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index ebe38b02..bcdfb765 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -8,53 +8,16 @@ {{this.$t('standardSelect.standardSelection')}} - -
- - - - -
- -
- {{$t('cancel')}} - {{$t('submit')}} -
-
+ + +