From 6082f939a0b869db7957473e2792501c1ff57a43 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 06 五月 2026 17:05:07 +0800
Subject: [PATCH] 1.报工调整修改、打印模板修改
---
src/views/workOrder/workOrderList.vue | 125 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index e71c162..c6be2fc 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -1553,6 +1553,22 @@
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
</el-form-item>
+ <el-form-item label="鎵撳嵃浜哄憳:" class="formContent">
+ <!-- {{ localStorage.getItem('username') }}-->
+ {{ formApprove.routename }}
+ </el-form-item>
+ <el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
+ {{ formApprove.lm_date }}
+ </el-form-item>
+ <!-- <br>-->
+ <!-- <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
+ <!-- <br>-->
+ <!-- <el-form-item label="瀛愪欢澶囨敞:" class="formContent" style="width: 100%">-->
+ <!-- {{ formApprove.memo }}-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="瑙勬牸鍨嬪彿:" class="formContent" style="width: 100%">-->
+ <!-- {{ formApprove.bomsubspec }}-->
+ <!-- </el-form-item>-->
<!-- <el-form-item label="瀹㈡埛鍚嶇О:" class="formContent">-->
<!-- {{ formApprove.priuserdefnvc1 }}-->
@@ -1576,18 +1592,13 @@
<!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
<!-- {{ formApprove.routename }}-->
<!-- </el-form-item>-->
- <el-form-item label="鎵撳嵃浜哄憳:" class="formContent">
- <!-- {{ localStorage.getItem('username') }}-->
- {{ formApprove.routename }}
- </el-form-item>
- <el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
- {{ formApprove.lm_date }}
- </el-form-item>
+
</div>
</el-form>
</div>
<div
id="qrCode0"
+ :key="formApprove.mesordercode"
style="width: 22%;height:90px;
margin-top: 20px;
overflow-y: scroll;display: flex;
@@ -1719,11 +1730,23 @@
<el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
{{ formApprove.lm_date }}
</el-form-item>
+
+ <!-- <br>-->
+ <!-- <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
+ <!-- <br>-->
+ <!-- <el-form-item label="瀛愪欢澶囨敞:" class="formContent" style="width: 100%">-->
+ <!-- {{ formApprove.memo }}-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="瑙勬牸鍨嬪彿:" class="formContent" style="width: 100%">-->
+ <!-- {{ formApprove.bomsubspec }}-->
+ <!-- </el-form-item>-->
+
</div>
</el-form>
</div>
<div
id="qrCode1"
+ :key="formApprove.mesordercode"
style="width: 22%;height:90px;
margin-top: 20px;
overflow-y: scroll;display: flex;
@@ -2496,9 +2519,8 @@
</div>
<div v-for="(i,index) in formData3" :key="index" class="customDiv">
-
+ <!-- ref="dialogForm"-->
<el-form
- ref="dialogForm"
inline
:model="i"
label-width="110px"
@@ -2756,7 +2778,7 @@
AddUpdateMesOrder, AddUpdateMesOrderList, DeleteMesOrder,
MesBadOrderSearch, MesOrderDistribution, MesOrderNewStepContent, MesOrderProcessSopSearch,
MesOrderSearch, MesOrderSopSearch, UpdateMesOrderStepListSearch,
- UpdateMesOrderStepSearch
+ UpdateMesOrderStepSearch, MesOrderNewStepListContent
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
@@ -2764,7 +2786,12 @@
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
import DateType from '@/components/DateType'
-import { PartSelectRpute, PartSelectRputeList, RouteSelectStep, RouteSelectStepList } from '@/api/basicSettings'
+import {
+ PartSelectRpute,
+ PartSelectRputeList,
+ RouteSelectStep,
+ RouteSelectStepList
+} from '@/api/basicSettings'
import { DeviceSopSearch } from '@/api/DeviceManager'
export default {
@@ -3191,6 +3218,8 @@
stepTableData: []// 宸ュ簭琛ㄥ��
})
})
+
+ const tempArr = []
const { data: res3 } = await UpdateMesOrderStepListSearch(data3)
console.log(res3, 321)
res3.forEach((i, index) => {
@@ -3201,40 +3230,61 @@
})
this.formData3[index].stepTableData = i.stepdata
this.formData3[index].stepSelectedValue = i.stepdata.map(j => j.stepcode)
+ } else {
+ tempArr.push({
+ 'wkshopcode': this.formData3[index].wkshopcode,
+ 'routecode': this.formData3[index].routecode,
+ 'partcode': this.formData3[index].partcode
+ })
}
})
-
- const { data: res } = await PartSelectRputeList(partcodeArr)
- if (this.mesSetting.route) {
- res.forEach((i, index) => {
- if (i.routedata.length > 0) {
- this.formData3[index].routecodeArr = i.routedata
- }
- })
- } else {
+ console.log(this.sourceType, '鎵ц1', this.formData3)
+ const tempArr2 = tempArr.filter((item, index) => {
+ return tempArr.findIndex(i => i.partcode === item.partcode) === index
+ })
+ if (this.sourceType) { // 涓簍rue鏃讹紝璋冪敤MesOrderNewStepListContent
+ const { data: res } = await MesOrderNewStepListContent(tempArr2)
this.formData3.forEach((i, index) => {
if (i.stepTableData.length === 0) {
- i.stepTableData = res[index].stepdata
- i.stepSelectedValue = res[index].stepdata.length > 0 ? res[index].stepdata.map(j => j.stepcode) : []
- }
- })
- }
- // i.stepdata.forEach(j => {
- // j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
- // j.sumqty = Math.round(parseFloat(i.canupdate_qty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
- // })
- if (this.mesSetting.route) {
- const { data: res2 } = await RouteSelectStepList(data2)
- this.formData3.forEach((i, index) => {
- if (i.stepTableData.length === 0) {
- res2[index].stepdata.forEach(j => {
+ const ind = res.findIndex(j => j.partcode === this.formData3[index].partcode)
+ res[ind].stepdata.forEach(j => {
j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
j.sumqty = Math.round(parseFloat(i.mesqty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
})
- i.stepTableData = res2[index].stepdata
- i.stepSelectedValue = res2[index].stepdata.length > 0 ? res2[index].stepdata.map(j => j.stepcode) : []
+ this.formData3[index].stepTableData = res[ind].stepdata
+ this.formData3[index].stepSelectedValue = res[ind].stepdata.length > 0 ? res[ind].stepdata.map(j => j.stepcode) : []
}
})
+ } else { // 璋冪敤PartSelectRputeList
+ const { data: res } = await PartSelectRputeList(partcodeArr)
+ if (this.mesSetting.route) {
+ res.forEach((i, index) => {
+ if (i.routedata.length > 0) {
+ this.formData3[index].routecodeArr = i.routedata
+ }
+ })
+ } else {
+ this.formData3.forEach((i, index) => {
+ if (i.stepTableData.length === 0) {
+ i.stepTableData = res[index].stepdata
+ i.stepSelectedValue = res[index].stepdata.length > 0 ? res[index].stepdata.map(j => j.stepcode) : []
+ }
+ })
+ }
+
+ if (this.mesSetting.route) {
+ const { data: res2 } = await RouteSelectStepList(data2)
+ this.formData3.forEach((i, index) => {
+ if (i.stepTableData.length === 0) {
+ res2[index].stepdata.forEach(j => {
+ j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
+ j.sumqty = Math.round(parseFloat(i.mesqty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
+ })
+ i.stepTableData = res2[index].stepdata
+ i.stepSelectedValue = res2[index].stepdata.length > 0 ? res2[index].stepdata.map(j => j.stepcode) : []
+ }
+ })
+ }
}
// this.formData3 = this.multipleSelection
@@ -4144,6 +4194,9 @@
this.formApprove.priuserdefnvc5 = row.priuserdefnvc5 ? row.priuserdefnvc5 : '/'
this.formApprove.priuserdefnvc6 = row.priuserdefnvc6 ? row.priuserdefnvc6 : '/'
+ this.formApprove.memo = row.memo || '/'
+ this.formApprove.bomsubspec = row.bomsubspec || '/'
+
this.formApprove.TopInventoryName = row.TopInventoryName || '/'
this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
--
Gitblit v1.9.3