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 95c7f35150
commit 10b9d642d6
3 changed files with 81 additions and 78 deletions
Show Stats Download Patch File Download Diff File

1
src/views/half/components/EditView.vue
Unescape View File

@ -529,6 +529,7 @@ export default {
return false; return false;
} }
let updateLog = updateObj.LogList.join("、"); let updateLog = updateObj.LogList.join("、");
debugger
// 发送保存请求 // 发送保存请求
console.log('updateObj', updateObj); console.log('updateObj', updateObj);
delete updateObj.LogList delete updateObj.LogList

63
src/views/half/components/EditViewOFF.vue
Unescape View File

@ -22,21 +22,22 @@
</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'&& data['Power'].indexOf(item.key+',')>-1" 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' &&data['Power'].indexOf(item.key+',')>-1" 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 &&data['Power'].indexOf(item.key+',')>-1" 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 &&data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]"></lay-input>
<label v-else="">{{data[item.key]}}</label>
</template> </template>
</lay-table> </lay-table>
<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog> <OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
@ -223,23 +224,19 @@ export default {
methods: { methods: {
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: 84, FRoleType: 84,
FViewType: this.dataInfoObj.FViewType,
TeamId: this.dataInfoObj.FTeamID,
Type: 2
}) || []).map(it => parseInt(it.F2))
this.userPower[1] = (await getBasicRoleList({
FRoleType: 44,
FViewType: this.dataInfoObj.FViewType,
TeamId: this.dataInfoObj.FTeamID, TeamId: this.dataInfoObj.FTeamID,
Type: 2 Type: 2
}) || []).map(it => parseInt(it.F2)) }) || [])
} }
this.initPage(layer.load(2)); this.initPage(layer.load(2));
}, },
async initPage(idx) { async initPage(idx) {
this.idx = idx; this.idx = idx;
let $this = this;
let _data = await getListByHalfMaterialTeamId({ let _data = await getListByHalfMaterialTeamId({
teamId: this.dataInfoObj.FTeamID, teamId: this.dataInfoObj.FTeamID,
viewType: this.dataInfoObj.FViewType viewType: this.dataInfoObj.FViewType
@ -266,19 +263,39 @@ 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=[];
let editColumn = dataColumn.filter(it => {
let b = false; //判断视图权限
if (this.dataInfoObj.FCanEdit != 2) { _data.rows.forEach((itemRow)=>{
if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
else b = this.userPower[0].indexOf(it.id) >= 0; if(!itemRow["Power"])
if (b) { {
it.customSlot = it.key; itemRow["Power"]="";
it.cellClass = "edit-item"
} }
let powerColumns= $this.userPower[0].filter(s=>s.F1==itemRow.FViewType);
if(powerColumns)
{
powerColumns.forEach((itemColums)=>{
let dataColumn=_data.columns.find(s=>s.id==itemColums.F2);
itemRow["Power"]+=dataColumn.key+",";
if(!editColumn.find(s=>s.key==dataColumn.key))
{
dataColumn["customSlot"]=dataColumn.key;
dataColumn["cellClass"]="edit-item";
editColumn.push(dataColumn);
} }
return b;
}); })
}
})
debugger
if (editColumn.length > 0) { if (editColumn.length > 0) {
if (this.selectDataMap == null) { if (this.selectDataMap == null) {
@ -336,7 +353,7 @@ export default {
console.log('editColumn', editColumn); console.log('editColumn', editColumn);
this.editColumn = editColumn; this.editColumn = editColumn;
let $this = this;
this.dataList = _data.rows.map(function (item) { this.dataList = _data.rows.map(function (item) {
item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2); item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2);

91
src/views/materia/components/EditView.vue
Unescape View File

@ -22,21 +22,22 @@
</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' && data['Power'].indexOf(item.key+',')>-1" 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' && data['Power'].indexOf(item.key+',')>-1" 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 && data['Power'].indexOf(item.key+',')>-1" 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 && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]"></lay-input>
<label v-else="">{{data[item.key]}}</label>
</template> </template>
</lay-table> </lay-table>
<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog> <OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
@ -221,16 +222,10 @@ export default {
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
this.userPower[0] = (await getBasicRoleList({ this.userPower[0] = (await getBasicRoleList({
FRoleType: 84, FRoleType: 84,
FViewType: this.dataInfoObj.FViewType,
TeamId: this.dataInfoObj.FTeamID,
Type: 1
}) || []).map(it => parseInt(it.F2))
this.userPower[1] = (await getBasicRoleList({
FRoleType: 44,
FViewType: this.dataInfoObj.FViewType,
TeamId: this.dataInfoObj.FTeamID, TeamId: this.dataInfoObj.FTeamID,
Type: 1 Type: 1
}) || []).map(it => parseInt(it.F2)) }) || []).map(it => parseInt(it.F2))
} }
this.initPage(layer.load(2)); this.initPage(layer.load(2));
}, },
@ -247,19 +242,39 @@ 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 $this = this;
let editColumn = dataColumn.filter(it => { let editColumn=[];
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; _data.rows.forEach((itemRow)=>{
if (b) {
it.customSlot = it.key; if(!itemRow["Power"])
it.cellClass = "edit-item" {
itemRow["Power"]="";
}
let powerColumns= $this.userPower[0].filter(s=>s.F1==itemRow.FViewType);
if(powerColumns)
{
powerColumns.forEach((itemColums)=>{
let dataColumn=_data.columns.find(s=>s.id==itemColums.F2);
itemRow["Power"]+=dataColumn.key+",";
if(!editColumn.find(s=>s.key==dataColumn.key))
{
dataColumn["customSlot"]=dataColumn.key;
dataColumn["cellClass"]="edit-item";
editColumn.push(dataColumn);
} }
})
} }
return b; })
});
if (editColumn.length > 0) { if (editColumn.length > 0) {
if (this.selectDataMap == null) { if (this.selectDataMap == null) {
@ -302,19 +317,7 @@ export default {
return items["cellClass"] = ""; return items["cellClass"] = "";
}) })
// 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; let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
if (info != null) { if (info != null) {
col7.forEach((col) => { col7.forEach((col) => {
@ -324,31 +327,13 @@ export default {
item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1; item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1;
item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2; item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2;
// if (this.dataInfoObj.FCanEdit == 2) {
// let fType1 = this.typeList[0].find((t) => {
// return t.FID === item.FTypeID1
// });
// let fType2 = this.typeList[1].find((t) => {
// return t.FID === item.FTypeID2
// })
// if (fType1) {
// item.FTypeID1 = fType1.FName;
// }
// if (fType2) {
// item.FTypeID2 = fType2.FName;
// }
// }
}); });
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));
this.editColumn = editColumn; this.editColumn = editColumn;
let $this = this;
this.dataList = _data.rows.map(function (item) { this.dataList = _data.rows.map(function (item) {
item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2); item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2);
let fType1 = $this.typeList[0].find((t) => { let fType1 = $this.typeList[0].find((t) => {

Write Preview
Loading…
Cancel
Save