WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知问题

Browse Source
This commit is contained in:
qq787203167
2022-05-25 16:35:16 +08:00
parent 6ac094c4e9
commit 56eb985472
4 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/dashboard/components/customContent.vue
+9 -3
View File
@@ -3,7 +3,7 @@
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text">{{item.iconName}}</div>
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
</div>
<div class="box-content" @click="customClick()" style=";margin-top: 0">
@@ -25,7 +25,7 @@
<div class="box-top" @click="statusClick(1,item,index)">
<div class="box-content">
<img :src="item.iconPath" class="img" alt="">
<div class="text">{{item.iconName}}</div>
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
</div>
</div>
@@ -38,7 +38,7 @@
@click="statusClick(2,item,index)">
<div class="box-content">
<img :src="item.iconPath" class="img" alt="">
<div class="text">{{item.iconName}}</div>
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
</div>
</div>
@@ -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;
}
}
}
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+16 -11
View File
@@ -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'))
}
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+10 -9
View File
@@ -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()
}
})
},
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+1 -45
View File
@@ -151,8 +151,6 @@
@click="deleteLib(record)">
{{ $t('deleteLib') }}
</a>
<!-- <a class="text-operation" @click="resultReportedClick(record)">{{$t('resultReported')}}</a>-->
<!-- <a @click="addProcess(record)">发起</a>-->
</span>
<span slot="titleName" slot-scope="text,record" :title="text">
{{ 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()
},