diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index a3f743475..3bd57aa82 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -10,11 +10,11 @@
- {{item.projectName+'-'+ item.flowTypeShow}} - + {{item.serialNumber+'-'+item.flowTypeShow}} @@ -31,17 +31,22 @@
{{$t('dataLoading')}} +
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 31e1cc703..06ca28a16 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -176,7 +176,15 @@ data() { return { formInline: {}, - rules: {}, + rules: { + certificationProgressRemark:[ + { + max: 500, + message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ], + }, title: this.$t('CertificationProgress'), visible: false, confirmLoading: false, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 7f30ea37e..67604767d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -70,7 +70,8 @@
{{ $t('export') }} @@ -129,7 +130,7 @@
{{ $t('templateDownload') }} @@ -144,7 +145,7 @@
-
+
@@ -167,7 +168,7 @@
+ v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"> ...{{ $t('more') }}
@@ -513,11 +514,6 @@ value: 'category', text: this.$t('category') }, - { - type: 'string', - value: 'inspectionItem', - text: this.$t('inspectionItems') - }, { type: 'string', value: 'configItem', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 4b4c5c89a..739c4de1c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -208,6 +208,19 @@ } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '21') { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer: row.studioEngineer, + type: '106' + } + }) + window.open(newUrl.href, '_blank') } else if (row.flowType == '2') { row.taskId = row.taskId + '' if (row.taskId.length > 30) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 74873bffe..239842f2a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -203,6 +203,19 @@ } }) window.open(newUrl.href, '_blank') + } else if (row.flowType == '21') { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer: row.studioEngineer, + type: '106' + } + }) + window.open(newUrl.href, '_blank') }else if(row.flowType == '2'){ row.taskId = row.taskId + '' if (row.taskId.length > 30) { diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue index 7679f8d82..25ccd69f9 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue @@ -1,215 +1,290 @@ \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue new file mode 100644 index 000000000..63389d01a --- /dev/null +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -0,0 +1,313 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index 5c5fe7dd3..4765a055d 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -49,7 +49,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 300px)'}" - rowKey="id" + :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" @change="tableOnChange" @@ -113,7 +113,8 @@
* - {{$t('CertificationListName')}} + {{$t('CertificationListName')}}
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 76a5a4661..95301d8a7 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -232,7 +232,7 @@
- + @@ -292,7 +292,7 @@ title: this.$t('category'), align: 'left', dataIndex: 'category', - width: 150, + width: 200, fixed: 'left', ellipsis: true }, @@ -300,7 +300,7 @@ title: this.$t('inspectionItems'), align: 'left', dataIndex: 'inspectionItem', - width: 150, + width: 200, ellipsis: true, fixed: 'left', scopedSlots: { customRender: 'inspectionItems' } @@ -323,7 +323,7 @@ title: this.$t('standard'), align: 'left', dataIndex: 'serialNumber', - width: 150, + width: 210, ellipsis: true }, { @@ -353,7 +353,7 @@ } }, created() { - if (this.$route.query.title == '虚拟认证清单详情') { + if (this.$route.query.title == '市场认证清单详情') { document.title = this.$t('virtualAuthenticationListDetails') this.columns.splice(7, 1) } else { @@ -362,8 +362,8 @@ }, mounted() { this.title = this.$route.query.title - this.isTrue = this.$route.query.title == '虚拟认证清单详情' ? false : true - this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false + this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true + this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false this.getList() }, computed: {}, @@ -382,6 +382,10 @@ searchQuery() { this.getList() }, + transferListForm() { + this.selectedRowKeys = [] + this.getList() + }, //清空 searchReset() { this.queryParam = {}