From f6b6162c08fb8fd93369064d4daef6c94b100eea Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 18:02:15 +0800
Subject: [PATCH] bug修复
---
src/views/home/index.vue | 2 +-
src/views/experiment/inspectionApplication/index.vue | 16 +++++++---------
src/App.vue | 5 ++++-
src/views/inspectionManagement/commissionInspection/addCommision.vue | 32 ++++++++++++++++++--------------
src/views/inspectionManagement/commissionInspection/index.vue | 3 +++
5 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 230665e..f9aafd2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,10 @@
<script>
export default {
- name: 'App'
+ name: 'App',
+ mounted() {
+ document.title = "瑁呭鐢电紗 lims 绯荤粺"
+ }
}
</script>
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 5616b4e..78e28ef 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -50,11 +50,12 @@
</div>
</div>
<div class="table-box">
- <el-table ref="inspectionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
+ max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="inspectionTable" style="width: 100%">
+ :data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
- <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="100px" />
+ <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
<el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
<template slot-scope="scope">
<div v-if="scope.row.type === 0"><span>鍘熸潗鏂欐楠�</span></div>
@@ -62,7 +63,7 @@
<div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
</template>
</el-table-column>
- <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="100px" />
+ <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="80px" />
<el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" />
<el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="150px" />
<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
@@ -70,13 +71,13 @@
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
<el-table-column prop="num" label="鏁伴噺" min-width="50px" />
<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
- <el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
<template slot-scope="scope">
<el-tag class="tag" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
disable-transitions>{{ scope.row.inspection_status === 0 ? '涓嶅悎鏍�' : '鍚堟牸' }}</el-tag>
</template>
</el-table-column>
+ <el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
<el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="150px" />
<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
<template slot-scope="scope">
@@ -302,7 +303,6 @@
</el-dialog>
</div>
</div>
-
<!-- 纭畾璺宠浆鍩烘湰搴撳脊绐� -->
<el-dialog title="鏍囧噯搴�" :visible.sync="Standardframe" width="49%">
<el-card>
@@ -310,7 +310,6 @@
<span>鐗堟湰閫夋嫨锛�</span>
<el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
<el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
-
</el-select>
</template>
</el-card>
@@ -438,7 +437,6 @@
} from '@/api/experiment/planAssignments'
export default {
data() {
-
return {
showDetail: false,
searchData: {
@@ -501,7 +499,7 @@
}],
currentPage: 1,
total: 20, // 鎬绘潯鏁�
- pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
+ pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index aeecc96..d7201cd 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -124,7 +124,7 @@
this.getcheckProjectNum();
this.getVerifiedData();
this.getUncheckedData();
- this.getPieChart();
+ this.getPieChart();
},
methods: {
cell({ row, column, rowIndex, columnIndex }) {
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index ddcf3bc..5874594 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -41,7 +41,8 @@
<el-table-column prop="remarks" label="澶囨敞" min-width="8%" />
<el-table-column label="鎿嶄綔" min-width="8%">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
+ <el-button type="text" size="small"
+ @click.native.prevent="deleteRow(scope.$index, detectionInfo)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -174,7 +175,8 @@
</el-col>
<el-col :span="11">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О" @change="getProductList">
+ <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"
+ @change="getProductList">
<el-option v-for="options in model_sta_options" :value="options.key" :label="options.value"
:key="options.key">{{ options.value }}</el-option>
</el-select>
@@ -194,7 +196,7 @@
</el-col>
</el-row>
<el-row :gutter="50">
- <el-col :span="9">
+ <el-col :span="11">
<el-form-item label="娣诲姞椤圭洰锛�">
<el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
<el-checkbox v-for="(expers, ai) in productList" :label="expers"
@@ -202,7 +204,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- <el-col :span="41">
+ <el-col :span="11">
<el-form-item label="澶囨敞锛�">
<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
@@ -302,12 +304,12 @@
watch: {
addPointerForm: {
handler: function(val) {
- if(val.addway!=""){
+ if (val.addway != "") {
this.model_sta_options = []
- this.model_options.forEach(a=>{
- if(a.specificationsName==val.addway){
- this.model_sta_options = a.children.map(item=>{
- return{
+ this.model_options.forEach(a => {
+ if (a.specificationsName == val.addway) {
+ this.model_sta_options = a.children.map(item => {
+ return {
key: item.modelId,
value: item.modelName
}
@@ -426,8 +428,8 @@
handleCurrentChange(pageNo) {
this.pageParams.pageNo = pageNo
},
- deleteRow(row) {
-
+ deleteRow(index, rows) {
+ rows.splice(index, 1);
},
upMaterialName(val) {
this.sampleoptions.forEach(a => {
@@ -437,9 +439,11 @@
})
this.getModelSpecification(val)
},
- getProductList(val){
- getProductList({modelId: val}).then(res=>{
- this.productList = res.data.map(item=>{
+ getProductList(val) {
+ getProductList({
+ modelId: val
+ }).then(res => {
+ this.productList = res.data.map(item => {
return item.name
})
})
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 2cf97f8..3a9c084 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -327,6 +327,9 @@
if (document.execCommand('copy')) {
this.$message.success('宸插鍒跺埌鍓创鏉�')
}
+ },
+ handleClick(row){
+ console.log(row);
}
}
}
--
Gitblit v1.9.3