diff --git a/.env.development b/.env.development index 1d8e6f4f..6ed6ba36 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development VUE_APP_TAG_FLAG=0 +VUE_APP_LOGIN_PAGE='https://iam-uat.sinotruk.com:7011/idp/oauth2/authorize?redirect_uri=http://srms-test.sinotruk.com/dashboard/analysis&state=123&client_id=SRMS&response_type=code' VUE_APP_LOGIN_PAGE='/user/login' VUE_APP_CURRENT_SYSTEM='inner' VUE_APP_LOGOUT_PAGE='/user/login' diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index 5ef181bd..e4045e26 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -7,7 +7,9 @@ @input="indexClick($event)" :disabled="disabled || selectOnly" :max-length="500" - :placeholder="placeholder"/> + :placeholder="placeholder"> + + {{this.$t('standardSelect.standardSelection')}} @@ -63,6 +65,13 @@ export default { } this.$refs.standardSelectionModal.open() }, + // 清空输入框 + clearInput () { + console.log('输入框清空了') + this.$emit('change', '') + this.$emit('nameChange', '') + this.$emit('listChange', []) + }, // 输入框输入监听 indexClick (event) { this.$emit('change', event.target.value) @@ -101,4 +110,13 @@ export default { margin-left: 10px; } } + +.close-icon { + font-size: 12px; + color: rgba(0, 0, 0, 0.25); + transition: color 0.3s; +} +.close-icon:hover { + color: rgba(0, 0, 0, 0.45); +} diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index bd2faa0a..1775cce1 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -311,6 +311,7 @@ export default { }, close () { this.visible = false + this.selectedRowKeys = [] this.ipagination = { current: 1, pageSize: 10, diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 2393e8dd..f2d71df5 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -63,11 +63,11 @@ - + @@ -82,7 +82,7 @@ @@ -98,7 +98,7 @@ @@ -114,7 +114,7 @@ @@ -130,7 +130,7 @@ @@ -146,7 +146,7 @@ @@ -162,7 +162,7 @@ @@ -178,7 +178,7 @@