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

物料新增权限修改

Browse Source
master
leo 3 years ago
parent 25e904fabb
commit 4bf1283644
5 changed files with 117 additions and 73 deletions
Show Stats Download Patch File Download Diff File

1
src/api/api/material.ts
Unescape View File

@ -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;
});

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

@ -145,7 +145,7 @@ export default {
FDataId: this.objInfoObj.FID
}, "View") || {};
console.log('result2', result2);

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

@ -20,8 +20,8 @@
</lay-button>
<lay-button size="sm" @click="upSAP" type="primary">物料上传
</lay-button>
</template>
<template v-for="item in editColumn" v-slot:[item.key]="{ data }">
</template>
<template v-for="item in dataColumn" v-slot:[item.key]="{ data }">
<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">
<lay-select-option v-for="(tIdv, tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
@ -38,7 +38,11 @@
:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
</lay-select>
<lay-input v-else-if="!item.dataType && data['Power'].indexOf(item.key + ',') > -1" size="sm"
v-model="data[item.key]"></lay-input>
v-model="data[item.key]">
</lay-input>
<label v-else-if="item.key == 'FTypeID1'">{{ data["FTypeID1Name"] }}</label>
<label v-else-if="item.key == 'FTypeID2'">{{ data["FTypeID2Name"] }}</label>
<label v-else-if="item.selectTypeId">{{ data[item.key + "Name"] }}</label>
<label v-else="">{{ data[item.key] }}</label>
</template>
</lay-table>
@ -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");

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

@ -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);
}
}
}
}

1
src/views/materia/route.vue
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save