mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '跟新bug' (#407) from projects/mes-zwq into projects/mes-test

Browse Source 
Reviewed-on: #407
This commit is contained in:
朱文强 2024-11-20 13:48:28 +08:00
commit fc20e275f7
6 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/extend/processFlow/index.vue
View File

@ -189,7 +189,7 @@ export default {
input: true,
label: '工艺编码',
prop: 'code',
// url: '/base/core-equipment/getCode',
url: '/extend/process-flow/getCode',
},
],
[

8
src/views/produce/order/base/orderManage/index.vue
View File

@ -69,7 +69,7 @@
</el-table-column>
<el-table-column prop="workOrderNum" label="工单数量" width="140">
<template v-slot="scope">
<el-button @click="handleRoute" type="text">
<el-button @click="handleRoute(scope.row)" type="text">
{{ scope.row.workOrderNum }}
</el-button>
</template>
@ -499,13 +499,13 @@ export default {
this.splitWorkOrderCancel();
this.getList();
},
async handleRoute() {
async handleRoute(row) {
const res = await orderAssignmentList({
orderIdList: [this.injectData.id],
orderIdList: [row.id],
});
console.log(res.data);
let arr = [];
res.data[this.injectData.id].forEach((ele) => {
res.data[row.id].forEach((ele) => {
arr.push(ele.workOrderId);
});
let woIdString = arr.join(',');

4
src/views/produce/workOrder/addWorkOrder.vue
View File

@ -183,6 +183,7 @@
</el-select>
</el-col>
<el-col :span="8">
<el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
<el-input-number
style="width: 100%"
v-model="item.num"
@ -190,6 +191,7 @@
:step="1"
:min="0"
step-strictly />
</el-tooltip>
</el-col>
</el-row>
</div>
@ -236,12 +238,14 @@
</el-select>
</el-col>
<el-col :span="8">
<el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
<el-input-number
style="width: 100%"
v-model="item.num"
:step="1"
:min="0"
step-strictly />
</el-tooltip>
</el-col>
</el-row>
</div>

21
src/views/produce/workOrder/detail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2024-10-15 16:16:22
* @LastEditTime: 2024-11-19 16:49:09
* @Description:
-->
<template>
@ -61,7 +61,7 @@
<el-row :gutter="20">
<el-col :span="8">负责人:{{ dataForm.workers }}</el-col>
<el-col :span="8">关联产线:
<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item
<span v-for="(item, index) in dataForm.productLineIds" :key="index" style="margin-right: 10px">{{ item.lineName
}}</span>
</el-col>
<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展'
@ -115,10 +115,10 @@
@clickBtn="handleClick" />
</base-table>
</el-tab-pane>
<el-tab-pane label="预计用料信息" name="material">
<!-- <el-tab-pane label="预计用料信息" name="material">
<base-table :max-height="tableH" :table-props="tableProps1" :page="listQuery1.pageNo"
:limit="listQuery1.pageSize" :table-data="materialList" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="质量信息" name="quality">
<base-table :max-height="tableH" :table-props="tablePropsQuality" :table-data="qualityList" :page="1"
:limit="10" />
@ -532,11 +532,12 @@ export default {
// });
// }
// 获取订单相关信息
// orderList({
// workOrderId: this.dataForm.id
// }).then((response) => {
// this.orderArray = response.data;
// });
getConOrderList({
workOrderId: this.dataForm.id,
}).then((response) => {
this.orderList = response.data;
// this.listQuery.total = response.data.total;
});
},
init(id, isdetail) {
this.initData();
@ -559,7 +560,7 @@ export default {
})
}
// 获取订单列表和用料列表
// this.getList();
this.getList();
});
} else {
if (this.urlOptions.isGetCode) {

39
src/views/produce/workOrder/index.vue
View File

@ -315,7 +315,14 @@ export default {
{
prop: 'status',
label: '工单状态',
filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val]
filter: (val) => ['', '等待', '激活', '暂停', '完成', '作废', '终止', '', '', ''][val]
},
{
prop: 'startProduceTime',
label: '实际开始时间',
filter: parseTime,
minWidth: 150,
showOverflowtooltip: true
},
{
prop: 'planFinishTime',
@ -362,20 +369,20 @@ export default {
})
},
refreshWorkOrder(val) {
console.log(val)
if (val) {
// 预使用原料信息
console.log('预使用原料信息')
this.handleCancel()
this.getDataList()
this.materialVisible = true;
this.addOrEditTitle = "预使用主原料信息";
this.$nextTick(() => {
this.$refs.material.init(val, true);
});
} else {
this.successSubmit()
}
// if (val) {
// // 预使用原料信息
// console.log('预使用原料信息')
// this.handleCancel()
// this.getDataList()
// this.materialVisible = true;
// this.addOrEditTitle = "预使用主原料信息";
// this.$nextTick(() => {
// this.$refs.material.init(val, true);
// });
// } else {
// this.successSubmit()
// }
this.successSubmit()
},
closeDetail() {
this.detailVisible = false
@ -417,7 +424,7 @@ export default {
opration = '暂停'
}
if (val.type === 'nullify') {
param.status = 9
param.status = 5
opration = '报废'
}
if (val.type === 'finish') {

5
src/views/produce/workOrder/workOrderNav.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: zhp
* @Date: 2024-09-09 15:39:08
* @LastEditTime: 2024-09-11 10:25:54
* @LastEditors: zhp
* @LastEditTime: 2024-11-18 16:43:54
* @LastEditors: zwq
* @Description:
-->
<template>
@ -15,7 +15,6 @@
</button>
<el-button style="flex: .1" type="text" @click="nextText" icon="el-icon-caret-right"></el-button>
<button style="flex: .2;display: inline-block;" @click="goback()">
<svg-icon style="width: 20px; height: 20px" :icon-class=" 'back' " />
<span>返回</span>
</button>
</div>