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

订单管理

Browse Source
This commit is contained in:
朱菊兰
2024-02-23 17:01:48 +08:00
parent 2ee2b2bfc7
commit 71fc98b0bb
14 changed files with 786 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/views/order/base/orderGroup/orderGroupDetailData.vue
View File

@@ -10,11 +10,11 @@
<el-row>
<el-col :span='4'>
<div class="blodTip">订单名称</div>
<div class="lightTip">{{orderGroupMsg.name}}</div>
<div class="lightTip" :title='orderGroupMsg.name'>{{orderGroupMsg.name}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">产品名称</div>
<div class="lightTip">{{orderGroupMsg.productName}}</div>
<div class="lightTip" :title="orderGroupMsg.productName">{{orderGroupMsg.productName}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">产品规格</div>
@@ -26,25 +26,17 @@
</el-col>
<el-col :span='4'>
<div class="blodTip">包装要求</div>
<div class="lightTip">接口没有该字段</div>
<div class="lightTip">{{getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq)}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">交货时间</div>
<div class="lightTip">需要确认时哪个字段</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.deliveTime)}}</div>
</el-col>
</el-row>
<el-row>
<el-col :span='4'>
<div class="blodTip">创建时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.triggerTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">计划开始时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">计划完成时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">计划加工数量</div>
@@ -52,14 +44,12 @@
</el-col>
<el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">接口没有该字段</div>
<div class="lightTip">{{orderGroupMsg.actualArea}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">状态</div>
<div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
</el-col>
</el-row>
<el-row>
<el-col :span='4'>
<div class="blodTip">实际开始时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
@@ -68,9 +58,11 @@
<div class="blodTip">实际完成时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
</el-col>
</el-row>
<el-row>
<el-col :span='4'>
<div class="blodTip">实际生产数量</div>
<div class="lightTip">{{orderGroupMsg.actualquantity }}</div>
<div class="lightTip">{{orderGroupMsg.actualquantity }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">完成比%</div>
@@ -78,81 +70,81 @@
</el-col>
<el-col :span='4'>
<div class="blodTip">废片数量</div>
<div class="lightTip">接口未看到该字段</div>
<div class="lightTip">该字段未绑定</div>
</el-col>
</el-row>
</div>
</div>
<div class="box2">
<div class="box2" v-for="(item, index) in orderMsg" :key='index'>
<div class="boxTitle">
<span class="blueTitle"></span>
<span>厂务订单编码: 64656563453543</span>
<span>厂务订单编码: {{item.code}}</span>
</div>
<div style="padding-left: 14px;">
<el-row>
<el-col :span='4'>
<div class="blodTip">订单名称</div>
<div class="lightTip">测试订单1</div>
<div class="lightTip" :title="item.name">{{item.name}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">产品名称</div>
<div class="lightTip">测试产品</div>
<div class="lightTip" :title="item.productName">{{item.productName}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">产品规格</div>
<div class="lightTip">测试产品规格</div>
<div class="lightTip">{{item.specifications}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">创建时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
<div class="lightTip">{{ parseTime(item.createTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">计划开始时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.planStartTime) }}</div>
<div class="lightTip">{{ parseTime(item.planStartTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">计划完成时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.planFinishTime) }}</div>
<div class="lightTip">{{ parseTime(item.planFinishTime) }}</div>
</el-col>
</el-row>
<el-row>
<el-col :span='4'>
<div class="blodTip">计划加工数量</div>
<div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
<div class="lightTip">{{item.planQuantity}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">{{orderGroupMsg.planArea}}</div>
<div class="lightTip">{{item.actualArea}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">预计用时</div>
<div class="lightTip">10</div>
<div class="blodTip">预计用时(时)</div>
<div class="lightTip">{{item.expectTime}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">状态</div>
<div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
<div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status)}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">实际开始时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
<div class="lightTip">{{ parseTime(item.startProduceTime) }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">实际完成时间</div>
<div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
<div class="lightTip">{{ parseTime(item.finishProduceTime) }}</div>
</el-col>
</el-row>
<el-row>
<el-col :span='4'>
<div class="blodTip">实际生产数量</div>
<div class="lightTip">{{orderGroupMsg.actualQuantity }}</div>
<div class="lightTip">{{item.actualQuantity }}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">完成比%</div>
<div class="lightTip">{{orderGroupMsg.completeProp}}</div>
<div class="lightTip">{{item.completeProp}}</div>
</el-col>
<el-col :span='4'>
<div class="blodTip">废片数量</div>
<div class="lightTip">100</div>
<div class="lightTip">该字段未绑定</div>
</el-col>
</el-row>
</div>
@@ -165,7 +157,7 @@
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:table-data="item.coreWorkOrderRespVOS || []"
:max-height="tableH"
/>
</div>
@@ -174,7 +166,6 @@
<script>
import { parseTime } from '@/utils/ruoyi'
import { publicFormatter } from '@/utils/dict'
import { getProcessFlowList } from '@/api/base/orderManage'
import { orderGroupDetail } from '@/api/base/orderGroup'
const tableProps = [
{
@@ -186,7 +177,7 @@ const tableProps = [
{
prop: 'name',
label: '工单名',
minWidth: 100,
minWidth: 150,
showOverflowtooltip: true
},
{
@@ -195,12 +186,13 @@ const tableProps = [
minWidth: 150
},
{
prop: 'code1',
prop: 'roomNameDict',
label: '负责车间',
minWidth: 150
minWidth: 120,
filter: publicFormatter('workshop')
},
{
prop: 'planAssignmentQuantity',
prop: 'planQuantity',
label: '计划加工量',
width: 100
},
@@ -239,29 +231,29 @@ const tableProps = [
},
{
prop: 'workers',
label: '负责人'
label: '负责人',
showOverflowtooltip: true
},
{
prop: 'remark',
label: '备注'
label: '备注',
showOverflowtooltip: true
}
]
import { bomUseNum } from '@/api/base/orderManage'
export default {
name: 'orderGroupDetailData',
data() {
return {
orderGroupId: '',
tableProps,
list: [{remark: 111},{remark: 111},{remark: 111}],
orderMsg: [],
tableH: this.tableHeight(510) / 2,
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 500
},
orderGroupMsg: {},
processFlowName: ''
orderGroupMsg: {}
}
},
mounted() {
@@ -271,49 +263,17 @@ export default {
this.orderGroupId = location.href.split('?')[1].split('=')[1]
this.getMsg()
},
watch: {
$route: 'initData'
},
methods: {
initData(to) {
if (to.name === 'orderGroupDetailData') {
this.orderGroupId = location.href.split('?')[1].split('=')[1]
this.getMsg()
}
},
getMsg() {
orderGroupDetail({
id: this.orderGroupId
}).then(res => {
this.orderGroupMsg = res.data
// this.list = res.data.coreWorkOrderRespVOS
// bomUseNum({
// productId: this.orderGroupMsg.planProductId
// }).then(res2 => {
// if (res2.data && res2.data.length > 0) {
// let arr = res2.data
// arr.map(item => {
// if (item) {
// let a = item.num * this.orderGroupMsg.remainingQuantity
// item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
// }
// })
// this.list2 = arr
// }else {
// this.list2 = []
// }
// })
// 工艺
getProcessFlowList().then(res => {
let arr = res.data || []
if (arr.length > 0) {
arr.map(item => {
if (item.id === this.orderGroupMsg.processFlowId) {
this.processFlowName = item.name
}
})
}
})
if ( res.data.orderIdNum && res.data.orderIdNum > 0) {
this.orderMsg = res.data.orderDetailVOS
}else{
this.orderMsg = []
}
})
},
// 返回
@@ -344,6 +304,9 @@ export default {
font-weight: 400;
color: rgba(102,102,102,0.75);
margin-bottom: 12px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.box2 {