From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/processconfiguration/index.vue | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 2f21df8..2802435 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -9,6 +9,7 @@
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
+ @queryParam="getQueryParam($event)"
ref="processconfiguration"
>
<template #toolbar></template>
@@ -42,19 +43,28 @@
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
<el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
<el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</el-radio-group>
</div>
<div v-if="type === '杩囩▼妫�楠�'">
<el-radio-group v-model="checkList">
- <el-radio label="杩斾慨">杩斾慨</el-radio>
- <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-row>
+ <div style="padding: 20px;">
+ <el-radio label="杩斾慨">杩斾慨</el-radio>
+ <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ </div>
+ <div style="padding: 20px;">
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </div>
+ </el-row>
</el-radio-group>
</div>
</el-form>
<span slot="footer" >
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="WayCancel()">鍙� 娑�</el-button>
<el-button type="primary" @click="WaySure()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -63,15 +73,21 @@
</template>
<script>
-import { UnqualifiedList,pullInsUnapi,AuditSuggestion
+import {
+ UnqualifiedList,
+ pullInsUnapi,
+ AuditSuggestion,
+ exportData
} 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() {
return {
+ queryParam: {},
checkList: "",
// WayIdea:'',
UserId:{},
@@ -247,44 +263,14 @@
// 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.addOrUpdateHandle
- },
+ // {
+ // text: '瀵煎嚭',
+ // type: 'primary',
+ // fun: this.handleExport
+ // },
],
operator: [
// {
@@ -313,7 +299,7 @@
minWidth: 100
}
},
- materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'}],
+ materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'浜у搧妫�楠�',value:'浜у搧妫�楠�'},{label:'鍖呰妫�楠�',value:'鍖呰妫�楠�'}],
StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
@@ -330,12 +316,44 @@
// this.getType()
},
methods: {
+ getQueryParam(data){
+ this.queryParam = data
+ },
+ handleExport(){
+ exportData(this.queryParam).then(res=>{
+ this.downloadFun(res)
+ }).catch(error=>{
+ console.log(error);
+ })
+ },
+ downloadFun(result){
+ if(result == null || result == undefined){
+ return;
+ }
+ var nameList = result.headers['content-disposition'];
+ nameList = decodeURI(nameList);
+ var fileName = nameList.split('=')[1];
+ const blob = new Blob([result.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+ const downloadElement = document.createElement('a') // 鏂板缓涓�涓狣OM鑺傜偣
+ const href = window.URL.createObjectURL(blob) // 鍒涘缓涓嬭浇鐨勯摼鎺�
+ downloadElement.href = href
+ downloadElement.download = fileName // 涓嬭浇鍚庢枃浠跺悕
+ document.body.appendChild(downloadElement) // 灏嗘柊澧炵殑鑺傜偣鎸傝浇鍒伴〉闈笂
+ downloadElement.click() // 鐐瑰嚮涓嬭浇
+ document.body.removeChild(downloadElement) // 涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(href)
+ },
//瀹℃牳缁撴灉
AuditResult(row){
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
+ },
+ WayCancel(){
+ this.dialogVisible = false
+ this.checkList = null
+ this.WayIdea = null
},
WaySure(){
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
@@ -348,9 +366,7 @@
},
//鎻愪氦瀹℃牳
Submitreview(row){
- console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
- console.log(res);
this.$refs.processconfiguration.refreshData()
})
},
--
Gitblit v1.9.3