From d20654ba067e5c0621d4d7d95915cbe47a10fe87 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 08 八月 2024 17:23:48 +0800
Subject: [PATCH] 1.正清和 增加页面缓存处理
---
src/views/reportManager/defectDetailList.vue | 150 ++++++++++++++++++++++---------------------------
1 files changed, 67 insertions(+), 83 deletions(-)
diff --git a/src/views/reportManager/defectDetailList.vue b/src/views/reportManager/defectDetailList.vue
index ea98c79..05457a5 100644
--- a/src/views/reportManager/defectDetailList.vue
+++ b/src/views/reportManager/defectDetailList.vue
@@ -14,16 +14,29 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style="display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </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;">
+ <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;">
@@ -103,6 +116,11 @@
label="搴忓彿"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
+ /> <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
@@ -111,26 +129,38 @@
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
- width="160"
+ width="110"
show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="160"
+ width="110"
show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
- width="160"
+ width="110"
show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
<div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -157,6 +187,18 @@
<el-table-column
prop="defect_qty"
label="涓嶈壇鏁伴噺"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="defect_pendqty"
+ label="涓嶈壇寰呭鐞�"
+ width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="bad_qty"
+ label="鎶ュ簾鏁伴噺"
width="110"
sortable="custom"
/>
@@ -204,7 +246,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getDefectDetailsReportSearch"
/>
@@ -265,9 +307,10 @@
import { MesOrderStepReportSelectUserGroup } from '@/api/produceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
- name: 'Zzjg',
+ name: 'DefectDetailList',
components: {
Pagination, ImportPicker
},
@@ -279,6 +322,8 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -293,6 +338,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ WorkShopArr: [],
// groupArr: [],
total: 10,
tableData: [],
@@ -341,10 +387,16 @@
methods: {
handleRequest() {
this.getDefectDetailsReportSearch().then(res => {
- // if (res.code === '200') {
+ if (res.code === '200') {
// this.getMesOrderStepReportSelectUserGroup()
- // }
+ this.getWorkShopSelect()
+ }
})
+ },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
async getDefectDetailsReportSearch() {
let tempDate = this.form.reportdate
@@ -352,6 +404,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,
@@ -360,6 +413,7 @@
defectcode: this.form.defectcode,
defectname: this.form.defectname,
reportname: this.form.reportname,
+ wkshopcode: this.form.wkshopcode,
reportdate: tempDate,
prop: this.form.prop,
order: this.form.order,
@@ -398,6 +452,7 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -406,6 +461,7 @@
defectcode: this.form.defectcode,
defectname: this.form.defectname,
reportname: this.form.reportname,
+ wkshopcode: this.form.wkshopcode,
reportdate: tempDate
}
@@ -426,6 +482,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -435,81 +492,8 @@
this.form.defectname = ''
this.form.reportname = ''
this.form.reportdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getDefectDetailsReportSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.reportname)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getDefectDetailsReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getDefectDetailsReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
--
Gitblit v1.9.3