From ccfd5dc264d07471d831d2287ff03f293c295981 Mon Sep 17 00:00:00 2001
From: Goldennfish <1981343953@qq.com>
Date: 星期二, 25 七月 2023 14:22:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-front-end
---
src/views/rawMaterials/reportForInspection/index.vue | 79 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/src/views/rawMaterials/reportForInspection/index.vue b/src/views/rawMaterials/reportForInspection/index.vue
index 62ec587..720e8d5 100644
--- a/src/views/rawMaterials/reportForInspection/index.vue
+++ b/src/views/rawMaterials/reportForInspection/index.vue
@@ -60,43 +60,43 @@
style="width: 100%"
>
<el-table-column
- prop="applicationOrdernumber"
- label="鐢宠鍗曞彿"
- min-width="200"
- />
- <el-table-column
- prop="typeofInspection"
+ prop="type"
label="妫�楠岀被鍨�"
min-width="200"
/>
<el-table-column
- prop="objectofInspection"
- label="妫�楠屽璞�"
+ prop="createTime"
+ label="鍒涘缓鏃堕棿"
min-width="200"
/>
<el-table-column
- prop="palceofObject"
- label="瀵硅薄浣嶇疆"
- min-width="200"
- />
- <el-table-column
- prop="name"
- label="瀵硅薄鍚嶇О"
- min-width="200"
- />
- <el-table-column
- prop="date"
- label="鐧昏鏃ユ湡"
+ prop="userName"
+ label="鐢宠浜�"
min-width="200"
/>
<el-table-column
prop="registrant"
- label="鐧昏浜�"
+ label="妫�楠屼汉"
min-width="200"
/>
<el-table-column
- prop="applicationTime"
- label="鐢宠鏃堕棿"
+ prop="inspectionStatus"
+ label="妫�楠岀姸鎬�"
+ min-width="200"
+ />
+ <el-table-column
+ prop="qualifiedState"
+ label="鍚堟牸鐘舵��"
+ min-width="200"
+ />
+ <el-table-column
+ prop="inspectStartTime"
+ label="妫�楠屽紑濮嬫椂闂�"
+ min-width="200"
+ />
+ <el-table-column
+ prop="inspectEndTime"
+ label="妫�楠岀粨鏉熸椂闂�"
min-width="200"
/>
<el-table-column
@@ -117,7 +117,7 @@
:page-sizes="[100, 200, 300, 400]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="this.inspectionTable.length"
+ :total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -152,6 +152,7 @@
</template>
<script>
+import { getInspectionList } from '@/api/rawMaterials/reportForInspection'
export default {
data() {
return {
@@ -160,18 +161,22 @@
keyword: ''
},
inspectionTable: [{
- applicationOrdernumber: 'QC22-09155',
- typeofInspection: '閲囪喘鍏ュ簱',
- objectofInspection: 'MI202207032-1',
- palceofObject: '---',
- name: '杩欐槸涓�鏉℃祴璇曟暟鎹�',
- date: '2022-09-23',
- registrant: '绠＄悊鍛�',
- applicationTime: '111'
+ 'id': '1681215775833042945',
+ 'type': 0,
+ 'inspectionStatus': 0,
+ 'qualifiedState': null,
+ 'state': 1,
+ 'createTime': '2023-07-18 16:14:11',
+ 'updateTime': null,
+ 'version': null,
+ 'userName': '娴嬭瘯浜哄憳',
+ 'inspectUserId': null,
+ 'inspectStartTime': null,
+ 'inspectEndTime': null
}],
currentPage: 1,
total: 20, // 鎬绘潯鏁�
- pageSize: 100, // 姣忛〉鐨勬暟鎹潯鏁�
+ pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
type: 0
@@ -207,10 +212,18 @@
// // 鐢变簬浼氭覆鏌撳悓鏍风殑 Foo 缁勪欢锛屽洜姝ょ粍浠跺疄渚嬩細琚鐢ㄣ�傝�岃繖涓挬瀛愬氨浼氬湪杩欎釜鎯呭喌涓嬭璋冪敤銆�
// // 鍙互璁块棶缁勪欢瀹炰緥 `this`
// },
+ created() {
+ this.getInspectionTableData()
+ },
updated() {
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
+ async getInspectionTableData() {
+ const res = await getInspectionList({ pageSize: this.currentPage, countSize: this.pageSize })
+ // this.inspectionTable = data
+ console.log(res)
+ },
goToForInspectionDetail() {
this.$router.push('/rawMaterials/reportForInspection/forInspectionDetail')
},
--
Gitblit v1.9.3