From 314d6fc39ede1b94cdab512adb9dc806471ef8a4 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期二, 08 八月 2023 17:44:14 +0800
Subject: [PATCH] 委托检验查询功能
---
src/utils/request.js | 1
src/api/inspection/commisioninspection.js | 8 ++
src/views/standardLibrary/index.vue | 10 +-
src/views/inspectionManagement/commissionInspection/index.vue | 123 +++++++++++++++++++++++++++++++++--------
4 files changed, 113 insertions(+), 29 deletions(-)
diff --git a/src/api/inspection/commisioninspection.js b/src/api/inspection/commisioninspection.js
index 07cb024..2564e17 100644
--- a/src/api/inspection/commisioninspection.js
+++ b/src/api/inspection/commisioninspection.js
@@ -7,4 +7,12 @@
method: 'get',
params
})
+}
+
+export function getlink(params){
+ return request({
+ url:'/link-basic-table/link',
+ method:'get',
+ params
+ })
}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index dacba5f..2a4647d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,6 +21,7 @@
// please modify it according to the actual situation
config.headers['X-Token'] = getToken()
}
+ console.log('config' ,config)
return config
},
error => {
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index be593cd..a34af7c 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>
@@ -73,7 +73,7 @@
<el-table-column
prop="entrust_coding"
label="濮旀墭缂栧彿"
- min-width="8%"
+ min-width="10%"
/>
<el-table-column
prop="entrusted"
@@ -160,7 +160,7 @@
</template>
<script>
-import { getCommisionList } from '@/api/inspection/commisioninspection'
+import { getCommisionList, getlink } from '@/api/inspection/commisioninspection'
export default {
data() {
return {
@@ -173,14 +173,8 @@
options: [{
value: '1',
label: '閮ㄩ棬1'
- }, {
- value: '2',
- label: '閮ㄩ棬2'
- }, {
- value: '3',
- label: '閮ㄩ棬3'
}],
- radioValue: '',
+ radioValue: 0,
commisionTable: [{
specifications_models: "GGXH-AAAAA",
inspectionTime: "2023-08-03",
@@ -194,6 +188,20 @@
sample_name: "鍙戝姩鏈�",
inspection_status: 1
}],
+ conditionsOptions: [
+ {
+ label: '鍏ㄩ儴',
+ value: 0
+ },
+ {
+ label: '宸叉楠�',
+ value: 1
+ },
+ {
+ label: '寰呮楠�',
+ value: 2
+ }
+ ],
currentPage: 1,
pageSize: 5,
total: 100,
@@ -211,22 +219,89 @@
},
methods: {
async getCommisionList(){
- const res = await getCommisionList({pageNo:this.currentPage , pageSize:this.pageSize})
+ 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)
+ 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鏂规硶
+ if(this.radioValue === 0){
+ const res = await getCommisionList({
+ pageNo: this.currentPage,
+ pageSize: this.pageSize,
+ entrustCoding: this.searchData.code,
+ sampleName: this.searchData.name,
+ entrusted: this.searchData.department,
+ })
+ }else{
+ const 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
- this.commisionTable = getCommisionList({pageNo:this.currentPage , pageSize:this.pageSize})
+ 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')
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index a447d44..bd0a4b2 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -384,7 +384,7 @@
// height: 800px;
// }
.standard-library-main{
- width: 100%;
+ width: 100vh;
height: 100%;
// 椤甸潰涓績鍐呭鍖哄煙
.content-main{
@@ -398,12 +398,12 @@
background: #fff;
}
.library-bom{
- flex: 2;
- // width: 20%;
+ padding-right: 10px;
+ width: 40vh;
// height: 100%;
max-height: 100%;
margin-right: 12px;
- overflow-y: scroll;
+ // overflow-y: scroll;
.el-tree {
// margin-top: 12px;
::v-deep .el-tree-node__content{
@@ -453,7 +453,7 @@
}
.library-table{
// height: 100%;
- flex: 8;
+ width: 170vh;
max-height: 100%;
// flex: 8;
margin-left: 12px;
--
Gitblit v1.9.3