diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2db63ba8e..9b08f22c0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1107,4 +1107,9 @@ module.exports = { ValidationComplianceNotification:'Validation Compliance Notification', RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification', evaluationMethod:'Evaluation method', + uploadRelevantMaterials:'Upload relevant materials', + processBackground:'Process background', + selectedStandard:'Selected standard', + standardDecompositionDocument:'Standard decomposition document', + pleaseSelectStandardFirst:'Please select a standard first', } \ 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 82611fe55..d1d642381 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1111,4 +1111,9 @@ module.exports = { ValidationComplianceNotification:'验证符合性通知', RegulationTaskConfirmationNotification:'任务确认通知', evaluationMethod:'评估方式', + uploadRelevantMaterials:'相关资料上传', + processBackground:'流程背景', + selectedStandard:'所选标准', + standardDecompositionDocument:'带入标准分解单', + pleaseSelectStandardFirst:'请先选择标准', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue new file mode 100644 index 000000000..1ccae18b1 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 66b030e9c..1cf238d6c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -34,6 +34,24 @@ /> + + +
+
+ {{$t('selectedStandard')}} +
+
+ 件大事发的科技示范和的空间是否和是科技示范的空间是多少 +
+
+ + {{$t('standardDecompositionDocument')}} + +
+
+
+
@@ -52,6 +70,74 @@
+ +
+
+ {{$t('enclosure')}} +
+ + + {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || + formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+
+
+ + +
+
+ {{$t('processBackground')}} +
+ + + +
+
+
+ + +
+
+ {{$t('remarks')}} +
+ + + +
+
+
+ + +
+
+ * + {{$t('evaluationMethod')}} +
+ + + + + {{ item.name }} + + + + +
+
@@ -69,38 +155,8 @@
- - -
-
- {{$t('taskDescription')}} -
- - - -
-
-
- - -
-
- {{$t('enclosure')}} -
- - - {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || - formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
-
-
+ {{this.$t('pleaseWaitWhileRunning')}} +
@@ -118,6 +176,8 @@ import uploadFile from '@/components/uploadFile/file' import PersonnelSelection from '@/components/PersonnelSelection/index' import footerProcess from '../../../processCenter/components/footerProcess' + import standardDecompositionSheet from './standardDecompositionSheet' + import TermInformation from './TermInformation' import { getAction, postAction } from '@/api/manage' import moment from 'moment' import eventBUs from '../../../../common/event' @@ -130,7 +190,9 @@ search, uploadFile, footerProcess, - PersonnelSelection + PersonnelSelection, + standardDecompositionSheet, + TermInformation }, data() { return { @@ -141,13 +203,24 @@ addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' }, loading: false, - JLoading:false, + JLoading: false, + isTrue: false, dataSource: [], selectedRowKeys: [], total: 0, pageSize: 10, pageNo: 1, formInline: {}, + gatherResultList: [ + { + value: 'Underway', + name: this.$t('inProgress') + }, + { + value: 'Completed', + name: this.$t('Finished') + } + ], rules: { endTime: [ { @@ -215,6 +288,11 @@ mounted() { document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess') this.getList() + if (this.$route.query.whetherTobring == '1') { + this.isTrue = true + } else { + this.isTrue = false + } eventBUs.$on('searchQuery', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { @@ -263,6 +341,16 @@ record.shift() } this.selectedRowKeysRecord = record + }, + standardDecompositionDocumentClick() { + if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) { + this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0]))) + } else { + this.$message.warning(this.$t('pleaseSelectStandardFirst')) + } + }, + standardDecompositionSheetForm(value) { + }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() @@ -295,14 +383,14 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, - getUUID(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + return str.join('') }, submit() { this.$refs.ruleForm.validate(valid => { @@ -336,7 +424,7 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) - }else{ + } else { this.JLoading = false } }) @@ -444,4 +532,38 @@ text-align: right; margin-top: 20px; } + + .title-text-content { + display: inline-block; + width: calc(100% - 334px); + text-align: center; + border: 1px solid #d9d9d9; + line-height: 38px; + border-bottom-left-radius: 5px; + border-top-left-radius: 5px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .title-text-right { + width: 200px; + text-align: center; + border: 1px solid #d9d9d9; + line-height: 38px; + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + border-left: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #21c9cc; + cursor: pointer; + } + + .title-text-content-one { + border-bottom-right-radius: 5px; + border-top-right-radius: 5px; + width: calc(100% - 128px); + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue new file mode 100644 index 000000000..511c36717 --- /dev/null +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 7f8b97246..ca3a8db38 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -111,6 +111,43 @@ /> + + + + +
+
+ * + {{$t('standardDecompositionDocument')}} +
+ + + + + {{ item.name }} + + + + +
+
+
+
+
@@ -126,6 +163,7 @@ list: '', getSysCategoryTree: '/sys/category/getSysCategoryTree' }, + visible: false, loading: false, toggleSearchStatus: false, dataSource: [], @@ -135,6 +173,26 @@ pageNo: 1, CategoryTreeList: [], queryParam: {}, + formInline: {}, + rules: { + whetherTobring: [ + { + required: true, + message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + whetherTobringList: [ + { + value: '1', + name: '是' + }, + { + value: '2', + name: '否' + } + ], gatherResultList: [ { value: 'Underway', @@ -271,14 +329,27 @@ onSelectChange(value) { this.selectedRowKeys = value }, + handleOk() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.visible = false + let newUrl = this.$router.resolve({ + path: '/evaluationInitiationProcess', + query: this.formInline + }) + // let newUrl = this.$router.resolve({ + // path: '/regulatoryProcessReview' + // }) + window.open(newUrl.href, '_blank') + } + }) + }, initiatingProcessClick() { - let newUrl = this.$router.resolve({ - path: '/evaluationInitiationProcess' + this.visible = true + this.formInline = {} + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() }) - // let newUrl = this.$router.resolve({ - // path: '/regulatoryProcessReview' - // }) - window.open(newUrl.href, '_blank') }, viewProcessClick(row) { let newUrl = this.$router.resolve({ @@ -348,4 +419,15 @@ .text-operation { margin-right: 8px; } + + .itemModel { + width: calc(100% - 130px); + display: inline-block; + margin-top: 2px; + } + + .Required { + color: red; + margin-right: 4px; + } \ No newline at end of file