diff --git a/src/components/InfoEditRecord/index.vue b/src/components/InfoEditRecord/index.vue index 29362c8..c3758d3 100644 --- a/src/components/InfoEditRecord/index.vue +++ b/src/components/InfoEditRecord/index.vue @@ -188,12 +188,12 @@ >

- 更新 -

+ +

{{ item }}

{{ v.describe }}

@@ -345,6 +345,7 @@ export default { let date = new Date(item.creatorTime * 1000); item.updataTime = this.$m(date).format("YYYY-MM-DD HH:mm:ss"); item.updataList = JSON.parse(item.content); + item.changeRecord = item.content ? JSON.parse(item.describe) : item.describe; }); this.updataRecordList = data.list; this.record_loading = false; diff --git a/src/views/baseSpecialAction/dynamicModel/list/Form.vue b/src/views/baseSpecialAction/dynamicModel/list/Form.vue index 31069c8..e7ea4c3 100644 --- a/src/views/baseSpecialAction/dynamicModel/list/Form.vue +++ b/src/views/baseSpecialAction/dynamicModel/list/Form.vue @@ -162,7 +162,7 @@ export default { if (callback && typeof callback === "function") callback() this.visible = false this.btnLoading = false - !this.dataForm.id && this.toSaveItemid(itemId) + !this.dataForm.id && await this.toSaveItemid(itemId) this.$emit('refreshDataList', true) } }) @@ -173,7 +173,7 @@ export default { let res = await request({ url: '/Extend/BaseSpecialActionInfo/UpdateState', method: "PUT", - data: { + params: { id: this.taskId, itemId }, diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index e0d8de1..8d5a291 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -107,21 +107,19 @@ - + + + @@ -270,8 +270,8 @@ export default { }) } else if(row.taskType == '专项行动') { this.formVisible = true; - let data = await this.getBaseSpecialActionInfo('588008032122701061'); - // let row = await this.getBaseSpecialActionInfo(row.taskCorrelationId); + // let data = await this.getBaseSpecialActionInfo('588008032122701061'); + let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId); var Itemid = data.itemId || '';//数据id,没有的话就是新增 ,有的话就是修改 var modelId = data.formId;//关联的表单id var taskId = data.id; // 当前专项行动id