From 2631ca1e0a9ddefc5292598b7f9ef2a31c7af29a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 04 九月 2023 18:03:05 +0800
Subject: [PATCH] modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/organizational/index.vue modified: src/views/laboratory/personnel/index.vue
---
src/views/inspectionManagement/reportForInspection/index.vue | 5 +
src/views/laboratory/ledger/index.vue | 74 +++++++++++-------------
src/views/laboratory/organizational/index.vue | 6 +
src/views/laboratory/personnel/index.vue | 60 +++++++++++++++----
4 files changed, 89 insertions(+), 56 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index 1a39e40..f400f52 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -72,7 +72,9 @@
<div class="table-box">
<el-table ref="inspectionTable" :max-height="450" :cell-style="{textAlign: 'left'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
- :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
+ :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange"
+ :default-sort = "{prop: 'createTime', order: 'descending'}"
+ >
<el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
<el-table-column type="index" label="搴忓彿" min-width="8%" />
<el-table-column prop="dateSurvey" label="鏉ユ枡鏃ユ湡" min-width="8%" />
@@ -83,6 +85,7 @@
<el-table-column prop="unit" label="鍗曚綅" min-width="5%" />
<el-table-column prop="quantity" label="鏁伴噺" min-width="5%" />
<el-table-column prop="inspectionDate" label="鎶ユ鏃ユ湡" min-width="8%" />
+ <el-table-column v-if="1===0" prop="createTime" label="鏃ユ湡" min-width="8%" />
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
<template slot-scope="scope">
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 9746cd5..5ce4d90 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -25,7 +25,7 @@
<div class="bom-item-search">
<el-row>
<el-col :span="19">
- <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
+ <el-input v-model="filterText" clearable placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
</el-col>
<el-col :span="5">
<el-button type="primary" size="small" @click="addClassVisible = true"><i
@@ -33,7 +33,7 @@
</el-col>
</el-row>
</div>
- <el-tree 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">
@@ -63,8 +63,11 @@
<el-table-column prop="termValidity" label="璁￠噺鎴鏈夋晥鏈�" min-width="200" />
<el-table-column prop="conditions" label="璁惧鐘舵��" min-width="120">
<template slot-scope="scope">
- <el-tag :type="scope.row.conditions === 0 ? 'primary' : 'success'" disable-transitions>{{
- scope.row.conditions | conditionsFilter }}</el-tag>
+ <el-tag v-if="scope.row.conditions === 1" type="success" disable-transitions>杩愯</el-tag>
+ <el-tag v-if="scope.row.conditions === 2" type="danger" disable-transitions>鏁呴殰</el-tag>
+ <el-tag v-if="scope.row.conditions === 3" type="warning" disable-transitions>鎶ヤ慨</el-tag>
+ <el-tag v-if="scope.row.conditions === 4" type="warning" disable-transitions>妫�淇�</el-tag>
+ <el-tag v-if="scope.row.conditions === 5" disable-transitions>寰呮満</el-tag>
</template>
</el-table-column>
<el-table-column prop="storage_place" label="瀛樻斁鍦�" min-width="200" />
@@ -151,7 +154,7 @@
<span><i class="el-icon-edit" />楠屾敹鏃ユ湡锛歿{ equipmentDetail.acceptanceDate }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.userId }}</span>
+ <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.name }}</span>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition == 1 ? '鏀寔' : '涓嶆敮鎸�'
@@ -247,7 +250,7 @@
<el-row :gutter="50">
<el-col :span="11">
<el-form-item label="鎵�灞炲垎绫伙細" prop="classifyId" label-width="80" :rules="[
- { required: true, message: '璇烽�夋嫨鎵�灞炲垎绫�', trigger: 'change' }
+ { required: true, message: '璇烽�夋嫨鎵�灞炲垎绫�', trigger: 'blur' }
]">
<el-cascader style="width: 100%;" v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
</el-form-item>
@@ -268,7 +271,7 @@
</el-col>
<el-col :span="11">
<el-form-item label="鐘舵�侊細" prop="conditions"
- :rules="[{ required: true, message: '璇烽�夋嫨浠櫒璁惧鐘舵��', trigger: 'change' }]" label-width="80">
+ :rules="[{ required: true, message: '璇烽�夋嫨浠櫒璁惧鐘舵��', trigger: 'blur' }]" label-width="80">
<el-select v-model="equipmentform.conditions" clearable filterable :allow-create="true"
placeholder="璇烽�夋嫨浠櫒璁惧鐘舵��" style="width:100%">
<el-option v-for="item in conditionsOptions" :key="item.value" :label="item.label"
@@ -310,7 +313,7 @@
</el-col>
<el-col :span="11">
<el-form-item label="鍒拌揣鏃ユ湡锛�" label-width="80">
- <el-date-picker v-model="equipmentform.arrivalDate" type="date" placeholder="璇烽�夋嫨鍒拌揣鏃ユ湡"
+ <el-date-picker value-format="yyyy-MM-dd" v-model="equipmentform.arrivalDate" type="date" placeholder="璇烽�夋嫨鍒拌揣鏃ユ湡"
style="width:100%" />
</el-form-item>
</el-col>
@@ -318,7 +321,7 @@
<el-row :gutter="50">
<el-col :span="11">
<el-form-item label="楠屾敹鏃ユ湡锛�" label-width="80">
- <el-date-picker v-model="equipmentform.acceptanceDate" type="date" placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
+ <el-date-picker value-format="yyyy-MM-dd" v-model="equipmentform.acceptanceDate" type="date" placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
style="width:100%" />
</el-form-item>
</el-col>
@@ -348,7 +351,7 @@
<el-row v-show="equipmentform.equipmentMeasurement === 1" :gutter="50">
<el-col :span="12">
<el-form-item label="璁￠噺鎴鏈夋晥鏈燂細" label-width="80">
- <el-input v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忔湁鏁堟湡" type="number" />
+ <el-input min="0" v-model="equipmentform.termValidity" placeholder="璇峰～鍐欒閲忔湁鏁堟湡" type="number" />
</el-form-item>
</el-col>
</el-row>
@@ -372,7 +375,7 @@
<el-form label-position="top" ref="addmeasureForm" :model="measureForm">
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="璐熻矗浜�" prop="userId" :rules="[{ required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: 'change' }]">
+ <el-form-item label="璐熻矗浜�" prop="userId" :rules="[{ required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: 'blur' }]">
<el-select v-model="measureForm.userId" clearable filterable :allow-create="true" placeholder="璐熻矗浜�"
style="width:100%">
<el-option v-for="item in userOpetions" :key="item.id" :label="item.label" :value="item.value" />
@@ -388,7 +391,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="24">
- <el-form-item label="妫�瀹氭湁鏁堟湡" prop="date" :rules="[{ required: true, message: '璇烽�夋嫨妫�瀹氭湁鏁堟湡', trigger: 'change' }]">
+ <el-form-item label="妫�瀹氭湁鏁堟湡" prop="date" :rules="[{ required: true, message: '璇烽�夋嫨妫�瀹氭湁鏁堟湡', trigger: 'blur' }]">
<el-date-picker v-model="measureForm.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" />
</el-form-item>
@@ -402,7 +405,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="缁撴灉" prop="result" :rules="[{ required: true, message: '璇烽�夋嫨缁撴灉', trigger: 'change' }]">
+ <el-form-item label="缁撴灉" prop="result" :rules="[{ required: true, message: '璇烽�夋嫨缁撴灉', trigger: 'blur' }]">
<el-select v-model="measureForm.result" clearable filterable :allow-create="true" placeholder="璇烽�夋嫨缁撴灉"
style="width:100%">
<el-option v-for="item in resultOptions" :key="item.id" :label="item.label" :value="item.value" />
@@ -427,7 +430,7 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="">
- <el-upload class="upload-demo" action="#" :on-change="handleUpload" :auto-upload="false">
+ <el-upload ref="upload" class="upload-demo" action="#" :on-change="handleUpload" :auto-upload="false">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
@@ -460,29 +463,7 @@
} from '@/api/laboratory/ledger'
import { parseTime } from '@/utils/index'
export default {
- filters: {
- conditionsFilter(value) {
- let returnValue = null
- switch (+value) {
- case 1:
- returnValue = '杩愯'
- break
- case 2:
- returnValue = '鏁呴殰'
- break
- case 3:
- returnValue = '鎶ヤ慨'
- break
- case 4:
- returnValue = '妫�淇�'
- break
- case 5:
- returnValue = '寰呮満'
- break
- }
- return returnValue
- }
- },
+ filters: {},
data() {
return {
// 鐢ㄦ埛涓嬫媺妗嗛厤缃」
@@ -631,6 +612,12 @@
watch: {
filterText(val) {
this.$refs.classTree.filter(val)
+ },
+ measureFormVisible(newVal){
+ if(newVal === false){
+ this.measureForm.file = null;
+ this.$refs['upload'].clearFiles();
+ }
}
},
created() {
@@ -790,6 +777,8 @@
this.$message.error('娣诲姞澶辫触')
}
this.$message.success('娣诲姞鎴愬姛')
+ let d = this.nodeclicked
+ this.nodeClickHandler(d);
this.addDrawerVisible = false
this.equipmentform = {}
return
@@ -805,13 +794,15 @@
}
},
cancelAddEq() {
+ this.resetForm('addDrawer')
this.addDrawerVisible = false
- // this.resetForm('addNewEquipment')
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
cancelAddMeasure() {
+ this.$refs['upload'].clearFiles();
+ this.measureForm.file = null;
this.measureFormVisible = false
this.resetForm('addmeasureForm')
},
@@ -849,12 +840,16 @@
} catch (error) {
this.$message.error('娣诲姞澶辫触')
}
+ this.measureForm.file = null;
+ this.$refs['upload'].clearFiles();
},
// 鍏抽棴璁惧璇︽儏鎶藉眽
closeDetailDrawer() {
this.equipmentDetail = {}
this.codePointsTable = []
this.measureTable = []
+ this.measureForm.file = null;
+ this.$refs['upload'].clearFiles();
},
// 鍏抽棴娣诲姞淇敼璁惧鎶藉眽
closeAddOrChangeDrawer() {
@@ -951,9 +946,8 @@
},
async deleteInstrument() {
await deleteInstrument({ instrumentId: this.instrumentId }).then(res=>{
- this.$message.error('鍒犻櫎鎴愬姛锛�');
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
let d = this.nodeclicked
- console.log(d);
this.nodeClickHandler(d);
}).catch(()=>{
this.$message.error('鍒犻櫎澶辫触锛�');
diff --git a/src/views/laboratory/organizational/index.vue b/src/views/laboratory/organizational/index.vue
index 3561611..aa83bc1 100644
--- a/src/views/laboratory/organizational/index.vue
+++ b/src/views/laboratory/organizational/index.vue
@@ -92,7 +92,6 @@
<el-input
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
v-model="formData.department"
- clearable
style="width: 80%"
>
</el-input>
@@ -281,7 +280,10 @@
handler(newVal, oldVal) {
if (newVal == false) {
this.isUpdate = false;
- this.formData = {};
+ this.formData = {
+ fatherId: "",
+ department: "",
+ };
this.$refs.ruleForm.resetFields();
}
},
diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index ac88585..f523436 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -44,6 +44,12 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍦ㄨ亴鐘舵��" v-if="isUpdate" :label-width="formLabelWidth" prop="jobState">
+ <el-select v-model="form.jobState" clearable style="width: 100%" placeholder="璇烽�夋嫨鍦ㄨ亴鐘舵��">
+ <el-option v-for="(item,index) in jobList" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
@@ -97,10 +103,8 @@
}}
</template>
</el-table-column>
- <el-table-column prop="jobState" label="鍦ㄨ亴鐘舵��" min-width="120" :filters="[
- { text: '鍦ㄨ亴', value: 1 },
- { text: '绂诲矖', value: 0 },
- ]" column-key="status" :filter-method="filterTag" filter-placement="bottom-end">
+ <el-table-column prop="jobState" label="鍦ㄨ亴鐘舵��" min-width="120" :filters="[{ text: '鍦ㄨ亴', value: 1 },{ text: '绂诲矖', value: 0 },]"
+ column-key="status" :filter-method="filterTag" filter-placement="bottom-end">
<template slot-scope="scope">
<el-tag :type="scope.row.jobState === 0 ? 'danger' : 'success'"
disable-transitions>{{ scope.row.jobState === 0 ? "绂诲矖" : "鍦ㄨ亴" }}</el-tag>
@@ -147,6 +151,7 @@
personData: [], // 鐢ㄦ潵瀛樻斁鎺ュ彛浼犺繃鏉ョ殑浜哄憳鍒楄〃鏁版嵁
dialogFormVisible: false,
form: {
+ id: "",
account: "",
age: "",
email: "",
@@ -154,7 +159,9 @@
phone: "",
organizationId: "",
roleId: "",
+ jobState: "",
},
+ jobList:[{ label: '鍦ㄨ亴', value: 1 },{ label: '绂诲矖', value: 0 }],
myProp: {
value: "id",
label: "department",
@@ -215,10 +222,11 @@
this.currentPage = 1;
this.pageSize = val;
},
- filterTag(value) {
- this.status = "";
- this.status = value;
- return true;
+ filterTag(value,row) {
+ // console.log("filterTag--",value);
+ // this.status = "";
+ // this.status = value;
+ return row.jobState === value;
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
@@ -252,24 +260,38 @@
this.$refs.form.validate((valid) => {
if (valid) {
let departmentId = this.form.organizationId;
- this.form.organizationId = departmentId[departmentId.length - 1];
+ let form = {
+ id: this.form.id,
+ account: this.form.account,
+ age: this.form.age,
+ email: this.form.email,
+ name: this.form.name,
+ phone: this.form.phone,
+ organizationId: departmentId[departmentId.length - 1],
+ roleId: this.form.roleId,
+ jobState: this.form.jobState
+ }
if (!this.isUpdate) {
- post("/user/add_new_personnel", this.form).then((response) => {
+ post("/user/add_new_personnel", form).then((response) => {
this.$message({
message: response.message,
type: "success",
});
this.dialogFormVisible = false;
this.getData();
+ }).catch((error)=>{
+ this.$message.error(error.message);
});
} else {
- put("/user/update_new_personnel", this.form).then((res) => {
+ put("/user/update_new_personnel", form).then((res) => {
this.$message({
message: res.message,
type: "success",
});
this.dialogFormVisible = false;
this.getData();
+ }).catch((error)=>{
+ this.$message.error(error.message);
});
}
} else {
@@ -312,6 +334,7 @@
},
handleClick(row) {
+ console.log(row);
this.isUpdate = true;
this.dialogFormVisible = true;
this.form.name = row.username;
@@ -319,11 +342,12 @@
this.form.phone = row.phone;
this.form.id = row.id;
this.form.email = row.email;
+ this.form.jobState = row.jobState;
this.form.organizationId = this.getParentsById(
this.options,
row.departmentId
);
- this.form.roleId = row.roleName;
+ this.form.roleId = row.roleId;
this.form.age = row.age;
this.form.account = row.account;
},
@@ -344,7 +368,17 @@
handler(newVal, oldVal) {
if (newVal == false) {
this.isUpdate = false;
- this.form = {};
+ this.form = {
+ id: "",
+ account: "",
+ age: "",
+ email: "",
+ name: "",
+ phone: "",
+ organizationId: "",
+ roleId: "",
+ jobState: "",
+ };
this.$refs.form.resetFields();
} else {
this.getRoleList();
--
Gitblit v1.9.3