From e8b239efa63361a8984810bf9b4047981b98050c Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期三, 16 八月 2023 17:17:18 +0800
Subject: [PATCH] 8.16提交 原材料报检 角色管理
---
src/views/laboratory/measure/index.vue | 155 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 38 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 7e72abe..f7efa18 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -63,31 +63,31 @@
min-width="10%"
/>
<el-table-column
- prop="hello"
+ prop="equipment_code"
label="浠櫒璁惧缂栧彿"
min-width="10%"
/>
<el-table-column
- prop="entrust_coding"
+ prop="equipment_name"
label="浠櫒璁惧鍚嶇О"
min-width="10%"
/>
<el-table-column
- prop="entrusted"
+ prop="measure_range"
label="娴嬮噺鑼冨洿"
min-width="15%"
/>
<el-table-column
- prop="samples_number"
+ prop="measurecycle"
label="璁￠噺鍛ㄦ湡"
min-width="6%"
/>
<el-table-column
- prop="inspection_status"
+ prop="mesureresult"
label="璁￠噺缁撴灉"
min-width="6%">
<template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 1">
+ <div v-if="scope.row.mesureresult === 1">
<span style="color: green;">姝ｅ父</span>
</div>
<div v-else>
@@ -96,32 +96,32 @@
</template>
</el-table-column>
<el-table-column
- prop="specifications_models"
+ prop="date"
label="璁￠噺鏃ユ湡"
min-width="12%"
/>
<el-table-column
- prop="dateSurvey"
+ prop="term_validity"
label="璁￠噺鏈夋晥鏈�"
min-width="8%"
/>
<el-table-column
- prop="completionDeadline"
+ prop="head"
label="璐熻矗浜�"
min-width="6%"
/>
<el-table-column
- prop="contacts"
+ prop="create_time"
label="鍒涘缓鏃ユ湡"
min-width="8%"
/>
<el-table-column
- prop="inspectionTime"
+ prop="create_person"
label="鍒涘缓浜�"
min-width="8%"
/>
<el-table-column
- prop="inspectionTime"
+ prop="measure_code"
label="璁￠噺缂栧彿"
min-width="8%"
/>
@@ -136,7 +136,7 @@
</el-table-column>
</el-table>
<el-table
- v-if="this.radioValue === 1"
+ v-show="this.radioValue === 1"
:max-height="800"
:cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
@@ -148,31 +148,31 @@
min-width="10%"
/>
<el-table-column
- prop="hello"
+ prop="measure_number"
label="璁￠噺鍗曞彿"
min-width="10%"
/>
<el-table-column
- prop="entrust_coding"
+ prop="equipment_code"
label="璁惧缂栧彿"
min-width="10%"
/>
<el-table-column
- prop="entrusted"
+ prop="equipment_name"
label="璁惧鍚嶇О"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="scheduled_date"
+ label="璁″垝鏃ユ湡"
min-width="15%"
/>
<el-table-column
- prop="samples_number"
- label="璁″垝鏃ユ湡"
- min-width="6%"
- />
- <el-table-column
- prop="inspection_status"
+ prop="measure_state"
label="璁￠噺鐘舵��"
min-width="6%">
<template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 1">
+ <div v-if="scope.row.measure_state === 1">
<span style="color: green;">宸插畬鎴�</span>
</div>
<div v-else>
@@ -181,22 +181,22 @@
</template>
</el-table-column>
<el-table-column
- prop="specifications_models"
+ prop="head"
label="璁￠噺璐熻矗浜�"
min-width="12%"
/>
<el-table-column
- prop="dateSurvey"
+ prop="department"
label="璁￠噺鍗曚綅"
min-width="8%"
/>
<el-table-column
- prop="completionDeadline"
+ prop="creater"
label="鍒涘缓浜�"
min-width="6%"
/>
<el-table-column
- prop="contacts"
+ prop="create_date"
label="鍒涘缓鏃ユ湡"
min-width="8%"
/>
@@ -211,7 +211,7 @@
</el-table-column>
</el-table>
<!-- 鍒嗛〉鍣� -->
- <div>
+ <div class="pagination">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -246,8 +246,74 @@
value: 1 ,
label: '璁￠噺璁″垝'
}],
- measureLedgerTable: [],
- measurePlanTable: [],
+ measureLedgerTable: [{
+ equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
+ equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
+ measure_range: '---', // 娴嬮噺鑼冨洿
+ measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
+ mesureresult: 1, // 璁￠噺缁撴灉
+ date: '2022-07-20', // 璁￠噺鏃ユ湡
+ term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
+ head: '榛勫皬鏄�' , // 璐熻矗浜�
+ create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
+ create_person: '榛勫皬鏄�', // 鍒涘缓浜�
+ measure_code: 'QCX20230720' // 璁￠噺缂栧彿
+ },{
+ equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
+ equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
+ measure_range: '---', // 娴嬮噺鑼冨洿
+ measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
+ mesureresult: 0, // 璁￠噺缁撴灉
+ date: '2022-07-20', // 璁￠噺鏃ユ湡
+ term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
+ head: '榛勫皬鏄�' , // 璐熻矗浜�
+ create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
+ create_person: '榛勫皬鏄�', // 鍒涘缓浜�
+ measure_code: 'QCX20230720' // 璁￠噺缂栧彿
+ },{
+ equipment_code: 'JSTC-W1-00001', // 浠櫒璁惧缂栧彿
+ equipment_name: '鏁板瓧鐢垫ˉ', // 浠櫒璁惧鍚嶇О
+ measure_range: '---', // 娴嬮噺鑼冨洿
+ measurecycle: '12鏈�', // 璁￠噺鍛ㄦ湡
+ mesureresult: 1, // 璁￠噺缁撴灉
+ date: '2022-07-20', // 璁￠噺鏃ユ湡
+ term_validity: '2023-07-20', // 璁￠噺鏈夋晥鏈�
+ head: '榛勫皬鏄�' , // 璐熻矗浜�
+ create_time: '2023-07-20', // 鍒涘缓鏃ユ湡
+ create_person: '榛勫皬鏄�', // 鍒涘缓浜�
+ measure_code: 'QCX20230720' // 璁￠噺缂栧彿
+ }],
+ measurePlanTable: [{
+ measure_number: 'QC568946512', // 璁￠噺鍗曞彿
+ equipment_code: '010101', // 璁惧缂栧彿
+ equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
+ scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
+ measure_state: 1, // 璁￠噺鐘舵��
+ head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
+ department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
+ creater: '榛勫皬鏄�', // 鍒涘缓浜�
+ create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
+ },{
+ measure_number: 'QC568946512', // 璁￠噺鍗曞彿
+ equipment_code: '010101', // 璁惧缂栧彿
+ equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
+ scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
+ measure_state: 1, // 璁￠噺鐘舵��
+ head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
+ department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
+ creater: '榛勫皬鏄�', // 鍒涘缓浜�
+ create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
+ },{
+ measure_number: 'QC568946512', // 璁￠噺鍗曞彿
+ equipment_code: '010101', // 璁惧缂栧彿
+ equipment_name: '鎷夊姏鏈�', // 璁惧鍚嶇О
+ scheduled_date: '2023-04-08 ~ 2023-08-08', // 璁″垝鏃ユ湡
+ measure_state: 0, // 璁￠噺鐘舵��
+ head: '榛勫皬鏄�', // 璁￠噺璐熻矗浜�
+ department: '鍦扮嚎妫�娴�', // 璁￠噺鍗曚綅
+ creater: '榛勫皬鏄�', // 鍒涘缓浜�
+ create_date: '2023-07-20', // 鍒涘缓鏃ユ湡
+ }],
currentPage: 1,
pageSize: 5,
total: 20
@@ -255,14 +321,27 @@
},
created(){
this.getStandingPageList()
+ // this.getPlanPageList()
},
methods: {
+ // 璇锋眰璁￠噺鍙拌处鍒嗛〉鍒楄〃
async getStandingPageList(){
const res = await getStandingPageList({pageNo:this.currentPage , pageSize:this.pageSize })
- this.measureLedgerTable = res.data
- console.log(this.measureLedgerTable)
+ // this.measureLedgerTable = res.data
+ // console.log(this.measureLedgerTable)
+ },
+ // 璇锋眰璁￠噺璁″垝鍒嗛〉鍒楄〃
+ async getPlanPageList(){
+ const res = await getPlanPageList({})
+ },
+ handleSizeChange(val) {
+ console.log(`褰撳墠姣忛〉${val}鏉℃暟鎹甡)
+ this.pageSize = val
+ },
+ handleCurrentChange(val) {
+ console.log(`褰撳墠鏄${val}椤礰)
+ this.currentPage = val
}
-
}
}
</script>
@@ -308,11 +387,11 @@
.el-table {
flex: 1;
}
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
+ }
+ .pagination{
+ display:flex;
+ justify-content:end;
+ margin-top: 20px
}
}
--
Gitblit v1.9.3