diff --git a/src/views/System/components/EditUser.vue b/src/views/System/components/EditUser.vue index 6ecb6c0..74b70d8 100644 --- a/src/views/System/components/EditUser.vue +++ b/src/views/System/components/EditUser.vue @@ -80,7 +80,7 @@ mounted() { this.factoryLists = JSON.parse(JSON.stringify(this.factoryList)); this.stateLists = JSON.parse(JSON.stringify(this.stateList)); - debugger + let userInfo = JSON.parse(JSON.stringify(this.userInfoObj)); userInfo.FUser = userInfo.FUser || " "; userInfo.FPassword = userInfo.FPassword || "123456"; diff --git a/src/views/System/components/EditUser2.vue b/src/views/System/components/EditUser2.vue index 12db69b..96d4d09 100644 --- a/src/views/System/components/EditUser2.vue +++ b/src/views/System/components/EditUser2.vue @@ -141,7 +141,7 @@ export default { mounted() { //this.factoryLists = JSON.parse(JSON.stringify(this.factoryList)); this.stateLists = JSON.parse(JSON.stringify(this.stateList)); - debugger + let userInfo = JSON.parse(JSON.stringify(this.userInfoObj)); userInfo.FUser = userInfo.FUser || " "; userInfo.FPassword = userInfo.FPassword || "123456"; @@ -199,7 +199,7 @@ export default { this.userInfo.FUser = this.userInfo.FUser.trim(); this.userInfo.FPassword = this.userInfo.FPassword.trim(); this.userInfo.FName = this.userInfo.FName.trim(); - debugger + //this.userInfo.FFactoryID = this.userInfo.FFactoryID.trim(); //this.userInfo.FRoleID = this.userInfo.FRoleID || -1; //this.userInfo.FRoleName = role == null ? "" : role.FName; diff --git a/src/views/System/components/PowerRole.vue b/src/views/System/components/PowerRole.vue index ff2e026..7a72318 100644 --- a/src/views/System/components/PowerRole.vue +++ b/src/views/System/components/PowerRole.vue @@ -302,7 +302,7 @@ return ids; } - debugger + let result = await saveRolePower({ FRoleId: this.roleInfo.FID, FMenuId: this.tabIndex == 1 ? getIds(this.menuList).join(',') : null, diff --git a/src/views/Team/all.vue b/src/views/Team/all.vue index 35c07b0..b83cf01 100644 --- a/src/views/Team/all.vue +++ b/src/views/Team/all.vue @@ -266,7 +266,7 @@ item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate); }); this.pageInfo.total = result.Data.Total || 0; - debugger + this.dataList = result.Data.List.map(function(item){ if(factoryList){ diff --git a/src/views/Team/components/ShowData1.vue b/src/views/Team/components/ShowData1.vue index 1be9a52..8cc7d9b 100644 --- a/src/views/Team/components/ShowData1.vue +++ b/src/views/Team/components/ShowData1.vue @@ -307,7 +307,7 @@ result.forEach((item) => { let viewData = dataList.find(s => s.name == item.FName) || null; - debugger + if (viewData == null) { if (hasType.indexOf(item.FCode) != -1) { viewData = { diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue index cad7d70..9d2215b 100644 --- a/src/views/half/components/EditMateria.vue +++ b/src/views/half/components/EditMateria.vue @@ -330,7 +330,7 @@ export default { item.FTypeName = type == null ? item.FType : type.FName; if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID }); - debugger + this.dataList = result.Data; } diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue index 69b776a..9a00f11 100644 --- a/src/views/half/components/EditView.vue +++ b/src/views/half/components/EditView.vue @@ -293,7 +293,6 @@ export default { // it.cellClass = "edit-item" // return it; // }); - debugger if (editColumn.length > 0) { if (this.selectDataMap == null) { @@ -487,7 +486,7 @@ export default { console.log('this.editColumn', this.editColumn); for (let col of this.dataColumn) { let valTemp = row[col.key]; - debugger + if (!dataObj[col.table]) { dataObj[col.table] = {}; dataObj[col.table].FMaterialID = row["FMaterialID"]; diff --git a/src/views/half/components/EditViewOFF.vue b/src/views/half/components/EditViewOFF.vue index 855ecdf..b9e65b1 100644 --- a/src/views/half/components/EditViewOFF.vue +++ b/src/views/half/components/EditViewOFF.vue @@ -296,10 +296,6 @@ export default { } }) - debugger - - - if (editColumn.length > 0) { if (this.selectDataMap == null) { let dataTypeIds = editColumn.filter(it => { @@ -508,7 +504,7 @@ export default { console.log('this.editColumn', this.editColumn); for (let col of this.dataColumn) { let valTemp = row[col.key]; - debugger + if (!dataObj[col.table]) { dataObj[col.table] = {}; dataObj[col.table].FMaterialID = row["FMaterialID"]; diff --git a/src/views/half/components/ShowData1.vue b/src/views/half/components/ShowData1.vue index a43ab46..b41c174 100644 --- a/src/views/half/components/ShowData1.vue +++ b/src/views/half/components/ShowData1.vue @@ -244,7 +244,7 @@ export default { Type: 2 }) || []; - debugger + console.log('result', result); console.log('this.dataInfoObj', this.dataInfoObj); let dataList = []; @@ -252,7 +252,7 @@ export default { result.forEach((item) => { let viewData = dataList.find(s => s.name == item.FName) || null; - debugger + if (viewData == null) { if (hasType.indexOf(item.FCode) != -1) { viewData = { diff --git a/src/views/half/route.vue b/src/views/half/route.vue index 51a8d27..577a4dd 100644 --- a/src/views/half/route.vue +++ b/src/views/half/route.vue @@ -315,7 +315,7 @@ export default { else { return layer.msg("未知事项类型"); } - debugger + this.objInfoObj = data; this.editType = type; this.showEditBox[data.FBoxType] = true; diff --git a/src/views/materia/all.vue b/src/views/materia/all.vue index bfb6d18..84c87d4 100644 --- a/src/views/materia/all.vue +++ b/src/views/materia/all.vue @@ -47,7 +47,7 @@ 已完成 @@ -297,6 +297,8 @@ } }); + console.log('result', result); + this.hasLoaded = true; }, //日期处理 diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue index 76715f6..4f77e7d 100644 --- a/src/views/materia/components/EditView.vue +++ b/src/views/materia/components/EditView.vue @@ -7,13 +7,13 @@ -