|
@@ -1,7 +1,7 @@
|
|
|
<!-- 子订单状态页面 -->
|
|
<!-- 子订单状态页面 -->
|
|
|
<template>
|
|
<template>
|
|
|
<el-dialog v-model="SubWorkOrderStatusListlog" :before-close="SubWorkOrderClose" width="100%" style="height: 100vh;margin: 0px;overflow-y: auto;" top="0vh">
|
|
<el-dialog v-model="SubWorkOrderStatusListlog" :before-close="SubWorkOrderClose" width="100%" style="height: 100vh;margin: 0px;overflow-y: auto;" top="0vh">
|
|
|
- <el-button type="primary" style="width: 90px;height: 40px;margin-left: 10px;" @click="SubWorkOrderClose">退出</el-button>
|
|
|
|
|
|
|
+ <el-button type="danger" style="width: 90px;height: 40px;margin-left: 10px;" @click="SubWorkOrderClose">关闭</el-button>
|
|
|
<br><br>
|
|
<br><br>
|
|
|
<div class="order-info" style="margin-left: 10px;">
|
|
<div class="order-info" style="margin-left: 10px;">
|
|
|
<el-text style="font-size: 24px;">订单编号: </el-text>
|
|
<el-text style="font-size: 24px;">订单编号: </el-text>
|
|
@@ -13,7 +13,7 @@
|
|
|
<el-text style="font-size: 24px;">客户编号: </el-text>
|
|
<el-text style="font-size: 24px;">客户编号: </el-text>
|
|
|
<el-input v-model="orderform['客户编号']" disabled style="width: 5%; height: 40px;" />
|
|
<el-input v-model="orderform['客户编号']" disabled style="width: 5%; height: 40px;" />
|
|
|
|
|
|
|
|
- <el-text style="font-size: 24px;">款号: </el-text>
|
|
|
|
|
|
|
+ <el-text style="font-size: 24px;">PO款号: </el-text>
|
|
|
<el-input v-model="orderform['款号']" disabled style="width: 10%; height: 40px;" />
|
|
<el-input v-model="orderform['款号']" disabled style="width: 10%; height: 40px;" />
|
|
|
|
|
|
|
|
<el-text style="font-size: 24px;">款式: </el-text>
|
|
<el-text style="font-size: 24px;">款式: </el-text>
|
|
@@ -35,7 +35,31 @@
|
|
|
<el-table-column align="left" label="制单数" prop="制单数" width="100"/>
|
|
<el-table-column align="left" label="制单数" prop="制单数" width="100"/>
|
|
|
<el-table-column align="left" label="完成百分比" prop="scale" width="100"/>
|
|
<el-table-column align="left" label="完成百分比" prop="scale" width="100"/>
|
|
|
</el-table>
|
|
</el-table>
|
|
|
-
|
|
|
|
|
|
|
+ <br>
|
|
|
|
|
+ <div class="progress-wrapper">
|
|
|
|
|
+ <div
|
|
|
|
|
+ class="progress-row"
|
|
|
|
|
+ v-for="item in progressList"
|
|
|
|
|
+ :key="item.subOrderNo"
|
|
|
|
|
+ >
|
|
|
|
|
+ <div class="progress-info">
|
|
|
|
|
+ <span style='font-size: 20px;'><strong>子订单编号：</strong>{{ item.subOrderNo }}</span>
|
|
|
|
|
+ <!--
|
|
|
|
|
+ <span style='font-size: 20px;'><strong>成品入仓数量：</strong>{{ item['入仓数量'] }}</span>
|
|
|
|
|
+
|
|
|
|
|
+ <span style='font-size: 20px;'><strong>裁剪数量：</strong>{{ item['裁剪数量'] }}</span> -->
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <el-progress
|
|
|
|
|
+ :percentage="item.percentage"
|
|
|
|
|
+ :status="item.percentage >= 100 ? 'success' : 'success'"
|
|
|
|
|
+ :stroke-width="17"
|
|
|
|
|
+ :text-inside="true"
|
|
|
|
|
+ style="flex: 1;width: 79%;"
|
|
|
|
|
+ />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <br>
|
|
|
|
|
+
|
|
|
<div style="display: flex; align-items: center;">
|
|
<div style="display: flex; align-items: center;">
|
|
|
<el-tag type="info" style="width: 40px; height: 40px; margin-right: 10px;"><h2>包数</h2></el-tag>
|
|
<el-tag type="info" style="width: 40px; height: 40px; margin-right: 10px;"><h2>包数</h2></el-tag>
|
|
|
<h2 style="margin: 0 20px 0 0;">白格子图标表示“已有包”</h2>
|
|
<h2 style="margin: 0 20px 0 0;">白格子图标表示“已有包”</h2>
|
|
@@ -61,7 +85,7 @@
|
|
|
// import LuckyExcel from 'luckyexcel';
|
|
// import LuckyExcel from 'luckyexcel';
|
|
|
import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
|
|
import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
|
|
|
import {ref, reactive} from 'vue';
|
|
import {ref, reactive} from 'vue';
|
|
|
-import {SubWorkOrderStatusList,Mabaolist} from '@/api/mes/job';
|
|
|
|
|
|
|
+import {SubWorkOrderStatusList,Mabaolist,SubOrderProgress} from '@/api/mes/job';
|
|
|
import { useUserStore } from '@/pinia/modules/user';
|
|
import { useUserStore } from '@/pinia/modules/user';
|
|
|
defineOptions({name: 'Company'})
|
|
defineOptions({name: 'Company'})
|
|
|
|
|
|
|
@@ -79,6 +103,8 @@ const orderform = ref({
|
|
|
"款号": '',
|
|
"款号": '',
|
|
|
"款式": ''
|
|
"款式": ''
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
|
|
+const progressList = ref([])
|
|
|
const open = async (ddzbh,gongxu) => {
|
|
const open = async (ddzbh,gongxu) => {
|
|
|
console.log("orderid",ddzbh)
|
|
console.log("orderid",ddzbh)
|
|
|
console.log("gx",gongxu)
|
|
console.log("gx",gongxu)
|
|
@@ -94,6 +120,15 @@ const open = async (ddzbh,gongxu) => {
|
|
|
orderform.value = order.data.workOrderData
|
|
orderform.value = order.data.workOrderData
|
|
|
orderdata.splice(0,order.data.data.length,...order.data.data);//表格数据
|
|
orderdata.splice(0,order.data.data.length,...order.data.data);//表格数据
|
|
|
arr.splice(0,order.data.arr.length,...order.data.arr);//表格尺码投数据
|
|
arr.splice(0,order.data.arr.length,...order.data.arr);//表格尺码投数据
|
|
|
|
|
+
|
|
|
|
|
+ const SubOrderProgress_list = await SubOrderProgress({order:order.data.workOrderData['订单编号']});
|
|
|
|
|
+ console.log(SubOrderProgress_list)
|
|
|
|
|
+ progressList.value = SubOrderProgress_list.data.result.map(item => ({
|
|
|
|
|
+ subOrderNo: item['子订单编号'],
|
|
|
|
|
+ 入仓数量: item['入仓数量'],
|
|
|
|
|
+ 裁剪数量: item['裁剪数量'],
|
|
|
|
|
+ percentage: parseFloat(item['完成率'].replace('%', ''))
|
|
|
|
|
+ }))
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const satusCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
const satusCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
@@ -217,4 +252,5 @@ defineExpose({open})
|
|
|
:deep(.el-table__body .status-plan-usage-lows) {
|
|
:deep(.el-table__body .status-plan-usage-lows) {
|
|
|
background: white !important;
|
|
background: white !important;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
</style>
|
|
</style>
|
