From 5fdfea676b2bc01e7d2066c32fb2453a9284b25e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 13:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/request.js | 1 -
src/views/basicData/index.vue | 2 +-
src/views/experiment/inspectionApplication/index.vue | 28 +++++++++++++---------------
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 2b822e9..13d605c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -48,7 +48,6 @@
// if the custom code is not 20000, it is judged as an error.
if (res.code !== 200) {
- console.log(res.message || 'Error')
// Message({
// message: res.message || 'Error',
// type: 'error',
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 4ee318a..952955e 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -136,7 +136,7 @@
<el-table
:data="tableData"
style="width: 100%; margin-bottom: 20px"
- row-key="name"
+ row-key="id"
border
height="calc(100vh - 250px)"
default-expand-all
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 1e9deeb..84990fe 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -180,16 +180,17 @@
title="鏂板妫�楠屽崟"
:visible.sync="checkTypeVisible"
width="50%"
+ top="10vh"
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>濮旀墭妫�楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>鎴愬搧妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>鍘熸潗鏂欐楠�</el-radio>
+ <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>濮旀墭妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
- <div v-if="type === 0 || type === ''">
- <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
+ <div v-if="type === 0">
+ <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
@@ -395,8 +396,6 @@
height="calc(100vh - 250px)"
default-expand-all
ref="multipleTable"
- @select="selectTr"
- @select-all="selectAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column type="selection" label="搴忓彿"> </el-table-column>
@@ -593,7 +592,6 @@
</template>
<template v-else>
<router-view />
-
</template>
</div>
</template>
@@ -647,7 +645,7 @@
amount: '',
checkdate: []
},
- infoForm:'',
+ infoForm:{},
commisionSelection:{
entrust_coding: '',
entrusted: '',
@@ -688,11 +686,12 @@
pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: '',
- Standardframe: false
+ Standardframe: false,
+ tableData: []
}
},
watch: {
@@ -811,8 +810,7 @@
},
async handleRadioChange(){
if(this.type === 0){
- 鍘熸潗鏂欐姤妫�
-
+ // 鍘熸潗鏂欐姤妫�
this.rawmaterialVisible = true
const res = await selectAll({type: this.type})
var data = res.data
@@ -880,7 +878,7 @@
type: this.type,
unit: this.finishedTable.unit })
}
- this.type = ''
+ this.type = 0
this.checkTypeVisible = false
this.$message({
message: '娣诲姞鎴愬姛锛�',
@@ -927,7 +925,7 @@
}
height: auto;
font-size: 22px !important;
- padding: 20px 40px !important;
+ padding: 40px 50px !important;
::v-deep .el-radio__label{
font-size: 22px !important;
padding-left: 0px !important;
--
Gitblit v1.9.3