From 480fd6b48efc83dc4754ea2d6211e5b0f3a97429 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期三, 08 十一月 2023 11:25:47 +0800
Subject: [PATCH] 仝亚平

---
 src/views/quality/finishedProductInspection/index.vue |  126 ++++++-----------------------------------
 1 files changed, 20 insertions(+), 106 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index e2cccb9..3647ffc 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -16,12 +16,12 @@
 	</div>
 </template>
 
-
 <script>
     import ttable from '@/views/common/ztt-table.vue'
     import * as fecha from 'element-ui/lib/utils/date'
-	import finishedProductInspectionAdd from './finishedProductInspectionAdd'
-    import { page,deletePro } from '@/api/quality/finishedProduct'
+	import finishedProductInspectionAdd from './finishedProduct-form'
+    import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
+    import { transform } from '@/util/fileTransform'
 	export default {
 		components: {
 			finishedProductInspectionAdd,
@@ -151,10 +151,9 @@
                         fun: this.addOrUpdateHandle
                     },
                     {
-                        text: '鍒犻櫎',
-                    },
-                    {
                         text: '瀵煎嚭',
+                        type: 'primary',
+                        fun: this.exportExcel
                     }
                     ],
                     operator: [{
@@ -174,68 +173,19 @@
                     minWidth: 100
                     },
                 },
-
-
-
-
-
-                
-				searchData: {
-					result: '',
-					material: '',
-				},
-				// 涓绘満宸ヤ笅鎷夋
-				usernameOptions: [],
-				inspectionTable: [],
-				rowInfo: {},
-				pageParams: {
-					countSize: 10, //姣忛〉鏁伴噺
-					pageSize: 1, // 褰撳墠椤电爜
-					total: 0
-				},
-				showAddPage: false,
-				showAdd: false,
-				showLook: false,
-				showUp: false,
-				showDetail: false,
-				addInspectionform: [{
-					number: '',
-					username: '',
-					projectname: '',
-					tracenumber: '',
-					code: '',
-					class: '',
-					specificationmodel: '',
-					unit: '',
-					quantity: '',
-					group: '',
-					worker: '',
-					machine: ''
-				}],
-				inspectionItems: [{
-					project: '甯冮殕杩�',
-					unit: '鍚�',
-					standardVal: '8219384314',
-					controlVal: '9823401',
-					detectionVal: '11111',
-					device: '',
-					conclusion: '鍚堟牸'
-				}],
-				inspectionResultForm: [{
-					id: '274024',
-					name: '111',
-					inspecter: '111',
-					conclusion: '',
-					operation: ''
-				}],
-				finishedInsInfo: {}
 			}
 		},
-		created() {
-			this.init()
-			// this.getInspectionTableData()
-		},
+		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('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
@@ -257,7 +207,10 @@
 			addOrUpdateHandle(row) {
 				this.$router.push({
 					name: 'finishedProductForm',
-					query: { id: row == null ? null : row.id }
+					query: { 
+                        id: row == null ? null : row.id,
+                        resultVal: row == null ? null : row.result 
+                    }
 				})
 			},
             formatResult(row, column, cellValue){
@@ -272,49 +225,10 @@
             formatDateTime(row, column, cellValue) {
                 return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
             },
-            handleSelectionChange(){
-
-            },
-			// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
-			handleSizeChange(val) {
-				console.log(`姣忛〉 ${val} 鏉)
-				this.currentPage = 1
-				this.pageSize = val
-			},
-			// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
-			handleCurrentChange(val) {
-				console.log(`褰撳墠椤�: ${val}`)
-				this.currentPage = val
-			},
-			handleAddNew() {
-				this.showAdd = true
-			},
+            handleSelectionChange(){ },
 			getData() {
 				this.$refs.finishedProduct.getDataList()
 			},
-			goToDetail(row) {
-				this.rowInfo = row
-				this.showLook = true
-			},
-			goUp(row) {
-				this.rowInfo = row
-				this.showUp = true
-			},
-			async init() {
-				// const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
-				// this.usernameOptions = data
-
-			},
-			comBackMain(val) {
-				this.showAdd = false
-				this.showLook = false
-				this.showUp = false
-				this.init()
-				// this.getInspectionTableData()
-				if (val) {
-					this.$parent.removeAllTab()
-				}
-			}
 		}
 
 	}

--
Gitblit v1.9.3