|
|
|
@ -1,5 +1,6 @@
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
|
<lay-container fluid="true" :style="'padding:10px;height:' + (dataInfoObj != undefined ? (dataInfoObj.FHeight + 'px') : 'auto')">
|
|
|
|
<lay-container fluid="true"
|
|
|
|
|
|
|
|
:style="'padding:10px;height:' + (dataInfoObj != undefined ? (dataInfoObj.FHeight + 'px') : 'auto')">
|
|
|
|
<lay-row space="10">
|
|
|
|
<lay-row space="10">
|
|
|
|
<lay-col span="24">
|
|
|
|
<lay-col span="24">
|
|
|
|
<lay-card>
|
|
|
|
<lay-card>
|
|
|
|
@ -70,6 +71,9 @@ import {
|
|
|
|
getBasicList,
|
|
|
|
getBasicList,
|
|
|
|
getPageList
|
|
|
|
getPageList
|
|
|
|
} from "/src/api/api/common";
|
|
|
|
} from "/src/api/api/common";
|
|
|
|
|
|
|
|
import{
|
|
|
|
|
|
|
|
getFactoryList
|
|
|
|
|
|
|
|
}from "/src/api/api/factory";
|
|
|
|
import ShowData1 from '../half/components/ShowData1.vue';
|
|
|
|
import ShowData1 from '../half/components/ShowData1.vue';
|
|
|
|
import EditMateria from '../half/components/EditMateria.vue';
|
|
|
|
import EditMateria from '../half/components/EditMateria.vue';
|
|
|
|
import EditView from '../half/components/EditView.vue';
|
|
|
|
import EditView from '../half/components/EditView.vue';
|
|
|
|
@ -119,8 +123,8 @@ export default {
|
|
|
|
align: 'center'
|
|
|
|
align: 'center'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
title: "产品分类",
|
|
|
|
title: "模式",
|
|
|
|
key: "FType",
|
|
|
|
key: "FCreateFactoryID",
|
|
|
|
width: "150px",
|
|
|
|
width: "150px",
|
|
|
|
align: 'center'
|
|
|
|
align: 'center'
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -156,6 +160,7 @@ export default {
|
|
|
|
const selectedKeys = ref(["1"]);
|
|
|
|
const selectedKeys = ref(["1"]);
|
|
|
|
const checkbox = ref(false);
|
|
|
|
const checkbox = ref(false);
|
|
|
|
const defaultToolbar = ref(true);
|
|
|
|
const defaultToolbar = ref(true);
|
|
|
|
|
|
|
|
const factoryLists = ref([]);
|
|
|
|
const pageInfo = ref({
|
|
|
|
const pageInfo = ref({
|
|
|
|
total: 0,
|
|
|
|
total: 0,
|
|
|
|
limit: 10,
|
|
|
|
limit: 10,
|
|
|
|
@ -196,7 +201,8 @@ export default {
|
|
|
|
stateList,
|
|
|
|
stateList,
|
|
|
|
hasLoaded,
|
|
|
|
hasLoaded,
|
|
|
|
MaterialModel,
|
|
|
|
MaterialModel,
|
|
|
|
dataItem
|
|
|
|
dataItem,
|
|
|
|
|
|
|
|
factoryLists
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
props: {
|
|
|
|
props: {
|
|
|
|
@ -219,9 +225,14 @@ export default {
|
|
|
|
this.dataColumn[7].hide = false;
|
|
|
|
this.dataColumn[7].hide = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this._getTypeList();
|
|
|
|
this._getTypeList();
|
|
|
|
this._getPageList(true);
|
|
|
|
this._getFactoryList();
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
async _getFactoryList(){
|
|
|
|
|
|
|
|
this.factoryLists=await getFactoryList()||[];
|
|
|
|
|
|
|
|
this._getPageList(true);
|
|
|
|
|
|
|
|
},
|
|
|
|
changePage(obj) {
|
|
|
|
changePage(obj) {
|
|
|
|
this.pageInfo.current = obj.current;
|
|
|
|
this.pageInfo.current = obj.current;
|
|
|
|
this.pageInfo.limit = obj.limit;
|
|
|
|
this.pageInfo.limit = obj.limit;
|
|
|
|
@ -241,6 +252,10 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
//分页列表
|
|
|
|
//分页列表
|
|
|
|
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) {
|
|
|
|
@ -252,13 +267,15 @@ export default {
|
|
|
|
if (this.dataInfoObj != undefined) {
|
|
|
|
if (this.dataInfoObj != undefined) {
|
|
|
|
this.postData.FDataType = this.dataInfoObj;
|
|
|
|
this.postData.FDataType = this.dataInfoObj;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let $this = this;
|
|
|
|
let $this = this;
|
|
|
|
let result = await GetMaterialTeamworkPageList(this.postData);
|
|
|
|
let result = await GetMaterialTeamworkPageList(this.postData);
|
|
|
|
this.dataList = result.Data.List.map(function (item) {
|
|
|
|
this.dataList = result.Data.List.map(function (item) {
|
|
|
|
item.FAddDate = item.FAddDate == null ? "" : $this.dateFormat(item.FAddDate);
|
|
|
|
item.FAddDate = item.FAddDate == null ? "" : $this.dateFormat(item.FAddDate);
|
|
|
|
if(item.FState==2)
|
|
|
|
|
|
|
|
{
|
|
|
|
if(factoryList){
|
|
|
|
|
|
|
|
item.FCreateFactoryID=factoryList.find(s=>s.FID==item.FCreateFactoryID).FName;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (item.FState == 2) {
|
|
|
|
item["FStateName"] = "已完成";
|
|
|
|
item["FStateName"] = "已完成";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (item.FState == 1) {
|
|
|
|
else if (item.FState == 1) {
|
|
|
|
@ -266,7 +283,6 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return item;
|
|
|
|
return item;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
debugger
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.hasLoaded = true;
|
|
|
|
this.hasLoaded = true;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -284,9 +300,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
showEditMaterial(i, data) {
|
|
|
|
showEditMaterial(i, data) {
|
|
|
|
debugger
|
|
|
|
if (data) {
|
|
|
|
if(data)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
data["FTeamID"] = data.FID;
|
|
|
|
data["FTeamID"] = data.FID;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.objInfoObj = data;
|
|
|
|
this.objInfoObj = data;
|
|
|
|
|
