From 6afada5b2288dcad1edb2b7d6d05c6fac1195f8e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 17:29:05 +0800
Subject: [PATCH] modified: src/api/quality/finishedProduct.js modified: src/api/quality/unqualifiedprocess.js modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/processconfiguration/index.vue
---
src/api/quality/unqualifiedprocess.js | 9 ++++
src/views/quality/processconfiguration/index.vue | 71 +++++------------------------------
src/views/quality/finishedProductInspection/index.vue | 14 ++++++
src/api/quality/finishedProduct.js | 9 ++++
4 files changed, 42 insertions(+), 61 deletions(-)
diff --git a/src/api/quality/finishedProduct.js b/src/api/quality/finishedProduct.js
index 0badd57..cb8ce52 100644
--- a/src/api/quality/finishedProduct.js
+++ b/src/api/quality/finishedProduct.js
@@ -60,4 +60,13 @@
method: 'post',
params: obj
})
+}
+
+export function exportExaminationProducts(query) {
+ return request({
+ url: '/mes/qualityFinishedInspect/exportExcel',
+ method: 'get',
+ responseType : 'blob',
+ params: query
+ })
}
\ No newline at end of file
diff --git a/src/api/quality/unqualifiedprocess.js b/src/api/quality/unqualifiedprocess.js
index 729751c..ce160f0 100644
--- a/src/api/quality/unqualifiedprocess.js
+++ b/src/api/quality/unqualifiedprocess.js
@@ -199,3 +199,12 @@
method: 'get'
})
}
+
+export function UnqualifiedDisposal(query) {
+ return request({
+ url: '/mes/qualityInspectUnaccepted/export',
+ method: 'get',
+ responseType : 'blob',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 674a317..3647ffc 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -20,7 +20,8 @@
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
import finishedProductInspectionAdd from './finishedProduct-form'
- import { page,deletePro } from '@/api/quality/finishedProduct'
+ import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
+ import { transform } from '@/util/fileTransform'
export default {
components: {
finishedProductInspectionAdd,
@@ -151,6 +152,8 @@
},
{
text: '瀵煎嚭',
+ type: 'primary',
+ fun: this.exportExcel
}
],
operator: [{
@@ -174,6 +177,15 @@
},
created() { },
methods: {
+ exportExcel(){
+ console.log("============");
+ let queryParam=this.$refs.finishedProduct.getQueryParam();
+ delete queryParam.criteria
+ console.log(queryParam);
+ exportExaminationProducts(queryParam).then((res)=>{
+ transform(res)
+ })
+ },
deleteHandle(row){
console.log(row.id)
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index b5b64a4..906ad00 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -74,11 +74,11 @@
</template>
<script>
-import { UnqualifiedList,pullInsUnapi,AuditSuggestion
-} from '@/api/quality/unqualifiedprocess'
+import { UnqualifiedList,pullInsUnapi,AuditSuggestion,UnqualifiedDisposal} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
// import { remote } from '@/api/admin/dict'
+import { transform } from '@/util/fileTransform'
import ttable from '@/views/common/ztt-table.vue'
export default {
data() {
@@ -259,43 +259,13 @@
// return this.processModeOptions
// }
// },
- //鍙戣捣浜�
- // {
- // minWidth: '200',
- // prop: 'originator',
- // label: '鍙戣捣浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
- // 瀹℃牳浜�
- // {
- // minWidth: '140',
- // prop: 'examiner',
- // label: '瀹℃牳浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
- // 澶勭悊浜�
- // {
- // minWidth: '120',
- // prop: 'handler',
- // label: '澶勭悊浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
],
toolbar: [
{
text: '瀵煎嚭',
type: 'primary',
- fun: this.handleExcel
+ fun: this.exportExcel
},
],
operator: [
@@ -342,33 +312,14 @@
// this.getType()
},
methods: {
- async costPlannedAmountChange(value){
- this.resultData= value
- },
- handleExcel() {
- console.log(this.resultData);
- console.log(this.table.column);
- let arr = this.table.column.filter(item => item.isTrue == true).map(item => {
- return{
- prop:item.prop,
- label:item.label
- }
- })
- let opt = {
- title: '鏂囨。鏍囬',
- column: [{
- label:'涓嶅悎鏍煎缃�',
- prop:'header',
- children:arr
- }],
- data: this.resultData
- }
- this.$Export.excel({
- title: opt.title,
- columns: opt.column,
- data: opt.data
- });
- },
+ exportExcel(){
+ let queryParam=this.$refs.processconfiguration.getQueryParam();
+ delete queryParam.criteria
+ console.log(queryParam);
+ UnqualifiedDisposal(queryParam).then((res)=>{
+ transform(res)
+ })
+ },
//瀹℃牳缁撴灉
AuditResult(row){
this.UserId = row.id
--
Gitblit v1.9.3