From 0b35bd152a6ec2f529dcb13091a5c1746e7cc3fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 09 十月 2023 14:37:04 +0800
Subject: [PATCH] 1.报工调整100%
---
src/views/produce/reportCorrect.vue | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 34 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index f101c93..eafea2f 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -28,9 +28,18 @@
<el-input v-model="form.reportuser" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style=" display: flex;">
- <el-input v-model="form.reportdate" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-date-picker
+ v-model="form.reportdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
</el-form-item>
-
</div>
<div
class="bodySearchReset"
@@ -113,20 +122,20 @@
show-overflow-tooltip
min-width="110"
/>
- <el-table-column
- prop="wkshp_name"
- label="杞﹂棿鍚嶇О"
- show-overflow-tooltip
- sortable="custom"
- min-width="110"
- />
- <el-table-column
- prop="eqp_name"
- label="璁惧鍚嶇О"
- sortable="custom"
- show-overflow-tooltip
- min-width="110"
- />
+ <!-- <el-table-column-->
+ <!-- prop="wkshp_name"-->
+ <!-- label="杞﹂棿鍚嶇О"-->
+ <!-- show-overflow-tooltip-->
+ <!-- sortable="custom"-->
+ <!-- min-width="110"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqp_name"-->
+ <!-- label="璁惧鍚嶇О"-->
+ <!-- sortable="custom"-->
+ <!-- show-overflow-tooltip-->
+ <!-- min-width="110"-->
+ <!-- />-->
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
@@ -134,13 +143,35 @@
sortable="custom"
min-width="110"
/>
+ <!-- <el-table-column-->
+ <!-- prop="step_price"-->
+ <!-- label="宸ュ簭鍗曚环"-->
+ <!-- show-overflow-tooltip-->
+ <!-- sortable="custom"-->
+ <!-- min-width="110"-->
+ <!-- />-->
<el-table-column
- prop="step_price"
- label="宸ュ簭鍗曚环"
+ prop="steptype"
+ label="宸ュ簭绫诲瀷"
show-overflow-tooltip
sortable="custom"
min-width="110"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.steptype === 'Z' ? '鑷埗' : '澶栧崗' }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wx_name"
+ label="渚涘簲鍟�"
+ show-overflow-tooltip
+ sortable="custom"
+ min-width="110"
+ >
+ <template slot-scope="{row}">
+ {{ row.wx_name ? row.wx_name : '/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="usergroup_name"
label="鎶ュ伐鐝粍"
@@ -267,12 +298,17 @@
</el-form-item>
<el-form-item label="宸ュ簭鍗曚环" class="dialogFormItem">
<div style="width: 200px;">
- {{ dialogForm.unprice }}
+ {{ dialogForm.unprice ? dialogForm.unprice : '/' }}
</div>
</el-form-item>
- <el-form-item label="鎶ュ伐鐝粍" class="dialogFormItem">
+ <el-form-item v-if="dialogForm.flw_type==='Z'" label="鎶ュ伐鐝粍" class="dialogFormItem">
<div style="width: 200px;" class="ellipsis">
{{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}
+ </div>
+ </el-form-item>
+ <el-form-item v-if="dialogForm.flw_type!=='Z'" label="渚涘簲鍟�" class="dialogFormItem">
+ <div style="width: 200px;" class="ellipsis">
+ {{ dialogForm.wx_name }}
</div>
</el-form-item>
<el-form-item label="鎶ュ伐浜哄憳" class="dialogFormItem">
@@ -280,7 +316,7 @@
{{ dialogForm.username }}
</div>
</el-form-item>
- <el-form-item label="鍚堟牸鏁伴噺" prop="report_qty" class="dialogFormItem">
+ <el-form-item :label="dialogForm.flw_type==='Z'?'鍚堟牸鏁伴噺':'鏀舵枡鏁伴噺'" prop="report_qty" class="dialogFormItem">
<el-input
v-model="dialogForm.report_qty"
oninput="value=value.replace(/[^0-9]/g,'')"
@@ -457,6 +493,8 @@
'report_date': '',
'report_qty': '',
'report_dvalue': '',
+ wx_code: '',
+ wx_name: '',
children: []
},
tableDataDialog: [],
@@ -569,6 +607,9 @@
this.dialogForm.report_qty = row.report_qty
this.dialogForm.report_qty2 = row.report_qty // old鍊�
+ this.dialogForm.wx_code = row.wx_code
+ this.dialogForm.wx_name = row.wx_name
+
if (res.data.length > 0) {
res.data.forEach(i => {
i.defect_code = i.defect_code.split(',')
@@ -626,24 +667,25 @@
'unprice': this.dialogForm.unprice,
'groupcode': this.dialogForm.groupcode,
'usercode': this.dialogForm.usercode,
+ wxcode: this.dialogForm.wx_code,
'report_date': this.dialogForm.report_date,
'report_qty': parseFloat(this.dialogForm.report_qty),
'report_dvalue': parseFloat(this.dialogForm.report_qty) - parseFloat(this.dialogForm.report_qty2),
children
}
- console.log(JSON.stringify(data), 12)
+ // console.log(JSON.stringify(data), 12)
// console.log(JSON.parse(JSON.stringify(data)), 12)
- // this.$store.state.app.buttonIsDisabled = true
- // const res = await MesOrderStepUpdateSeave([data])
- // if (res.code === '200') {
- // this.$notify.success('璋冩暣鎴愬姛锛�')
- // await this.getMesOrderStepVerifySearch()
- // this.$store.state.app.buttonIsDisabled = false
- // this.dialogVisible = false
- // } else {
- // this.$store.state.app.buttonIsDisabled = false
- // this.$notify.error('璋冩暣澶辫触锛�')
- // }
+ this.$store.state.app.buttonIsDisabled = true
+ const res = await MesOrderStepUpdateSeave([data])
+ if (res.code === '200') {
+ this.$notify.success('璋冩暣鎴愬姛锛�')
+ await this.getMesOrderStepVerifySearch()
+ this.$store.state.app.buttonIsDisabled = false
+ this.dialogVisible = false
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error('璋冩暣澶辫触锛�')
+ }
}
})
},
@@ -677,4 +719,23 @@
align-items: center;
justify-content: center;
}
+
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
</style>
--
Gitblit v1.9.3