From 7846034cd1a7f19f4f2c7c955542ee4f85bbb14a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 29 八月 2024 14:47:08 +0800
Subject: [PATCH] 1.工序报工优化
---
src/api/WorkOrder.js | 9 +++++++++
src/views/produce/stepReport.vue | 45 +++++++++++++++++++++++++++++++++++++--------
2 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
index 85ae1eb..09d8e7f 100644
--- a/src/api/WorkOrder.js
+++ b/src/api/WorkOrder.js
@@ -196,6 +196,15 @@
})
}
+// 鐢熶骇寮�鎶ュ伐锛氭姤宸�/澶栧崗(鍙戞枡/鏀舵枡)鏃惰幏鍙栬澶�/澶栧崗渚涘簲鍟嗘暟鎹繑鍥炴帴鍙�
+export function MesOrderStepDeviceCusstomer(data) {
+ return request({
+ url: 'WorkOrder/MesOrderStepDeviceCusstomer',
+ method: 'get',
+ params: data
+ })
+}
+
// 鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦
export function SavaMesOrderStepReport(data) {
return request({
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 5e992a7..c21a597 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -670,6 +670,12 @@
align="center"
/>
<el-table-column
+ prop="eqp_name"
+ label="璁惧/渚涘簲鍟�"
+ show-tooltip-when-overflow
+ align="center"
+ />
+ <el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
show-tooltip-when-overflow
@@ -882,7 +888,7 @@
import {
EditOrderNgStepSeave,
MesOrderNgStepSearch,
- MesOrderNgSubStepSearch,
+ MesOrderNgSubStepSearch, MesOrderStepDeviceCusstomer,
MesOrderStepSearch, MesOrderStepStart,
MesOrderWxStepSearch, SavaMesOrderStepIn, SavaMesOrderStepOut, SavaMesOrderStepReport
} from '@/api/WorkOrder'
@@ -1076,11 +1082,11 @@
const { data: res3 } = await DefectPermissions() // 缂洪櫡
this.defectArr = res3
- const { data: res4 } = await EqpPermissions() // 璁惧
- this.eqpArr = res4
-
- const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
- this.wxArr = res5
+ // const { data: res4 } = await EqpPermissions() // 璁惧
+ // this.eqpArr = res4
+ //
+ // const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
+ // this.wxArr = res5
const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
this.wkshopcodeArr = res6
@@ -1237,6 +1243,18 @@
},
// 鐢熶骇寮�鎶ュ伐锛氭姤宸�/澶栧崗(鍙戞枡/鏀舵枡)鏃舵潯浠跺垽鏂強鏁版嵁杩斿洖鎺ュ彛
async getMesOrderStepStart(OperType, SelectType, wocode, stepcode) {
+ const data2 = {
+ OperType, wocode, stepcode
+ }
+
+ const { data: res2 } = await MesOrderStepDeviceCusstomer(data2)
+ if (OperType === 'ZZ') {
+ this.eqpArr = res2
+ }
+ if (OperType === 'WX') {
+ this.wxArr = res2
+ }
+
const data = {
OperType, SelectType, wocode, stepcode
}
@@ -1366,12 +1384,23 @@
badqty: i.badqty
})
})
+
+ // let stepprice = null
+ //
+ // if (this.activeName === '鐢熶骇鍒楄〃') {
+ // stepprice = this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice
+ // }
+ //
+ // if (this.activeName === '澶栧崗鍙戞枡' || this.activeName === '澶栧崗鏀舵枡') {
+ // stepprice = this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice
+ // }
+
const data = {
mesordercode: this.dialogForm.wo_code,
partcode: this.dialogForm.partnumber,
stepseq: this.dialogForm.seq,
stepcode: this.dialogForm.stepcode,
- stepprice: this.dialogForm.stepprice,
+ stepprice: this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice,
eqpcode: this.dialogForm.eqpcode,
inbarcode,
reckway: this.dialogForm.reckway,
@@ -1489,7 +1518,7 @@
partcode: this.dialogForm.partnumber,
stepseq: this.dialogForm.seq,
stepcode: this.dialogForm.stepcode,
-
+ stepprice: this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice,
wxcode: this.dialogForm.wxcode,
inbarcode,
inuser: this.dialogForm.inuser,
--
Gitblit v1.9.3