From 5964678d04f9a6ac454d919ef8c68f57d1e6e819 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 10:53:49 +0800 Subject: [PATCH] =?UTF-8?q?rxswin=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../components/rxswinModel.vue | 180 +++++++++++------- .../components/transferListRxswin.vue | 7 +- .../components/transferListvirtalRxswin.vue | 176 +++++++++++------ 4 files changed, 233 insertions(+), 132 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e5cf99ed6..709bdd937 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1929,7 +1929,7 @@ module.exports = { softwareversion:'Software version', softwareplatform:'Software platform', softwarereleasetime:'Software release time', - theme:'theme', + theme:'Theme', influencestatute:'Influence statute', vdrste:'VDR status', impactdescription:'Impact description', diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 383320977..6faf9138b 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -14,8 +14,8 @@
{{$t('standard')}}
- + @@ -25,8 +25,8 @@
{{$t('theme')}}
- + @@ -34,8 +34,8 @@
RXSWIN
- + @@ -48,8 +48,10 @@ show-search class="box-input-search" optionFilterProp="label" + showSearch + :autoClearSearchValue="false" :getPopupContainer="triggerNode=> triggerNode.parentNode" - v-model="queryParam.firstLevelDutyTerritory"> + v-model="queryParam.version">
+ +
+ + {{$t('submit')}} +
@@ -134,17 +141,17 @@ - - - - - - - - - - - +
+ +
{{$t('cancel')}} {{$t('determine')}} @@ -169,12 +176,13 @@ {{$t('standard')}}
- + + @change="StandardselectionChange" + v-model="formInline.serialNumber"/>
@@ -188,7 +196,7 @@
+ v-model="formInline.theme" :maxLength="100"> @@ -200,9 +208,9 @@ * RXSWIN - + + v-model="formInline.rxswin" :maxLength="100"> @@ -221,13 +229,12 @@ import SelectedBy from '@/components/SelectedBy/index' import personBatting from './personBatting' import Standardselection from '@/components/Standardselection/index' - import { getAction, postAction, downloadFile, putAction } from '@/api/manage' + import { getAction, postAction, downloadFile, putAction, deleteAction } from '@/api/manage' import ImportFile from '@/components/ImportFile/index' import transferList from './transferListRxswin' import transferListvirtal from './transferListvirtalRxswin' import { mapGetters } from 'vuex' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' - import { deleteAction } from '../../../api/manage' export default { name: 'listOfRelevantPersonnel', @@ -255,7 +262,7 @@ { title: this.$t('standard'), align: 'left', - dataIndex: 'standard', + dataIndex: 'serialNumber', ellipsis: true, sorter:true, width: 170 @@ -271,7 +278,7 @@ { title: 'RXSWIN', align: 'left', - dataIndex: 'RXSWIN', + dataIndex: 'rxswin', ellipsis: true, sorter:true, width: 170 @@ -279,7 +286,7 @@ { title: this.$t('Correspondingversion'), align: 'left', - dataIndex: 'Correspondingversion', + dataIndex: 'version', ellipsis: true, sorter:true, width: 170 @@ -299,17 +306,12 @@ confirmLoading: false, formInline: {}, rules: { - standard: [ + serialNumber: [ { required: true, message: this.$t('standard') + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], theme: [ { @@ -317,30 +319,19 @@ message: this.$t('theme') + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('areaOfResponsibility') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], - RXSWIN: [ + rxswin: [ { required: true, message: 'RXSWIN' + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('regulatoryEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], }, - // total: 0, // pageSize: 10, // pageNo: 1, url: { - page: '/project/projectRelatedPersonnel/page', + page: '/project/projectRxswinEO/page', edit: '/project/projectRelatedPersonnel/edit', exportData: '/project/projectRelatedPersonnel/exportXls', importZipUrl: '/project/projectRelatedPersonnel/importExcel', @@ -353,6 +344,9 @@ userName:'', orderBy: '1', orderByField: '', + total: 0, + pageNo: 1, + pageSize: 10 } }, computed: { @@ -406,20 +400,38 @@ handleSubmit() { this.visible = false }, + submit(){ + let ids = [] + this.dataSource.forEach(item => { + ids.push(item.id) + }) + let query = { + projectId: this.$route.query.id, + ids: ids.join(',') + } + getAction('/project/projectRxswinEO/submitInfo', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, batDeleteClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - // postAction('/project/problemKnowledgeBaseReplyEO/deleteBatch', { ids: this.selectedRowKeys }).then((res) => { - // if (res.success) { - // _this.$message.success(_this.$t('OperationSuccessful')) - // _this.getList() - // } else { - // _this.$message.warning(res.message) - // } - // }) + deleteAction('/project/projectRxswinEO/deleteBatch', { ids: _this.selectedRowKeys.join(',') }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) } else { @@ -433,14 +445,28 @@ getPersonnelList() { this.getList() }, + StandardselectionChange(value, id) { + this.formInline.documentId = id + this.formInline = { ...this.formInline } + }, editOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - if (!this.formInline.certificationEngineer) { - this.formInline.certificationEngineer = '' + let url = '' + let Action = '' + if(this.title == this.$t('newlyAdded')){ + url = '/project/projectRxswinEO/add' + Action = postAction + }else{ + url = '/project/projectRxswinEO/edit' + Action = putAction + } + let query = { + projectId: this.$route.query.id, + ...this.formInline, } this.confirmLoading = true - putAction(this.url.edit, this.formInline).then((res) => { + Action(url, query).then((res) => { if (res.success) { this.editVisible = false this.$message.success(this.$t('OperationSuccessful')) @@ -475,14 +501,14 @@ this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - // postAction('/project/problemKnowledgeBaseReplyEO/deleteBatch', { ids: item.id }).then((res) => { - // if (res.success) { - // _this.$message.success(_this.$t('OperationSuccessful')) - // _this.getList() - // } else { - // _this.$message.warning(res.message) - // } - // }) + deleteAction('/project/projectRxswinEO/deleteBatch', { ids: item.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) }, @@ -502,18 +528,34 @@ ...this.queryParam, orderBy: this.orderBy, orderByField: this.orderByField, + pageNo: this.pageNo, + pageSize: this.pageSize } this.loading = true - postAction(this.url.page, query).then((res) => { + getAction(this.url.page, query).then((res) => { if (res.success) { - this.dataSource = res.result || [] - // this.total = res.result.total + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } + this.dataSource = res.result.records || [] + this.total = res.result.total this.loading = false } else { this.loading = false } }) }, + pageOnChange(page, pageSize) { + this.pageNo = page + this.getList() + }, + SizeChange(page, pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.getList() + }, handleExport() { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { diff --git a/jero-web/src/views/projectManagement/components/transferListRxswin.vue b/jero-web/src/views/projectManagement/components/transferListRxswin.vue index d19b84601..06462dac8 100644 --- a/jero-web/src/views/projectManagement/components/transferListRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListRxswin.vue @@ -59,14 +59,14 @@ columns: [ { title: this.$t('projectVersion'), - dataIndex: 'name', + dataIndex: 'projectName', align: 'left', ellipsis: true, width: 235 }, { title: this.$t('Listcreationtime'), - dataIndex: 'useExplain', + dataIndex: 'createTime', align: 'left', ellipsis: true, }, @@ -109,12 +109,13 @@ }, replacePage() { let query = { + projectId: this.$route.query.id, pageNo: this.pageNo, pageSize: this.pageSize, ...this.queryParam } this.loading = true - postAction(this.url.transferUrl, query).then((res) => { + getAction('/project/projectRxswinEO/getOnePage', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.total = res.result.total diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index b60182499..1ba72f7a2 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -12,32 +12,70 @@
- -
-
+ +
+
{{$t('standard')}}
- +
- -
-
- {{$t('title')}} + + + + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} @@ -52,18 +90,18 @@ :loading="loading"> - - - - - - - - - - - - +
+ +
@@ -85,6 +123,7 @@ export default { props: ['url'], data() { return { + toggleSearchStatus: false, visible: false, queryParam: {}, confirmLoading: false, @@ -201,11 +240,14 @@ export default { methods: { transferModel(id) { this.visible = true - this.dummyInventoryBaseId = id + this.projectId = id this.queryParam = {} this.selectedRowKeys = [] this.replacePage() }, + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, searchQuery() { this.pageNo = 1 this.replacePage() @@ -214,8 +256,6 @@ export default { this.pageNo = 1 this.queryParam = {} this.replacePage() - this.$refs.globalAdvancedQueryRef.resetLine() - this.$refs.globalAdvancedQueryRef.emitCallback() }, onChange(page, pageSize) { this.pageNo = page @@ -226,31 +266,17 @@ export default { this.pageSize = pageSize this.replacePage() }, - handleSuperQuery(params, matchType) { - let sqp = {} - if (!params || (params && params.length == 0)) { - sqp['superQueryParams'] = '' - this.$refs.globalAdvancedQueryRef.superQueryFlag = false - } else { - this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) - sqp['superQueryMatchType'] = matchType - } - this.queryParamQuery = sqp - this.replacePage() - }, replacePage() { let query = { - // pageNo: this.pageNo, - // pageSize: this.pageSize, - ...this.queryParamQuery, + pageNo: this.pageNo, + pageSize: this.pageSize, ...this.queryParam, - dummyInventoryBaseId: this.dummyInventoryBaseId + projectId: this.projectId } this.loading = true - getAction('/dummy/dummyInventoryInfoEO/list', query).then((res) => { + getAction('/project/projectRxswinEO/getTwoPage', query).then((res) => { if (res.success) { - this.dataList = res.result || [] + this.dataList = res.result.records || [] this.loading = false } else { this.loading = false @@ -270,10 +296,10 @@ export default { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - postAction('project/projectLawsInventoryEO/add', { - dummyInventoryBaseId: this.dummyInventoryBaseId, - projectLibraryId: this.$route.query.id, - dummyids: selectedRowKeys.join(','), + getAction('/project/projectRxswinEO/iSExist', { + projectId: this.projectId, + // projectLibraryId: this.$route.query.id, + ids: selectedRowKeys.join(','), }).then((res) => { if (res.success) { this.confirmLoading = false @@ -345,4 +371,36 @@ export default { .box-button { height: 38px; } +.box-title-text-search { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; +} + +.title-text-search { + width: 110px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.box-input-search { + display: inline-block; + width: calc(100% - 100px); + height: 38px; + margin-top: 2px; +} + +.box-button-search { + height: 38px; + /*margin-top: 2px;*/ +} \ No newline at end of file