Huabao
/
FactorySystemWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit by yzf

Browse Source
master
Yang 3 years ago
parent 81d0bd6931
commit 81f236087f
4 changed files with 412 additions and 346 deletions
Show Stats Download Patch File Download Diff File

13
src/styles/admin.css
Unescape View File

@ -121,3 +121,16 @@
.layui-table-main td{ .layui-table-main td{
white-space: pre-line!important; white-space: pre-line!important;
} }
.one{
background: #00B0F0 !important;;
}
.twe{
background: #00FF00!important;
}
.three{
background:#FF6464!important;
}
.four{
background: #FF64FF!important;
}

736
src/views/Need/components/EditView.vue
Unescape View File

@ -1,13 +1,14 @@
<template> <template>
<lay-container fluid="true" class="content-box"> <lay-container fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> <FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting"> <lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting> <FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
</lay-layer> </lay-layer>
<lay-table id="dataTable" v-if="dataColumn.length>0" height="320px" :columns="dataColumn" <lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName"> :cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit!=2"> <template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length===0">保存 <lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存
</lay-button> </lay-button>
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true"> <lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
<template #prepend>半成品编号：</template> <template #prepend>半成品编号：</template>
@ -15,23 +16,24 @@
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true"> <lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true">
<template #prepend>描述：</template> <template #prepend>描述：</template>
</lay-input> </lay-input>
<lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length===0" @click="_clickFreezingColumnSetting()">固定项 <lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length === 0"
@click="_clickFreezingColumnSetting()">固定项
</lay-button> </lay-button>
</template> </template>
<template v-for="item in editColumn" v-slot:[item.key]="{ data }"> <template v-for="item in editColumn" v-slot:[item.key]="{ data }">
<lay-select v-if="item.key=='FTypeID1'" size="sm" v-model="data['FTypeID1']" <lay-select v-if="item.key == 'FTypeID1'" size="sm" v-model="data['FTypeID1']"
@change="_changeType(data,1)" :showEmpty="false"> @change="_changeType(data, 1)" :showEmpty="false">
<lay-select-option v-for="(tIdv,tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID" <lay-select-option v-for="(tIdv, tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
:label="tIdv.FName"></lay-select-option> :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-select v-else-if="item.key=='FTypeID2'" size="sm" v-model="data['FTypeID2']" <lay-select v-else-if="item.key == 'FTypeID2'" size="sm" v-model="data['FTypeID2']"
@change="_changeType(data,2)" :showEmpty="false"> @change="_changeType(data, 2)" :showEmpty="false">
<lay-select-option v-show="data.FTypeID1==tIdv.FParentID" v-for="(tIdv,tIdx) in typeList[1]" <lay-select-option v-show="data.FTypeID1 == tIdv.FParentID" v-for="(tIdv, tIdx) in typeList[1]"
:key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option> :key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-select v-else-if="item.selectType" size="sm" v-model="data[item.key]" :showEmpty="false"> <lay-select v-else-if="item.selectType" size="sm" v-model="data[item.key]" :showEmpty="false">
<lay-select-option v-for="(tIdv,tIdx) in selectDataMap['FType'+item.selectTypeId]" :key="tIdx" <lay-select-option v-for="(tIdv, tIdx) in selectDataMap['FType' + item.selectTypeId]" :key="tIdx"
:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option> :value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input> <lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input>
</template> </template>
@ -41,362 +43,412 @@
</template> </template>
<style scoped> <style scoped>
.content-box { .content-box {
margin: 30px 10px; margin: 30px 10px;
display: block; display: block;
position: relative; position: relative;
clear: both; clear: both;
float: none; float: none;
min-height: 740px; min-height: 740px;
} }
.row-select td {
overflow: inherit;
}
.layui-select { .row-select td {
width: 100%; overflow: inherit;
} }
.edit { .layui-select {
color: green; width: 100%;
} }
:deep(.edit-item .layui-input) { .edit {
border-color: #5FB878 !important; color: green;
} }
:deep(.edit-item .layui-input:hover) { :deep(.edit-item .layui-input) {
border-color: #009688 !important; border-color: #5FB878 !important;
color: #009688; }
}
.isShow{ :deep(.edit-item .layui-input:hover) {
width: 370px; border-color: #009688 !important;
height:30px; color: #009688;
border: none; }
}
.isHidden{ .isShow {
display: none; width: 370px;
} height: 30px;
.isBomHidden{ border: none;
display: none; }
}
.isHidden {
display: none;
}
.isBomHidden {
display: none;
}
</style> </style>
<script> <script>
import { import {
ref ref
} from 'vue'; } from 'vue';
import { import {
getListByTeamId, getListByTeamId,
updateBatchById2 updateBatchById2
} from "/src/api/api/view"; } from "/src/api/api/view";
import { import {
getBasicRoleList getBasicRoleList
} from "/src/api/api/user"; } from "/src/api/api/user";
import { import {
getDataCode, getDataCode,
commonSave commonSave
} from "/src/api/api/common"; } from "/src/api/api/common";
import { import {
getInfoData, getInfoData,
changeInfoData changeInfoData
} from "/src/api/api/materialType"; } from "/src/api/api/materialType";
import OperateLog from "./OperateLog.vue"; import OperateLog from "./OperateLog.vue";
import FormulaView from "./FormulaView.vue"; import FormulaView from "./FormulaView.vue";
import FreezingColumnSetting from './FreezingColumnSetting.vue'; import FreezingColumnSetting from './FreezingColumnSetting.vue';
export default { export default {
components: { components: {
OperateLog, OperateLog,
FormulaView, FormulaView,
FreezingColumnSetting FreezingColumnSetting
},
setup() {
const dataColumn = ref([]);
const dataList = ref([]);
const editColumn = ref([]);
const selectDataMap = ref(null);
const typeList = ref([
[],
[]
]);
const userPower = ref([
[],
[]
]);
const cellStyle = function (row, column, rowIndex, columnIndex) {
let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : ""
return back;
}
const cellClassName = function (row, column, rowIndex, columnIndex) {
return column.cellClass || "";
}
const inputCodeValue = ref("");
const inputDescValue = ref("");
const visible2 = ref(false)
const changeVisible2 = function () {
visible2.value = !visible2.value
};
const showFreezingColumnSettingBox = ref(false);
const freezingColumnSetting = ref([]);
const originalColumns = ref([]);
const tmpDataColumn = ref([]);
return {
dataColumn,
dataList,
editColumn,
selectDataMap,
typeList,
userPower,
cellStyle,
cellClassName,
inputCodeValue,
inputDescValue,
isShow: false,
isBomShow: false,
visible2,
changeVisible2,
showFreezingColumnSettingBox,
freezingColumnSetting,
originalColumns,
tmpDataColumn
};
},
props: {
dataInfoObj: {
type: Object,
default: () => { },
}, },
setup() { viewDataList: {
const dataColumn = ref([]); type: Object,
const dataList = ref([]); default: () => [],
const editColumn = ref([]); }
const selectDataMap = ref(null); },
const typeList = ref([ mounted() {
[], this.getUserPower();
[] },
]); methods: {
const userPower = ref([ async getUserPower() {
[], if (this.dataInfoObj.FCanEdit != 2) {
[] this.userPower[0] = (await getBasicRoleList({
]); FRoleType: 40,
const cellStyle = function(row, column, rowIndex, columnIndex) { FViewType: this.dataInfoObj.FViewType
let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246) !important;" : "" }) || []).map(it => parseInt(it.F2))
return back; this.userPower[1] = (await getBasicRoleList({
} FRoleType: 44,
const cellClassName = function(row, column, rowIndex, columnIndex) { FViewType: this.dataInfoObj.FViewType
return column.cellClass || ""; }) || []).map(it => parseInt(it.F2))
} }
const inputCodeValue = ref(""); this.initPage(layer.load(2));
const inputDescValue = ref("");
const visible2 = ref(false)
const changeVisible2 = function() {
visible2.value = !visible2.value
};
const showFreezingColumnSettingBox = ref(false);
const freezingColumnSetting = ref([]);
const originalColumns = ref([]);
const tmpDataColumn = ref([]);
return {
dataColumn,
dataList,
editColumn,
selectDataMap,
typeList,
userPower,
cellStyle,
cellClassName,
inputCodeValue,
inputDescValue,
isShow: false,
isBomShow :false,
visible2,
changeVisible2,
showFreezingColumnSettingBox,
freezingColumnSetting,
originalColumns,
tmpDataColumn
};
}, },
props: { async initPage(idx) {
dataInfoObj: { let _data = await getListByTeamId({
type: Object, teamId: this.dataInfoObj.FTeamID,
default: () => {}, viewType: this.dataInfoObj.FViewType
}, });
viewDataList: { if (this.dataInfoObj.FViewType == 1) {
type: Object, this.inputCodeValue = _data.rows[0].HalfCode;
default: () => [], this.inputDescValue = _data.rows[0].HalfDesc;
this.isShow = true;
} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true;
} }
},
mounted() {
this.getUserPower();
},
methods: {
async getUserPower() {
if (this.dataInfoObj.FCanEdit != 2) {
this.userPower[0] = (await getBasicRoleList({
FRoleType: 40,
FViewType: this.dataInfoObj.FViewType
}) || []).map(it => parseInt(it.F2))
this.userPower[1] = (await getBasicRoleList({
FRoleType: 44,
FViewType: this.dataInfoObj.FViewType
}) || []).map(it => parseInt(it.F2))
}
this.initPage(layer.load(2));
},
async initPage(idx) {
let _data = await getListByTeamId({
teamId: this.dataInfoObj.FTeamID,
viewType: this.dataInfoObj.FViewType
});
if(this.dataInfoObj.FViewType == 1){ this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
this.inputCodeValue = _data.rows[0].HalfCode; this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
this.inputDescValue = _data.rows[0].HalfDesc; let dataColumn = _data.columns || [];
this.isShow = true; let editColumn = dataColumn.filter(it => {
}else if(this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4){
this.isBomShow = true;
}
this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || []; let b = false;
this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || []; if (this.dataInfoObj.FCanEdit != 2) {
let dataColumn = _data.columns || []; if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
let editColumn = dataColumn.filter(it => { else b = this.userPower[0].indexOf(it.id) >= 0;
let b = false; if (b) {
if (this.dataInfoObj.FCanEdit != 2) { it.customSlot = it.key;
if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0; it.cellClass = "edit-item"
else b = this.userPower[0].indexOf(it.id) >= 0;
if (b) {
it.customSlot = it.key;
it.cellClass = "edit-item"
}
}
return b;
});
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 (this.dataInfoObj.FCanEdit != 2) {
// let tempColumn1 = dataColumn.filter(s => s.customSlot) || [];
// let tempColumn2 = dataColumn.filter(s => s.customSlot == undefined) || [];
// dataColumn = [...tempColumn1, ...tempColumn2];
// }
} }
let col7 = dataColumn.filter(s => s.fieldType == 7) || []; return b;
_data.rows.forEach((item) => { });
let k3Code = item.FBaseMaterialDesc; if (editColumn.length > 0) {
if(k3Code.indexOf("@") > 0){ if (this.selectDataMap == null) {
item.FK3Code = k3Code.substr(0, k3Code.indexOf("@")); let dataTypeIds = editColumn.filter(it => {
item.FK3Name = k3Code.substr(k3Code.indexOf("@") +1); it.selectType = it.dataType.startsWith('select:');
}else{ if (it.selectType) {
item.FK3Code = ""; it.selectTypeId = it.dataType.substring(7)
item.FK3Name = ""; }
} return it.selectType;
if(k3Code.lastIndexOf(".") > 0){ }).map(it => it.selectTypeId);
item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1); if (dataTypeIds.length > 0) {
}else{ this.selectDataMap = await getDataCode({
item.FK3ShortCode = ""; FType: dataTypeIds.join(",")
}
let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
if (info != null) {
col7.forEach((col) => {
item[col.key] = info[col.key] || item[col.key] || "";
}); });
} }
item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1; }
item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2; // //修改项移到前面
}); // if (this.dataInfoObj.FCanEdit != 2) {
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; // let tempColumn1 = dataColumn.filter(s => s.customSlot) || [];
localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); // let tempColumn2 = dataColumn.filter(s => s.customSlot == undefined) || [];
this.editColumn = editColumn; // dataColumn = [...tempColumn1, ...tempColumn2];
this.dataList = _data.rows; // }
this.dataColumn = dataColumn; }
this.originalColumns = this.deepCopy(dataColumn); let columnsList = [];
let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
debugger
setTimeout(function() { _data.rows.forEach((item, i) => {
layer.close(idx);
}, 500); columnsList = _data.columns.map(function (items) {
}, let str = _data.infos[i][items.key + "Type"];
cancelClick(isRefresh) { if (typeof (str) != "undefined") {
isRefresh = isRefresh == undefined ? false : isRefresh; switch (str) {
this.$emit('cancelClick', isRefresh); case "1":
}, return items.cellClass = items.cellClass + " one";
async _changeType(data, type) { case "2":
if (type == 1) { return items.cellClass = items.cellClass + " twe";
data.FTypeID2 = -1; case "3":
} else { return items.cellClass = items.cellClass + " three";
if (data.FTypeID2) { case "4":
let result = await getInfoData({ return items.cellClass = items.cellClass + " four";
"FDataID": data.FTypeID2,
"FType": 1
}) || null;
if (result != null && result.FID) {
let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
col7.forEach((item) => {
if (item.table == "TFS_MaterialInfo") {
data[item.key] = result[item.key] || data[item.key] || "";
}
});
} }
} }
return items;
})
let k3Code = item.FBaseMaterialDesc;
if (k3Code.indexOf("@") > 0) {
item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
item.FK3Name = k3Code.substr(k3Code.indexOf("@") + 1);
} else {
item.FK3Code = "";
item.FK3Name = "";
} }
}, if (k3Code.lastIndexOf(".") > 0) {
async saveBatch() { item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".") + 1);
let idx = layer.load(2); } else {
let updateObj = { item.FK3ShortCode = "";
LogList: [], }
FTeamID: this.dataInfoObj['FTeamID'], let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
FViewType: this.dataInfoObj.FViewType if (info != null) {
}; col7.forEach((col) => {
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; item[col.key] = info[col.key] || item[col.key] || "";
let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId)); });
this.dataList.forEach((row, index) => { }
let cache = cacheDataList[index]; item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1;
let dataObj = {}; item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2;
for (let col of this.editColumn) { });
let valTemp = row[col.key]; let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
if (valTemp != cache[col.key]) { localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
if (!dataObj[col.table]) {
dataObj[col.table] = {};
dataObj[col.table].FMaterialID = row["FMaterialID"];
this.editColumn = editColumn;
this.dataList = _data.rows;
this.dataColumn = dataColumn;
this.originalColumns = this.deepCopy(dataColumn);
debugger
setTimeout(function () {
layer.close(idx);
}, 500);
},
cancelClick(isRefresh) {
isRefresh = isRefresh == undefined ? false : isRefresh;
this.$emit('cancelClick', isRefresh);
},
async _changeType(data, type) {
if (type == 1) {
data.FTypeID2 = -1;
} else {
if (data.FTypeID2) {
let result = await getInfoData({
"FDataID": data.FTypeID2,
"FType": 1
}) || null;
if (result != null && result.FID) {
let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
col7.forEach((item) => {
if (item.table == "TFS_MaterialInfo") {
data[item.key] = result[item.key] || data[item.key] || "";
} }
dataObj[col.table][col.key] = valTemp; });
if (col.key == "FTypeID1" || col.key == "FTypeID2") {
let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; this.dataColumn.map(function (item) {
let temp = temps.find(s => s.FID == valTemp) || null; debugger
valTemp = temp == null ? "" : temp.FName; let str = result[item.key + "Type"];
if (typeof (str) != "undefined") {
switch (str) {
case "1":
return item.cellClass = item.cellClass.split(" ")[0] + " one";
case "2":
return item.cellClass = item.cellClass.split(" ")[0] + " twe";
case "3":
return item.cellClass = item.cellClass.split(" ")[0] + " three";
case "4":
return item.cellClass = item.cellClass.split(" ")[0] + " four";
}
} }
updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
} return item;
} })
for (let key in dataObj) {
if (!updateObj[key]) updateObj[key] = [];
updateObj[key].push(dataObj[key]);
}
});
let updateLog = updateObj.LogList.join("、");
if (updateLog != "") {
delete updateObj.LogList
// 发送保存请求
let _result = await updateBatchById2(updateObj);
if (_result.Code === 200) {
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() {
layer.close(idx);
layer.msg('保存成功');
$this.$emit('cancelClick', true, true);
$this.$refs.OperateLog._getPageList();
}, 500);
} }
} else {
layer.close(idx);
layer.msg('您没有做任何更改')
} }
}, }
_clickFreezingColumnSetting() { },
this.dataColumn = ref([]); async saveBatch() {
this.showFreezingColumnSettingBox = true; let idx = layer.load(2);
}, let updateObj = {
setFreezingColumns() { LogList: [],
this.tmpDataColumn = this.deepCopy(this.originalColumns); FTeamID: this.dataInfoObj['FTeamID'],
let freezingColumns = []; FViewType: this.dataInfoObj.FViewType
if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) { };
this.freezingColumnSetting.forEach(column => { let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
let colIndex = this.tmpDataColumn.findIndex(d => d.key === column); let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
if (colIndex >= 0) { this.dataList.forEach((row, index) => {
let fc = this.tmpDataColumn.splice(colIndex, 1)[0]; let cache = cacheDataList[index];
if (fc) { let dataObj = {};
fc.fixed = "left"; for (let col of this.editColumn) {
freezingColumns.push(fc); let valTemp = row[col.key];
} 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") {
this.dataColumn = freezingColumns.concat(this.tmpDataColumn); let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || [];
} else { let temp = temps.find(s => s.FID == valTemp) || null;
this.dataColumn = this.tmpDataColumn; valTemp = temp == null ? "" : temp.FName;
}
updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
}
} }
}, for (let key in dataObj) {
setFreezingColumnsSetting(fcs) { if (!updateObj[key]) updateObj[key] = [];
this.freezingColumnSetting = fcs; updateObj[key].push(dataObj[key]);
if (fcs && fcs.length > 0) { }
} else { });
this.dataColumn = this.originalColumns; let updateLog = updateObj.LogList.join("、");
if (updateLog != "") {
delete updateObj.LogList
// 发送保存请求
let _result = await updateBatchById2(updateObj);
if (_result.Code === 200) {
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 () {
layer.close(idx);
layer.msg('保存成功');
$this.$emit('cancelClick', true, true);
$this.$refs.OperateLog._getPageList();
}, 500);
} }
this.showFreezingColumnSettingBox = false; } else {
}, layer.close(idx);
closeFreezingSetting() { layer.msg('您没有做任何更改')
this.setFreezingColumns();
},
deepCopy(arr) {
return JSON.parse(JSON.stringify(arr))
} }
},
_clickFreezingColumnSetting() {
this.dataColumn = ref([]);
this.showFreezingColumnSettingBox = true;
},
setFreezingColumns() {
this.tmpDataColumn = this.deepCopy(this.originalColumns);
let freezingColumns = [];
if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
this.freezingColumnSetting.forEach(column => {
let colIndex = this.tmpDataColumn.findIndex(d => d.key === column);
if (colIndex >= 0) {
let fc = this.tmpDataColumn.splice(colIndex, 1)[0];
if (fc) {
fc.fixed = "left";
freezingColumns.push(fc);
}
}
})
this.dataColumn = freezingColumns.concat(this.tmpDataColumn);
} else {
this.dataColumn = this.tmpDataColumn;
}
},
setFreezingColumnsSetting(fcs) {
this.freezingColumnSetting = fcs;
if (fcs && fcs.length > 0) {
} else {
this.dataColumn = this.originalColumns;
}
this.showFreezingColumnSettingBox = false;
},
closeFreezingSetting() {
this.setFreezingColumns();
},
deepCopy(arr) {
return JSON.parse(JSON.stringify(arr))
} }
} }
}
</script> </script>

3
src/views/Order/components/ShowMaterial.vue
Unescape View File

@ -139,6 +139,7 @@ export default {
}); });
} }
}); });
debugger
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
let result2 = await getPageList({ let result2 = await getPageList({
FPageSize: 99, FPageSize: 99,
@ -166,7 +167,7 @@ export default {
item["FBaseWeightUnit"]=item.FBaseUnit; item["FBaseWeightUnit"]=item.FBaseUnit;
item["FCraftExplain"]=item.FCraftDesc; item["FCraftExplain"]=item.FCraftDesc;
return item; return item;
}) || []; }) || [];
}, },
cancelClick() { cancelClick() {

6
yarn.lock
Unescape View File

@ -1293,10 +1293,10 @@ error-ex@^1.3.1:
dependencies: dependencies:
is-arrayish "^0.2.1" is-arrayish "^0.2.1"
esbuild-windows-64@0.14.39: esbuild-windows-32@0.14.39:
version "0.14.39" version "0.14.39"
resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz" resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz"
integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow== integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
esbuild@^0.14.27, esbuild@>=0.13: esbuild@^0.14.27, esbuild@>=0.13:
version "0.14.39" version "0.14.39"

Write Preview
Loading…
Cancel
Save