From 56eb985472afff577328b95f500252d183b47167 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dashboard/components/customContent.vue | 12 +++--
.../processForm/handshakeProcess/index.vue | 27 ++++++-----
.../processForm/taskListProcess/index.vue | 19 ++++----
.../components/listOfRegulations.vue | 46 +------------------
4 files changed, 36 insertions(+), 68 deletions(-)
diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue
index b6ba8bfcc..929d3ed43 100644
--- a/jero-web/src/views/dashboard/components/customContent.vue
+++ b/jero-web/src/views/dashboard/components/customContent.vue
@@ -3,7 +3,7 @@
![]()
-
{{item.iconName}}
+
{{item.iconName}}
@@ -25,7 +25,7 @@
![]()
-
{{item.iconName}}
+
{{item.iconName}}
![]()
-
{{item.iconName}}
+
{{item.iconName}}
@@ -195,6 +195,9 @@
font-weight: 400;
color: #040B29;
margin-top: 8px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
}
@@ -228,6 +231,9 @@
font-weight: 400;
color: #040B29;
margin-top: 8px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
}
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index a61fa6986..94434a59d 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -163,7 +163,7 @@
this.textLoading = this.$t('Returning')
this.loading = true
this.$refs.examineInformationRef.submitNoRule((res) => {
- this.completeTask({ ...res,flag: 1 }, handlingTime,)
+ this.completeTask({ ...res, flag: 1 }, handlingTime)
})
},
queryTaskDetailByTask(callback) {
@@ -203,14 +203,16 @@
}
if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType &&
!this.queryProject.designDeliverableType) {
- this.$router.push({
- path: '/ProcessCenter'
- })
+ window.close()
+ // this.$router.push({
+ // path: '/ProcessCenter'
+ // })
}
} else {
- this.$router.push({
- path: '/ProcessCenter'
- })
+ window.close()
+ // this.$router.push({
+ // path: '/ProcessCenter'
+ // })
}
} else {
this.$router.push({
@@ -226,6 +228,7 @@
startProcessDesign(value, num) {
let query = {
type: num,
+ projectLawsInventoryId: value.id,
msg: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/startProcess', query).then((res) => {
@@ -247,10 +250,12 @@
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
this.visible = false
- // this.$message.success(this.$t('OperationSuccessful'))
- this.$router.push({
- path: '/ProcessCenter'
- })
+ setTimeout(() => {
+ window.close()
+ }, 2000)
+ // this.$router.push({
+ // path: '/ProcessCenter'
+ // })
} else {
this.$message.warning(this.$t('operationFailed'))
}
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 90b1b0d64..7e0b5e7e9 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -303,10 +303,11 @@
if (res.success) {
this.loading = false
this.$message.success(this.$t('OperationSuccessful'))
- this.$router.push({
- path: '/ProjectDetails',
- query: this.$route.query
- })
+ // this.$router.push({
+ // path: '/ProjectDetails',
+ // query: this.$route.query
+ // })
+ window.close()
} else {
this.loading = false
this.$message.warning(this.$t('operationFailed'))
@@ -326,10 +327,10 @@
this.$message.success(this.$t('OperationSuccessful'))
this.loading = false
this.edit()
- this.$router.push({
- path: '/ProjectDetails',
- query: this.$route.query
- })
+ // this.$router.push({
+ // path: '/ProjectDetails',
+ // query: this.$route.query
+ // })
} else {
this.loading = false
this.$message.warning(this.$t('operationFailed'))
@@ -343,7 +344,7 @@
}
putAction(this.url.edit, query).then((res) => {
if (res.success) {
-
+ window.close()
}
})
},
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index ac1624006..205dc7449 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -151,8 +151,6 @@
@click="deleteLib(record)">
{{ $t('deleteLib') }}
-
-
{{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
@@ -1107,6 +1105,7 @@
msg: JSON.stringify(value).replace(/\"/g, '\''),
projectNameId: this.$route.query.projectNameId,
projectName: this.$route.query.projectName,
+ projectLawsInventoryId:value.id
taskAffirmDueDate: this.formInline.taskAffirmDueDate
}
postAction('/workFlow/startProcess', query).then((res) => {
@@ -1326,49 +1325,6 @@
})
},
- addProcess(val) {
- let num = 1
- for (let i = 0; i < 3; i++) {
- setTimeout(() => {
- ++num
- this.startProcessDesign(val, num)
- }, 500)
- }
- },
- startProcessDesign(value, num) {
- let query = {
- type: num,
- msg: JSON.stringify(value).replace(/\"/g, '\'')
- }
- postAction('/workFlow/startProcess', query).then((res) => {
- if (res.success) {
- this.completeTaskDesign(value, res.result)
- }
- })
- },
-
- completeTaskDesign(value, taskId) {
- value.reviewResult = 'launch'
- let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
- value.operatorTime = operatorTime
- let query = {
- userid: this.userInfo().id,
- taskId: taskId,
- json: JSON.stringify(value).replace(/\"/g, '\'')
- }
- postAction('/workFlow/completeTask', query).then((res) => {
- if (res.success) {
- this.visible = false
- this.$message.success(this.$t('OperationSuccessful'))
- this.$router.push({
- path: '/ProcessCenter'
- })
- } else {
- this.$message.warning(this.$t('operationFailed'))
- }
- })
- },
-
resultReportedClick(val) {
this.clickButtonToUploadFile()
},