From c09e46bfa6183b6863ebff35b6d5fbea91cefd4b Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Sun, 14 May 2023 16:03:58 +0800 Subject: [PATCH] commit by yzf --- src/views/half/components/EditView.vue | 16 ++++++---- src/views/half/components/EditViewOFF.vue | 37 +++++++++++++++++------ src/views/half/components/ShowData1.vue | 17 ++++++++--- 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue index fc40101..264e7d5 100644 --- a/src/views/half/components/EditView.vue +++ b/src/views/half/components/EditView.vue @@ -190,6 +190,7 @@ export default { }; const idx = ref([]); const materialInfoList = ref([]); + const dataRowsList=ref(""); return { dataColumn, dataList, @@ -211,7 +212,8 @@ export default { tmpDataColumn, infoList, materialInfoList, - idx + idx, + dataRowsList }; }, @@ -346,7 +348,7 @@ export default { }); - let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; + this.dataRowsList=JSON.stringify(_data.rows); this.editColumn = editColumn; let $this = this; this.dataList = _data.rows.map(function (item) { @@ -469,10 +471,10 @@ export default { FTeamID: this.dataInfoObj['FTeamID'], FViewType: this.dataInfoObj.FViewType }; - let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; - console.log('cacheDataList', cacheDataList); + let cacheDataList = JSON.parse(this.dataRowsList); let allTypeSelected = true; this.dataList.forEach((row, index) => { + let cache = cacheDataList[index]; let dataObj = {}; if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') { layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 }); @@ -495,7 +497,10 @@ export default { let temp = temps.find(s => s.FID == valTemp) || null; valTemp = temp == null ? "" : temp.FName; } - updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); + if(dataObj[col.table][col.key]!=cache[col.key]) + { + updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); + } } @@ -524,7 +529,6 @@ export default { }, "OperateLog"); let $this = this; //$this.initPage(); - localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList)); setTimeout(function () { layer.close(idx); layer.msg('保存成功'); diff --git a/src/views/half/components/EditViewOFF.vue b/src/views/half/components/EditViewOFF.vue index b9e65b1..e2015de 100644 --- a/src/views/half/components/EditViewOFF.vue +++ b/src/views/half/components/EditViewOFF.vue @@ -187,6 +187,7 @@ export default { const tmpDataColumn = ref([]); const materialInfoList = ref([]); const idx = ref([]); + const dataRowsList=ref(""); return { dataColumn, dataList, @@ -207,7 +208,8 @@ export default { originalColumns, tmpDataColumn, materialInfoList, - idx + idx, + dataRowsList }; }, props: { @@ -347,15 +349,26 @@ export default { } }); - let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; + //let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; //localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); + this.dataRowsList=JSON.stringify(_data.rows); + console.log('editColumn', editColumn); this.editColumn = editColumn; - this.dataList = _data.rows.map(function (item) { item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2); + if(typeof(item["FTypeID1"])=="string") + { + item["FTypeID1"]=parseInt(item["FTypeID1"]); + } + + if(typeof(item["FTypeID2"])=="string") + { + item["FTypeID2"]=parseInt(item["FTypeID2"]); + } + let fType1 = $this.typeList[0].find((t) => { if (item.FTypeID1) { return t.FID == item.FTypeID1 @@ -482,18 +495,20 @@ export default { }, async saveBatch() { let idx = layer.load(2); + let $this = this; let updateObj = { LogList: [], FTeamID: this.dataInfoObj['FTeamID'], FViewType: this.dataInfoObj.FViewType, FType: this.dataInfoObj.FType }; - let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; - //let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId)); + //let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; + let cacheDataList = JSON.parse(this.dataRowsList); //console.log('cacheDataList', cacheDataList); let allTypeSelected = true; this.dataList.forEach((row, index) => { - //let cache = cacheDataList[index]; + let cache = cacheDataList[index]; + let dataObj = {}; // if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') { // layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 }); @@ -516,7 +531,11 @@ export default { let temp = temps.find(s => s.FID == valTemp) || null; valTemp = temp == null ? "" : temp.FName; } - updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); + debugger + if(dataObj[col.table][col.key]!=cache[col.key]) + { + updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); + } } @@ -535,13 +554,13 @@ export default { // 发送保存请求 console.log('updateObj', updateObj); let _result = await updateBatchById4(updateObj); - if (_result.Code === 200) { + if (_result.Code === 200&&updateLog!='') { await commonSave({ teamId: updateObj.FTeamID, type: this.dataInfoObj['FType'], desc: updateLog }, "OperateLog"); - let $this = this; + //$this.initPage(); //localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList)); setTimeout(function () { diff --git a/src/views/half/components/ShowData1.vue b/src/views/half/components/ShowData1.vue index b41c174..290394c 100644 --- a/src/views/half/components/ShowData1.vue +++ b/src/views/half/components/ShowData1.vue @@ -233,10 +233,18 @@ export default { //获取视图 async _getViewList() { - let result = await getBasicRoleList({ - FRoleType: 39 - - }) || []; + let result =[ + {"FID":43,"FCode":"1","FName":"物料视图","FRemark":"视图查看","F1":"","F2":""}, + {"FID":44,"FCode":"2","FName":"配方视图","FRemark":"视图查看","F1":"","F2":""}, + {"FID":45,"FCode":"3","FName":"生产工艺路线视图","FRemark":"视图查看","F1":"","F2":""}, + {"FID":46,"FCode":"4","FName":"生产版本视图","FRemark":"视图查看","F1":"","F2":""}, + {"FID":47,"FCode":"5","FName":"组装BOM视图","FRemark":"视图查看","F1":"","F2":""}, + {"FID":48,"FCode":"6","FName":"物料视图","FRemark":"视图导出","F1":"","F2":""}, + {"FID":49,"FCode":"7","FName":"配方视图","FRemark":"视图导出","F1":"","F2":""}, + {"FID":50,"FCode":"8","FName":"生产工艺路线视图","FRemark":"视图导出","F1":"","F2":""}, + {"FID":51,"FCode":"9","FName":"生产版本视图","FRemark":"视图导出","F1":"","F2":""}, + {"FID":52,"FCode":"10","FName":"组装BOM视图","FRemark":"视图导出","F1":"","F2":""} + ]; let result2 = await getBasicRoleList({ FRoleType: 39, @@ -249,7 +257,6 @@ export default { console.log('this.dataInfoObj', this.dataInfoObj); let dataList = []; let hasType = "1,2".split(','); - result.forEach((item) => { let viewData = dataList.find(s => s.name == item.FName) || null;