suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产监控问题修改

Browse Source
dev-scheduling
zhangdi 2 weeks ago
parent 64c6ba2943
commit a192359bdb
5 changed files with 530 additions and 443 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/views/desk/myMessage.vue
  2. 4
      src/views/processManagement/components/addTemplateDialog.vue
  3. 22
      src/views/processManagement/inPlantProcess.vue
  4. 2
      src/views/processManagement/taskDispatch.vue
  5. 242
      src/views/workRate/index.vue

13
src/views/desk/myMessage.vue
Unescape View File

@ -251,12 +251,15 @@ export default {
}
},
onLoad(page, params = {}) {
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// const data = res.data.data;
// this.page.total = data.total;
// this.data = data.records;
// this.loading = false;
// });
this.data = []
this.loading = false;
});
},
},
};

4
src/views/processManagement/components/addTemplateDialog.vue
Unescape View File

@ -792,7 +792,7 @@ export default {
type: 'success',
message: '操作成功!',
});
// this.$emit('closeDialog');
this.$emit('closeDialog');
this.getDetail()
})
.catch(err => {
@ -807,7 +807,7 @@ export default {
type: 'success',
message: '操作成功!',
});
// this.$emit('closeDialog');
this.$emit('closeDialog');
this.getDetail()
})
.catch(err => {

22
src/views/processManagement/inPlantProcess.vue
Unescape View File

@ -136,17 +136,17 @@ export default {
align: 'left',
searchLabelWidth: 60,
},
{
label: '产线',
prop: 'equipmentName',
search: true,
sortable: true,
filter: true,
span: 12,
headerAlign: 'center',
align: 'left',
searchLabelWidth: 45,
},
// {
// label: '产线',
// prop: 'equipmentName',
// search: true,
// sortable: true,
// filter: true,
// span: 12,
// headerAlign: 'center',
// align: 'left',
// searchLabelWidth: 45,
// },
{
label: '确认编号',
prop: 'confirmCondition',

2
src/views/processManagement/taskDispatch.vue
Unescape View File

@ -74,7 +74,7 @@ export default {
border: true,
index: true,
selection: true,
selectable: (row, index) => row.children.length === 0,
selectable:true,
viewBtn: false,
delBtn: false,
editBtn: false,

242
src/views/workRate/index.vue
Unescape View File

@ -7,85 +7,29 @@
@close="closeDialog"
fullscreen
>
<el-collapse v-model="activeName" >
<el-collapse-item title="订单信息" name="1">
<template #title="{ isActive }"> 订单信息 </template>
<el-descriptions title="订单信息"></el-descriptions>
<div class="order-box">
<div class="order-item">车间订单号：{{ detailsForm.orderWoCode||'' }}</div>
<div class="order-item">流程卡号：{{ detailsForm.cardNo||'' }}</div>
<div class="order-item">
零件号：
<div class="order-item" v-for="(item, index) in displayOrderItems" :key="index">
{{ item.label }}：
<span
v-if="item.clickable"
style="cursor: pointer; font-weight: 500"
@dblclick="openDocLink(detailsForm.dsPart)"
>{{ detailsForm.partCode||'' }}</span
>
</div>
<div class="order-item">批次号：{{ detailsForm.batchNo||'' }}</div>
<div class="order-item">订单数量：{{ detailsForm.poQty||'' }}</div>
<div class="order-item">状态：{{ detailsForm.curStatus||'' }}</div>
<div class="order-item">
优先级：
<span :style="importanceColor(rowItem.priority)"> {{ detailsForm.priority||'' }}</span>
</div>
<div class="order-item">
调度员：{{ detailsForm.dispatcher === null ? '' : detailsForm.userName }}
</div>
<div class="order-item">订单下达：{{ detailsForm.sendDownTime||'' }}</div>
<div class="order-item">生产数量：{{ detailsForm.makeQty ||''}}</div>
<div class="order-item">零件名称：{{ detailsForm.dsPart.partName||'' }}</div>
<div class="order-item">产品型号：{{ detailsForm.dsPart.productType||'' }}</div>
<div class="order-item">硬度：{{ detailsForm.dsPart.hardness||'' }}</div>
<div class="order-item">计划完工：{{ detailsForm.planEndDate ||''}}</div>
<div class="order-item">
需求交期：{{ detailsForm.priority === 4 ? detailsForm.demandDate : '' }}
</div>
<div class="order-item">镀种：{{ detailsForm.dsPart.plate||'' }}</div>
<div class="order-item">面积(dm²)：{{ detailsForm.dsPart.area ||''}}</div>
<div class="order-item">材料：{{ detailsForm.dsPart.material||'' }}</div>
<div class="order-item">生产标识：{{ detailsForm.prodIdent||'' }}</div>
<div class="order-item">镀后入库：{{ detailsForm.putStoreTime ||''}}</div>
<div class="order-item">标记要求：{{ detailsForm.dsPart.signMemo||'' }}</div>
<div class="order-item">关键信息：{{ detailsForm.dsPart.cruxMemo ||''}}</div>
<div class="order-item">试验数量：{{ detailsForm.testQty ||''}}</div>
<div class="order-item">消耗数量：{{ detailsForm.lossQty ||''}}</div>
<div class="order-item" v-if="detailsForm.yieldType != 1">
是否印字：
<i v-if="detailsForm.dsPart.isPrint == 1">否</i>
<i v-if="detailsForm.dsPart.isPrint == 2">单</i>
<i v-if="detailsForm.dsPart.isPrint == 3">双</i>
</div>
<div class="order-item">工艺路线：{{ detailsForm.dsPart.craftWay ||''}}</div>
<div class="order-item" v-if="detailsForm.curStatus == 19">
返工单号：<span
style="cursor: pointer"
@dblclick="openClient(detailsForm.qcReworkCode)"
>
{{ detailsForm.qcReworkCode||'' }}</span
@dblclick="item.clickHandler"
>{{ item.value }}</span
>
<span v-else-if="item.style" :style="item.style">{{ item.value }}</span>
<span v-else>{{ item.value }}</span>
</div>
<div class="order-item" v-if="detailsForm.yieldType == 1">
涂色标个数：{{ detailsForm.dsPart.tsbNum }}
</div>
<div class="order-item" v-if="rowItem.yieldType == 1">
涂色带个数：{{ detailsForm.dsPart.tsdNum||'' }}
</div>
<div class="order-item" v-if="rowItem.yieldType == 1">
涂箭头个数：{{ detailsForm.dsPart.tjtNum ||''}}
</div>
<div class="order-item">产品系列：{{ detailsForm.dsPart.productSeries||'' }}</div>
<div class="order-item">工作订单备注：{{ detailsForm.poMemo||'' }}</div>
<div class="order-item">
会议要求周期：{{ detailsForm.priority === 4 ? detailsForm.meetCycle : '' }}
</div>
<div class="order-item">
审理单号：<span style="cursor: pointer" @dblclick="openQcSheet(detailsForm.reworkCode)">
{{ detailsForm.reworkCode||'' }}</span
>
<!-- 展开/收起按钮 -->
<div class="order-item" style="width: 100%; text-align: center; margin-top: 10px">
<el-button type="text" @click="toggleOrderInfo" class="expand-btn">
{{ orderInfoExpanded ? '收起 ▲' : '展开更多 ▼' }}
</el-button>
</div>
</div>
</el-collapse-item>
<el-collapse-item title="工序信息" name="2" v-loading="processSelectLoading">
<el-descriptions title="工序信息"> </el-descriptions>
<div v-loading="processSelectLoading">
<div class="scrollContent">
<div ref="pointView" class="scrollBox">
<!-- -->
@ -190,9 +134,7 @@
<span class="icon-text">
<el-icon><Edit /></el-icon>实际结束：</span
>
<span style="color: #1990ff" class="icon-text">
{{ item.factEndTime || '-' }}</span
>
<span style="color: #1990ff" class="icon-text"> {{ item.factEndTime || '-' }}</span>
</div>
</div>
</div>
@ -569,11 +511,21 @@
</template>
</div>
</div>
<div class="details-box details-box-item" v-if="selectedItemId && selectedItemInfo.status == 1">
<div
class="details-box details-box-item"
v-if="selectedItemId && selectedItemInfo.status == 1"
>
<el-empty description="暂无加工、检验记录！"></el-empty>
</div>
</div>
<!-- <el-collapse v-model="activeName">
<el-collapse-item title="订单信息" name="1">
<template #title="{ isActive }"> 订单信息 </template>
</el-collapse-item>
</el-collapse>
<el-collapse-item title="工序信息" name="2" >
</el-collapse-item>
</el-collapse> -->
</el-dialog>
</template>
<script>
@ -598,6 +550,115 @@ export default {
contentView,
preserveSlotList,
},
computed: {
// 订单信息列表
orderItems() {
// 获取优先级样式
const getPriorityStyle = importance => {
if (importance == 1) {
return 'color: green';
} else if (importance == 2 || importance == 3) {
return 'color: red';
} else {
return 'color: rgb(251, 170, 8)';
}
};
return [
{ label: '车间订单号', value: this.detailsForm.orderWoCode || '' },
{ label: '流程卡号', value: this.detailsForm.cardNo || '' },
{
label: '零件号',
value: this.detailsForm.partCode || '',
clickable: true,
clickHandler: () => this.openDocLink(this.detailsForm.dsPart),
},
{ label: '批次号', value: this.detailsForm.batchNo || '' },
{ label: '订单数量', value: this.detailsForm.poQty || '' },
{ label: '状态', value: this.detailsForm.curStatus || '' },
{
label: '优先级',
value: this.detailsForm.priority || '',
style: getPriorityStyle(this.detailsForm.priority),
},
{
label: '调度员',
value: this.detailsForm.dispatcher === null ? '' : this.detailsForm.userName,
},
{ label: '订单下达', value: this.detailsForm.sendDownTime || '' },
{ label: '生产数量', value: this.detailsForm.makeQty || '' },
{ label: '零件名称', value: this.detailsForm.dsPart?.partName || '' },
{ label: '产品型号', value: this.detailsForm.dsPart?.productType || '' },
{ label: '硬度', value: this.detailsForm.dsPart?.hardness || '' },
{ label: '计划完工', value: this.detailsForm.planEndDate || '' },
{
label: '需求交期',
value: this.detailsForm.priority === 4 ? this.detailsForm.demandDate : '',
},
{ label: '镀种', value: this.detailsForm.dsPart?.plate || '' },
{ label: '面积 (dm²)', value: this.detailsForm.dsPart?.area || '' },
{ label: '材料', value: this.detailsForm.dsPart?.material || '' },
{ label: '生产标识', value: this.detailsForm.prodIdent || '' },
{ label: '镀后入库', value: this.detailsForm.putStoreTime || '' },
{ label: '标记要求', value: this.detailsForm.dsPart?.signMemo || '' },
{ label: '关键信息', value: this.detailsForm.dsPart?.cruxMemo || '' },
{ label: '试验数量', value: this.detailsForm.testQty || '' },
{ label: '消耗数量', value: this.detailsForm.lossQty || '' },
{
label: '是否印字',
value:
this.detailsForm.yieldType != 1
? this.detailsForm.dsPart?.isPrint == 1
? '否'
: this.detailsForm.dsPart?.isPrint == 2
? '单'
: '双'
: '',
},
{ label: '工艺路线', value: this.detailsForm.dsPart?.craftWay || '' },
{
label: '返工单号',
value: this.detailsForm.curStatus == 19 ? this.detailsForm.qcReworkCode || '' : '',
clickable: this.detailsForm.curStatus == 19,
clickHandler: () => this.openClient(this.detailsForm.qcReworkCode),
},
{
label: '涂色标个数',
value: this.detailsForm.yieldType == 1 ? this.detailsForm.dsPart?.tsbNum : '',
},
{
label: '涂色带个数',
value: this.rowItem.yieldType == 1 ? this.detailsForm.dsPart?.tsdNum || '' : '',
},
{
label: '涂箭头个数',
value: this.rowItem.yieldType == 1 ? this.detailsForm.dsPart?.tjtNum || '' : '',
},
{ label: '产品系列', value: this.detailsForm.dsPart?.productSeries || '' },
{ label: '工作订单备注', value: this.detailsForm.poMemo || '' },
{
label: '会议要求周期',
value: this.detailsForm.priority === 4 ? this.detailsForm.meetCycle : '',
},
{
label: '审理单号',
value: this.detailsForm.reworkCode || '',
clickable: true,
clickHandler: () => this.openQcSheet(this.detailsForm.reworkCode),
},
];
},
// 控制显示的订单项
displayOrderItems() {
if (this.orderInfoExpanded) {
// 展开时显示全部
return this.orderItems;
} else {
// 收起时只显示前 10 个（约 2 行）
return this.orderItems.slice(0, 10);
}
},
},
data() {
return {
processSelectLoading: false,
@ -634,6 +695,7 @@ export default {
5: '已完成',
},
processDetails: {}, //工序详情
orderInfoExpanded: false,
};
},
mounted() {
@ -650,6 +712,10 @@ export default {
});
},
methods: {
// 切换订单信息展开/收起
toggleOrderInfo() {
this.orderInfoExpanded = !this.orderInfoExpanded;
},
// 同步数据
syncData() {
this.syncLoading = true;
@ -948,10 +1014,8 @@ i {
border-radius: 6px 6px 6px 6px;
margin-bottom: 15px;
}
}
.production-process-item {
border: 1px solid #284c89;
width: 220px;
@ -1041,4 +1105,24 @@ i {
margin-bottom: 5px;
}
.expand-btn {
font-size: 13px;
color: #409eff;
padding: 5px 10px;
&:hover {
color: #66b1ff;
}
}
.order-box {
margin: 10px 0 10px 0;
padding: 0 10px;
display: flex;
flex-wrap: wrap;
.order-item {
width: 20%;
margin-bottom: 10px;
}
}
</style>

Write Preview
Loading…
Cancel
Save