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 93afab121d
commit c16b107a42
5 changed files with 124 additions and 142 deletions
Show Stats Download Patch File Download Diff File

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

@ -64,3 +64,13 @@ export async function GetMaterialById(param)
}); });
return result; return result;
} }
export async function GetMaterialListByFTestCode(param)
{
let result = [];
debugger
await http.post('/api/Material/GetMaterialListByFTestCode', param).then((data) => {
result = data;
});
return result;
}

51
src/views/half/components/EditMateria.vue
Unescape View File

@ -121,6 +121,9 @@ import {
import { import {
getFormulaList getFormulaList
} from '/src/api/api/formula'; } from '/src/api/api/formula';
import{
GetMaterialListByFTestCode
} from '/src/api/api/material';
import { import {
InsertDataModel InsertDataModel
} from '/src/api/api/halfmaterialteamwork' } from '/src/api/api/halfmaterialteamwork'
@ -152,12 +155,7 @@ export default {
}, },
{ {
title: "物料描述", title: "物料描述",
key: "FDesc", key: "FName",
width: "110px",
},
{
title: "模式",
key: "FFactoryID",
width: "110px", width: "110px",
}, },
{ {
@ -261,7 +259,7 @@ export default {
this.formulaList = await getFormulaList(); this.formulaList = await getFormulaList();
}, },
async _getMateriaList() { async _getMateriaList() {
this._getPageList(true); this._getPageList();
}, },
async _getSelectList() { async _getSelectList() {
let result = await getDataCode({ let result = await getDataCode({
@ -286,7 +284,7 @@ export default {
}, },
//配方检索 //配方检索
_searchPageList(value) { _searchPageList(value) {
this._getPageList(true); this._getPageList();
}, },
//配方翻页 //配方翻页
changePage(obj) { changePage(obj) {
@ -304,7 +302,7 @@ export default {
this.formula1Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName; this.formula1Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName;
this.fVersion1Code=data.FVersionCode; this.fVersion1Code=data.FVersionCode;
this.FDesc=data.FName; this.FDesc=data.FName;
this._getPageList(true); this._getPageList();
} else { } else {
this.formula2 = data.FTestCode; this.formula2 = data.FTestCode;
this.formula2Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName; this.formula2Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName;
@ -315,37 +313,26 @@ export default {
}, },
//配方接口 //配方接口
async _getPageList(isFirst) { async _getPageList(isFirst) {
if (isFirst) {
this.pageInfo.current = 1; if (this.formula1Name != ""&& this.formula1!="") {
this.pageInfo.total = 0;
}
let postData = { let result = await GetMaterialListByFTestCode({
FPageIndex: this.pageInfo.current, "FTestCode": this.formula1
FPageSize: this.pageInfo.limit, });
FTestCode: this.formula1
}
let search = this.dataInfo.FSearchName;
if (search && search != "") {
postData.Or_FPlmCode = postData.Or_FTestCode = postData.Or_FName = postData.Or_FVersionCode =
search;
}
if (this.formula1Name != "") {
let result = await getPageList(postData, "Material");
let factoryList=[]; let factoryList=[];
for(let i=0;i<this.factoryLists.length;i++){ for(let i=0;i<this.factoryLists.length;i++){
factoryList.push(this.factoryLists[i]); factoryList.push(this.factoryLists[i]);
} }
result.Data.List = result.Data.List || []; result.Data = result.Data || [];
result.Data.List.forEach((item) => { result.Data.forEach((item) => {
if(factoryList){
item.FFactoryID=factoryList.find(s=>s.FID==item.FFactoryID).FName;
}
let type = this.typeList.find(s => s.FValue == item.FType); let type = this.typeList.find(s => s.FValue == item.FType);
item.FTypeName = type == null ? item.FType : type.FName; item.FTypeName = type == null ? item.FType : type.FName;
if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID
}); });
this.pageInfo.total = result.Data.Total || 0; debugger
this.dataList = result.Data.List; this.dataList = result.Data;
} }
}, },

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

@ -1,6 +1,7 @@
<template> <template>
<lay-container fluid="true" class="content-box"> <lay-container fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :dataInfoObj="dataInfoObj" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> <FormulaView :teamId="dataInfoObj.FTeamID" :dataInfoObj="dataInfoObj" :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" <FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting> :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
@ -22,7 +23,7 @@
</lay-button> </lay-button>
</template> </template>
<template v-for="(item,index) in editColumn" v-slot:[item.key]="{ data }" :key="index + 'editColumn'"> <template v-for="(item, index) in editColumn" v-slot:[item.key]="{ data }" :key="index + 'editColumn'">
<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"
@ -158,19 +159,19 @@ export default {
let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : ""; let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : "";
let info = row["info"]; let info = row["info"];
if (info) { if (info) {
if (typeof(document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0])!="undefined") { if (typeof (document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0]) != "undefined") {
switch (info[column.key + "Type"]) { switch (info[column.key + "Type"]) {
case "1": case "1":
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one");
return back; return back;
case "2": case "2":
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe");
return back; return back;
case "3": case "3":
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three");
return back; return back;
case "4": case "4":
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four");
return back; return back;
default: default:
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one");
@ -188,7 +189,7 @@ export default {
return column.cellClass = column.key + "_" + rowIndex + "_" + columnIndex; return column.cellClass = column.key + "_" + rowIndex + "_" + columnIndex;
}; };
const idx = ref([]); const idx = ref([]);
const materialInfoList=ref([]); const materialInfoList = ref([]);
return { return {
dataColumn, dataColumn,
dataList, dataList,
@ -234,20 +235,20 @@ export default {
this.userPower[0] = (await getBasicRoleList({ this.userPower[0] = (await getBasicRoleList({
FRoleType: 84, FRoleType: 84,
FViewType: this.dataInfoObj.FViewType, FViewType: this.dataInfoObj.FViewType,
TeamId:this.dataInfoObj.FTeamID, TeamId: this.dataInfoObj.FTeamID,
Type:2 Type: 2
}) || []).map(it => parseInt(it.F2)) }) || []).map(it => parseInt(it.F2))
this.userPower[1] = (await getBasicRoleList({ this.userPower[1] = (await getBasicRoleList({
FRoleType: 44, FRoleType: 44,
FViewType: this.dataInfoObj.FViewType, FViewType: this.dataInfoObj.FViewType,
TeamId:this.dataInfoObj.FTeamID, TeamId: this.dataInfoObj.FTeamID,
Type:2 Type: 2
}) || []).map(it => parseInt(it.F2)) }) || []).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 _data = await getListByHalfMaterialTeamId({ let _data = await getListByHalfMaterialTeamId({
teamId: this.dataInfoObj.FTeamID, teamId: this.dataInfoObj.FTeamID,
viewType: this.dataInfoObj.FViewType viewType: this.dataInfoObj.FViewType
@ -257,13 +258,12 @@ export default {
console.log('_data', _data); console.log('_data', _data);
let freezingCols = await GetFreezingColumns(); let freezingCols = await GetFreezingColumns();
if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) { if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
let dataResult=await GetMaterialById({ let dataResult = await GetMaterialById({
ID:this.dataInfoObj.FMaterialHalfIDs ID: this.dataInfoObj.FMaterialHalfIDs
}) })
if(dataResult) if (dataResult) {
{ this.inputCodeValue = dataResult.Data.FCode;
this.inputCodeValue =dataResult.Data.FCode; this.inputDescValue = dataResult.Data.FName;
this.inputDescValue =dataResult.Data.FName;
} }
this.isShow = true; this.isShow = true;
@ -350,10 +350,10 @@ 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));
this.editColumn = editColumn; this.editColumn = editColumn;
let $this=this; 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) => {
if (item.FTypeID1) { if (item.FTypeID1) {
@ -370,16 +370,16 @@ export default {
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
} }
else{ else {
let isFTypeID1 = $this.editColumn.find((t)=>{ let isFTypeID1 = $this.editColumn.find((t) => {
return t.key=="FTypeID1"; return t.key == "FTypeID1";
}) })
let isFTypeID2 = $this.editColumn.find((t)=>{ let isFTypeID2 = $this.editColumn.find((t) => {
return t.key=="FTypeID2"; return t.key == "FTypeID2";
}) })
if(!isFTypeID1&&!isFTypeID2){ if (!isFTypeID1 && !isFTypeID2) {
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
} }
@ -451,11 +451,10 @@ export default {
if (typeName.indexOf("成品") > 0) { if (typeName.indexOf("成品") > 0) {
data.FViewType = 1 data.FViewType = 1
} }
data["info"]=this.materialInfoList.Data.find(s=>s.FDataID==data.FTypeID2); data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2);
this.dataColumn.forEach((item) => { this.dataColumn.forEach((item) => {
if(item.key!="FTypeID1"&& item.key!="FTypeID2"&&result[item.key]) if (item.key != "FTypeID1" && item.key != "FTypeID2" && 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] || "";
@ -475,12 +474,12 @@ 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); console.log('cacheDataList', cacheDataList);
let allTypeSelected=true; let allTypeSelected = true;
this.dataList.forEach((row, index) => { this.dataList.forEach((row, index) => {
let cache = cacheDataList[index]; let cache = cacheDataList[index];
let dataObj = {}; let dataObj = {};
if (row["FTypeID1"]==-1 || row["FTypeID2"]==-1||row["FTypeID1"]==''||row["FTypeID2"]==''){ if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') {
layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000}); layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 });
layer.close(idx); layer.close(idx);
allTypeSelected = false; allTypeSelected = false;
return false; return false;
@ -488,31 +487,20 @@ export default {
console.log('this.editColumn', this.editColumn); console.log('this.editColumn', this.editColumn);
for (let col of this.dataColumn) { for (let col of this.dataColumn) {
let valTemp = row[col.key]; let valTemp = row[col.key];
if (this.dataInfoObj.FViewType == 10) { debugger
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"];
}
dataObj[col.table][col.key] = valTemp; }
if (col.key == "FTypeID1" || col.key == "FTypeID2") { dataObj[col.table][col.key] = valTemp;
let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; if (col.key == "FTypeID1" || col.key == "FTypeID2") {
let temp = temps.find(s => s.FID == valTemp) || null; let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || [];
valTemp = temp == null ? "" : temp.FName; 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));
} }
updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
} }
console.log('dataObj', dataObj); console.log('dataObj', dataObj);
@ -523,32 +511,31 @@ export default {
} }
}); });
if(!allTypeSelected) if (!allTypeSelected) {
{
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
let _result = await updateBatchById3(updateObj); let _result = await updateBatchById3(updateObj);
if (_result.Code === 200) { if (_result.Code === 200) {
await commonSave({ await commonSave({
teamId: updateObj.FTeamID, teamId: updateObj.FTeamID,
type: this.dataInfoObj['FType'], type: this.dataInfoObj['FType'],
desc: updateLog desc: updateLog
}, "OperateLog"); }, "OperateLog");
let $this = this; let $this = this;
//$this.initPage(); //$this.initPage();
localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList)); localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
setTimeout(function () { setTimeout(function () {
layer.close(idx); layer.close(idx);
layer.msg('保存成功'); layer.msg('保存成功');
$this.$emit('cancelClick', true, false); $this.$emit('cancelClick', true, false);
$this.$refs.OperateLog._getPageList(); $this.$refs.OperateLog._getPageList();
}, 500); }, 500);
} }
}, },
_clickFreezingColumnSetting() { _clickFreezingColumnSetting() {
this.dataColumn = ref([]); this.dataColumn = ref([]);

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

@ -498,33 +498,22 @@ export default {
return return
} }
console.log('this.editColumn', this.editColumn); console.log('this.editColumn', this.editColumn);
for (let col of this.editColumn) { for (let col of this.dataColumn) {
let valTemp = row[col.key]; let valTemp = row[col.key];
if (this.dataInfoObj.FViewType == 10) { debugger
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"];
}
dataObj[col.table][col.key] = valTemp; }
if (col.key == "FTypeID1" || col.key == "FTypeID2") { dataObj[col.table][col.key] = valTemp;
let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; if (col.key == "FTypeID1" || col.key == "FTypeID2") {
let temp = temps.find(s => s.FID == valTemp) || null; let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || [];
valTemp = temp == null ? "" : temp.FName; 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));
} }
updateObj.LogList.push(col.title + "：" + (valTemp == "" ? "删除" : valTemp));
} }
console.log('dataObj', dataObj); console.log('dataObj', dataObj);

15
src/views/half/route.vue
Unescape View File

@ -54,11 +54,11 @@
<EditMateria v-if="showEditBox[2]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMateria> <EditMateria v-if="showEditBox[2]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMateria>
</lay-layer> </lay-layer>
<lay-layer :area="modelArea[1]" v-model="showEditBox[1]" title="物料视图"> <lay-layer :area="modelArea[1]" v-model="showEditBox[1]" title="物料分类">
<EditView v-if="showEditBox[1]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView> <EditView v-if="showEditBox[1]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
</lay-layer> </lay-layer>
<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" title="物料视图"> <lay-layer :area="modelArea[3]" v-model="showEditBox[3]" :title="label">
<EditViewOFF v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditViewOFF> <EditViewOFF v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditViewOFF>
</lay-layer> </lay-layer>
<lay-layer :area="modelArea[0]" v-model="showEditBox[0]" title="BOM下载"> <lay-layer :area="modelArea[0]" v-model="showEditBox[0]" title="BOM下载">
@ -179,6 +179,7 @@ export default {
}]); }]);
const hasLoaded = ref(false); const hasLoaded = ref(false);
const dataItem = ref([]); const dataItem = ref([]);
const label=ref("");
return { return {
selectedKeys, selectedKeys,
checkbox, checkbox,
@ -196,7 +197,8 @@ export default {
stateList, stateList,
hasLoaded, hasLoaded,
MaterialModel, MaterialModel,
dataItem dataItem,
label
}; };
}, },
props: { props: {
@ -301,6 +303,13 @@ export default {
else if (data.FType == 1) { else if (data.FType == 1) {
data.FBoxType = 1; //配方选择 data.FBoxType = 1; //配方选择
}else if(data.FType == 2||data.FType==3){ }else if(data.FType == 2||data.FType==3){
if(data.FType == 2)
{
this.label="物料编辑";
}
else{
this.label="物料确认";
}
data.FBoxType = 3; data.FBoxType = 3;
} }
else { else {

Write Preview
Loading…
Cancel
Save