diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index c5f89f38b..5d19ac984 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -17,7 +17,7 @@
{{$t('standard')}}
+ v-model="queryParam.serialNumber">
@@ -225,7 +225,7 @@
this.selectedRowKeys = []
this.$emit('addModelList')
} else {
- this.$message.warning(this.$t('operationFailed'))
+ this.$message.warning(res.message)
this.confirmLoading = false
}
})
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 609114e56..f336bbeb0 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -249,7 +249,7 @@
}
],
url: {
- addModelList: '/document/bussDocumentLibraryEO/queryPageInfoDummy',
+ addModelList: '/project/projectLawsInventoryEO/queryPageInfoBussDocument',
list: '/dummy/dummyInventoryInfoEO/list',
addModel: '/dummy/dummyInventoryInfoEO/add',
editModel: '/dummy/dummyInventoryInfoEO/edit',
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 93cd8893d..85efdc3e4 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -187,13 +187,12 @@
})
},
completeTask(value,handlingTime) {
- let json = Object.assign({}, this.queryBy, value)
+ let json = Object.assign({handlingTime:handlingTime}, this.queryBy, value)
let data = JSON.stringify(json).replace(/\"/g, '\'')
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
json: data,
- handlingTime:handlingTime
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index cbb004715..2123d94ee 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -17,7 +17,7 @@
{{$t('standard')}}
+ v-model="queryParam.serialNumber">
@@ -209,7 +209,7 @@
this.selectedRowKeys = []
this.$emit('addModelList')
} else {
- this.$message.warning(this.$t('operationFailed'))
+ this.$message.warning(res.message)
this.confirmLoading = false
}
})
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index c4b1f34dc..7a068d029 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -519,7 +519,7 @@
},
queryParam: {},
url: {
- addModelList: '/document/bussDocumentLibraryEO/queryPageInfoDummy',
+ addModelList: '/project/projectLawsInventoryEO/queryPageInfoBussDocument',
list: '/project/projectLawsInventoryEO/list',
addModel: 'project/projectLawsInventoryEO/add',
editModel: '/project/projectLawsInventoryEO/edit',
@@ -810,6 +810,8 @@
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
+ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+ this.dataSource[i].handlingTime = handlingTime
Object.keys(this.dataSource[i]).forEach(res => {
if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
@@ -828,11 +830,9 @@
})
},
startProcess(value) {
- let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
let query = {
type: 1,
msg: value,
- handlingTime:handlingTime,
projectNameId:this.$route.query.projectNameId,
projectName:this.$route.query.projectName,
taskAffirmDueDate: this.formInline.taskAffirmDueDate,