diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue index 0f2c238..3e813dc 100644 --- a/src/views/materia/components/EditView.vue +++ b/src/views/materia/components/EditView.vue @@ -246,10 +246,8 @@ export default { let dataColumn = _data.columns || []; let $this = this; - console.log('dataColumn', dataColumn); let editColumn = []; - //判断视图权限 _data.rows.forEach((itemRow) => { @@ -277,8 +275,6 @@ export default { } }) - - if (editColumn.length > 0) { if (this.selectDataMap == null) { let dataTypeIds = editColumn.filter(it => { @@ -331,7 +327,7 @@ export default { item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2; }); - + let saveId = this.dataInfoObj.FID; localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); @@ -375,9 +371,6 @@ export default { let freezingColumns = freezingCols.FFreezingColumns - console.log('this.dataList', this.dataList); - console.log('this.dataColumn', this.dataColumn); - if (freezingColumns) { let c_list = freezingColumns.split(",") c_list.forEach(c => { @@ -464,6 +457,8 @@ export default { //data[item.key] = result[item.key] || data[item.key] || ""; }); + data["FMRP1ProductType"] = result["FMRP1ProductType"]; + } } } @@ -490,6 +485,7 @@ export default { allTypeSelected = false return false; } + console.log(' this.editColumn', this.editColumn); for (let col of this.editColumn) { let valTemp = row[col.key]; // if (this.dataInfoObj.FViewType == 10) { @@ -550,9 +546,14 @@ export default { } } - // dataObj["TFS_ViewMaterial"].FMRP1ProductType = row["FMRP1ProductType"]; - // dataObj["TFS_ViewMaterial"].FTypeID1 = row["FTypeID1"]; - // dataObj["TFS_ViewMaterial"].FTypeID2 = row["FTypeID2"]; + if (!dataObj["TFS_ViewMaterial"]) { + dataObj["TFS_ViewMaterial"] = {}; + dataObj["TFS_ViewMaterial"].FMaterialID = row["FMaterialID"]; + dataObj["TFS_ViewMaterial"].FMRP1ProductType = row["FMRP1ProductType"]; + dataObj["TFS_ViewMaterial"].FTypeID2 = row["FTypeID2"]; + } + + console.log('dataObj', dataObj); for (let key in dataObj) { if (!updateObj[key]) updateObj[key] = [];