|
@ -70,7 +70,7 @@ |
|
|
|
|
|
|
|
|
</el-tab-pane> |
|
|
</el-tab-pane> |
|
|
<el-tab-pane label="工序物料" name="materials"> |
|
|
<el-tab-pane label="工序物料" name="materials"> |
|
|
<el-table :data="materialsData" ref="tableMaterials" style="width: 100%; height: 80%"> |
|
|
<el-table :data="materialsData" ref="tableMaterials" style="width: 100%; height: 80%"> |
|
|
<el-table-column prop="repMaterialCode" label="物料编码" /> |
|
|
<el-table-column prop="repMaterialCode" label="物料编码" /> |
|
|
<el-table-column prop="repMaterialCounts" label="物料数量" /> |
|
|
<el-table-column prop="repMaterialCounts" label="物料数量" /> |
|
|
<el-table-column prop="repMaterialModel" label="物料单位" /> |
|
|
<el-table-column prop="repMaterialModel" label="物料单位" /> |
|
@ -260,7 +260,14 @@ const workstationData=ref([]) |
|
|
const dialogVisible = ref(false) // 弹窗的是否展示 |
|
|
const dialogVisible = ref(false) // 弹窗的是否展示 |
|
|
const dialogTitle = ref('') // 弹窗的标题 |
|
|
const dialogTitle = ref('') // 弹窗的标题 |
|
|
const graphJson =ref() |
|
|
const graphJson =ref() |
|
|
const currentNode = ref({}) |
|
|
const currentNode = ref({ |
|
|
|
|
|
attrs:{ |
|
|
|
|
|
title:{ |
|
|
|
|
|
text:'' |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
id:'' |
|
|
|
|
|
}) |
|
|
/*班组数据*/ |
|
|
/*班组数据*/ |
|
|
const teamData = ref([]) |
|
|
const teamData = ref([]) |
|
|
/*班组弹窗搜索条件*/ |
|
|
/*班组弹窗搜索条件*/ |
|
@ -283,6 +290,8 @@ const closeTeamUser = () =>{ |
|
|
const workerData=ref([]) |
|
|
const workerData=ref([]) |
|
|
/*查询班组接口参数*/ |
|
|
/*查询班组接口参数*/ |
|
|
const teamParams = ref({ |
|
|
const teamParams = ref({ |
|
|
|
|
|
workshopCode:'', |
|
|
|
|
|
productionLineCode:'', |
|
|
teamGroup: '', |
|
|
teamGroup: '', |
|
|
name: '', |
|
|
name: '', |
|
|
pageNo:1, |
|
|
pageNo:1, |
|
@ -304,6 +313,8 @@ const searchTeamList = () => { |
|
|
} |
|
|
} |
|
|
/** 打开弹窗 */ |
|
|
/** 打开弹窗 */ |
|
|
const open = async (type: string, row?: any, titleName?: any) => { |
|
|
const open = async (type: string, row?: any, titleName?: any) => { |
|
|
|
|
|
currentNode.value.attrs.title.text='' |
|
|
|
|
|
currentNode.value.id='' |
|
|
//首次打开页面,将数据清空 |
|
|
//首次打开页面,将数据清空 |
|
|
workerData.value = [] |
|
|
workerData.value = [] |
|
|
equipmentData.value = [] |
|
|
equipmentData.value = [] |
|
@ -424,7 +435,7 @@ const opensearchTable = ( |
|
|
false, |
|
|
false, |
|
|
//true |
|
|
//true |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
const publishPlan=()=>{ |
|
|
const publishPlan=()=>{ |
|
|
message.confirm("确认发布当前计划?","question").then(async () => { |
|
|
message.confirm("确认发布当前计划?","question").then(async () => { |
|
@ -441,11 +452,11 @@ const publishPlan=()=>{ |
|
|
}).catch(() => { |
|
|
}).catch(() => { |
|
|
message.info("已取消发布") |
|
|
message.info("已取消发布") |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
const doPublishPlan= ()=>{ |
|
|
const doPublishPlan= ()=>{ |
|
|
|
|
|
|
|
|
let data ={ |
|
|
let data ={ |
|
|
updateId: detailData.value.id, |
|
|
updateId: detailData.value.id, |
|
|
status: detailData.value.status, |
|
|
status: detailData.value.status, |
|
@ -464,9 +475,10 @@ const doPublishPlan= ()=>{ |
|
|
planDate: detailData.value.planDate, |
|
|
planDate: detailData.value.planDate, |
|
|
startTime: detailData.value.planDate, |
|
|
startTime: detailData.value.planDate, |
|
|
endTime: detailData.value.endTime, |
|
|
endTime: detailData.value.endTime, |
|
|
taskMode: detailData.value.taskMode |
|
|
taskMode: detailData.value.taskMode, |
|
|
} |
|
|
batchCode:detailData.value.batchCode, |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
let res = OrderDayApi.publishPlan(data) |
|
|
let res = OrderDayApi.publishPlan(data) |
|
|
console.log("---doPublishPlan-- 458--",res) |
|
|
console.log("---doPublishPlan-- 458--",res) |
|
|
if(res.code===0){ |
|
|
if(res.code===0){ |
|
@ -567,6 +579,8 @@ const opensearchTableUser = async ( |
|
|
teamParams.value.teamGroup = '' |
|
|
teamParams.value.teamGroup = '' |
|
|
teamParams.value.name = '' |
|
|
teamParams.value.name = '' |
|
|
teamParams.value.pageNo = 1 |
|
|
teamParams.value.pageNo = 1 |
|
|
|
|
|
teamParams.value.workshopCode = detailData.value.workroomCode |
|
|
|
|
|
teamParams.value.productionLineCode = detailData.value.lineCode |
|
|
var teamList = await getTeamList(teamParams.value) |
|
|
var teamList = await getTeamList(teamParams.value) |
|
|
teamData.value = teamList.list |
|
|
teamData.value = teamList.list |
|
|
totalTeam.value = teamList.total |
|
|
totalTeam.value = teamList.total |
|
|