From 09bc0a81c166562bc4523f3a3d3fc86203f64b1e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 14:50:52 +0800
Subject: [PATCH] 1.生产管理、报表管理 新增销售单号查询
---
src/views/reportManager/personSalaryList.vue | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index afc05ac..4cf701a 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -50,13 +50,16 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </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.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.reportname" 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.reportdate"
@@ -145,6 +148,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -315,6 +324,12 @@
width="50"
fixed
label="搴忓彿"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
/>
<el-table-column
prop="wo_code"
@@ -525,6 +540,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -532,7 +548,8 @@
stepname: '', // 宸ュ簭鍚嶇О
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
- reportdate: '', // 鎿嶄綔鏃堕棿
+ reportdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 鎿嶄綔鏃堕棿
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡
@@ -610,7 +627,7 @@
this.WorkShopArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
- async getStepSelect() {
+ async getStepSelect() {
const { data: res } = await StepSelect()
this.StepSelectArr = res
},
@@ -660,6 +677,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,
@@ -718,6 +736,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -731,6 +750,7 @@
}
const { data: res } = await PeopleSalaryReportExcelSearch(data)
+ // console.log(res, 1)
window.location.href = res
},
// 鏌ヨ
@@ -747,6 +767,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -754,7 +775,8 @@
this.form.stepname = ''
this.form.groupcode = ''
this.form.reportname = ''
- this.form.reportdate = ''
+ this.form.reportdate = [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.getPeopleSalaryReportSearch()
},
--
Gitblit v1.9.3