From c02a3ebf5b4338710c4f9ae231d72cf591dfb97f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 02 十二月 2024 11:28:04 +0800
Subject: [PATCH] 1.修改 批量派发 没绑定工艺路线的单子，显示在最前面
---
src/views/reportManager/groupSalaryList.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index 59757e9..d805961 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -50,13 +50,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -75,9 +78,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.operdate"
@@ -146,6 +149,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -324,6 +333,12 @@
label="搴忓彿"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
@@ -486,8 +501,6 @@
width="800px"
:close-on-click-modal="false"
top="15vh"
- @closed="handleClose"
- @close="handleClose"
>
<div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
<el-tag
@@ -539,7 +552,7 @@
import { WorkShopSelect } from '@/api/deviceManager'
export default {
- name: 'Zzjg',
+ name: 'GroupSalaryList',
components: {
Pagination, ImportPicker
},
@@ -552,6 +565,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -560,7 +574,8 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
- operdate: '', // 鎿嶄綔鏃堕棿
+ operdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 鎿嶄綔鏃堕棿
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡 閫愰亾宸ュ簭锛歝ontin 鏈亾宸ュ簭锛歭ast
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -647,7 +662,7 @@
const sums = []
columns.forEach((column, index) => {
- if (index === 10) {
+ if (index === 12) {
sums[index] = '鎬讳环'
return
}
@@ -680,6 +695,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -739,6 +755,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -768,6 +785,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -775,7 +793,8 @@
this.form.stepname = ''
this.form.groupcode = ''
this.form.username = ''
- this.form.operdate = ''
+ this.form.operdate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)]
this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getGroupSalaryReportSearch()
},
@@ -790,7 +809,22 @@
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ const res = await GroupSalaryReportSearchUser({ id: row.id })
+ this.tagArr = res.data.map(r => r.username)
+ // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
+ // this.$nextTick(() => {
+ // this.dialogForm.OrgCode = row.org_code
+ // this.dialogForm.OrgName = row.org_name
+ // this.dialogForm.SupUnit = row.parent_id
+ // })
}
+
}
}
</script>
--
Gitblit v1.9.3