From 3be76f58d38a9c27408533357778a6e43f844fd6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 21 十一月 2022 13:05:21 +0800
Subject: [PATCH] 1.修改报工接口接入
---
src/views/scgl/xgbg.vue | 176 ++++++++++++++++++++++++++++++++++++-------
src/views/bbgl/rygz.vue | 14 +-
2 files changed, 152 insertions(+), 38 deletions(-)
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 974da2e..fc188eb 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -158,13 +158,13 @@
show-tooltip-when-overflow
sortable="custom"
/>
- <el-table-column
- prop="group_name"
- label="鐢熶骇鐝粍"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="group_name"-->
+ <!-- label="鐢熶骇鐝粍"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="report_qty"
label="鎶ュ伐鏁伴噺"
diff --git a/src/views/scgl/xgbg.vue b/src/views/scgl/xgbg.vue
index dcb378d..e8d905a 100644
--- a/src/views/scgl/xgbg.vue
+++ b/src/views/scgl/xgbg.vue
@@ -112,7 +112,8 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div>{{ row.verify==='Y'?'宸插鏍�':'鏈鏍�' }}</div>
+ <div v-if="row.verify==='Y'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />宸插鏍�</div>
+ <div v-if="row.verify==='N'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />鏈鏍�</div>
</template>
</el-table-column>
<el-table-column
@@ -232,6 +233,7 @@
<el-input
v-if="row.isVisible===1"
v-model="row.report_qty"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
<div v-else>{{ row.report_qty }}</div>
@@ -258,6 +260,7 @@
<el-input
v-if="row.isVisible===1"
v-model="row.ng_qty"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
<div v-else>{{ row.ng_qty }}</div>
@@ -276,6 +279,7 @@
prop="bad_qty"
label="鎶ュ簾鏁伴噺"
fixed="right"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
width="110"
sortable="custom"
>
@@ -283,6 +287,7 @@
<el-input
v-if="row.isVisible===1"
v-model="row.bad_qty"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
<div v-else>{{ row.bad_qty }}</div>
@@ -308,6 +313,7 @@
<el-input
v-if="row.isVisible===1"
v-model="row.bad_money"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
/>
<div v-else>{{ row.bad_money }}</div>
@@ -329,7 +335,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<div v-if=" row.verify==='Y'">
- <el-tooltip class="item" effect="dark" content="鎶ュ伐鍙嶆牳" placement="top">
+ <el-tooltip class="item" effect="dark" content="鎶ュ伐鍙嶅鏍�" placement="top">
<i class="el-icon-document" style="color:#42b983;cursor:pointer;margin-right: 15px" @click="noVerify(row)" />
</el-tooltip>
</div>
@@ -382,13 +388,11 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
-import { handleDatetime, validateCode } from '@/utils/global'
+import { handleDatetime } from '@/utils/global'
import {
MesOrderStepDeleteSeave,
- MesOrderStepNoVerifySeave,
+ MesOrderStepNoVerifySeave, MesOrderStepUpdateSeave,
MesOrderStepVerifySearch,
MesOrderStepVerifySeave
} from '@/api/scgl'
@@ -424,6 +428,8 @@
total: 10,
tableData: [],
+
+ editRowData: {}, // 缂栬緫鏃剁殑鏁版嵁鏆傚瓨瀵硅薄
tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
@@ -463,7 +469,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
reportuser: this.form.reportuser, // 鎶ュ伐浜哄憳
reportdate: tempDate, // 鎶ュ伐鏃堕棿
- prop: 'eqp_code', // 鎺掑簭瀛楁
+ prop: 'report_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -520,11 +526,6 @@
// 鎶ュ伐瀹℃牳
verify(row) {
const data = {
- // report_dvalue: '+1',
- // ng_dvalue: '+1',
- // bad_dvalue: '+1',
- // badmoney_dvalue: '+1'
-
'id': row.id,
'sbid': row.sbid,
'wo_code': row.wo_code,
@@ -535,20 +536,20 @@
'route_code': row.route_code,
'step_seq': row.step_seq,
'step_code': row.step_code,
- 'flw_type': row.flw_type,
+ 'flw_type': row.flwtype,
'first_choke': row.first_choke,
'last_choke': row.last_choke,
- 'unprice': row.unprice,
+ 'unprice': row.unprice ? row.unprice : 0,
'usercode': row.usercode,
'report_date': row.report_date,
'report_qty': row.report_qty,
- 'report_dvalue': '+1',
+ 'report_dvalue': 0,
'ng_qty': row.ng_qty,
- 'ng_dvalue': '+1',
+ 'ng_dvalue': 0,
'bad_qty': row.bad_qty,
- 'bad_dvalue': '+1',
+ 'bad_dvalue': 0,
'bad_money': row.bad_money,
- 'badmoney_dvalue': '+1'
+ 'badmoney_dvalue': 0
}
// const objData = { ...row, ...data }
@@ -557,29 +558,117 @@
MesOrderStepVerifySeave([data]).then(r => {
if (r.code === '200') {
- this.$message.success('瀹℃牳鎴愬姛锛�')
+ this.$message.success('鎶ュ伐瀹℃牳鎴愬姛锛�')
+ this.getMesOrderStepVerifySearch()
}
})
},
// 鎶ュ伐鍙嶅
noVerify(row) {
- MesOrderStepNoVerifySeave([row]).then(r => {
+ const data = {
+ 'id': row.id,
+ 'sbid': row.sbid,
+ 'wo_code': row.wo_code,
+ 'partnumber': row.partnumber,
+ 'task_qty': row.task_qty,
+ 'wkshp_code': row.wkshp_code,
+ 'eqp_code': row.eqp_code,
+ 'route_code': row.route_code,
+ 'step_seq': row.step_seq,
+ 'step_code': row.step_code,
+ 'flw_type': row.flwtype,
+ 'first_choke': row.first_choke,
+ 'last_choke': row.last_choke,
+ 'unprice': row.unprice,
+ 'usercode': row.usercode,
+ 'report_date': row.report_date,
+ 'report_qty': row.report_qty,
+ 'report_dvalue': 0,
+ 'ng_qty': row.ng_qty,
+ 'ng_dvalue': 0,
+ 'bad_qty': row.bad_qty,
+ 'bad_dvalue': 0,
+ 'bad_money': row.bad_money,
+ 'badmoney_dvalue': 0
+ }
+
+ MesOrderStepNoVerifySeave([data]).then(r => {
if (r.code === '200') {
- this.$message.success('瀹℃牳鎴愬姛锛�')
+ this.$message.success('鎶ュ伐鍙嶅鎴愬姛锛�')
+ this.getMesOrderStepVerifySearch()
}
})
},
// 淇敼鎸夐挳
edit(row) {
- console.log(row, 1)
- console.log(row.number, 1)
- console.log(row.isVisible, 1)
-
if (this.tableData.find(i => i.isVisible === 1)) {
- return this.$message.info('璇峰厛淇濆瓨褰撳墠鏁版嵁锛�')
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屾暟鎹紒')
}
- row.isVisible = 1
+ // 娴呮嫹璐�:鏁扮粍鍜屽璞＄洿鎺ョ瓑鍙疯祴鍊肩殑閫氬父鏄祬鎷疯礉,鏂板璞℃敼鍙�,鍘熷璞′篃浼氭敼鍙�,浼氫簰鐩稿奖鍝�
+ // 娣辨嫹璐�:鎶婇噷闈㈢殑鍐呭涓�涓竴涓殑澶嶅埗鍑烘潵,寮�涓�涓柊鍐呭瓨鏀捐繘鍘�,鏂板璞″拰鍘熷璞′笉浼氫簰鐩稿奖鍝�
+ this.editRowData = { ...row }// 姝ゅ鐢ㄦ繁鎷疯礉锛岄伩鍏嶄簰鐩稿奖鍝�
+ this.tableData.forEach((item, index) => {
+ item.isVisible = 0
+ if (item.number === row.number) {
+ this.tableData.splice(index, 1, row)
+ this.tableData[index].isVisible = 1
+ }
+ })
+
+ console.log(this.tableData, 56789)
+ },
+ // 淇濆瓨
+ save(row) {
+ // const editRowData = this.editRowData
+
+ const data = {
+ 'id': row.id,
+ 'sbid': row.sbid,
+ 'wo_code': row.wo_code,
+ 'partnumber': row.partnumber,
+ 'task_qty': row.task_qty,
+ 'wkshp_code': row.wkshp_code,
+ 'eqp_code': row.eqp_code,
+ 'route_code': row.route_code,
+ 'step_seq': row.step_seq,
+ 'step_code': row.step_code,
+ 'flw_type': row.flwtype,
+ 'first_choke': row.first_choke,
+ 'last_choke': row.last_choke,
+ 'unprice': row.unprice,
+ 'usercode': row.usercode,
+ 'report_date': row.report_date,
+ 'report_qty': row.report_qty,
+ 'report_dvalue': parseFloat(row.report_qty) - this.editRowData.report_qty >= 0 ? '+' + (parseFloat(row.report_qty) - this.editRowData.report_qty) : (parseFloat(row.report_qty) - this.editRowData.report_qty).toString(),
+ 'ng_qty': row.ng_qty,
+ 'ng_dvalue': parseFloat(row.ng_qty) - this.editRowData.ng_qty >= 0 ? '+' + (parseFloat(row.ng_qty) - this.editRowData.ng_qty) : (parseFloat(row.ng_qty) - this.editRowData.ng_qty).toString(),
+ 'bad_qty': row.bad_qty,
+ 'bad_dvalue': parseFloat(row.bad_qty) - this.editRowData.bad_qty >= 0 ? '+' + (parseFloat(row.bad_qty) - this.editRowData.bad_qty) : (parseFloat(row.bad_qty) - this.editRowData.bad_qty).toString(),
+ 'bad_money': row.bad_money,
+ 'badmoney_dvalue': parseFloat(row.bad_money) - this.editRowData.bad_money >= 0 ? '+' + (parseFloat(row.bad_money) - this.editRowData.bad_money) : (parseFloat(row.bad_money) - this.editRowData.bad_money)
+ }
+
+ console.log(data, 1)
+ // console.log(this.editRowData, 2)
+ // console.log(parseFloat(row.report_qty), 3)
+ // console.log(this.editRowData.report_qty, 3)
+ // console.log(parseFloat(row.report_qty) - this.editRowData.report_qty, 3)
+
+ MesOrderStepUpdateSeave([data]).then(res => {
+ this.$message.success('鎶ュ伐淇敼鎴愬姛锛�')
+ this.getMesOrderStepVerifySearch()
+ })
+
+ // this.getMesOrderStepVerifySearch()
+
+ // this.tableData.forEach((item, index) => {
+ // item.isVisible = 0
+ // if (item.number === row.number) {
+ // this.tableData.splice(index, 1, row)
+ // // this.tableData[index].isVisible = 1
+ // }
+ // })
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -588,7 +677,34 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- MesOrderStepDeleteSeave([row]).then(res => {
+ const data = {
+ 'id': row.id,
+ 'sbid': row.sbid,
+ 'wo_code': row.wo_code,
+ 'partnumber': row.partnumber,
+ 'task_qty': row.task_qty,
+ 'wkshp_code': row.wkshp_code,
+ 'eqp_code': row.eqp_code,
+ 'route_code': row.route_code,
+ 'step_seq': row.step_seq,
+ 'step_code': row.step_code,
+ 'flw_type': row.flwtype,
+ 'first_choke': row.first_choke,
+ 'last_choke': row.last_choke,
+ 'unprice': row.unprice,
+ 'usercode': row.usercode,
+ 'report_date': row.report_date,
+ 'report_qty': row.report_qty,
+ 'report_dvalue': '0',
+ 'ng_qty': row.ng_qty,
+ 'ng_dvalue': '0',
+ 'bad_qty': row.bad_qty,
+ 'bad_dvalue': '0',
+ 'bad_money': row.bad_money,
+ 'badmoney_dvalue': '0'
+ }
+
+ MesOrderStepDeleteSeave([data]).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
@@ -601,9 +717,7 @@
this.$message.info('宸插彇娑堝垹闄�')
})
},
- save(row) {
- row.isVisible = 0
- },
+
// 琛ㄦ牸鍙屽嚮鐐瑰嚮
cellDblclick(row, column, cell, event) {
console.log(row, column, cell, event)
--
Gitblit v1.9.3