From 6b003c3d7ef58ef2c7a24b7668c74fd8f16f37d6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 06 十一月 2023 17:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/api/quality/unqualifiedprocess.js | 9 ++++
src/views/quality/processconfiguration/index.vue | 39 ++++---------------
src/views/quality/finishedProductInspection/index.vue | 14 ++++++
src/api/quality/finishedProduct.js | 9 ++++
4 files changed, 39 insertions(+), 32 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 d40ab95..e3702a0 100644
--- a/src/api/quality/unqualifiedprocess.js
+++ b/src/api/quality/unqualifiedprocess.js
@@ -208,3 +208,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 6bc79bd..e608a41 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -64,7 +64,7 @@
</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>
@@ -82,6 +82,7 @@
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() {
@@ -262,36 +263,6 @@
// 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: [
@@ -378,6 +349,12 @@
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(
--
Gitblit v1.9.3