From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before
---
src/views/laboratory/ledger/index.vue | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 51edbca..7d96ba1 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -2,7 +2,7 @@
<div class="ledger-main">
<div class="page-header-search">
<div class="serve-btn">
- <el-button type="primary" icon="el-icon-plus"
+ <el-button size="small" type="primary" icon="el-icon-plus"
@click="showAddDrawer()">鏂板浠櫒</el-button>
</div>
</div>
@@ -11,7 +11,7 @@
<div class="bom-item-search">
<el-row>
<el-col :span="19">
- <el-input v-model="filterText" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
+ <el-input size="small" v-model="filterText" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
</el-col>
<el-col :span="5">
<el-button type="primary" size="small" @click="addClassVisible = true"><i
@@ -28,14 +28,14 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form ref="form" :inline="true" :model="searchData">
- <el-form-item>
- <el-input v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
+ <el-form-item width="200">
+ <el-input size="small" v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="filterTableData">鏌ヨ</el-button>
- <el-button type="primary" plain @click="resetBtn">閲嶇疆</el-button>
+ <el-button size="small" type="primary" @click="filterTableData">鏌ヨ</el-button>
+ <el-button size="small" type="primary" plain @click="resetBtn">閲嶇疆</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -53,7 +53,7 @@
<div class="table-box">
<el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'left' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
- :data="equipmentTable" style="width: 100%;">
+ :data="equipmentTable" style="width: 100%;height: 100vh">
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipment_code" label="浠櫒璁惧缂栧彿" min-width="200" />
<el-table-column prop="equipment_name" label="浠櫒璁惧鍚嶇О" min-width="150" />
@@ -180,7 +180,7 @@
<el-table ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
- :data="codePointsTable" style="width: 100%">
+ :data="codePointsTable" style="width: 100%;overflow: scroll;height:314px;">
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipmentPoint" label="鐮佺偣缂栫爜" min-width="150">
<template slot-scope="scope">
@@ -606,7 +606,7 @@
},
measureFormVisible(newVal){
if(newVal === false){
- this.resetForm("addmeasureForm");
+ this.cancelAddMeasure();
}
}
},
@@ -639,7 +639,6 @@
// 鑾峰彇鍒嗙被鏁版嵁
async getThreeData() {
const { data } = await getClassifyList()
- // console.log(data)
this.classTree = data.map(item => {
if (item.children) {
item.children = item.children.map(childrenItem => {
@@ -672,17 +671,14 @@
const { data } = await getInstrumentDetail({ InstrumentId: row.id })
this.equipmentDetail = data
this.equipmentform = data
- console.log(this.equipmentform)
const { data: pointList } = await getEquipmentPointList({ InstrumentId: this.equipmentDetail.id })
this.codePointsTable = pointList
const { data: informationList } = await getMetricalInformationList({ InstrumentId: this.equipmentDetail.id })
this.measureTable = informationList
- console.log(informationList)
},
// 鑺傜偣鐐瑰嚮澶勭悊
nodeClickHandler(data, node, element) {
this.nodeclicked = data
- console.log(data)
// 鍙湁鏁版嵁涓惡甯d鎵嶈兘鍙戦�佹煡璇㈣姹�
if (data.id) {
this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
@@ -690,7 +686,6 @@
},
// 鑾峰彇浠櫒鍒楄〃鏁版嵁
async getEquipmentTable(ages) {
- // console.log('鏉′欢瀵硅薄', ages)
const { data } = await getInstrumentList(ages)
this.equipmentTable = data.row
this.total = data.total
@@ -709,14 +704,8 @@
handleCurrentChange() {
// 褰撳墠椤垫洿鏀�
},
- // 鏄剧ず璁惧鐮佺偣
- addCodePoints() {
- // 娣诲姞鏂扮爜鐐癸紝娓呯┖鍘熸暟缁�
- this.codePointesTableStatus = true
- },
// 鏂板璁惧鐮佺偣
addNewCodePoints() {
- console.log(this.equipmentDetail.id);
this.codePointesTableStatus = true;
const newObj = {}
newObj.isInput = true,
@@ -814,10 +803,10 @@
this.$refs[formName].resetFields();
},
cancelAddMeasure() {
- this.$refs['upload'].clearFiles();
this.measureForm.file = null;
this.measureFormVisible = false
this.resetForm('addmeasureForm');
+ this.$refs['upload'].clearFiles();
},
// 娣诲姞璁￠噺淇℃伅
async addMeasure() {
@@ -829,7 +818,6 @@
this.measureForm.beginDate = parseTime(this.measureForm.date[0], '{y}-{m}-{d}')
this.measureForm.endDate = parseTime(this.measureForm.date[1], '{y}-{m}-{d}')
}
- console.log(this.measureForm)
const formData = new FormData()
if(this.measureForm.file == null || this.measureForm.file == ""){
this.$message.warning("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢!");
@@ -837,16 +825,11 @@
}else{
formData.append('file', this.measureForm.file?.raw, this.measureForm.file?.name)
}
- console.log(this.measureForm)
for (const key in this.measureForm) {
- console.log(key)
- // if (key === 'file') return
formData.append(key, this.measureForm[key])
}
- console.log(formData)
try {
- const { data } = await addMetricalInformation(formData)
- console.log(data)
+ await addMetricalInformation(formData)
this.$message.success('娣诲姞鎴愬姛')
const { data: informationList } = await getMetricalInformationList({ InstrumentId: this.equipmentDetail.id })
this.measureTable = informationList
@@ -857,8 +840,6 @@
}
this.measureForm.file = null;
this.$refs['upload'].clearFiles();
- }else{
- console.log(32);
}
});
},
@@ -868,7 +849,6 @@
this.codePointsTable = []
this.measureTable = []
this.measureForm.file = null;
- this.$refs['upload'].clearFiles();
},
// 鍏抽棴娣诲姞淇敼璁惧鎶藉眽
closeAddOrChangeDrawer() {
@@ -878,7 +858,6 @@
},
// 鏂囦欢涓婁紶
handleUpload(file, fileList) {
- console.log(file, fileList)
this.measureForm.file = file
},
// 鏍规嵁杈撳叆鐨勮澶囩紪鍙凤紝璁惧鍚嶇О鎴栬�呭瀷鍙疯鏍煎叧閿瓧杩涜杩囨护鍒楄〃
@@ -896,7 +875,6 @@
this.equipmentTable = this.oldtableData
},
getConditionTable() {
- // console.log(this.radioValue)
let filteredTable = this.oldtableData.filter(item => {
return item.conditions === this.radioValue
})
@@ -939,12 +917,10 @@
let expireItem
for (expireItem of this.expireData) {
this.equipmentTable = this.oldtableData.filter(item => {
- console.log(this.radioValue)
console.log('item', item)
console.log('expireItem', expireItem)
return item.conditions === this.radioValue && item.equipment_code === expireItem.equipment_code
})
- console.log(this.equipmentTable)
}
} else {
this.equipmentTable = this.expireData
--
Gitblit v1.9.3