From d149f4806af2f91669f27737a179bb15278e01bd Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 06 五月 2026 17:07:23 +0800
Subject: [PATCH] 1.定时任务修改
---
src/views/produce/reportCorrect.vue | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 747064d..0ac0b91 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -37,7 +37,10 @@
<el-form-item label="璁㈠崟鍙�" style=" display: flex;">
<el-input v-model="form.orderno" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saorderno" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partnumber" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -148,6 +151,17 @@
>
<template slot-scope="{row}">
{{ row.m_po?row.m_po:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ min-width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
</template>
</el-table-column>
<el-table-column
@@ -383,19 +397,57 @@
/>
</el-form-item>
<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>
+ <!-- <div style="width: 200px;" class="ellipsis">-->
+ <!-- {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}-->
+ <!-- </div>-->
+
+ <el-select
+ v-model="dialogForm.groupcode"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :disabled="dialogForm.groupcode===''"
+ :popper-append-to-body="false"
+ @change="usergroupChange"
+ >
+ <el-option
+ v-for="item in usergroupArr"
+ :key="item.usergroupcode"
+ :label="item.usergroupname"
+ :value="item.usergroupcode"
+ />
+ </el-select>
+
</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">
- <div style="width: 200px;" class="ellipsis">
- {{ dialogForm.username }}
- </div>
+ <el-form-item label="鎶ュ伐浜哄憳" class="dialogFormItem" prop="usercode">
+ <!-- <div style="width: 200px;" class="ellipsis">-->
+ <!-- {{ dialogForm.username }}-->
+ <!-- </div>-->
+
+ <el-select
+ v-model="dialogForm.usercode"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ multiple
+ collapse-tags
+ :multiple-limit="dialogForm.groupcode===''?1:0"
+ :disabled="dialogForm.groupcode===''&&dialogForm.usergroupcode===''"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in reportuserArr"
+ :key="item.usercode"
+ :label="item.usercode+' / '+item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+
</el-form-item>
<el-form-item :label="dialogForm.flw_type==='Z'?'鍚堟牸鏁伴噺':'鏀舵枡鏁伴噺'" prop="report_qty" class="dialogFormItem">
<el-input
@@ -529,7 +581,6 @@
size="medium"
:precision="2"
:step="0.1"
- :max="10"
:min="0"
style="margin: 0 10px 5px"
/>
@@ -560,7 +611,13 @@
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { DefectPermissions, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
+import {
+ DefectPermissions,
+ GroupsPermissions, GroupsPersonPermissions,
+ PersonPermissions,
+ PrentOrganizationNoCompany,
+ StepData
+} from '@/api/GeneralBasicData'
import {
MesOrderStepModelSearch, MesOrderStepPriceBatchUpdateSeave,
MesOrderStepUpdateSeave,
@@ -589,6 +646,7 @@
reportuser: '', // 鎶ュ伐浜哄憳
reportdate: '', // 鎶ュ伐鏃堕棿
stepcode: '',
+ saorderno: '',
prop: 'report_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -633,11 +691,16 @@
dialogFormRules: {
report_qty: [
{ required: true, message: '璇疯緭鍏ュ悎鏍兼暟閲�', trigger: ['blur', 'change'] }
+ ],
+ usercode: [
+ { required: true, message: '璇烽�夋嫨鎶ュ伐浜哄憳', trigger: ['blur', 'change'] }
]
},
stepCodeArr: [], // 涓嬫媺宸ュ簭闆嗗悎
batchUpdateDialogVisible: false,
- stepPriceEdit: 0
+ stepPriceEdit: 0,
+ usergroupArr: [],
+ reportuserArr: []
}
},
@@ -708,10 +771,20 @@
batchUpdateHandleClose() {
this.stepPriceEdit = 0
},
+ async usergroupChange(val) {
+ const { data: res } = await GroupsPersonPermissions({ groupcode: val })
+ this.dialogForm.usercode = res[0].usercode_list ? res[0].usercode_list.split(',') : []
+ },
// 鑾峰彇宸ュ簭鍩虹璧勬枡
async getStepData() {
const { data: res } = await StepData()
this.stepCodeArr = res
+
+ const { data: res1 } = await GroupsPermissions()// 鐝粍
+ this.usergroupArr = res1
+
+ const { data: res2 } = await PersonPermissions() // 浜哄憳
+ this.reportuserArr = res2
},
async getPrentOrganizationNoCompany() {
const { data: res } = await PrentOrganizationNoCompany()
@@ -737,6 +810,7 @@
stepcode: this.form.stepcode,
reportdate: tempDate,
orderno: this.form.orderno,
+ saorderno: this.form.saorderno,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -763,6 +837,7 @@
reset() {
this.form.wkshopcode = ''
this.form.wo_code = ''
+ this.form.saorderno = ''
this.form.orderno = ''
this.form.partnumber = ''
this.form.partname = ''
@@ -804,7 +879,7 @@
this.dialogForm.last_choke = row.last_choke
this.dialogForm.unprice = row.step_price
this.dialogForm.groupcode = row.usergroup_code
- this.dialogForm.usercode = row.usercode
+ this.dialogForm.usercode = row.usercode.split(',')
this.dialogForm.usergroup_name = row.usergroup_name
this.dialogForm.username = row.username
this.dialogForm.report_date = row.report_date
@@ -870,7 +945,7 @@
'last_choke': this.dialogForm.last_choke,
'unprice': this.dialogForm.unprice,
'groupcode': this.dialogForm.groupcode,
- 'usercode': this.dialogForm.usercode,
+ 'usercode': this.dialogForm.usercode.join(','),
wxcode: this.dialogForm.wx_code,
'report_date': this.dialogForm.report_date,
'report_qty': parseFloat(this.dialogForm.report_qty),
--
Gitblit v1.9.3