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

物料分类流程新增

Browse Source
master
leo 3 years ago
parent 1960b50999
commit a832835a35
8 changed files with 117 additions and 411 deletions
Show Stats Download Patch File Download Diff File

5
components.d.ts vendored
Unescape View File

@ -33,6 +33,8 @@ declare module '@vue/runtime-core' {
LayLogo: typeof import('@layui/layui-vue')['LayLogo'] LayLogo: typeof import('@layui/layui-vue')['LayLogo']
LayMenu: typeof import('@layui/layui-vue')['LayMenu'] LayMenu: typeof import('@layui/layui-vue')['LayMenu']
LayMenuItem: typeof import('@layui/layui-vue')['LayMenuItem'] LayMenuItem: typeof import('@layui/layui-vue')['LayMenuItem']
LayProgress: typeof import('@layui/layui-vue')['LayProgress']
LayQuote: typeof import('@layui/layui-vue')['LayQuote']
LayRadio: typeof import('@layui/layui-vue')['LayRadio'] LayRadio: typeof import('@layui/layui-vue')['LayRadio']
LayRow: typeof import('@layui/layui-vue')['LayRow'] LayRow: typeof import('@layui/layui-vue')['LayRow']
LayScroll: typeof import('@layui/layui-vue')['LayScroll'] LayScroll: typeof import('@layui/layui-vue')['LayScroll']
@ -44,6 +46,9 @@ declare module '@vue/runtime-core' {
LayTab: typeof import('@layui/layui-vue')['LayTab'] LayTab: typeof import('@layui/layui-vue')['LayTab']
LayTabItem: typeof import('@layui/layui-vue')['LayTabItem'] LayTabItem: typeof import('@layui/layui-vue')['LayTabItem']
LayTable: typeof import('@layui/layui-vue')['LayTable'] LayTable: typeof import('@layui/layui-vue')['LayTable']
LayTextarea: typeof import('@layui/layui-vue')['LayTextarea']
LayTooltip: typeof import('@layui/layui-vue')['LayTooltip']
LayUpload: typeof import('@layui/layui-vue')['LayUpload']
LightIcon: typeof import('./src/components/LightIcon.vue')['default'] LightIcon: typeof import('./src/components/LightIcon.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']

16
src/api/api/user.ts
Unescape View File

@ -131,4 +131,20 @@ export async function GetPowerList() {
return result; return result;
} }
export async function GetFreezingColumns() {
let result="";
await http.post('/api/User/GetFreezingColumns').then((data)=>{
result=data.Data;
})
return result;
}
export async function EditFreezingColumns(freezingColumns) {
let result="";
await http.post('/api/User/EditFreezingColumns?freezingColumns='+freezingColumns, {}).then((data)=>{
result=data.Data;
})
return result;
}

9
src/views/Need/all.vue
Unescape View File

@ -72,9 +72,6 @@
<lay-layer :area="modelArea[8]" v-model="showEditBox[8]" :title="objInfoObj.FName"> <lay-layer :area="modelArea[8]" v-model="showEditBox[8]" :title="objInfoObj.FName">
<SupplyPackage v-if="showEditBox[8]" :data-info-obj="objInfoObj" @cancelClick="cancelClick"></SupplyPackage> <SupplyPackage v-if="showEditBox[8]" :data-info-obj="objInfoObj" @cancelClick="cancelClick"></SupplyPackage>
</lay-layer> </lay-layer>
<lay-layer :area="modelArea[9]" v-model="showEditBox[9]" :title="objInfoObj.FName">
<EditType v-if="showEditBox[9]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditType>
</lay-layer>
<lay-layer :area="modelArea[10]" v-model="showEditBox[10]" :title="objInfoObj.FName"> <lay-layer :area="modelArea[10]" v-model="showEditBox[10]" :title="objInfoObj.FName">
<EditFSuccedaneum v-if="showEditBox[10]" @getData="getData" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditFSuccedaneum> <EditFSuccedaneum v-if="showEditBox[10]" @getData="getData" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditFSuccedaneum>
</lay-layer> </lay-layer>
@ -95,7 +92,6 @@
import AddTerm from '../Team/components/AddTerm.vue'; import AddTerm from '../Team/components/AddTerm.vue';
import BOMDownload from "./components/BOMDownload.vue"; import BOMDownload from "./components/BOMDownload.vue";
import EditView from "./components/EditView.vue"; import EditView from "./components/EditView.vue";
import EditType from "./components/EditType.vue";
import AddPackage from "./components/AddPackage.vue"; import AddPackage from "./components/AddPackage.vue";
import SureView from "./components/SureView.vue"; import SureView from "./components/SureView.vue";
import EditGroup from "./components/EditGroup.vue"; import EditGroup from "./components/EditGroup.vue";
@ -111,7 +107,6 @@
AddTerm, AddTerm,
BOMDownload, BOMDownload,
EditView, EditView,
EditType,
AddPackage, AddPackage,
SureView, SureView,
EditGroup, EditGroup,
@ -345,8 +340,8 @@
} else if (data.FType == 14) { } else if (data.FType == 14) {
data.FBoxType = 8; //补充包材规格 data.FBoxType = 8; //补充包材规格
} else if (data.FType == 15) { } else if (data.FType == 15) {
data.FBoxType = 9; //物料选择类型 data.FBoxType = 3; //物料选择类型
}else if(data.FType==16){ } else if(data.FType==16){
this.dataItem=data; this.dataItem=data;
data.FBoxType = 10; //替代料确认 data.FBoxType = 10; //替代料确认
}else { }else {

390
src/views/Need/components/EditType.vue
Unescape View File

@ -1,390 +0,0 @@
<template>
<lay-container fluid="true" class="content-box">
<lay-table class="row-select" v-if="dataColumn.length>0" height="320px" :columns="dataColumn"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit!=2">
<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length===0">保存
</lay-button>
<!-- <lay-button size="sm" type="primary" :class="this.isBomShow ? 'isBomShow' : 'isBomHidden'" @click="changeVisible2">查看BOM配方</lay-button>-->
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
<template #prepend>半成品编号：</template>
</lay-input>
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true">
<template #prepend>描述：</template>
</lay-input>
</template>
<template v-for="item in editColumn" v-slot:[item.key]="{ data }">
<lay-select v-if="item.key=='FTypeID1'" size="sm" v-model="data['FTypeID1']"
@change="_changeType(data,1)" :showEmpty="false">
<lay-select-option v-for="(tIdv,tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
:label="tIdv.FName"></lay-select-option>
</lay-select>
<lay-select v-else-if="item.key=='FTypeID2'" size="sm" v-model="data['FTypeID2']"
@change="_changeType(data,2)" :showEmpty="false">
<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>
</lay-select>
<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"
:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
</lay-select>
<lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input>
</template>
</lay-table>
<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
<!-- <lay-layer title="标题" :move="false" v-model="visible2">-->
<!-- 内容-->
<!-- </lay-layer>-->
</lay-container>
</template>
<style scoped>
.content-box {
margin: 30px 10px;
display: block;
position: relative;
clear: both;
float: none;
min-height: 740px;
}
.row-select td {
overflow: inherit;
}
.layui-select {
width: 100%;
}
.edit {
color: green;
}
:deep(.edit-item .layui-input) {
border-color: #5FB878 !important;
}
:deep(.edit-item .layui-input:hover) {
border-color: #009688 !important;
color: #009688;
}
.isShow{
width: 370px;
height:30px;
border: none;
}
.isHidden{
display: none;
}
.isBomShow{
}
.isBomHidden{
display: none;
}
</style>
<script>
import {
ref
} from 'vue';
import {
getListByTeamId,
updateBatchById2
} from "/src/api/api/view";
import {
getBasicRoleList
} from "/src/api/api/user";
import {
getDataCode,
commonSave
} from "/src/api/api/common";
import {
getInfoData,
changeInfoData
} from "/src/api/api/materialType";
import{EditTypeList} from "/src/api/api/teamwork";
import OperateLog from "./OperateLog.vue";
export default {
components: {
OperateLog
},
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) !important;" : ""
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
}
return {
dataColumn,
dataList,
editColumn,
selectDataMap,
typeList,
userPower,
cellStyle,
cellClassName,
inputCodeValue,
inputDescValue,
isShow: false,
isBomShow :false,
visible2,
changeVisible2
};
},
props: {
dataInfoObj: {
type: Object,
default: () => {},
},
viewDataList: {
type: Object,
default: () => [],
}
},
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: ""
});
if(this.dataInfoObj.FViewType == 1){
this.inputCodeValue = _data.rows[0].HalfCode;
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;
}
this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
let dataColumn = _data.columns || [];
// let editColumn = dataColumn.filter(it => {
// let b = false;
// if (this.dataInfoObj.FCanEdit != 2) {
// if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
// else b = this.userPower[0].indexOf(it.id) >= 0;
// if (b) {
// it.customSlot = it.key;
// it.cellClass = "edit-item"
// }
// }
// return b;
// });
let editColumn = dataColumn.map(function(item){
if(item.title=="一级分类"||item.title=="二级分类")
{
item.customSlot=item.key;
item.cellClass="edit-item";
}
return item;
});
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) || [];
_data.rows.forEach((item) => {
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){
item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1);
}else{
item.FK3ShortCode = "";
}
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;
});
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
localStorage.setItem('EditType' + saveId, JSON.stringify(_data.rows));
this.editColumn = editColumn;
this.dataList = _data.rows;
this.dataColumn = dataColumn;
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] || "";
}
});
}
}
}
},
async saveBatch() {
var arr=new Array();
for(let i=0;i<this.dataList.length;i++)
{
if(this.dataList[i].FTypeID1==null||this.dataList[i].FTypeID1=="")
{
layer.msg("请选择一级分类", { icon : 2, time: 1000});
return;
}
if(this.dataList[i].FTypeID2==null||this.dataList[i].FTypeID2=="")
{
layer.msg("请选择二级分类", { icon : 2, time: 1000});
return;
}
arr.push({FMaterialID:this.dataList[i].FMaterialID,FTypeID1:this.dataList[i].FTypeID1,FTypeID2:this.dataList[i].FTypeID2})
}
let arr2={
taskId:this.dataInfoObj.FID,
tempId:this.dataInfoObj.FTeamID,
list:arr
}
let result= await EditTypeList(arr2);
let idx = layer.load(2);
let updateObj = {
LogList: [],
FTeamID: this.dataInfoObj['FTeamID'],
FViewType: this.dataInfoObj.FViewType
};
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
let cacheDataList = JSON.parse(localStorage.getItem('EditType' + saveId));
this.dataList.forEach((row, index) => {
let cache = cacheDataList[index];
let dataObj = {};
for (let col of this.editColumn) {
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") {
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));
}
}
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
// 发送保存请求
if (result.Code === 200) {
await commonSave({
teamId: updateObj.FTeamID,
type: this.dataInfoObj['FType'],
desc: updateLog
}, "OperateLog");
//$this.initPage();
localStorage.setItem('EditType' + 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('您没有做任何更改')
}
}
}
}
</script>

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

@ -97,7 +97,8 @@ import {
updateBatchById2 updateBatchById2
} from "/src/api/api/view"; } from "/src/api/api/view";
import { import {
getBasicRoleList getBasicRoleList,
GetFreezingColumns
} from "/src/api/api/user"; } from "/src/api/api/user";
import { import {
getDataCode, getDataCode,
@ -186,7 +187,7 @@ export default {
async getUserPower() { async getUserPower() {
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
this.userPower[0] = (await getBasicRoleList({ this.userPower[0] = (await getBasicRoleList({
FRoleType: 40, FRoleType: 84,
FViewType: this.dataInfoObj.FViewType FViewType: this.dataInfoObj.FViewType
}) || []).map(it => parseInt(it.F2)) }) || []).map(it => parseInt(it.F2))
this.userPower[1] = (await getBasicRoleList({ this.userPower[1] = (await getBasicRoleList({
@ -201,7 +202,8 @@ export default {
teamId: this.dataInfoObj.FTeamID, teamId: this.dataInfoObj.FTeamID,
viewType: this.dataInfoObj.FViewType viewType: this.dataInfoObj.FViewType
}); });
if (this.dataInfoObj.FViewType == 1) { console.log('_data', _data);
if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
this.inputCodeValue = _data.rows[0].HalfCode; this.inputCodeValue = _data.rows[0].HalfCode;
this.inputDescValue = _data.rows[0].HalfDesc; this.inputDescValue = _data.rows[0].HalfDesc;
this.isShow = true; this.isShow = true;
@ -212,8 +214,8 @@ export default {
this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || []; this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || []; this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
let dataColumn = _data.columns || []; let dataColumn = _data.columns || [];
let editColumn = dataColumn.filter(it => { let editColumn = dataColumn.filter(it => {
let b = false; let b = false;
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0; if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
@ -225,6 +227,7 @@ export default {
} }
return b; return b;
}); });
if (editColumn.length > 0) { if (editColumn.length > 0) {
if (this.selectDataMap == null) { if (this.selectDataMap == null) {
let dataTypeIds = editColumn.filter(it => { let dataTypeIds = editColumn.filter(it => {
@ -249,7 +252,6 @@ export default {
} }
let columnsList = []; let columnsList = [];
let col7 = dataColumn.filter(s => s.fieldType == 7) || []; let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
debugger
_data.rows.forEach((item, i) => { _data.rows.forEach((item, i) => {
@ -295,18 +297,35 @@ 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)); localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
console.log('editColumn', editColumn);
this.editColumn = editColumn; this.editColumn = editColumn;
this.dataList = _data.rows; this.dataList = _data.rows;
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
this.originalColumns = this.deepCopy(dataColumn); this.originalColumns = this.deepCopy(dataColumn);
debugger this.getFreezingColumns();
setTimeout(function () { setTimeout(function () {
layer.close(idx); layer.close(idx);
}, 500); }, 500);
}, },
async getFreezingColumns() {
let result = await GetFreezingColumns();
let freezingColumns = result.FFreezingColumns
if (freezingColumns) {
let c_list = freezingColumns.split(",")
c_list.forEach(c => {
if(c && c.length > 0) {
this.freezingColumnSetting.push(c)
}
})
}
if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
this.dataColumn = ref([]);
this.setFreezingColumns();
}
},
cancelClick(isRefresh) { cancelClick(isRefresh) {
isRefresh = isRefresh == undefined ? false : isRefresh; isRefresh = isRefresh == undefined ? false : isRefresh;
this.$emit('cancelClick', isRefresh); this.$emit('cancelClick', isRefresh);
@ -323,14 +342,38 @@ export default {
if (result != null && result.FID) { if (result != null && result.FID) {
let col7 = this.dataColumn.filter(s => s.fieldType == 7) || []; let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
console.log('this.typeList[0]', this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0]);
col7.forEach((item) => { col7.forEach((item) => {
if (item.table == "TFS_MaterialInfo") { if (item.table == "TFS_MaterialInfo") {
data[item.key] = result[item.key] || data[item.key] || ""; data[item.key] = result[item.key] || data[item.key] || "";
} }
}); });
console.log('data.FTypeID1', data.FTypeID1);
let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
let typeName = type1.FName;
if (typeName.indexOf("半成品") > 0) {
data.FViewType = 2
}
if (typeName.indexOf("中间品") > 0) {
data.FViewType = 3
}
if (typeName.indexOf("香基") > 0) {
data.FViewType = 4
}
if (typeName.indexOf("原料类") > 0) {
data.FViewType = 5
}
if (typeName.indexOf("成品") > 0) {
data.FViewType = 1
}
this.dataColumn.map(function (item) { this.dataColumn.map(function (item) {
debugger
let str = result[item.key + "Type"]; let str = result[item.key + "Type"];
if (typeof (str) != "undefined") { if (typeof (str) != "undefined") {
@ -373,12 +416,26 @@ export default {
}; };
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId)); let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
console.log('cacheDataList', cacheDataList);
this.dataList.forEach((row, index) => { this.dataList.forEach((row, index) => {
let cache = cacheDataList[index]; let cache = cacheDataList[index];
let dataObj = {}; let dataObj = {};
console.log('this.editColumn', this.editColumn);
for (let col of this.editColumn) { for (let col of this.editColumn) {
let valTemp = row[col.key]; let valTemp = row[col.key];
if (valTemp != cache[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]) { if (!dataObj[col.table]) {
dataObj[col.table] = {}; dataObj[col.table] = {};
dataObj[col.table].FMaterialID = row["FMaterialID"]; dataObj[col.table].FMaterialID = row["FMaterialID"];
@ -392,6 +449,9 @@ export default {
updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp)); updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
} }
} }
console.log('dataObj', dataObj);
for (let key in dataObj) { for (let key in dataObj) {
if (!updateObj[key]) updateObj[key] = []; if (!updateObj[key]) updateObj[key] = [];
updateObj[key].push(dataObj[key]); updateObj[key].push(dataObj[key]);
@ -401,6 +461,8 @@ export default {
if (updateLog != "") { if (updateLog != "") {
delete updateObj.LogList delete updateObj.LogList
// 发送保存请求 // 发送保存请求
debugger
console.log('updateObj', updateObj);
let _result = await updateBatchById2(updateObj); let _result = await updateBatchById2(updateObj);
if (_result.Code === 200) { if (_result.Code === 200) {
await commonSave({ await commonSave({
@ -443,9 +505,11 @@ export default {
}) })
this.dataColumn = freezingColumns.concat(this.tmpDataColumn); this.dataColumn = freezingColumns.concat(this.tmpDataColumn);
} else { } else {
this.dataColumn = this.tmpDataColumn; this.dataColumn = this.tmpDataColumn;
} }
this.$nextTick();
}, },
setFreezingColumnsSetting(fcs) { setFreezingColumnsSetting(fcs) {
this.freezingColumnSetting = fcs; this.freezingColumnSetting = fcs;

16
src/views/Need/components/FreezingColumnSetting.vue
Unescape View File

@ -21,6 +21,9 @@
import { import {
ref ref
} from 'vue'; } from 'vue';
import {
EditFreezingColumns
} from "/src/api/api/user";
export default { export default {
setup() { setup() {
const columnList = ref([]); const columnList = ref([]);
@ -53,7 +56,20 @@
this.$emit('cancelClick', this.freezingColumns); this.$emit('cancelClick', this.freezingColumns);
}, },
submitClick() { submitClick() {
this.editFreezingColumns();
this.$emit('cancelClick', this.checkedItem); 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);
}
} }
} }
} }

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

@ -139,7 +139,7 @@ export default {
}); });
} }
}); });
debugger
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
let result2 = await getPageList({ let result2 = await getPageList({
FPageSize: 99, FPageSize: 99,
@ -155,7 +155,7 @@ export default {
this.dataList = result2.Data.List.map(function(item){ this.dataList = result2.Data.List.map(function(item){
item["FTypeName1"]=materialType.Data.List.find(m=>m.FID==item.FTypeID1)?materialType.Data.List.find(m=>m.FID==item.FTypeID1).FName:""; item["FTypeName1"]=materialType.Data.List.find(m=>m.FID==item.FTypeID1)?materialType.Data.List.find(m=>m.FID==item.FTypeID1).FName:"";
item["FTypeName2"]=materialType.Data.List.find(m=>m.FID==item.FTypeID2)?materialType.Data.List.find(m=>m.FID==item.FTypeID2).FName:""; item["FTypeName2"]=materialType.Data.List.find(m=>m.FID==item.FTypeID2)?materialType.Data.List.find(m=>m.FID==item.FTypeID2).FName:"";
debugger
item.FType=materialType.Data.List.find(m=>m.FID==item.FType)?materialType.Data.List.find(m=>m.FID==item.FType).FName:""; item.FType=materialType.Data.List.find(m=>m.FID==item.FType)?materialType.Data.List.find(m=>m.FID==item.FType).FName:"";
item["FSAPCode"]=item.FCode; item["FSAPCode"]=item.FCode;
item["FSAPDescription"]=item.FName; item["FSAPDescription"]=item.FName;

2
src/views/System/role.vue
Unescape View File

@ -62,7 +62,7 @@
deleteRoleModel deleteRoleModel
} from "/src/api/api/user"; } from "/src/api/api/user";
import EditRole from './components/EditRole.vue'; import EditRole from './components/EditRole.vue';
import PowerRole from './components/PowerRole2.vue'; import PowerRole from './components/PowerRole.vue';
import '@layui/layui-vue/es/checkbox/index.css'; import '@layui/layui-vue/es/checkbox/index.css';
export default { export default {
components: { components: {

Write Preview
Loading…
Cancel
Save