diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index 43c3e00c2..b447b3d9a 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -149,7 +149,6 @@ service.interceptors.request.use(config => { ...config.data } } - console.log(config) return config }, (error) => { return Promise.reject(error) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index d0796936e..40d900739 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -68,7 +68,7 @@ queryBy: {}, queryProject: {}, loading: false, - textLoading:this.$t('dataLoading'), + textLoading: this.$t('dataLoading'), projectInformationList: [ { title: this.$t('entryName'), @@ -183,6 +183,10 @@ } }, mounted() { + let _this = this + this.queryTaskDetailByTask(function() { + _this.queryProjectLawsInventoryInfo() + }) }, methods: { ...mapGetters(['userInfo']), @@ -194,6 +198,33 @@ }, sendBack() { + }, + queryTaskDetailByTask(callback) { + this.loading = true + getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { + if (res instanceof String) { + this.queryBy = JSON.parse(res) + callback() + } else { + this.queryBy = res + callback() + } + }) + }, + queryProjectLawsInventoryInfo() { + let query = { + id: this.queryBy.id, + operatorType: 'taskAffirmQuery' + } + getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { + if (res.success) { + this.queryProject = res.result.projectLawsInventory || {} + this.loading = false + } else { + this.queryProject = {} + this.loading = false + } + }) } } } diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 6b4257f52..74c50aacd 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -52,8 +52,8 @@ >
- GB-7258-2017
- 及东盟火车大师傅但是 + {{result.serialNumber}}
+ {{result.title}}
@@ -63,28 +63,34 @@
-
+
截止时间: 2022-06-01
流程状态: 待审核
待追踪
-
+
-
+
截止时间: 2022-06-01
流程状态: 待审核
待追踪
+
+
+
-
+
截止时间: 2022-06-01
流程状态: 待审核
待追踪
+
+
+
@@ -171,6 +177,11 @@ } ], selectedRowKeys: [], + status: { + 'NotDone': '待办', + 'haveDone': '已办', + 'showData': '展示数据' + }, queryParam: {}, url: { list: '/project/projectTaskInventoryEO/list' @@ -195,6 +206,31 @@ }, handleExport() { + }, + verifyTaskClick(val, num) { + let query = {} + switch (num) { + case 1: + query = { + taskIds: val.designTaskId + } + break + case 2: + query = { + taskIds: val.prehomoTaskId + } + break + case 3: + query = { + taskIds: val.verifyTaskId + } + break + } + let newUrl = this.$router.resolve({ + path: '/taskListProcess', + query: query + }) + window.open(newUrl.href, '_blank') }, CertificationDirectory() { this.$refs.certificationDirectoryRef.addModel() @@ -206,8 +242,8 @@ } getAction(this.url.list, query).then((res) => { if (res.success) { - // this.dataSource = res.result - this.dataSource = [{}] + this.dataSource = res.result + // this.dataSource = [{}] } else { this.dataSource = [] }