ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
danshihao
2024-01-08 10:00:39 +08:00
parent 3ac86bebe5 ed3ff5c0e5
commit 8ff612a609
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue
+2 -2
View File
@@ -66,7 +66,7 @@
:filter-option="filterOption"
v-decorator="[ 'project', validatorRules.project]">
<a-select-option :value="undefined" :key="-1">请选择</a-select-option>
<a-select-option v-for="item in projectList" :value="item.id" :key="item.id">{{ item.projectName }}</a-select-option>
<a-select-option v-for="item in projectList" :value="item.id" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
@@ -208,7 +208,7 @@ export default {
},
// 获取项目下拉框数据
getCarTypeProjectList () {
getCarTypeProjectList().then(res => {
getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
if (res.success) {
this.projectList = res.result
} else {
src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
+9 -3
View File
@@ -23,8 +23,11 @@
<a-col :span="12">
<!-- 项目-->
<a-form-item :label="$t('project')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select :placeholder="$t('pleaseSelect') + $t('project')" v-decorator="['project', validatorRules.project]">
<a-select-option v-for="item in projectSelectOptions" :key="item.id">{{ item.projectName }}</a-select-option>
<a-select :placeholder="$t('pleaseSelect') + $t('project')"
v-decorator="['project', validatorRules.project]"
show-search
:filter-option="filterOption">
<a-select-option v-for="item in projectSelectOptions" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
@@ -144,7 +147,7 @@ export default {
},
// 获取项目下拉框数据
initProjectOptions () {
getCarTypeProjectList().then(res => {
getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
if (res.success) {
this.projectSelectOptions = res.result
} else {
@@ -176,6 +179,9 @@ export default {
},
close () {
this.visible = false
},
filterOption (input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
}
}
src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
+9 -3
View File
@@ -23,8 +23,11 @@
<a-col :span="12">
<!-- 项目-->
<a-form-item :label="$t('project')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select :placeholder="$t('pleaseSelect') + $t('project')" v-decorator="['project', validatorRules.project]">
<a-select-option v-for="item in projectSelectOptions" :key="item.id">{{ item.projectName }}</a-select-option>
<a-select :placeholder="$t('pleaseSelect') + $t('project')"
v-decorator="['project', validatorRules.project]"
show-search
:filter-option="filterOption">
<a-select-option v-for="item in projectSelectOptions" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
@@ -146,7 +149,7 @@ export default {
},
// 获取项目下拉框数据
initProjectOptions () {
getCarTypeProjectList().then(res => {
getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
if (res.success) {
this.projectSelectOptions = res.result
} else {
@@ -189,6 +192,9 @@ export default {
},
close () {
this.visible = false
},
filterOption (input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}
}
}
src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue
+2
View File
@@ -21,12 +21,14 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('treeRight.administrativePrivileges')">
<user-selection :placeholder="$t('pleaseSelect') + $t('treeRight.administrativePrivileges')"
type="checkbox"
:name-str="model.authManageIdsDictText"
v-decorator="['authManageIds', validatorRules.authManageIds]" />
</a-form-item>
<!--查看权限-->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('treeRight.checkPermissions')">
<user-selection :placeholder="$t('pleaseSelect') + $t('treeRight.checkPermissions')"
type="checkbox"
:name-str="model.authViewIdsDictText"
v-decorator="['authViewIds', validatorRules.authViewIds]" />
</a-form-item>
<!--文件夹顺序-->