From 00c703b89dfa507f55de3677a24fb8006092a043 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 11 十月 2024 12:28:14 +0800
Subject: [PATCH] 1.工单列表排序2.工单列表导出
---
src/api/WorkOrder.js | 8 ++
src/views/workOrder/workOrderClose.vue | 1
src/views/workOrder/produceOrderList.vue | 1
src/views/workOrder/workOrderList.vue | 229 ++++++++++++++++++++++++++++++++------------------------
src/views/workOrder/workOrderSend.vue | 1
5 files changed, 141 insertions(+), 99 deletions(-)
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
index 36c1a99..71c2743 100644
--- a/src/api/WorkOrder.js
+++ b/src/api/WorkOrder.js
@@ -96,6 +96,14 @@
params: data
})
}
+// MES宸ュ崟瀵煎嚭
+export function MesOrderExcelSearch(data) {
+ return request({
+ url: 'WorkOrder/MesOrderExcelSearch',
+ method: 'get',
+ params: data
+ })
+}
// 宸ュ崟娲惧彂
export function MesOrderDistribution(data) {
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 073f65c..f9c7b6c 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -778,6 +778,7 @@
this.form.payenddate = ''
this.form.creatuser = ''
this.form.erpordercode = ''
+ this.form.saleordercode = ''
this.form.createdate = ''
this.getErpOrderSearch()
},
diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index 5a58e06..d599b2a 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -2421,6 +2421,7 @@
this.form.sourceorder = ''
this.form.ordertype = ''
this.form.createdate = ''
+ this.form.saleordercode = ''
this.getMesOrderClosedSearch()
},
// 鏂板鎸夐挳
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 691427b..cc08537 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -8,6 +8,8 @@
<el-button v-waves type="success" icon="el-icon-connection" @click="send">娲惧彂</el-button>
</div>
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+
<!-- <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>-->
</div>
@@ -168,6 +170,92 @@
fixed
/>
<el-table-column
+ prop="injectnumber"
+ label="娉ㄥ鏈哄彿"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="customername"
+ label="瀹㈡埛鍚嶇О"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ show-tooltip-when-overflow
+ sortable="custom"
+ min-width="120"
+ />
+ <el-table-column
+ prop="partname"
+ min-width="150"
+ label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ sortable="custom"
+ width="110"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="colour"
+ label="棰滆壊"
+ show-tooltip-when-overflow
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_qty"
+ label="宸ュ崟鏁�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="100"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="clerkuser"
+ label="閿�鍞笟鍔″憳"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
prop="status"
label="宸ュ崟鐘舵��"
sortable="custom"
@@ -185,6 +273,21 @@
<div v-if="row.status==='SCHED'">宸叉帓绋�</div>
</template>
</el-table-column>
+
+ <el-table-column
+ prop="wotype"
+ label="鍗曟嵁绫诲瀷"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wotype==='PO'">鏍囧噯宸ュ崟</div>
+ <div v-else-if="row.wotype==='FO'">鎶ュ簾琛ュ崟</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
@@ -204,103 +307,7 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗�"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="160"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wotype"
- label="鍗曟嵁绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="120"
- >
- <template slot-scope="{row}">
- <div v-if="row.wotype==='PO'">鏍囧噯宸ュ崟</div>
- <div v-else-if="row.wotype==='FO'">鎶ュ簾琛ュ崟</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="partcode"
- label="浜у搧缂栫爜"
- show-tooltip-when-overflow
- sortable="custom"
- min-width="120"
- />
- <el-table-column
- prop="partname"
- min-width="150"
- label="浜у搧鍚嶇О"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- sortable="custom"
- width="110"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="plan_qty"
- label="宸ュ崟鏁�"
- sortable="custom"
- show-tooltip-when-overflow
- width="100"
- />
- <el-table-column
- prop="injectnumber"
- label="娉ㄥ鏈哄彿"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
- </el-table-column>
- <el-table-column
- prop="customername"
- label="瀹㈡埛鍚嶇О"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
- </el-table-column>
- <el-table-column
- prop="colour"
- label="棰滆壊"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
- </el-table-column>
- <el-table-column
- prop="clerkuser"
- label="閿�鍞笟鍔″憳"
- sortable="custom"
- show-tooltip-when-overflow
- width="150"
- >
- <template slot-scope="{row}">
- <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
@@ -2041,7 +2048,7 @@
import {
AddMesOrderCodeSearch,
AddUpdateMesOrder, DeleteMesOrder,
- MesBadOrderSearch, MesOrderDistribution, MesOrderNewStepContent,
+ MesBadOrderSearch, MesOrderDistribution, MesOrderExcelSearch, MesOrderNewStepContent,
MesOrderSearch,
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
@@ -2049,7 +2056,8 @@
import { CustomerPermissions, PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
-import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
+import { MesOrderPrintSearch } from '@/api/GridReport'
+import { GroupSalaryReportExcelSearch } from '@/api/ReportManager' // base on element-ui
export default {
name: 'WorkOrderList',
@@ -2351,6 +2359,28 @@
// })
},
methods: {
+ async download() {
+ // let tempDate = this.form.operdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
+ const data = {
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
+ mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
+ mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
+ partcode: this.form.partcode, // 浜у搧缂栫爜
+ ordertype: this.form.ordertype, // ordertype
+ sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
+ partname: this.form.partname, // 浜у搧鍚嶇О
+ partspec: this.form.partspec, // 浜у搧瑙勬牸
+ creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ createdate: this.form.createdate ? handleDatetime(this.form.createdate) : '' // 鍒涘缓鏃堕棿
+ }
+
+ const { data: res } = await MesOrderExcelSearch(data)
+ window.location.href = res
+ },
async getCustomerPermissions() {
const { data: res } = await CustomerPermissions()
this.customerArr = res
@@ -2481,6 +2511,7 @@
this.form.sourceorder = ''
this.form.ordertype = ''
this.form.createdate = ''
+ this.form.saleordercode = ''
this.getMesOrderSearch()
},
// 鏂板鎸夐挳
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index 56bcd20..8706181 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.vue
@@ -2416,6 +2416,7 @@
this.form.sourceorder = ''
this.form.ordertype = ''
this.form.createdate = ''
+ this.form.saleordercode = ''
this.getMesOrderSearch()
},
// 鏂板鎸夐挳
--
Gitblit v1.9.3