From e132d7d87ff834eb231bd39c82c3be22bae2d80b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 09:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 77 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 49 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 3b08605..e6f5023 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -393,7 +393,7 @@
style="width: 100%; margin-bottom: 20px"
row-key="name"
border
-
+
default-expand-all
ref="multipleTable"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -449,7 +449,7 @@
<el-button @click="Standardframe = false">鍙� 娑�</el-button>
<el-button type="primary" @click="Standardframe = false">纭� 瀹�</el-button>
</span>
-
+
</el-dialog>
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
@@ -470,7 +470,7 @@
<el-table-column
type="selection"
min-width="10%"
- />
+ />
<el-table-column
type="index"
label="搴忓彿"
@@ -695,16 +695,7 @@
},
methods: {
async handleClick(row){
- // console.log(item);
- // const res = await ddd({goodId:id})
- // this.$message({
- // message: '鎭枩浣狅紝杩欐槸涓�鏉℃垚鍔熸秷鎭�',
- // type: 'success'
- // });
-
- // console.log(res);
this.inspectionTable = row;
- console.log(row.id);
this.id = row.id
this.$router.push({name:'Viewdetails',query: {id:row.id}});
this.selectInspectsList()
@@ -723,7 +714,7 @@
async getCommisionList() {
const res = await getCommisionList({pageNo:1,pageSize:10 })
console.log(res);
- this.commisionTable = res.data.row
+ this.commisionTable = res.data
},
//鍘熸潗鏂�
async selecYANcailisotAllAPI() {
@@ -763,7 +754,6 @@
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
})
- console.log('data:',data)
this.inspectionTable = data
if(this.searchData.type !== ''){
if(this.searchData.state !== ''){
@@ -807,40 +797,29 @@
this.rawmaterialVisible = false
},
handleRadioChange(){
- setTimeout(() => {
- if(this.type === 0){
- // 鍘熸潗鏂欐姤妫�
- this.rawmaterialVisible = true
- YANcailiso({pageNo:1,pageSize:10}).then(res=>{
- // var data = res.data
- // data.forEach((item)=>{
- // var checkdate = []
- // checkdate.push(item['createTime'])
- // checkdate.push(item['updateTime'])
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // })
- this.rawMaterialTable = res.data.row
- })
-
- // this.infoForm = res.data
- // this.$router.push({ name: 'ReportForInspection' });
- }else if(this.type === 1){
- this.commisionVisible = true
- getCommisionList({pageNo:1,pageSize:10}).then(res=>{
- // console.log(res);
- this.commisionTable = res.data.row
- })
- // var data = res.data
- // data.forEach((item)=>{
- // var checkdate = []
- // checkdate.push(item['startTime'])
- // checkdate.push(item['endTime'])
- // item['checkdate_'] = item['startTime'] + '~' + item['endTime']
- // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- // })
-
- }
- }, 100);
+ setTimeout(()=>{
+ if(this.type === 0){
+ // 鍘熸潗鏂欐姤妫�
+ this.rawmaterialVisible = true
+ selectAll({type: this.type}).then(res=>{
+ var data = res.data
+ data.forEach((item)=>{
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ })
+ this.rawMaterialTable = res.data
+ })
+ // this.$router.push({ name: 'ReportForInspection' });
+ }else if(this.type === 1){
+ this.commisionVisible = true
+ getCnList({pageNo:1,pageSize:10}).then(res=>{
+ // consommisioole.log(res);
+ this.commisionTable = res.data.row
+ })
+ }
+ },100)
},
// 鏂板妫�楠�
async addInspection(){
@@ -913,7 +892,7 @@
this.BANben = res.data.row
console.log(this.BANben);
})
-
+
},
handleSelectionChange_0(val){
this.select_1 = []
--
Gitblit v1.9.3