From 5535157ce811a29c4e3c68148fd110c9c5a4137b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:39:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 8 +++++---
src/views/experiment/planAssignments/plan.vue | 5 +++--
src/views/laboratory/ledger/index.vue | 18 ++++++++----------
src/api/laboratory/organizational.js | 2 +-
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 4 ++--
src/views/inspectionManagement/commissionInspection/index.vue | 23 ++++++++++++++---------
6 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/api/laboratory/organizational.js b/src/api/laboratory/organizational.js
index bec30c9..5234aef 100644
--- a/src/api/laboratory/organizational.js
+++ b/src/api/laboratory/organizational.js
@@ -4,7 +4,7 @@
getOrganizational: "/organizational/list", // 鍥涚骇鏍�
getTableInitialization: "/organizational/table", // 琛ㄦ牸鏁版嵁鎺ュ彛
organizationalAdd: "/organizational/add", // 娣诲姞閮ㄩ棬
- organizationalUpdate: "/organizational/add", // 淇敼閮ㄩ棬
+ organizationalUpdate: "/organizational/update", // 淇敼閮ㄩ棬
organizationalDelete: "/organizational/delete", // 鍒犻櫎閮ㄩ棬
}
export function getOrganizationalApi() {
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 4799074..9be8f3f 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -174,7 +174,7 @@
id: row.id,
userProId: val
}).then(res => {
- if (res.data) this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
+ this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
})
},
chooseEquipment(val, row) {
@@ -182,7 +182,7 @@
id: row.id,
equipmentId: val[2]
}).then(res => {
- if (res.data) this.$message.success('璁惧鍒嗛厤鎴愬姛')
+ this.$message.success('璁惧鍒嗛厤鎴愬姛')
})
}
}
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 05d0439..40bc4d3 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,8 @@
</el-table-column>
<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState==1">宸叉姤妫�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState==0">鏈姤妫�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -268,6 +268,7 @@
.children.length
},
openUpDia(row) {
+ console.log(row);
// console.log(row);
this.upDia = true
this.upData = {
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index b6dec7b..cf60294 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div v-if="!showDetail">
+ <div>
<div class="content-main">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
@@ -24,19 +24,19 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="350" trigger="click">
+ <el-popover placement="left" width="400" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
<el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input>
- <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">鐢熸垚</el-button>
- <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">澶嶅埗</el-button>
+ <el-button size="small" type="primary" @click="viewDia=true">鐢熸垚</el-button>
+ <el-button size="small" type="primary" @click="copy">澶嶅埗</el-button>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col v-if="viewId==null">褰撳墠閾炬帴宸茶繃鏈燂紝璇风偣鍑荤敓鎴愭寜閽噸鏂扮敓鎴�</el-col>
<el-col
- v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
+ v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
</el-row>
</div>
<el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
@@ -97,9 +97,6 @@
</div>
</div>
</div>
- </div>
- <div v-else>
- <router-view />
</div>
<el-dialog title="閾炬帴鏃堕暱璁剧疆" :visible.sync="viewDia" width="30%">
<div>
@@ -228,7 +225,15 @@
view: null,
viewId: null,
viewTime: 1,
+ viewTime2: 1,
viewDia: false
+ }
+ },
+ watch:{
+ addReportDialog(newVal){
+ if(newVal === false){
+ this.resetForm("addInspectionForm");
+ }
}
},
created() {
@@ -471,7 +476,7 @@
}).then(res => {
this.view = `${this.vueIp}addCommision/${res.data.id}`
this.viewId = res.data.id
- this.viewTime = res.data.time
+ this.viewTime2 = res.data.time
})
},
getViewId() {
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 5ce4d90..48f4240 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -33,7 +33,7 @@
</el-col>
</el-row>
</div>
- <el-tree highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
+ <el-tree :highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
:filter-node-method="filterNode" @node-click="nodeClickHandler" />
</div>
<div class="library-table">
@@ -154,7 +154,7 @@
<span><i class="el-icon-edit" />楠屾敹鏃ユ湡锛歿{ equipmentDetail.acceptanceDate }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.name }}</span>
+ <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.userName }}</span>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition == 1 ? '鏀寔' : '涓嶆敮鎸�'
@@ -350,8 +350,8 @@
</el-row>
<el-row v-show="equipmentform.equipmentMeasurement === 1" :gutter="50">
<el-col :span="12">
- <el-form-item label="璁￠噺鎴鏈夋晥鏈燂細" label-width="80">
- <el-input min="0" v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忔湁鏁堟湡" type="number" />
+ <el-form-item label="璁￠噺鍛ㄦ湡(鏈�)锛�" label-width="80">
+ <el-input min="0" v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忓懆鏈�" type="number" />
</el-form-item>
</el-col>
</el-row>
@@ -470,10 +470,6 @@
userOpetions: [],
// 浠櫒鐘舵�侀厤缃」
conditionsOptions: [
- {
- label: '鍏ㄩ儴',
- value: 0
- },
{
label: '杩愯',
value: 1
@@ -736,7 +732,7 @@
this.$message.success('娣诲姞鎴愬姛')
}
} catch (error) {
- this.$message.error(error)
+ this.$message.error(error.message)
}
await this.closeCodePoins()
},
@@ -777,7 +773,7 @@
this.$message.error('娣诲姞澶辫触')
}
this.$message.success('娣诲姞鎴愬姛')
- let d = this.nodeclicked
+ let d = this.nodeclicked;
this.nodeClickHandler(d);
this.addDrawerVisible = false
this.equipmentform = {}
@@ -787,6 +783,8 @@
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) {
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 9dea403..d436ee8 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -2,10 +2,10 @@
<div class="standard-library-main">
<div class="content-main">
<div class="library-bom" style="width: 300px">
- <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
<el-button type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
- node-key="id" highlight-current default-expand-all :filter-node-method="filterNode"
+ node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
</div>
<div class="library-table" style="width: 80%">
@@ -108,6 +108,7 @@
export default {
data() {
return {
+ filterNodeData: [],
options: [],
versionValue: "",
deleteList: [],
@@ -224,7 +225,7 @@
})
.catch(() => {});
},
- filterNode(value, data) {
+ filterNode(value, data,node) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
@@ -277,6 +278,7 @@
//TODO handle the exception
}
});
+
},
getDefault(arr, index) {
for (const item of arr) {
--
Gitblit v1.9.3