diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d7facbfbc..0d78ec8e3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1746,4 +1746,5 @@ module.exports = { andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', pleasefillintherange:'Please fill in the range', databasereportingtime:'Synchronize the database reporting time', + synchronizationtime:'Synchronization time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f25e6f914..c7c595952 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1848,4 +1848,5 @@ module.exports = { andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', pleasefillintherange:'请填写范围', databasereportingtime:'同步上报库时间', + synchronizationtime:'同步时间', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 574b31938..0a7af1fd7 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -51,11 +51,15 @@ {{val}}
-
{{ol.db_field_txt}} {{ol.db_field_txt}} - {{ol.value ? ol.value+'的时间更好的付款就给和看景点风光和的空间古典风格' : '--'}} + {{ol.value ? ol.value : '--'}}
- @@ -134,7 +134,7 @@
- @@ -343,7 +343,7 @@ export default { }, changeId(value, option) { - + debugger this.$nextTick(() => { this.form = { ...this.form } this.$refs.ruleForm.validateField('bapc') diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 69c67a94f..d68f43ccd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -390,6 +390,7 @@ import { message } from 'ant-design-vue' } postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => { if(res.success){ + this.flag = 2 localStorage.setItem('otaId', res.result.otaId) this.$message.success(res.message) this.getData() diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index f6fa244d4..2077e1322 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -100,6 +100,36 @@ {{$t('CustomExport')}}
+ + + +
+ + {{ $t('customize') }} +
+
@@ -233,7 +263,110 @@ NotSelectedRowKeysValue: [], NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有 NotSelectedNoEngineerValue: [], - paramsManifest: {} + paramsManifest: {}, + customizevisible: false, + indeterminate: false, + checkAll: false, + selectedValue: [], + checkedList: ['NiONumber', 'ParameterName', 'operation'], + customizeList: [ + { + sort: '1', + name: this.$t('NiONumber'), + disabled: true, + headFieldCn: 'NIO编号', + headFieldEn: 'NiONumber', + field: 'NiONumber', + key: 1, + moduleFlag: '上报库', + status: 1 + }, + { + sort: '2', + disabled: true, + name: this.$t('ParameterName'), + headFieldCn: '参数名称', + headFieldEn: 'Parameter Name', + field: 'ParameterName', + key: 2, + moduleFlag: '上报库', + status: 2 + }, + { + sort: '', + name: this.$t('ParameterDescription'), + headFieldCn: '参数说明', + headFieldEn: 'Parameter Description', + field: 'ParameterDescription', + key: 3, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('status'), + headFieldCn: '状态', + headFieldEn: 'status', + field: 'status', + key: 4, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('areaOfResponsibility'), + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', + field: 'areaOfResponsibility', + key: 5, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('engineeringInterfacePerson'), + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', + field: 'engineeringInterfacePerson', + key: 6, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('completedBy'), + headFieldCn: '填写人', + headFieldEn: 'Filled by', + field: 'completedBy', + key: 15, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('Version'), + headFieldCn: '版本', + headFieldEn: 'Version', + field: 'Version', + key: 23, + moduleFlag: '上报库' + }, + { + sort: '', + name: this.$t('synchronizationtime'), + headFieldCn: '同步时间', + headFieldEn: 'Synchronization time', + field: 'synchronizationtime', + key: 21, + moduleFlag: '上报库' + }, + { + sort: '', + disabled: true, + name: this.$t('operation'), + headFieldCn: '操作', + headFieldEn: 'Operation', + key: 35, + field: 'operation', + moduleFlag: '上报库', + status: 2 + } + ], } }, props: {}, @@ -243,6 +376,52 @@ document.title = this.$t('ParameterViewPage') }, methods: { + onCheckAllChange(e) { + let selectedValue = ['NiONumber', 'ParameterName', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue + this.selectedValue = this.checkedList + this.indeterminate = false + }, + onChange() { + this.selectedValue = this.checkedList + }, + getcustomize() { + this.customizevisible = true + }, + cancel() { + this.customizevisible = false + }, + handleSubmitcustomize() { + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val, index) => { + if (item == val.field) { + val.sort = index + 1 + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)) + let query = { + headCustomEOList: headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false + this.$refs.CollectionTabel.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, @@ -588,7 +767,43 @@ text-align: right; margin-top: 20px; } + .customize-text { + /*height: 1533px;*/ + display: flex; + flex-direction: column; + align-items: flex-start; + } + .customize-text-title { + margin-left: 0; + font-size: 14px; + font-weight: 400; + color: #040B29; + margin-bottom: 22px; + } + .drawer-bootom-button { + position: absolute; + bottom: 0; + z-index: 100; + width: 100%; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + left: 0; + background: #fff; + border-radius: 0 0 2px 2px; + } + .ant-table-placeholder { + padding: 0; + border-top: none; + } + + .itemModelComment .ant-form-item-control-wrapper { + width: 100% !important; + } + .second { + padding: 0 !important; + } .operator-text-left { font-size: 14px; margin-right: 20px; @@ -641,4 +856,38 @@ .Required { color: red; } + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 968fc7dff..0756617be 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -268,7 +268,36 @@ {{$t('CompulsoryWithdrawal')}}
- + + + +
+ + {{ $t('customize') }} +
+
{{this.$t('pleaseWaitWhileRunning')}} +
@@ -539,6 +569,7 @@ import parameterColumn from '../dialog/parametercolumn' import { getAction, postAction, downloadFile } from '../../../api/manage' import eventBUs from '../../../common/event' + import customizeList from './customizeList' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index' @@ -560,6 +591,7 @@ components: { TableCollection, ParameterLibraryAdd, + customizeList, parameterColumn, AssignedBy, AssignedByHomo, @@ -711,6 +743,110 @@ dictCode: 'dre'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 } ], + customizevisible: false, + indeterminate: false, + checkAll: false, + selectedValue: [], + checkedList: ['NiONumber', 'ParameterName', 'operation'], + customizeList: [ + { + sort: '1', + name: this.$t('NiONumber'), + disabled: true, + headFieldCn: 'NIO编号', + headFieldEn: 'NiONumber', + field: 'NiONumber', + key: 1, + moduleFlag: '参数收集', + status: 1 + }, + { + sort: '2', + disabled: true, + name: this.$t('ParameterName'), + headFieldCn: '参数名称', + headFieldEn: 'Parameter Name', + field: 'ParameterName', + key: 2, + moduleFlag: '参数收集', + status: 2 + }, + { + sort: '', + name: this.$t('ParameterDescription'), + headFieldCn: '参数说明', + headFieldEn: 'Parameter Description', + field: 'ParameterDescription', + key: 3, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('status'), + headFieldCn: '状态', + headFieldEn: 'status', + field: 'status', + key: 4, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('areaOfResponsibility'), + headFieldCn: '责任领域', + headFieldEn: 'Responsible Field', + field: 'areaOfResponsibility', + key: 5, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('engineeringInterfacePerson'), + headFieldCn: '工程接口人', + headFieldEn: 'Eng. Interface', + field: 'engineeringInterfacePerson', + key: 6, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('completedBy'), + headFieldCn: '填写人', + headFieldEn: 'Filled by', + field: 'completedBy', + key: 15, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('Deadline'), + headFieldCn: '截止时间', + headFieldEn: 'Due Date', + field: 'designDueDate', + key: 23, + moduleFlag: '参数收集' + }, + { + sort: '', + name: this.$t('databasereportingtime'), + headFieldCn: '同步上报库时间', + headFieldEn: 'database reporting time', + field: 'databasereportingtime', + key: 23, + moduleFlag: '参数收集' + }, + + { + sort: '', + disabled: true, + name: this.$t('operation'), + headFieldCn: '操作', + headFieldEn: 'Operation', + key: 35, + field: 'operation', + moduleFlag: '参数收集', + status: 2 + } + ], selectedRowKeys: [], textLoading: false, formInline: {}, @@ -1587,6 +1723,52 @@ } }) }, + onCheckAllChange(e) { + let selectedValue = ['NiONumber', 'ParameterName', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue + this.selectedValue = this.checkedList + this.indeterminate = false + }, + onChange() { + this.selectedValue = this.checkedList + }, + getcustomize() { + this.customizevisible = true + }, + cancel() { + this.customizevisible = false + }, + handleSubmitcustomize() { + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val, index) => { + if (item == val.field) { + val.sort = index + 1 + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)) + let query = { + headCustomEOList: headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false + this.$refs.CollectionTabel.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, // // 下发收集---请求接口 // distributionAndCollection() { // @@ -2177,7 +2359,7 @@ } } - \ No newline at end of file