diff --git a/src/views/log/log.vue b/src/views/log/log.vue index 77bc493..e9ef3ac 100644 --- a/src/views/log/log.vue +++ b/src/views/log/log.vue @@ -81,7 +81,7 @@ }, { title: "模块", - key: "", + key: "FModuleName", width: "120px", align: 'center' }, @@ -154,6 +154,9 @@ }, { id: 6, name: "系统设置" + }, { + id: 0, + name: "" }]); const hasLoaded = ref(false); const dataItem=ref([]); @@ -230,6 +233,8 @@ if (type) { item["FTypeName"] = type.FName; } + + item["FModuleName"] = this.moduleList.find(m => m.id == item.FModule).name; }) this.pageInfo.total = result.Data.Total; diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue index 4f77e7d..5c5b861 100644 --- a/src/views/materia/components/EditView.vue +++ b/src/views/materia/components/EditView.vue @@ -531,6 +531,7 @@ export default { let saveId = this.dataInfoObj.FID; let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId)); let allTypeSelected = true + let viewType = 0 this.dataList.forEach((row, index) => { let cache = cacheDataList[index]; @@ -611,6 +612,8 @@ export default { dataObj["TFS_ViewMaterial"].FMRP1ProductType = row["FMRP1ProductType"]; dataObj["TFS_ViewMaterial"].FTypeID2 = row["FTypeID2"]; dataObj["TFS_ViewMaterial"].FBaseMaterialCode = row["FBaseMaterialCode"] + + viewType = row["FViewType"]; for (let key in dataObj) { if (!updateObj[key]) updateObj[key] = []; @@ -624,6 +627,16 @@ export default { return false; } + let logType = 0 + + if (this.dataInfoObj['FType'] == 0) { + logType = 15 + } else if (this.dataInfoObj['FType'] == 2) { + logType = 13 + } else { + logType = viewType + 2 + } + let updateLog = updateObj.LogList.join("、"); delete updateObj.LogList // 发送保存请求 @@ -632,7 +645,8 @@ export default { if (_result.Data.TaskId > 0) { await commonSave({ teamId: updateObj.FTeamID, - type: this.dataInfoObj['FType'], + module: 3, + type: logType, desc: updateLog }, "OperateLog"); let $this = this;