From 2260184afb85c80eabce02da190f9f07ee660ab3 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期二, 08 八月 2023 14:35:57 +0800
Subject: [PATCH] 委托检验、原材料报检和检验申请页面

---
 src/views/inspectionManagement/commissionInspection/index.vue |  104 +++++++++++++++++++++++++++-------------------------
 1 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index f34234e..be593cd 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -62,60 +62,72 @@
                 style="width: 100%"
               >
                 <el-table-column
+                  type="selection"
+                  min-width="10%"
+                />
+                <el-table-column
                   type="index"
                   label="搴忓彿"
                   min-width="10%"
                 />
                 <el-table-column
-                  prop="commisioncode"
+                  prop="entrust_coding"
                   label="濮旀墭缂栧彿"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="department"
+                  prop="entrusted"
                   label="濮旀墭鍗曚綅"
-                  min-width="10%"
+                  min-width="12%"
                 />
                 <el-table-column
-                  prop="samplecode"
+                  prop="samples_number"
                   label="鏍峰搧缂栧彿"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="samplename"
+                  prop="sample_name"
                   label="鏍峰搧鍚嶇О"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="modelandspecification"
+                  prop="specifications_models"
                   label="瑙勬牸鍨嬪彿"
-                  min-width="10%"
+                  min-width="12%"
                 />
                 <el-table-column
-                  prop="arrivetime"
+                  prop="dateSurvey"
                   label="閫佽揪鏃堕棿"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="deadline"
+                  prop="completionDeadline"
                   label="瀹屾垚鏈熼檺"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="person"
+                  prop="contacts"
                   label="濮旀墭缂栧埗浜�"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="checkdate"
+                  prop="inspectionTime"
                   label="妫�楠屾棩鏈�"
                   min-width="8%"
                 />
                 <el-table-column
-                  prop="state"
+                  prop="inspection_status"
                   label="鐘舵��"
-                  min-width="8%"
-                />
+                  min-width="8%">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.inspection_status === 1">
+                      <span style="color: green;">宸叉娴�</span>
+                    </div>
+                    <div v-else>
+                      <span style="color: red;">寰呮娴�</span>
+                    </div>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   label="鎿嶄綔"
                   min-width="8%"
@@ -131,10 +143,10 @@
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage"
-                  :page-sizes="[100, 200, 300, 400]"
-                  :page-size="100"
+                  :page-sizes="[5, 10, 20]"
+                  :page-size="pageSize"
                   layout="total, sizes, prev, pager, next, jumper"
-                  :total="400">
+                  :total="total">
                 </el-pagination>
               </div>
             </div>
@@ -148,6 +160,7 @@
 </template>
 
 <script>
+import { getCommisionList } from '@/api/inspection/commisioninspection'
 export default {
   data() {
     return {
@@ -169,42 +182,26 @@
       }],
       radioValue: '',
       commisionTable: [{
-        commisioncode: 'GW31478631',
-        department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
-        samplecode: 'BP214274',
-        samplename: '缁濈紭鏉�',
-        modelandspecification: 'JLHA/G1A-185/30-26/7',
-        arrivetime: '2023-08-01',
-        deadline: '2023-08-05',
-        person: '榛勫皬鏄�',
-        checkdate: '2023-08-02',
-        state: '宸叉娴�'
-      }, {
-        commisioncode: 'GW31478631',
-        department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
-        samplecode: 'BP214274',
-        samplename: '缁濈紭鏉�',
-        modelandspecification: 'JLHA/G1A-185/30-26/7',
-        arrivetime: '2023-08-01',
-        deadline: '2023-08-05',
-        person: '榛勫皬鏄�',
-        checkdate: '2023-08-02',
-        state: '宸叉娴�'
-      }, {
-        commisioncode: 'GW31478631',
-        department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
-        samplecode: 'BP214274',
-        samplename: '缁濈紭鏉�',
-        modelandspecification: 'JLHA/G1A-185/30-26/7',
-        arrivetime: '2023-08-01',
-        deadline: '2023-08-05',
-        person: '榛勫皬zhi',
-        checkdate: '2023-08-02',
-        state: '宸叉娴�'
+        specifications_models: "GGXH-AAAAA",
+        inspectionTime: "2023-08-03",
+        id: 2,
+        samples_number: 0,
+        dateSurvey: "2023-08-03",
+        entrusted: "闃块噷宸村反",
+        completionDeadline: "2023-08-03",
+        contacts: "灏忛粦",
+        entrust_coding: "SL20230803000003",
+        sample_name: "鍙戝姩鏈�",
+        inspection_status: 1
       }],
-      currentPage: 0,
+      currentPage: 1,
+      pageSize: 5,
+      total: 100,
       showDetail: false
     }
+  },
+  created() {
+    this.getCommisionList()
   },
   updated() {
     if (this.$router.currentRoute.name === 'AddCommision') {
@@ -213,6 +210,12 @@
     }
   },
   methods: {
+    async getCommisionList(){
+      const res = await getCommisionList({pageNo:this.currentPage , pageSize:this.pageSize})
+      this.commisionTable = res.data.row
+      // this.total = res.data.row.length
+      console.log(this.commisionTable)
+    },
     // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
     handleSizeChange(val) {
       console.log(`姣忛〉 ${val} 鏉)
@@ -223,6 +226,7 @@
     handleCurrentChange(val) {
       console.log(`褰撳墠椤�: ${val}`)
       this.currentPage = val
+      this.commisionTable = getCommisionList({pageNo:this.currentPage , pageSize:this.pageSize})
     },
     goToaddCommision() {
       this.$router.push('/inspectionManagement/commissionInspection/addCommision')

--
Gitblit v1.9.3