From 154d53ca0f4c9a3f1a8433ae4d458f65a81341dc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 11:28:56 +0800
Subject: [PATCH] modified: .env.development modified: src/views/experiment/planAssignments/plan.vue modified: src/views/inspectionManagement/commissionInspection/addCommision.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/standardLibrary/index.vue
---
.env.development | 2
src/views/standardLibrary/index.vue | 5 +
src/views/experiment/planAssignments/plan.vue | 2
src/views/inspectionManagement/reportForInspection/index.vue | 3
src/views/laboratory/ledger/index.vue | 143 ++++++++++++++++++++++-------------------------
src/views/inspectionManagement/commissionInspection/addCommision.vue | 4
src/views/inspectionManagement/commissionInspection/index.vue | 8 +-
7 files changed, 80 insertions(+), 87 deletions(-)
diff --git a/.env.development b/.env.development
index ab9be2d..6c8cdfe 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.218.96:1234/'
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 40bc4d3..29f553a 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -160,7 +160,7 @@
<el-col :span="7">{{upData.internal}}</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀姸鎬侊細</el-col>
+ <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀粨鏋滐細</el-col>
<el-col :span="7">
<el-tag type="success" v-if="upData.testState==1">鍚堟牸</el-tag>
<el-tag type="danger" v-else-if="upData.testState==0">涓嶅悎鏍�</el-tag>
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index a68cbc8..c077f91 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -122,7 +122,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎶ュ憡鏁帮細">
- <el-input style="width: 200px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off"
+ <el-input type="number" min="0" style="width: 200px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off"
size="small" />
</el-form-item>
</el-col>
@@ -158,7 +158,7 @@
<el-form-item label="鏍峰搧鍚嶇О锛�">
<el-select v-model="addPointerForm.sampleName" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О"
@change="upMaterialName">
- <el-option v-for="options in sampleoptions" :value="options.key" :label="options.value"></el-option>
+ <el-option v-for="(options,index) in sampleoptions" :key="index" :value="options.key" :label="options.value"></el-option>
</el-select>
</el-form-item>
</el-col>
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index cf60294..f349521 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -73,7 +73,7 @@
<el-table-column prop="contacts" label="濮旀墭缂栧埗浜�" min-width="8%" />
<el-table-column prop="inspection_status" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
- <div v-if="scope.row.inspection_status === 0">
+ <div v-if="scope.row.inspection_status === 2">
<span style="color: green;">宸叉姤妫�</span>
</div>
<div v-else>
@@ -209,11 +209,11 @@
value: null
},
{
- label: '宸叉楠�',
- value: 0
+ label: '宸叉姤妫�',
+ value: 2
},
{
- label: '寰呮楠�',
+ label: '鏈姤妫�',
value: 1
}
],
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index c8db94d..f61d75c 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -413,8 +413,7 @@
"unit": val.unit,
"version": this.addInspectionForm.version
}
- // this.createReport(obj);
- console.log("obj---",obj);
+ this.createReport(obj);
this.addReportDialog = false;
}
}));
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 12f8143..51edbca 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -26,7 +26,7 @@
<div class="table-header">
<div class="search-bar">
<el-row :gutter="20">
- <el-col :span="15">
+ <el-col :span="8">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item>
<el-input v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
@@ -36,13 +36,11 @@
<el-form-item>
<el-button type="primary" @click="filterTableData">鏌ヨ</el-button>
<el-button type="primary" plain @click="resetBtn">閲嶇疆</el-button>
- <!-- <el-button type="text">楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right" /></el-button> -->
</el-form-item>
</el-form>
</el-col>
- <el-col :span="9">
+ <el-col :span="16">
<el-radio-group v-model="radioValue" @change="getConditionTable">
- <!-- <el-radio-button label="0">鍏ㄩ儴</el-radio-button> -->
<el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
{{ item.label }}
</el-radio-button>
@@ -174,11 +172,9 @@
</div>
<el-tabs v-model="activeTabsName">
<el-tab-pane label="璁惧鐮佺偣" name="codePoints">
- <el-button v-show="!codePointesTableStatus" :style="{ marginBottom: '18px' }"
- @click="addCodePoints">鏂板璁惧鐮佺偣</el-button>
- <div v-show="codePointesTableStatus" :style="{ marginBottom: '18px' }" class="btns">
+ <div :style="{ marginBottom: '18px' }" class="btns">
<el-button @click="addNewCodePoints">娣诲姞</el-button>
- <el-button @click="saveCodePoins">淇濆瓨</el-button>
+ <el-button v-show="codePointesTableStatus" @click="saveCodePoins">淇濆瓨</el-button>
<el-button @click="closeCodePoins">鍙栨秷</el-button>
</div>
@@ -188,29 +184,26 @@
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipmentPoint" label="鐮佺偣缂栫爜" min-width="150">
<template slot-scope="scope">
- <span v-show="!codePointesTableStatus">{{ scope.row.equipmentPoint }}</span>
- <el-input v-show="codePointesTableStatus" v-model="scope.row.equipmentPoint" />
+ <el-input v-if="codePointesTableStatus && scope.row.isInput" v-model="scope.row.equipmentPoint" />
+ <span v-else>{{ scope.row.equipmentPoint }}</span>
</template>
</el-table-column>
-
<el-table-column prop="equipmentPointName" label="鐮佺偣鍚嶇О" min-width="150">
<template slot-scope="scope">
- <span v-show="!codePointesTableStatus">{{ scope.row.equipmentPointName }}</span>
- <el-input v-show="codePointesTableStatus" v-model="scope.row.equipmentPointName" />
+ <el-input v-if="codePointesTableStatus && scope.row.isInput" v-model="scope.row.equipmentPointName" />
+ <span v-else>{{ scope.row.equipmentPointName }}</span>
</template>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="150">
<template slot-scope="scope">
- <span v-show="!codePointesTableStatus">{{ scope.row.unit }}</span>
- <el-input v-show="codePointesTableStatus" v-model="scope.row.unit" />
+ <el-input v-if="codePointesTableStatus && scope.row.isInput" v-model="scope.row.unit" />
+ <span v-else>{{ scope.row.unit }}</span>
</template>
</el-table-column>
- <!-- <el-table-column prop="name" label="鏇存柊浜�" min-width="100" />
- <el-table-column prop="updateTime" label="鏇存柊鏃ユ湡" min-width="120" /> -->
<el-table-column prop="descriptiveness" label="鎻忚堪" min-width="200">
<template slot-scope="scope">
- <span v-show="!codePointesTableStatus">{{ scope.row.descriptiveness }}</span>
- <el-input v-show="codePointesTableStatus" v-model="scope.row.descriptiveness" />
+ <el-input v-if="codePointesTableStatus && scope.row.isInput" v-model="scope.row.descriptiveness" />
+ <span v-else>{{ scope.row.descriptiveness }}</span>
</template>
</el-table-column>
@@ -273,7 +266,7 @@
<el-col :span="11">
<el-form-item label="鐘舵�侊細" prop="conditions"
:rules="[{ required: true, message: '璇烽�夋嫨浠櫒璁惧鐘舵��', trigger: 'blur' }]" label-width="80">
- <el-select v-model="equipmentform.conditions" clearable filterable :allow-create="true"
+ <el-select v-model="equipmentform.conditions" clearable :allow-create="true"
placeholder="璇烽�夋嫨浠櫒璁惧鐘舵��" style="width:100%">
<el-option v-for="item in conditionsOptions" :key="item.value" :label="item.label"
:value="item.value" />
@@ -328,7 +321,7 @@
</el-col>
<el-col :span="11">
<el-form-item label="淇濈浜猴細" label-width="80">
- <el-select v-model="equipmentform.userId" clearable filterable :allow-create="true" placeholder="璇烽�夋嫨淇濈浜�"
+ <el-select v-model="equipmentform.userId" clearable :allow-create="true" placeholder="璇烽�夋嫨淇濈浜�"
style="width:100%">
<el-option v-for="item in userOpetions" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
@@ -566,6 +559,7 @@
// 鐮佺偣琛ㄦ牸
codePointsTable: [
{
+ 'isInput':false,
'unit': '',
'descriptiveness': '',
'equipmentPoint': '',
@@ -674,7 +668,6 @@
},
// 鏄剧ず浠櫒璇︽儏
async openDetail(row) {
- // console.log(row)
this.detailDrawer = true
const { data } = await getInstrumentDetail({ InstrumentId: row.id })
this.equipmentDetail = data
@@ -720,15 +713,13 @@
addCodePoints() {
// 娣诲姞鏂扮爜鐐癸紝娓呯┖鍘熸暟缁�
this.codePointesTableStatus = true
- this.codePointsTable = undefined
},
// 鏂板璁惧鐮佺偣
addNewCodePoints() {
- //
- if (!this.codePointsTable) {
- this.codePointsTable = []
- }
+ console.log(this.equipmentDetail.id);
+ this.codePointesTableStatus = true;
const newObj = {}
+ newObj.isInput = true,
newObj.name = '' // 褰撳墠鐢ㄦ埛鐨勫悕绉�
newObj.updateTime = '' // 鑾峰彇褰撳墠鏃堕棿
newObj.equipmentPoint = ''
@@ -736,25 +727,21 @@
newObj.descriptiveness = ''
newObj.unit = ''
newObj.instrumentId = this.equipmentDetail.id
- this.codePointsTable.push(newObj)
+ this.codePointsTable.unshift(newObj)
},
// 淇濆瓨鎻愪氦鏂板璁惧鐮佺偣
async saveCodePoins() {
- console.log(this.codePointsTable)
- if (!this.codePointsTable) {
- this.codePointsTable = []
+ if (this.codePointsTable.length === 0) {
+ return this.$message.error('璇风偣鍑绘坊鍔犳寜閽坊鍔犳暟鎹�')
}
- if (this.codePointsTable.length === 0) return this.$message.error('璇风偣鍑绘坊鍔犳寜閽坊鍔犳暟鎹�')
- try {
- for (const item of this.codePointsTable) {
- const { code, data, message } = await addEquipmentPoint(item)
- console.log(data)
- if (code !== 200) throw new Error(message)
- this.$message.success('娣诲姞鎴愬姛')
- }
- } catch (error) {
+ let data = this.codePointsTable.filter(item => {
+ return item.instrumentId != null;
+ })
+ await addEquipmentPoint(data).then(()=>{
+ this.$message.success('娣诲姞鎴愬姛')
+ }).catch(error=>{
this.$message.error(error.message)
- }
+ })
await this.closeCodePoins()
},
// 鍙栨秷鏂板璁惧鐮佺偣
@@ -775,42 +762,39 @@
},
// 鐐瑰嚮鏂板浠櫒璁惧鎴栧綋瀛樺湪浠櫒璇︽儏鏃舵槸淇敼浠櫒璁惧淇℃伅
async addNewEquipment() {
- let v = this.submitForm('addNewEquipment')
- if (!v) {
- return
- }
- if (Array.isArray(this.equipmentform.classifyId)) {
- this.equipmentform.classifyId = this.equipmentform.classifyId.pop()
- }
- if (!this.equipmentDetail.id) {
- // 鏍煎紡鍖栨棩鏈�
- this.equipmentform.arrivalDate = parseTime(this.equipmentform.arrivalDate, '{y}-{m}-{d}')
- this.equipmentform.acceptanceDate = parseTime(this.equipmentform.acceptanceDate, '{y}-{m}-{d}')
- // this.equipmentform.termValidity = parseTime(this.equipmentform?.termValidity, '{y}-{m}-{d}')
- try {
- const res = await addInstrument(this.equipmentform)
- console.log(res)
- } catch (error) {
- this.$message.error('娣诲姞澶辫触')
+ this.$refs["addNewEquipment"].validate(async(valid)=>{
+ if(valid){
+ if (Array.isArray(this.equipmentform.classifyId)) {
+ this.equipmentform.classifyId = this.equipmentform.classifyId.pop()
+ }
+ if (!this.equipmentDetail.id) {
+ // 鏍煎紡鍖栨棩鏈�
+ this.equipmentform.arrivalDate = parseTime(this.equipmentform.arrivalDate, '{y}-{m}-{d}')
+ this.equipmentform.acceptanceDate = parseTime(this.equipmentform.acceptanceDate, '{y}-{m}-{d}')
+ // this.equipmentform.termValidity = parseTime(this.equipmentform?.termValidity, '{y}-{m}-{d}')
+ await addInstrument(this.equipmentform).then(()=>{
+ this.$message.success('娣诲姞鎴愬姛')
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ let d = this.nodeclicked;
+ this.nodeClickHandler(d);
+ this.addDrawerVisible = false
+ this.equipmentform = {}
+ return
+ }
+ console.log('淇敼浠櫒鍙傛暟', this.equipmentform)
+ await changeInstrument(this.equipmentform).then(()=>{
+ this.$message.success('淇敼鎴愬姛')
+ let d = this.nodeclicked;
+ this.nodeClickHandler(d);
+ this.addDrawerVisible = false
+ this.detailDrawer = false
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
}
- this.$message.success('娣诲姞鎴愬姛')
- let d = this.nodeclicked;
- this.nodeClickHandler(d);
- this.addDrawerVisible = false
- this.equipmentform = {}
- return
- }
- console.log('淇敼浠櫒鍙傛暟', this.equipmentform)
- try {
- const res = await changeInstrument(this.equipmentform)
- this.$message.success('淇敼鎴愬姛')
- let d = this.nodeclicked;
- this.nodeClickHandler(d);
- this.addDrawerVisible = false
- this.detailDrawer = false
- } catch (error) {
- this.$message.error('娣诲姞澶辫触')
- }
+ });
},
cancelAddEq() {
this.resetForm('addDrawer')
@@ -907,6 +891,8 @@
},
resetBtn() {
this.searchData.keyword = ''
+ this.radioValue = 0;
+ this.isOut = false;
this.equipmentTable = this.oldtableData
},
getConditionTable() {
@@ -1080,7 +1066,10 @@
display: flex;
justify-content: space-between;
padding: 15px 24px 12px 24px;
-
+ .serve-btn{
+ position: relative;
+ left: 92%;
+ }
.search-bar {
.el-radio-button.is-active {
color: #409EFF !important;
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index d4e3125..e694db0 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -139,6 +139,11 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
+ },
+ addTreeFormVisible(newVal){
+ if(newVal === false){
+ this.clear();
+ }
}
},
created() {
--
Gitblit v1.9.3