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 375a815747
commit 82dadc8d46
11 changed files with 366 additions and 219 deletions
Show Stats Download Patch File Download Diff File

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

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

4
src/api/http.ts
Unescape View File

@ -5,13 +5,13 @@ const config = {
timeout: 600000, timeout: 600000,
//baseURL: "http://124.222.104.55:58178/", //baseURL: "http://124.222.104.55:58178/",
baseURL: "http://localhost:58178/", baseURL: "http://localhost:58178/",
// baseURL: "http://plm-pw-test.hbflavor.com:81/", //baseURL: "http://plm-pw-test.hbflavor.com:81/",
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',
}, },
async: false async: false
} }
//let userToken = ""; //let userToken = "";
// let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoib2F0ZXN0MiIsIkZOYW1lIjoi5rWL6K-V5bel5Y6CIiwiRkV4cGlyZVRpbWUiOiIyMDIzLTAxLTE3IDIwOjIwOjA1In0.ZNN-fVE1JJ3tN82pM9DylqqMMpMUVLZWJKTBwz8M3bU" // let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoib2F0ZXN0MiIsIkZOYW1lIjoi5rWL6K-V5bel5Y6CIiwiRkV4cGlyZVRpbWUiOiIyMDIzLTAxLTE3IDIwOjIwOjA1In0.ZNN-fVE1JJ3tN82pM9DylqqMMpMUVLZWJKTBwz8M3bU"
let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoiSEIxMTAwMjgzIiwiRk5hbWUiOiLmnY7mtKrkvJ8iLCJGRXhwaXJlVGltZSI6IjIwMjMtMDctMjYgMjA6NTU6MDEifQ.qE281pbJFVWxkGqOiTjOeMZvmkN7lM9ObDS0D9bcbHA" let userToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJGSUQiOjIsIkZVc2VyIjoiSEIxMTAwMjgzIiwiRk5hbWUiOiLmnY7mtKrkvJ8iLCJGRXhwaXJlVGltZSI6IjIwMjMtMDctMjYgMjA6NTU6MDEifQ.qE281pbJFVWxkGqOiTjOeMZvmkN7lM9ObDS0D9bcbHA"

40
src/views/Need/components/EditFSuccedaneum.vue
Unescape View File

@ -106,13 +106,7 @@ export default {
FormulaView, FormulaView,
}, },
setup() { setup() {
let dataColumn = [{ let dataColumn = [
title: "ID",
key: "FID",
width: "160px",
align: 'center',
hide: false
},
{ {
title: "试验号", title: "试验号",
key: "FTestCode", key: "FTestCode",
@ -128,7 +122,7 @@ export default {
}, },
{ {
title: "物料描述", title: "物料描述",
key: "FDesc", key: "FName",
width: "360px", width: "360px",
align: 'center' align: 'center'
}, },
@ -227,11 +221,15 @@ export default {
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
this.userPower[0] = (await getBasicRoleList({ this.userPower[0] = (await getBasicRoleList({
FRoleType: 40, FRoleType: 40,
FViewType: this.dataInfoObj.FViewType FViewType: this.dataInfoObj.FViewType,
TeamId:this.dataInfoObj.FTeamID,
Type:0
}) || []).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,
Type:0
}) || []).map(it => parseInt(it.F2)) }) || []).map(it => parseInt(it.F2))
} }
this.initPage(layer.load(2)); this.initPage(layer.load(2));
@ -240,16 +238,20 @@ export default {
let _data = await GetMaterialInfoListByTeamId({ let _data = await GetMaterialInfoListByTeamId({
tempId: this.dataInfoObj.FTeamID tempId: this.dataInfoObj.FTeamID
}); });
this.dataList = _data.Data.map(function (item) {
if (item.FSuccedaneumID == -1) {
item["selected"] = "不需要";
}
else if (item.FSuccedaneumID > 0) {
item["selected"] = "需要";
}
return item; if(_data.Code==200){
}); this.dataList = _data.Data.map(function (item) {
if (item.FSuccedaneumID == -1) {
item["selected"] = "不需要";
}
else if (item.FSuccedaneumID > 0) {
item["selected"] = "需要";
}
return item;
});
}
setTimeout(function () { setTimeout(function () {
layer.close(idx); layer.close(idx);
}, 500); }, 500);

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

@ -96,6 +96,11 @@ import {
getListByTeamId, getListByTeamId,
updateBatchById2 updateBatchById2
} from "/src/api/api/view"; } from "/src/api/api/view";
import {
GetMaterialById
} from "/src/api/api/material";
import { import {
getBasicRoleList, getBasicRoleList,
GetFreezingColumns GetFreezingColumns
@ -174,6 +179,7 @@ export default {
const idx = ref([]); const idx = ref([]);
const materialInfoList=ref([]); const materialInfoList=ref([]);
return { return {
dataColumn, dataColumn,
dataList, dataList,
@ -213,7 +219,6 @@ export default {
}, },
methods: { methods: {
async getUserPower() { async getUserPower() {
debugger
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
this.userPower[0] = (await getBasicRoleList({ this.userPower[0] = (await getBasicRoleList({
FRoleType: 84, FRoleType: 84,
@ -239,10 +244,17 @@ export default {
}); });
this.materialInfoList = await GetMaterialInfoList() || null; this.materialInfoList = await GetMaterialInfoList() || null;
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) {
this.inputCodeValue = _data.rows[0]?_data.rows[0].HalfCode:""; let dataResult=await GetMaterialById({
this.inputDescValue = _data.rows[0]?_data.rows[0].HalfDesc:""; ID:this.dataInfoObj.FMaterialHalfIDs
})
if(dataResult)
{
this.inputCodeValue =dataResult.Data.FCode;
this.inputDescValue =dataResult.Data.FName;
}
this.isShow = true; this.isShow = true;
} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) { } else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true; this.isBomShow = true;
@ -311,19 +323,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) => {
@ -332,6 +332,7 @@ 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;
}); });
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));
@ -340,6 +341,39 @@ export default {
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) => {
if (item.FTypeID1) {
return t.FID == item.FTypeID1
}
});
let fType2 = $this.typeList[1].find((t) => {
if (item.FTypeID2) {
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";
})
if(!isFTypeID1&&!isFTypeID2){
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
}
}
return item; return item;
}); });
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
@ -362,7 +396,7 @@ export default {
} }
this._changeType(_data.rows[0],2); // this._changeType(_data.rows[0],2);
setTimeout(function () { setTimeout(function () {
layer.close(idx); layer.close(idx);
}, 500); }, 500);
@ -484,7 +518,6 @@ export default {
this.dataList.forEach((row, index) => { this.dataList.forEach((row, index) => {
let cache = cacheDataList[index]; let cache = cacheDataList[index];
let dataObj = {}; let dataObj = {};
debugger
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);

37
src/views/Team/all.vue
Unescape View File

@ -85,6 +85,9 @@
import { import {
checkIsHasPower checkIsHasPower
} from "/src/api/api/common"; } from "/src/api/api/common";
import{
getFactoryList
}from "/src/api/api/factory";
import AddTerm from './components/AddTerm.vue'; import AddTerm from './components/AddTerm.vue';
import ShowData1 from './components/ShowData1.vue'; import ShowData1 from './components/ShowData1.vue';
@ -121,16 +124,23 @@
key: "FFormulaTestCode", key: "FFormulaTestCode",
width: "190px" width: "190px"
}, },
{
title: "模式",
key: "FCreateFactoryID",
width: "190px"
},
{ {
title: "发起时间", title: "发起时间",
key: "FAddDate", key: "FAddDate",
width: "182px" width: "182px"
}, },
{ {
title: "发起人", title: "发起人",
key: "FAddUserName", key: "FAddUserName",
width: "126px" width: "126px"
}, },
{ {
title: "完成度", title: "完成度",
key: "FProgress", key: "FProgress",
@ -184,6 +194,7 @@
id: "100", id: "100",
name: "已完成" name: "已完成"
}]); }]);
const factoryLists=ref([]);
return { return {
objInfoObj, objInfoObj,
editBoxTitle, editBoxTitle,
@ -198,14 +209,20 @@
searchObj, searchObj,
postData, postData,
stateList, stateList,
userRolePower userRolePower,
factoryLists
}; };
}, },
mounted() { mounted() {
this._checkIsHasPower() this._checkIsHasPower()
this._getPageList(true); this._getFactoryList();
//this._getPageList(true);
}, },
methods: { methods: {
async _getFactoryList(){
this.factoryLists=await getFactoryList()||[];
this._getPageList(true);
},
//判断权限 //判断权限
async _checkIsHasPower() { async _checkIsHasPower() {
let result = await checkIsHasPower({ let result = await checkIsHasPower({
@ -225,6 +242,13 @@
}, },
//获取数据集合 //获取数据集合
async _getPageList(isFirst, showOk) { async _getPageList(isFirst, showOk) {
let factoryList=[];
for(let i=0;i<this.factoryLists.length;i++){
factoryList.push(this.factoryLists[i]);
}
this.pageInfo.total = 0; this.pageInfo.total = 0;
if (isFirst) { if (isFirst) {
this.pageInfo.current = 1; this.pageInfo.current = 1;
@ -242,7 +266,14 @@
item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate); item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate);
}); });
this.pageInfo.total = result.Data.Total || 0; this.pageInfo.total = result.Data.Total || 0;
this.dataList = result.Data.List; debugger
this.dataList = result.Data.List.map(function(item){
if(factoryList){
item.FCreateFactoryID=factoryList.find(s=>s.FID==item.FCreateFactoryID).FName;
}
return item;
});
}, },
//日期处理 //日期处理
dateFormat(dataStr) { dateFormat(dataStr) {

35
src/views/Team/components/ShowData1.vue
Unescape View File

@ -290,7 +290,16 @@
async _getViewList() { async _getViewList() {
let result = await getBasicRoleList({ let result = await getBasicRoleList({
FRoleType: 39 FRoleType: 39
}) || [];
let result2 = await getBasicRoleList({
FRoleType: 39,
TeamId:this.dataInfoObj.FID,
Type:0
}) || []; }) || [];
console.log('result', result); console.log('result', result);
console.log('this.dataInfoObj', this.dataInfoObj); console.log('this.dataInfoObj', this.dataInfoObj);
let dataList = []; let dataList = [];
@ -298,6 +307,7 @@
result.forEach((item) => { result.forEach((item) => {
let viewData = dataList.find(s => s.name == item.FName) || null; let viewData = dataList.find(s => s.name == item.FName) || null;
debugger
if (viewData == null) { if (viewData == null) {
if (hasType.indexOf(item.FCode) != -1) { if (hasType.indexOf(item.FCode) != -1) {
viewData = { viewData = {
@ -305,13 +315,30 @@
seeCode: "", seeCode: "",
outCode: "" outCode: ""
}; };
if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode; if(result2){
if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode; let dataResult=result2.find((x)=>{
return x.FID==item.FID;
})
if(dataResult){
if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode;
if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode;
}
}
dataList.push(viewData); dataList.push(viewData);
} }
} else { } else {
if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode; if(result2){
if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode; let dataResult=result2.find((x)=>{
return x.FID==item.FID;
})
if(dataResult){
if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode;
if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode;
}
}
} }
}); });

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

@ -7,6 +7,7 @@
</lay-layer> </lay-layer>
<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" <lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn"
:dataInfoObj="dataInfoObj" :data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName"> :dataInfoObj="dataInfoObj" :data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2"> <template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存 <lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存
</lay-button> </lay-button>
@ -20,7 +21,8 @@
@click="_clickFreezingColumnSetting()">固定项 @click="_clickFreezingColumnSetting()">固定项
</lay-button> </lay-button>
</template> </template>
<template v-for="item in editColumn" v-slot:[item.key]="{ data }">
<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"
@ -92,6 +94,9 @@
import { import {
ref ref
} from 'vue'; } from 'vue';
import {
GetMaterialById
} from "/src/api/api/material";
import { import {
getListByHalfMaterialTeamId, getListByHalfMaterialTeamId,
updateBatchById2, updateBatchById2,
@ -156,19 +161,23 @@ export default {
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":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one");
return back;
case "2": case "2":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe");
return back;
case "3": case "3":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three");
return back;
case "4": case "4":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four");
return back;
default: default:
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("twe"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("twe");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("three"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("three");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("four") document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("four")
return ""; return back;
} }
} }
@ -248,8 +257,15 @@ 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) {
this.inputCodeValue = _data.rows[0] ? _data.rows[0].HalfCode : ""; let dataResult=await GetMaterialById({
this.inputDescValue = _data.rows[0] ? _data.rows[0].HalfDesc : ""; ID:this.dataInfoObj.FMaterialHalfIDs
})
if(dataResult)
{
this.inputCodeValue =dataResult.Data.FCode;
this.inputDescValue =dataResult.Data.FName;
}
this.isShow = true; this.isShow = true;
} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) { } else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true; this.isBomShow = true;
@ -259,18 +275,26 @@ export default {
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 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.filter(it => { let editColumn = dataColumn.filter(it => {
let b = false; it.customSlot = it.key;
if (this.dataInfoObj.FCanEdit != 2) { it.cellClass = "edit-item"
if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0; return it;
else b = this.userPower[0].indexOf(it.id) >= 0;
if (b) {
it.customSlot = it.key;
it.cellClass = "edit-item"
}
}
return b;
}); });
debugger
if (editColumn.length > 0) { if (editColumn.length > 0) {
if (this.selectDataMap == null) { if (this.selectDataMap == null) {
@ -287,12 +311,7 @@ export default {
}); });
} }
} }
// //修改项移到前面
// if (this.dataInfoObj.FCanEdit != 2) {
// let tempColumn1 = dataColumn.filter(s => s.customSlot) || [];
// let tempColumn2 = dataColumn.filter(s => s.customSlot == undefined) || [];
// dataColumn = [...tempColumn1, ...tempColumn2];
// }
} }
let columnsList = []; let columnsList = [];
let col7 = dataColumn.filter(s => s.fieldType == 7) || []; let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
@ -317,19 +336,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) => {
@ -338,23 +345,7 @@ 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) => {
if (item.FTypeID1) {
return t.FID == item.FTypeID1
}
});
let fType2 = this.typeList[1].find((t) => {
if (item.FTypeID2) {
return t.FID == item.FTypeID2
}
})
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
}
}); });
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
@ -362,7 +353,39 @@ export default {
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) => {
if (item.FTypeID1) {
return t.FID == item.FTypeID1
}
});
let fType2 = $this.typeList[1].find((t) => {
if (item.FTypeID2) {
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";
})
if(!isFTypeID1&&!isFTypeID2){
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
}
}
return item; return item;
}); });
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
@ -388,24 +411,7 @@ export default {
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);
@ -421,13 +427,7 @@ export default {
}) || null; }) || null;
if (result != null && result.FID) { if (result != null && result.FID) {
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) => {
if (item.table == "TFS_MaterialInfo") {
data[item.key] = result[item.key] || data[item.key] || "";
}
});
console.log('data.FTypeID1', data.FTypeID1); console.log('data.FTypeID1', data.FTypeID1);
let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0]; let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
@ -452,15 +452,16 @@ 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);
let $this=this; this.dataColumn.forEach((item) => {
this.dataList.map(function (item) { if(item.key!="FTypeID1"&& item.key!="FTypeID2"&&result[item.key])
if(item.FID==data.FID)
{ {
item.info=$this.materialInfoList.Data.find(s=>s.FDataID==data.FTypeID2); data[item.key] = result[item.key]
} }
return item; //data[item.key] = result[item.key] || data[item.key] || "";
}) });
} }
} }
} }
@ -479,7 +480,6 @@ export default {
this.dataList.forEach((row, index) => { this.dataList.forEach((row, index) => {
let cache = cacheDataList[index]; let cache = cacheDataList[index];
let dataObj = {}; let dataObj = {};
debugger
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);

151
src/views/half/components/EditViewOFF.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>
@ -92,6 +93,9 @@
import { import {
ref ref
} from 'vue'; } from 'vue';
import {
GetMaterialById
} from "/src/api/api/material";
import { import {
getListByHalfMaterialTeamId, getListByHalfMaterialTeamId,
updateBatchById4 updateBatchById4
@ -133,6 +137,7 @@ export default {
[], [],
[] []
]); ]);
const cellStyle = function (row, column, rowIndex, columnIndex) { const cellStyle = function (row, column, rowIndex, columnIndex) {
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"];
@ -140,19 +145,23 @@ export default {
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":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one");
return back;
case "2": case "2":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("twe");
return back;
case "3": case "3":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("three");
return back;
case "4": case "4":
return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("four");
return back;
default: default:
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("one");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("twe"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("twe");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("three"); document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("three");
document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("four") document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.remove("four")
return ""; return back;
} }
} }
@ -217,14 +226,14 @@ 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));
@ -241,8 +250,14 @@ export default {
let freezingCols = await GetFreezingColumns(); let freezingCols = await GetFreezingColumns();
console.log('_data', _data); console.log('_data', _data);
if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) { if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
this.inputCodeValue = _data.rows[0] ? _data.rows[0].HalfCode : ""; let dataResult = await GetMaterialById({
this.inputDescValue = _data.rows[0] ? _data.rows[0].HalfDesc : ""; ID: this.dataInfoObj.FMaterialHalfIDs
})
if (dataResult) {
this.inputCodeValue = dataResult.Data.FCode;
this.inputDescValue = dataResult.Data.FName;
}
this.isShow = true; this.isShow = true;
} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) { } else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true; this.isBomShow = true;
@ -335,26 +350,39 @@ export default {
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);
let fType1 = $this.typeList[0].find((t) => {
if (item.FTypeID1) {
return t.FID == item.FTypeID1
}
});
let fType2 = $this.typeList[1].find((t) => {
if (item.FTypeID2) {
return t.FID == item.FTypeID2
}
})
if ($this.dataInfoObj.FCanEdit == 2) { if ($this.dataInfoObj.FCanEdit == 2) {
let fType1 = $this.typeList[0].find((t) => { item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
if (item.FTypeID1) { item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
return t.FID == item.FTypeID1 }
} else {
});
let fType2 = $this.typeList[1].find((t) => { let isFTypeID1 = $this.editColumn.find((t) => {
if (item.FTypeID2) { return t.key == "FTypeID1";
return t.FID == item.FTypeID2 })
} let isFTypeID2 = $this.editColumn.find((t) => {
return t.key == "FTypeID2";
}) })
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1; if (!isFTypeID1 && !isFTypeID2) {
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2; item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
}
} }
item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2);
return item; return item;
}); });
@ -406,13 +434,7 @@ export default {
"FType": 1 "FType": 1
}) || null; }) || null;
if (result != null && result.FID) { if (result != null && result.FID) {
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) => {
if (item.table == "TFS_MaterialInfo") {
data[item.key] = result[item.key] || data[item.key] || "";
}
});
console.log('data.FTypeID1', data.FTypeID1); console.log('data.FTypeID1', data.FTypeID1);
let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0]; let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
@ -437,19 +459,15 @@ export default {
if (typeName.indexOf("成品") > 0) { if (typeName.indexOf("成品") > 0) {
data.FViewType = 1 data.FViewType = 1
} }
let $this=this; data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2);
this.dataList.map(function (item) {
if(item.FID==data.FID)
{
item.info=$this.materialInfoList.Data.find(s=>s.FDataID==data.FTypeID2);
}
return item;
})
this.dataColumn.map(function (item) { this.dataColumn.forEach((item) => {
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] || "";
});
return item["cellClass"] = "";
})
} }
} }
} }
@ -460,17 +478,17 @@ export default {
LogList: [], LogList: [],
FTeamID: this.dataInfoObj['FTeamID'], FTeamID: this.dataInfoObj['FTeamID'],
FViewType: this.dataInfoObj.FViewType, FViewType: this.dataInfoObj.FViewType,
FType:this.dataInfoObj.FType FType: this.dataInfoObj.FType
}; };
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 return
@ -512,31 +530,30 @@ export default {
updateObj[key].push(dataObj[key]); updateObj[key].push(dataObj[key]);
} }
}); });
if(!allTypeSelected) if (!allTypeSelected) {
{
return false; return false;
} }
let updateLog = updateObj.LogList.join("、"); let updateLog = updateObj.LogList.join("、");
delete updateObj.LogList delete updateObj.LogList
// 发送保存请求 // 发送保存请求
console.log('updateObj', updateObj); console.log('updateObj', updateObj);
let _result = await updateBatchById4(updateObj); let _result = await updateBatchById4(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([]);

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

@ -132,13 +132,13 @@ export default {
align: 'center' align: 'center'
}, },
{ {
title: "发起人", title: "负责人",
key: "FUserName", key: "FUserName",
width: "178px", width: "178px",
align: 'center' align: 'center'
}, },
{ {
title: "负责人", title: "发起人",
key: "FUserName1", key: "FUserName1",
width: "98px", width: "98px",
align: 'center', align: 'center',

4
src/views/log/log.vue
Unescape View File

@ -34,8 +34,8 @@
v-model:selectedKeys="selectedKeys" :default-toolbar="defaultToolbar" v-model:selectedKeys="selectedKeys" :default-toolbar="defaultToolbar"
:page="dataList.length>0?pageInfo:null" @change="changePage"> :page="dataList.length>0?pageInfo:null" @change="changePage">
<template v-slot:toolbar> <template v-slot:toolbar>
<lay-button size="sm" @click="_getPageList(false,true)">刷新</lay-button> <!-- <lay-button size="sm" @click="_getPageList(false,true)">刷新</lay-button> -->
<lay-button size="sm" type="normal" @click="showEditMaterial(1)">导出</lay-button> <!-- <lay-button size="sm" type="normal" @click="showEditMaterial(1)">导出</lay-button> -->
</template> </template>
</lay-table> </lay-table>
</lay-card> </lay-card>

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

@ -324,24 +324,24 @@ 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) { // if (this.dataInfoObj.FCanEdit == 2) {
let fType1 = this.typeList[0].find((t) => { // let fType1 = this.typeList[0].find((t) => {
return t.FID === item.FTypeID1 // return t.FID === item.FTypeID1
}); // });
let fType2 = this.typeList[1].find((t) => { // let fType2 = this.typeList[1].find((t) => {
return t.FID === item.FTypeID2 // return t.FID === item.FTypeID2
}) // })
if (fType1) { // if (fType1) {
item.FTypeID1 = fType1.FName; // item.FTypeID1 = fType1.FName;
} // }
if (fType2) { // if (fType2) {
item.FTypeID2 = fType2.FName; // item.FTypeID2 = fType2.FName;
} // }
} // }
}); });
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
@ -351,6 +351,35 @@ export default {
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) => {
if (item.FTypeID1) {
return t.FID == item.FTypeID1
}
});
let fType2 = $this.typeList[1].find((t) => {
if (item.FTypeID2) {
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";
})
if(!isFTypeID1&&!isFTypeID2){
item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
}
}
return item; return item;
}); });
this.dataColumn = dataColumn; this.dataColumn = dataColumn;

Write Preview
Loading…
Cancel
Save