From 4bf1283644b53266d522135f7b77d8b8111f309d Mon Sep 17 00:00:00 2001 From: leo <10200039@qq.com> Date: Wed, 10 May 2023 12:12:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=96=B0=E5=A2=9E=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api/material.ts | 1 - src/views/Order/components/ShowMaterial.vue | 2 +- src/views/materia/components/EditView.vue | 170 ++++++++++-------- .../components/FreezingColumnSetting.vue | 16 ++ src/views/materia/route.vue | 1 - 5 files changed, 117 insertions(+), 73 deletions(-) diff --git a/src/api/api/material.ts b/src/api/api/material.ts index 262a9cb..748ceb7 100644 --- a/src/api/api/material.ts +++ b/src/api/api/material.ts @@ -68,7 +68,6 @@ export async function GetMaterialById(param) export async function GetMaterialListByFTestCode(param) { let result = []; - debugger await http.post('/api/Material/GetMaterialListByFTestCode', param).then((data) => { result = data; }); diff --git a/src/views/Order/components/ShowMaterial.vue b/src/views/Order/components/ShowMaterial.vue index 44d4c49..d7b43f7 100644 --- a/src/views/Order/components/ShowMaterial.vue +++ b/src/views/Order/components/ShowMaterial.vue @@ -145,7 +145,7 @@ export default { FDataId: this.objInfoObj.FID }, "View") || {}; - + console.log('result2', result2); diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue index 3e813dc..4a50248 100644 --- a/src/views/materia/components/EditView.vue +++ b/src/views/materia/components/EditView.vue @@ -20,8 +20,8 @@ 物料上传 - - + @@ -275,22 +279,22 @@ export default { } }) - if (editColumn.length > 0) { - if (this.selectDataMap == null) { - let dataTypeIds = editColumn.filter(it => { - it.selectType = it.dataType.startsWith('select:'); - if (it.selectType) { - it.selectTypeId = it.dataType.substring(7) - } - return it.selectType; - }).map(it => it.selectTypeId); - if (dataTypeIds.length > 0) { - this.selectDataMap = await getDataCode({ - FType: dataTypeIds.join(",") - }); - } - } - } + // if (editColumn.length > 0) { + // if (this.selectDataMap == null) { + // let dataTypeIds = editColumn.filter(it => { + // it.selectType = it.dataType.startsWith('select:'); + // if (it.selectType) { + // it.selectTypeId = it.dataType.substring(7) + // } + // return it.selectType; + // }).map(it => it.selectTypeId); + // if (dataTypeIds.length > 0) { + // this.selectDataMap = await getDataCode({ + // FType: dataTypeIds.join(",") + // }); + // } + // } + // } let columnsList = []; let col7 = dataColumn.filter(s => s.fieldType == 7) || []; @@ -331,8 +335,6 @@ export default { let saveId = this.dataInfoObj.FID; localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); - this.editColumn = editColumn; - this.dataList = _data.rows.map(function (item) { item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2); let fType1 = $this.typeList[0].find((t) => { @@ -346,26 +348,85 @@ export default { return t.FID == item.FTypeID2 } }) - if ($this.dataInfoObj.FCanEdit == 2) { - item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; - item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; - } - else { - let isFTypeID1 = $this.editColumn.find((t) => { - return t.key == "FTypeID1"; - }) - let isFTypeID2 = $this.editColumn.find((t) => { - return t.key == "FTypeID2"; - }) + item.FTypeID1Name = fType1 ? fType1.FName : item.FTypeID1; + item.FTypeID2Name = fType2 ? fType2.FName : item.FTypeID2; + + // if ($this.dataInfoObj.FCanEdit == 2) { + // item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; + // item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; + // } + // else { + + // let isFTypeID1 = $this.editColumn.find((t) => { + // return t.key == "FTypeID1"; + // }) + // let isFTypeID2 = $this.editColumn.find((t) => { + // return t.key == "FTypeID2"; + // }) + + // if (!isFTypeID1 && !isFTypeID2) { + // item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; + // item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; + // } + // } + return item; + }); - if (!isFTypeID1 && !isFTypeID2) { - item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; - item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; - } + // if (editColumn.length > 0) { + // if (this.selectDataMap == null) { + // let dataTypeIds = editColumn.filter(it => { + // it.selectType = it.dataType.startsWith('select:'); + // if (it.selectType) { + // it.selectTypeId = it.dataType.substring(7) + // } + // return it.selectType; + // }).map(it => it.selectTypeId); + // if (dataTypeIds.length > 0) { + // this.selectDataMap = await getDataCode({ + // FType: dataTypeIds.join(",") + // }); + // } + // } + // } + + let selectFiledIds = [] + dataColumn.forEach(c => { + if (c.dataType.startsWith("select:") || c.key == "FTypeID1" || c.key == "FTypeID2") { + c["customSlot"] = c.key + } + + if (c.dataType.startsWith("select:")) { + c.selectTypeId = c.dataType.substring(7) + selectFiledIds.push(c.dataType.substring(7)) } - return item; }); + + if (selectFiledIds && selectFiledIds.length > 0) { + this.selectDataMap = await getDataCode({ + FType: selectFiledIds.join(",") + }); + } + + dataColumn.forEach(c => { + if (c.selectTypeId) { + let key = "FType" + c.selectTypeId + let columnDataMap = this.selectDataMap[key] + + this.dataList.forEach(row => { + row[c.key + "Name"] = row[c.key] + let selectFieldValue = row[c.key] + if (selectFieldValue) { + let dataMap = columnDataMap.find(dm => dm.FValue == selectFieldValue) + if (dataMap) { + row[c.key + "Name"] = dataMap.FName + } + } + }) + } + }) + + this.editColumn = editColumn; this.dataColumn = dataColumn; this.originalColumns = this.deepCopy(dataColumn); @@ -385,10 +446,6 @@ export default { this.setFreezingColumns(); } - if (this.dataInfoObj.FCanEdit != 2) { - this._changeType(_data.rows[0], 2); - } - setTimeout(function () { layer.close(idx); }, 500); @@ -485,34 +542,9 @@ 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) { - // if (!dataObj[col.table]) { - // dataObj[col.table] = {}; - // dataObj[col.table].FMaterialID = row["FMaterialID"]; - // } - // dataObj[col.table][col.key] = valTemp; - // if (col.key == "FTypeID1" || col.key == "FTypeID2") { - // let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; - // let temp = temps.find(s => s.FID == valTemp) || null; - // valTemp = temp == null ? "" : temp.FName; - // } - // updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); - // } else if (valTemp != cache[col.key]) { - // if (!dataObj[col.table]) { - // dataObj[col.table] = {}; - // dataObj[col.table].FMaterialID = row["FMaterialID"]; - // } - // dataObj[col.table][col.key] = valTemp; - // if (col.key == "FTypeID1" || col.key == "FTypeID2") { - // let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; - // let temp = temps.find(s => s.FID == valTemp) || null; - // valTemp = temp == null ? "" : temp.FName; - // } - // updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); - // } if (valTemp != cache[col.key]) { if (!dataObj[col.table]) { dataObj[col.table] = {}; @@ -553,8 +585,6 @@ export default { dataObj["TFS_ViewMaterial"].FTypeID2 = row["FTypeID2"]; } - - console.log('dataObj', dataObj); for (let key in dataObj) { if (!updateObj[key]) updateObj[key] = []; updateObj[key].push(dataObj[key]); @@ -566,7 +596,7 @@ export default { } let updateLog = updateObj.LogList.join("、"); - if (updateLog != "") { + if (updateLog != "" || this.dataInfoObj.FType == 2) { delete updateObj.LogList // 发送保存请求 let _result = await updateMaterial(updateObj, "MaterialTeamwork"); diff --git a/src/views/materia/components/FreezingColumnSetting.vue b/src/views/materia/components/FreezingColumnSetting.vue index aa9b050..13b00c7 100644 --- a/src/views/materia/components/FreezingColumnSetting.vue +++ b/src/views/materia/components/FreezingColumnSetting.vue @@ -21,6 +21,9 @@ import { ref } from 'vue'; + import { + EditFreezingColumns + } from "/src/api/api/user"; export default { setup() { const columnList = ref([]); @@ -53,7 +56,20 @@ this.$emit('cancelClick', this.freezingColumns); }, submitClick() { + this.editFreezingColumns(); this.$emit('cancelClick', this.checkedItem); + }, + async editFreezingColumns() { + var checkedItemsStr = ""; + if (this.checkedItem && this.checkedItem.length > 0) { + this.checkedItem.forEach((item) => { + checkedItemsStr = checkedItemsStr + "," + item; + }) + } + + if (checkedItemsStr) { + let result = await EditFreezingColumns(checkedItemsStr); + } } } } diff --git a/src/views/materia/route.vue b/src/views/materia/route.vue index 25a14b9..0107455 100644 --- a/src/views/materia/route.vue +++ b/src/views/materia/route.vue @@ -312,7 +312,6 @@ for (let i = 0; i < this.showEditBox.length; i++) { this.showEditBox[i] = false; } - debugger data.FTeamID = data.FMaterialTeamID; data.FMdfMaterialTeamId = data.FMaterialTeamID; this.objInfoObj = data;