From e3d5394e07c6e7dc24cf620bd16f07d78ff96e03 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 08 八月 2024 14:56:45 +0800
Subject: [PATCH] 1.报表新增销售单号字段查询展示
---
src/views/statistic/defectDetailList.vue | 15 ++++
src/views/statistic/personSalaryList.vue | 33 +++++++++--
src/views/statistic/repairDetailList.vue | 15 ++++
vue.config.js | 2
src/views/statistic/groupSalaryList.vue | 28 ++++++++-
src/views/statistic/workOrderProcess.vue | 48 ++++++++++-----
src/views/statistic/subcontractingOperation.vue | 35 ++++++++---
7 files changed, 136 insertions(+), 40 deletions(-)
diff --git a/src/views/statistic/defectDetailList.vue b/src/views/statistic/defectDetailList.vue
index 18a7a12..e547a1f 100644
--- a/src/views/statistic/defectDetailList.vue
+++ b/src/views/statistic/defectDetailList.vue
@@ -14,6 +14,9 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
<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 label="浜у搧鍚嶇О" v-show="isExpandForm" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
@@ -121,6 +124,12 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞崟鍙�"
width="160"
sortable="custom"
/>
@@ -302,6 +311,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ socode:'',
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -381,6 +391,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -428,6 +439,7 @@
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -457,6 +469,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode=''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
diff --git a/src/views/statistic/groupSalaryList.vue b/src/views/statistic/groupSalaryList.vue
index 9d61962..615e582 100644
--- a/src/views/statistic/groupSalaryList.vue
+++ b/src/views/statistic/groupSalaryList.vue
@@ -40,6 +40,9 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -62,7 +65,7 @@
<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 label="浜у搧鍚嶇О" v-show="isExpandForm" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -81,9 +84,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"
@@ -156,6 +159,12 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞崟鍙�"
width="160"
sortable="custom"
/>
@@ -328,6 +337,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞紪鍙�"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -546,6 +562,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ socode:'' ,
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -672,6 +689,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -731,6 +749,7 @@
}
const data = {
+ socode: this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -760,6 +779,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode=''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index d4aa68f..2f57ade 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -40,6 +40,9 @@
style="display: flex; "
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -60,15 +63,15 @@
<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-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О" v-show="isExpandForm" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">-->
@@ -81,9 +84,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"
@@ -156,6 +159,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞紪鍙�"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -322,6 +332,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞紪鍙�"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -521,6 +538,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ socode:'',
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -656,6 +674,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode: this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -714,6 +733,7 @@
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -743,6 +763,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode=''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
diff --git a/src/views/statistic/repairDetailList.vue b/src/views/statistic/repairDetailList.vue
index 09c6421..a416130 100644
--- a/src/views/statistic/repairDetailList.vue
+++ b/src/views/statistic/repairDetailList.vue
@@ -14,6 +14,9 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
<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 label="浜у搧鍚嶇О" v-show="isExpandForm" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
@@ -129,6 +132,12 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞崟鍙�"
width="160"
sortable="custom"
/>
@@ -317,6 +326,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ socode:'',
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -400,6 +410,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -447,6 +458,7 @@
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -476,6 +488,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode=''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
diff --git a/src/views/statistic/subcontractingOperation.vue b/src/views/statistic/subcontractingOperation.vue
index 1eec12e..7c34cbc 100644
--- a/src/views/statistic/subcontractingOperation.vue
+++ b/src/views/statistic/subcontractingOperation.vue
@@ -14,6 +14,9 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -36,7 +39,7 @@
<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 label="浜у搧鍚嶇О" v-show="isExpandForm" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
@@ -48,16 +51,16 @@
<el-form-item v-show="isExpandForm" label="渚涙柟鍚嶇О" style=" display: flex;">
<el-input v-model="form.suppername" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">
- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in typeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+<!-- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">-->
+<!-- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">-->
+<!-- <el-option-->
+<!-- v-for="item in typeArr"-->
+<!-- :key="item.code"-->
+<!-- :label="item.name"-->
+<!-- :value="item.code"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item
v-show="isExpandForm"
style="display: flex;align-items: center"
@@ -130,6 +133,12 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="socode"
+ label="閿�鍞崟鍙�"
width="160"
sortable="custom"
/>
@@ -367,6 +376,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ socode:'',
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -442,6 +452,7 @@
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -482,6 +493,7 @@
}
const data = {
+ socode:this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -510,6 +522,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode = ''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
diff --git a/src/views/statistic/workOrderProcess.vue b/src/views/statistic/workOrderProcess.vue
index 0fd0279..b146512 100644
--- a/src/views/statistic/workOrderProcess.vue
+++ b/src/views/statistic/workOrderProcess.vue
@@ -15,6 +15,11 @@
style="display: flex;"
>
<div class="elForm">
+
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px"/>
+ </el-form-item>
+
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -42,20 +47,20 @@
</el-select>
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <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.wkshopname" 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 label="浜у搧缂栫爜" v-show="isExpandForm" style=" display: flex;">
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px"/>
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍗曟嵁鏃ユ湡" style="display: flex;align-items: center">
<el-date-picker
@@ -143,6 +148,13 @@
sortable="custom"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="135"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
prop="partcode"
label="浜у搧缂栫爜"
width="105"
@@ -220,8 +232,8 @@
/>
<div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{
- row.plan_qty
- }}
+ row.plan_qty
+ }}
</div>
</div>
@@ -267,21 +279,21 @@
<script>
import Pagination from '@/components/Pagination'
-import { handleDatetime } from '@/utils/global'
+import {handleDatetime} from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import {
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/ReportManager'
-import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
+import {PrentOrganizationNoCompany} from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
components: {
Pagination
},
- directives: { elDragDialog, waves },
+ directives: {elDragDialog, waves},
data() {
return {
mouseHoverType: 'mouseout',
@@ -289,6 +301,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ socode: '',//閿�鍞崟鍙�
status: '', // 宸ュ崟鐘舵��
wocode: '', // 宸ュ崟缂栧彿
wkshopcode: '', // 宸ヨ壓璺嚎缂栫爜
@@ -303,9 +316,9 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
statusArr: [
- { label: '鏈紑濮�', value: 'NOSTART' },
- { label: '鎵ц涓�', value: 'START' },
- { label: '宸插畬鎴�', value: 'CLOSED' }
+ {label: '鏈紑濮�', value: 'NOSTART'},
+ {label: '鎵ц涓�', value: 'START'},
+ {label: '宸插畬鎴�', value: 'CLOSED'}
],
wkshopcodeArr: [],
@@ -325,7 +338,7 @@
},
methods: {
async getPrentOrganizationNoCompany() {
- const { data: res } = await PrentOrganizationNoCompany()
+ const {data: res} = await PrentOrganizationNoCompany()
this.wkshopcodeArr = res
},
async getProductionScheduleReportSearch() {
@@ -334,6 +347,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode: this.form.socode,
status: this.form.status,
wocode: this.form.wocode,
wkshopcode: this.form.wkshopcode,
@@ -360,6 +374,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode: this.form.socode,
status: this.form.status,
wocode: this.form.wocode,
wkshopcode: this.form.wkshopcode,
@@ -375,7 +390,7 @@
window.location.href = res.data
},
// 鎺掑簭鏀瑰彉鏃�
- sortChange({ column, prop, order }) {
+ sortChange({column, prop, order}) {
if (order === 'descending') {
order = 'desc'
} else if (order === 'ascending') {
@@ -393,6 +408,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode=''
this.form.status = ''
this.form.wocode = ''
this.form.wkshopcode = ''
@@ -412,7 +428,7 @@
this.$refs.tableDataRef.doLayout()
})
},
- tableRowClassName({ row, rowIndex }) {
+ tableRowClassName({row, rowIndex}) {
return 'custom-row'
}
}
diff --git a/vue.config.js b/vue.config.js
index 9608024..d8fd5ac 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,7 +52,7 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8019', // 鏈湴
+ target: 'http://121.196.36.24:8033', // 鏈湴
// target: 'http://192.168.0.147:8000', // 浼樺厠
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3