From e51a8bda1e15ad30654c5f90f5591f240a5ec3de Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 22 八月 2023 18:02:09 +0800
Subject: [PATCH] modified: .env.development new file: src/api/home.js new file: src/assets/404_images/bg.png modified: src/main.js modified: src/views/home/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/inspectionManagement/commissionInspection/index.vue | 222 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 151 insertions(+), 71 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index f34234e..0cb885e 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -31,8 +31,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary">鏌ヨ</el-button>
- <el-button type="primary" plain>閲嶇疆</el-button>
+ <el-button type="primary" @click="search">鏌ヨ</el-button>
+ <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-form>
@@ -42,11 +42,11 @@
<div class="library-table">
<div class="table-header">
<div class="search-bar">
- <el-radio-group v-model="radioValue">
- <el-radio-button label="鍏ㄩ儴" />
- <el-radio-button label="寰呮楠�" />
- <el-radio-button label="宸叉楠�" />
- </el-radio-group>
+ <el-radio-group v-model="radioValue" @change="radioclick">
+ <el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
+ {{ item.label }}
+ </el-radio-button>
+ </el-radio-group>
</div>
<div class="generateInsp">
<el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
@@ -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"
- label="濮旀墭鍗曚綅"
min-width="10%"
/>
<el-table-column
- prop="samplecode"
+ prop="entrusted"
+ label="濮旀墭鍗曚綅"
+ min-width="12%"
+ />
+ <el-table-column
+ 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 {
@@ -160,51 +173,43 @@
options: [{
value: '1',
label: '閮ㄩ棬1'
- }, {
- value: '2',
- label: '閮ㄩ棬2'
- }, {
- value: '3',
- label: '閮ㄩ棬3'
}],
- radioValue: '',
+ radioValue: 0,
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,
+ conditionsOptions: [
+ {
+ label: '鍏ㄩ儴',
+ value: 0
+ },
+ {
+ label: '宸叉楠�',
+ value: 1
+ },
+ {
+ label: '寰呮楠�',
+ value: 2
+ }
+ ],
+ currentPage: 1,
+ pageSize: 5,
+ total: 100,
showDetail: false
}
+ },
+ created() {
+ this.getCommisionList()
},
updated() {
if (this.$router.currentRoute.name === 'AddCommision') {
@@ -213,16 +218,91 @@
}
},
methods: {
+ async getCommisionList(){
+ const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize})
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ // console.log(res)
+ // 鑾峰彇鎵�鏈夌殑濮旀墭鍗曚綅鍚嶇О
+ const allDepartmentNames = [...new Set(this.commisionTable.map(item => item.entrusted))]
+ // 灏哸llDepartmentNames杞崲涓簅ptions闇�瑕佺殑鏍煎紡
+ this.options = allDepartmentNames.map(name => ({ value: name, label: name }))
+
+ },
+ // 鏌ヨ鏂规硶
+ async search() {
+ // 灏嗘悳绱㈡潯浠朵綔涓哄弬鏁颁紶閫掔粰getCommisionList鏂规硶
+ let res
+ if(this.radioValue === 0){
+ res = await getCommisionList({
+ pageNo: this.currentPage,
+ pageSize: this.pageSize,
+ entrustCoding: this.searchData.code,
+ sampleName: this.searchData.name,
+ entrusted: this.searchData.department,
+ })
+ }else{
+ res = await getCommisionList({
+ pageNo: this.currentPage,
+ pageSize: this.pageSize,
+ entrustCoding: this.searchData.code,
+ sampleName: this.searchData.name,
+ entrusted: this.searchData.department,
+ inspectionStatus: this.radioValue
+ })
+ }
+ // console.log(res)
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ },
+
+ // 閲嶇疆鏂规硶
+ reset() {
+ // 閲嶇疆鎼滅储鏉′欢
+ this.searchData.code = ''
+ this.searchData.name = ''
+ this.searchData.department = ''
+ this.radioValue = 0
+ // 閲嶆柊鑾峰彇鏁版嵁
+ this.getCommisionList()
+ },
+ async radioclick(){
+ // 澶勭悊鐐瑰嚮radio鐨勬椂闂�
+ console.log('radioValue',this.radioValue)
+ if(this.radioValue === 0){
+ this.getCommisionList()
+ }else{
+ const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
+ // console.log(res)
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ }
+
+ },
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
+ async handleSizeChange(val) {
+ // console.log(`姣忛〉 ${val} 鏉)
this.currentPage = 1
this.pageSize = val
+ if(this.radioValue === 0){
+ this.getCommisionList()
+ }else{
+ const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ }
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
+ async handleCurrentChange(val) {
+ // console.log(`褰撳墠椤�: ${val}`)
this.currentPage = val
+ if(this.radioValue === 0){
+ this.getCommisionList()
+ }else{
+ const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
+ this.commisionTable = res.data.row
+ this.total = res.data.total
+ }
},
goToaddCommision() {
this.$router.push('/inspectionManagement/commissionInspection/addCommision')
--
Gitblit v1.9.3