Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2020-08-24 16:51:57 +08:00
commit 9f76a15120
7 changed files with 22 additions and 4 deletions

View File

@ -17,7 +17,7 @@
<slot name="button"></slot> <slot name="button"></slot>
</span> </span>
<span> <span>
<ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar"/> <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
<ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/> <ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>
</span> </span>
</el-row> </el-row>
@ -65,6 +65,12 @@
isTesterPermission: { isTesterPermission: {
type: Boolean, type: Boolean,
default: false default: false
},
tip: {
String,
default() {
return this.$t('commons.search_by_name');
}
} }
}, },
methods: { methods: {

View File

@ -4,7 +4,7 @@
class="search" class="search"
type="text" type="text"
size="small" size="small"
:placeholder="$t('commons.search_by_name')" :placeholder="tip"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
@change="search" @change="search"
maxlength="60" maxlength="60"
@ -18,6 +18,12 @@
props: { props: {
condition: { condition: {
type: Object type: Object
},
tip: {
String,
default() {
return this.$t('commons.search_by_name');
}
} }
}, },
methods: { methods: {

View File

@ -4,7 +4,7 @@
<el-card class="card-content" v-loading="result.loading"> <el-card class="card-content" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData" <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData" :tip="$t('commons.search_by_name_or_id')"
:create-tip="$t('test_track.case.create')" @create="testCaseCreate"> :create-tip="$t('test_track.case.create')" @create="testCaseCreate">
<template v-slot:title> <template v-slot:title>
<node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/> <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>

View File

@ -497,7 +497,10 @@
this.result = this.$post("/issues/add", param, () => { this.result = this.$post("/issues/add", param, () => {
this.$success(this.$t('commons.save_success')); this.$success(this.$t('commons.save_success'));
this.getIssues(param.testCaseId); this.getIssues(param.testCaseId);
}) });
this.issuesSwitch = false;
this.testCase.issues.title = "";
this.testCase.issues.content = "";
}, },
getIssues(caseId) { getIssues(caseId) {
this.result = this.$get("/issues/get/" + caseId, response => { this.result = this.$get("/issues/get/" + caseId, response => {

View File

@ -60,6 +60,7 @@ export default {
not_filled: 'Not filled', not_filled: 'Not filled',
please_select: 'Please select', please_select: 'Please select',
search_by_name: 'Search by name', search_by_name: 'Search by name',
search_by_name_or_id: 'Search by name or id',
personal_information: 'Personal Information', personal_information: 'Personal Information',
exit_system: 'Exit System', exit_system: 'Exit System',
verification: 'Verification', verification: 'Verification',

View File

@ -60,6 +60,7 @@ export default {
not_filled: '未填写', not_filled: '未填写',
please_select: '请选择', please_select: '请选择',
search_by_name: '根据名称搜索', search_by_name: '根据名称搜索',
search_by_name_or_id: '根据ID或名称搜索',
personal_information: '个人信息', personal_information: '个人信息',
exit_system: '退出系统', exit_system: '退出系统',
verification: '验证', verification: '验证',

View File

@ -60,6 +60,7 @@ export default {
not_filled: '未填寫', not_filled: '未填寫',
please_select: '請選擇', please_select: '請選擇',
search_by_name: '根據名稱搜索', search_by_name: '根據名稱搜索',
search_by_name_or_id: '根據ID或名稱搜索',
personal_information: '個人信息', personal_information: '個人信息',
exit_system: '退出系統', exit_system: '退出系統',
verification: '驗證', verification: '驗證',