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 7fa8516668
commit 4b5e8caa11
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,22 +22,24 @@
</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' && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data['FTypeID1']" <lay-select v-if="item.key == 'FTypeID1' && data['Power'].indexOf(item.key + ',') > -1" size="sm"
@change="_changeType(data, 1)" :showEmpty="false"> 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" <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' && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data['FTypeID2']" <lay-select v-else-if="item.key == 'FTypeID2' && data['Power'].indexOf(item.key + ',') > -1" size="sm"
@change="_changeType(data, 2)" :showEmpty="false"> 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]" <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 && data['Power'].indexOf(item.key+',')>-1" 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 && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]"></lay-input> <lay-input v-else-if="!item.dataType && data['Power'].indexOf(item.key + ',') > -1" size="sm"
<label v-else="">{{data[item.key]}}</label> 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>
@ -224,7 +226,7 @@ export default {
FRoleType: 84, FRoleType: 84,
TeamId: this.dataInfoObj.FTeamID, TeamId: this.dataInfoObj.FTeamID,
Type: 1 Type: 1
}) || []).map(it => parseInt(it.F2)) }) || [])
} }
this.initPage(layer.load(2)); this.initPage(layer.load(2));
@ -245,29 +247,25 @@ export default {
let $this = this; let $this = this;
console.log('dataColumn', dataColumn); console.log('dataColumn', dataColumn);
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;
if (b) {
it.customSlot = it.key;
it.cellClass = "edit-item"
}
}
let powerColumns= $this.userPower[0].filter(s=>s.F1==itemRow.FViewType); //判断视图权限
_data.rows.forEach((itemRow) => {
if (!itemRow["Power"]) {
itemRow["Power"] = "";
}
if(powerColumns) let powerColumns = $this.userPower[0].filter(s => s.F1 == itemRow.FViewType);
{ if (powerColumns) {
powerColumns.forEach((itemColums)=>{ powerColumns.forEach((itemColums) => {
let dataColumn=_data.columns.find(s=>s.id==itemColums.F2); let dataColumn = _data.columns.find(s => s.id == itemColums.F2);
itemRow["Power"]+=dataColumn.key+","; itemRow["Power"] += dataColumn.key + ",";
if(!editColumn.find(s=>s.key==dataColumn.key)) if (!editColumn.find(s => s.key == dataColumn.key)) {
{ dataColumn["customSlot"] = dataColumn.key;
dataColumn["customSlot"]=dataColumn.key; dataColumn["cellClass"] = "edit-item";
dataColumn["cellClass"]="edit-item";
editColumn.push(dataColumn); editColumn.push(dataColumn);
} }
@ -456,7 +454,7 @@ export default {
data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2); data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2);
this.editColumn.forEach((item) => { this.editColumn.forEach((item) => {
if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key]&&result[item.key]!="") { if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key] && result[item.key] != "") {
data[item.key] = result[item.key] data[item.key] = result[item.key]
} }
//data[item.key] = result[item.key] || data[item.key] || ""; //data[item.key] = result[item.key] || data[item.key] || "";

Write Preview
Loading…
Cancel
Save