From 2b5e20ec148e824fb6498bbe2977dd1820468c3e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 14 八月 2023 18:00:06 +0800
Subject: [PATCH] new file: src/api/urlEnum/personnel.js modified: src/api/urlEnum/satisfactionSurveys.js modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/personnel/index.vue
---
src/api/urlEnum/satisfactionSurveys.js | 3
src/views/laboratory/ledger/index.vue | 613 +++++++++++++-----------------------
src/views/CNAS/satisfactionSurveys/index.vue | 216 ++++++++++--
src/views/laboratory/personnel/index.vue | 151 +++-----
src/api/urlEnum/personnel.js | 8
5 files changed, 457 insertions(+), 534 deletions(-)
diff --git a/src/api/urlEnum/personnel.js b/src/api/urlEnum/personnel.js
new file mode 100644
index 0000000..acade93
--- /dev/null
+++ b/src/api/urlEnum/personnel.js
@@ -0,0 +1,8 @@
+const baseurl='/user'
+
+const url={
+ "list_new_personnel": baseurl+"/list_new_personnel",//鑾峰彇浜哄憳淇℃伅
+}
+export default{
+ url
+}
\ No newline at end of file
diff --git a/src/api/urlEnum/satisfactionSurveys.js b/src/api/urlEnum/satisfactionSurveys.js
index e4ef2ba..8a4bcba 100644
--- a/src/api/urlEnum/satisfactionSurveys.js
+++ b/src/api/urlEnum/satisfactionSurveys.js
@@ -3,7 +3,8 @@
const url={
"getCnasSatisfactionSurvey": baseurl+"/getCnasSatisfactionSurvey",//鑾峰彇涓嶅悎鏍煎搧鍙嶉
"getFillNameAndId": baseurl+"/getFillNameAndId",//褰撳墠褰曞叆浜�
- "uploadFile": baseurl+"/uploadFile"//鏂囦欢涓婁紶
+ "uploadFile": baseurl+"/uploadFile",//鏂囦欢涓婁紶
+ "addSurvey": baseurl+"/addSurvey",//婊℃剰搴︽柊澧�
}
export default{
url
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
index a0f1ee8..f1e2efb 100644
--- a/src/views/CNAS/satisfactionSurveys/index.vue
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -7,13 +7,19 @@
<el-form-item style="width: 800px;">
<el-col style="display: flex; justify-content: space-around;" :span="12">
<el-row>璋冩煡鏃ユ湡:</el-row>
- <el-row style="width: 300px;"><el-input type="date" prefix-icon="el-icon-date" v-model="surveyDate"
- placeholder="璇烽�夋嫨璋冩煡鏃ユ湡"></el-input></el-row>
+ <el-row style="width: 300px;">
+ <el-date-picker style="width: 270px;" class="newly-form" v-model="surveyDate" type="date"
+ placeholder="璇烽�夋嫨璋冩煡鏃ユ湡" autocomplete="off">
+ </el-date-picker>
+ </el-row>
</el-col>
<el-col style="display: flex; justify-content: space-around;" :span="12">
<el-row>褰曞叆鏃ユ湡:</el-row>
- <el-row style="width: 300px;"><el-input type="date" prefix-icon="el-icon-date" v-model="entryDate"
- placeholder="璇烽�夋嫨褰曞叆鏃ユ湡"></el-input></el-row>
+ <el-row style="width: 300px;">
+ <el-date-picker style="width: 270px;" class="newly-form" v-model="entryDate" type="date"
+ placeholder="璇烽�夋嫨褰曞叆鏃ユ湡" autocomplete="off">
+ </el-date-picker>
+ </el-row>
</el-col>
</el-form-item>
<el-form-item>
@@ -30,16 +36,11 @@
<el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
:data="tableData" style="width: 100%">
- <el-table-column type="index" label="搴忓彿" min-width="5%">
- <template slot-scope="scope">
- <el-checkbox v-model="id" value="scope.row.id"></el-checkbox>
- </template>
- </el-table-column>
+ <el-table-column prop="id" type="index" label="搴忓彿" min-width="20%"/>
<el-table-column prop="surveyDate" label="璋冩煡鏃ユ湡" min-width="10%" />
<el-table-column prop="userUnit" label="瀹㈡埛鍗曚綅鍚嶇О" min-width="10%" />
<el-table-column prop="projectName" label="椤圭洰鍚嶇О" min-width="10%" />
<el-table-column prop="fillName" label="濉〃浜哄鍚�" min-width="10%" />
- <el-table-column prop="dateInfo" label="鏃ユ湡" min-width="10%" />
<el-table-column prop="post" label="鑱屼綅" min-width="10%" />
<el-table-column prop="telephone" label="鑱旂郴鐢佃瘽" min-width="10%" />
<el-table-column prop="userName" label="褰曞叆浜�" min-width="10%" />
@@ -121,12 +122,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="璋冩煡鏃ユ湡锛�" prop="surveyDate">
- <el-input style="width: 200px;" type="date" v-model="ruleForm.surveyDate"></el-input>
+ <el-date-picker style="width: 200px;" class="newly-form" v-model="ruleForm.surveyDate" type="date"
+ placeholder="璇烽�夋嫨璋冩煡鏃ユ湡" autocomplete="off">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍗曚綅锛�" prop="unitName">
- <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ュ鎴峰崟浣嶅悕绉�" v-model="ruleForm.unitName"></el-input>
+ <el-form-item label="瀹㈡埛鍗曚綅锛�" prop="userUnit">
+ <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ュ鎴峰崟浣嶅悕绉�" v-model="ruleForm.userUnit"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -137,8 +140,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏃ユ湡锛�" prop="dateInfo">
- <el-input style="width: 200px;" type="date" v-model="ruleForm.dateInfo"></el-input>
+ <el-form-item label="鑱旂郴鐢佃瘽锛�" prop="telephone">
+ <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" v-model="ruleForm.telephone"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -158,30 +161,24 @@
<!-- 鑱旂郴鐢佃瘽/褰曞叆鏃ユ湡 -->
<el-row>
<el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽锛�" prop="telephone">
- <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ヨ亴浣�" v-model="ruleForm.telephone"></el-input>
+ <el-form-item label="褰曞叆浜猴細" prop="userName">
+ <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ュ綍鍏ヤ汉濮撳悕" v-model="ruleForm.userName"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="褰曞叆鏃ユ湡锛�" prop="entryDate">
- <el-input style="width: 200px;" type="date" v-model="ruleForm.entryDate"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <!-- 褰曞叆浜� -->
- <el-row>
- <el-col :span="12">
- <el-form-item label="褰曞叆浜猴細" prop="userName">
- <el-input style="width: 200px;" type="text" placeholder="璇疯緭鍏ュ綍鍏ヤ汉濮撳悕" v-model="ruleForm.userName"></el-input>
+ <el-date-picker style="width: 200px;" class="newly-form" v-model="ruleForm.entryDate" type="date"
+ placeholder="璇烽�夋嫨褰曞叆鏃ユ湡" autocomplete="off">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="闄勪欢涓婁紶锛�">
- <el-upload class="upload-demo" :action="path"
- :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="1"
- :on-exceed="handleExceed" :file-list="fileList" :on-success="fileUploadSuccess()">
+ <el-upload class="upload-demo" :action="path" :on-preview="handlePreview" :on-remove="handleRemove" multiple
+ :limit="1" :on-exceed="handleExceed" :file-list="fileList" :on-success="handleSuccess"
+ :before-upload="beforeAvatarUpload">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
@@ -189,7 +186,7 @@
</el-row>
<!-- 鎻愪氦 -->
<el-row>
- <el-col :span="8">
+ <el-col :span="24" style="display: flex;justify-content: center;">
<el-form-item>
<el-button @click="resetForm('ruleForm')">鍙栨秷</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">淇濆瓨</el-button>
@@ -230,20 +227,26 @@
path: 'http://192.168.110.254:1234/cnasSatisfactionSurvey/uploadFile',
ruleForm: {
surveyDate: '',
- unitName: '',
+ userUnit: '',
projectName: '',
- dateInfo: '',
fillName: '',
post: '',
+ userId: '',
telephone: '',
entryDate: '',
- userName: ''
+ userName: '',
+ serviceAttitude: '',
+ technicalPower: '',
+ testJob: '',
+ reasonableCharge: '',
+ improvementRequirements: '',
+ otherSupplements: ''
},
rules: {
surveyDate: [
{ type: 'date', required: true, message: '璇烽�夋嫨璋冩煡鏃ユ湡', trigger: 'change' }
],
- unitName: [
+ userUnit: [
{ required: true, message: '璇疯緭鍏ュ鎴峰崟浣嶅悕绉�', trigger: 'blur' },
],
projectName: [
@@ -260,7 +263,7 @@
}
},
created() {
-
+
},
mounted() {
this.getData()
@@ -270,6 +273,7 @@
this.getData();
},
look(id) {
+ console.log(id);
let str = "/$";
this.dialogVisible = true
let data = this.tableData.filter(res => {
@@ -311,25 +315,62 @@
"surveyDate": this.surveyDate,
"entryDate": this.entryDate
}
+ if (this.surveyDate != null) {
+ param.surveyDate = this.dateFormat(this.surveyDate);
+ }
+ if (this.entryDate !== null) {
+ param.entryDate = this.dateFormat(this.entryDate);
+ }
let res = await get(urlInfo.url.getCnasSatisfactionSurvey, param)
this.tableData = res.data.cnasSatisfactionSurveyList
this.total = res.data.total
},
- getFillName() {
+ async getFillName() {
this.dialogVisible2 = true
- // get(urlInfo.url.getFillNameAndId)
+ let res = await get(urlInfo.url.getFillNameAndId)
+ this.ruleForm.userName = res.data.name
+ this.ruleForm.userId = res.data.id
+ var now = new Date();
+ this.ruleForm.entryDate = now
},
- submitForm(formName) {
+ async submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- alert('submit!');
+ this.add();
} else {
console.log('error submit!!');
return false;
}
});
},
+ async add() {
+ let data = JSON.parse(JSON.stringify(this.ruleForm))
+ let entryDate = this.format(this.ruleForm.entryDate);
+ let surveyDate = this.format(this.ruleForm.surveyDate);
+ data.entryDate = entryDate
+ data.surveyDate = surveyDate
+ // data.dateInfo = dateInfo
+ let add = await post(urlInfo.url.addSurvey, data);
+ if (add) {
+ this.$message({
+ message: '娣诲姞鎴愬姛',
+ type: 'success'
+ });
+ this.fileList = []
+ this.$refs["ruleForm"].resetFields();
+ let res = await get(urlInfo.url.getFillNameAndId)
+ this.ruleForm.userName = res.data.name
+ this.ruleForm.id = res.data.id
+ var now = new Date();
+ this.ruleForm.entryDate = now
+ this.getData()
+ } else {
+ this.$message.error('娣诲姞澶辫触锛佽妫�鏌ュ唴瀹�');
+ }
+ },
resetForm(formName) {
+ this.dialogVisible2 = false
+ this.fileList = []
this.$refs[formName].resetFields();
},
handleRemove(file, fileList) {
@@ -341,11 +382,100 @@
handleExceed(files, fileList) {
this.$message.warning(`褰撳墠闄愬埗閫夋嫨 1 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
},
- beforeRemove(file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋);
+ // beforeRemove(file, fileList) {
+ // return this.$confirm(`纭畾绉婚櫎 ${file.name}锛焋);
+ // },
+ handleSuccess(response, file, fileList) {
+ let data = response.data;
+ if (this.ruleForm.userUnit == '') {
+ this.ruleForm.userUnit = data.unitName
+ }
+ if (this.ruleForm.projectName == '') {
+ this.ruleForm.projectName = data.projectName
+ }
+ if (this.ruleForm.post === '') {
+ this.ruleForm.post = data.post
+ }
+ if (this.ruleForm.fillName == '') {
+ this.ruleForm.fillName = data.fillName.split("/")[0]
+ }
+ if (this.ruleForm.telephone == '') {
+ this.ruleForm.telephone = data.telephone
+ }
+ if(this.ruleForm.surveyDate==null||this.ruleForm.surveyDate==''){
+ let dates = new Date(data.fillName.split("/")[1]);
+ console.log(dates);
+ if(dates!=''&&dates!=''){
+ this.ruleForm.surveyDate=dates
+ }
+ }
+ this.ruleForm.serviceAttitude = data.serviceAttitude
+ this.ruleForm.technicalPower = data.technicalPower
+ this.ruleForm.testJob = data.testJob
+ this.ruleForm.improvementRequirements = data.improvementRequirements
+ this.ruleForm.otherSupplements = data.otherSupplements
+ this.ruleForm.reasonableCharge=data.reasonableCharge
},
- fileUploadSuccess(res){
- console.log(res);
+ beforeAvatarUpload(file) {
+ let split = file.name.split(".");
+ let fileName = split[split.length - 1];
+ const isWord = fileName == 'doc' || fileName == 'docx';
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isWord) {
+ this.$message.error('涓婁紶word鏂囦欢鍙兘鏄� doc/docx 鏍煎紡!');
+ }
+ if (!isLt2M) {
+ this.$message.error('涓婁紶word鏂囦欢澶у皬涓嶈兘瓒呰繃 2MB!');
+ }
+ return isWord && isLt2M;
+ },
+ dateFormat(longTypeDate) {
+ var dateTypeDate = "";
+ var date = new Date();
+ date.setTime(longTypeDate);
+ dateTypeDate += date.getFullYear(); //骞�
+ dateTypeDate += "-" + this.getMonth(date); //鏈�
+ dateTypeDate += "-" + this.getDay(date); //鏃�
+ return dateTypeDate;
+ },
+ //杩斿洖 01-12 鐨勬湀浠藉��
+ getMonth(date) {
+ var month = "";
+ month = date.getMonth() + 1; //getMonth()寰楀埌鐨勬湀浠芥槸0-11
+ if (month < 10) {
+ month = "0" + month;
+ }
+ return month;
+ },
+ //杩斿洖01-30鐨勬棩鏈�
+ getDay(date) {
+ var day = "";
+ day = date.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ return day;
+ },
+ datetimeFormat(longTypeDate) {
+ var dateTypeDate = "";
+ var date = new Date();
+ date.setTime(longTypeDate);
+ dateTypeDate += date.getFullYear(); //骞�
+ dateTypeDate += "-" + this.getMonth(date); //鏈�
+ dateTypeDate += "-" + this.getDay(date); //鏃�
+ return dateTypeDate;
+ },
+ format(d) {
+ var y = d.getFullYear();
+ var m = d.getMonth() + 1;
+ if (m < 10) {
+ m = "0" + m;
+ }
+ var day = d.getDate();
+ if (day < 10) {
+ day = "0" + day;
+ }
+ return y + "-" + m + "-" + day;
}
}
}
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 329e21b..555d0b6 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -4,10 +4,7 @@
<div class="search-bar">
<el-form ref="form" :inline="true" :model="searchData">
<el-form-item>
- <el-input
- v-model="searchData.keyword"
- placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸"
- >
+ <el-input v-model="searchData.keyword" placeholder="璇疯緭鍏ョ紪鍙�/璁惧鍚嶇О/鍨嬪彿瑙勬牸">
<i slot="prefix" class="el-input__icon el-icon-search" />
</el-input>
</el-form-item>
@@ -27,24 +24,16 @@
<div class="bom-item-search">
<el-row>
<el-col :span="19">
- <el-input
- v-model="filterText"
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- />
+ <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" />
</el-col>
<el-col :span="5">
- <el-button type="primary" size="small" @click="addClassVisible = true"><i class="el-icon-plus" /></el-button>
+ <el-button type="primary" size="small" @click="addClassVisible = true"><i
+ class="el-icon-plus" /></el-button>
</el-col>
</el-row>
</div>
- <el-tree
- ref="classTree"
- :data="classTree"
- :props="defaultProps"
- :default-expand-all="true"
- :filter-node-method="filterNode"
- @node-click="nodeClickHandler"
- />
+ <el-tree ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
+ :filter-node-method="filterNode" @node-click="nodeClickHandler" />
</div>
<div class="library-table">
<div class="table-header">
@@ -55,74 +44,31 @@
{{ item.label }}
</el-radio-button>
</el-radio-group>
- <el-checkbox v-model="isOut" @change="getExpireTable" :style="{'marginLeft':'12px'}">宸茶繃鏈�</el-checkbox>
+ <el-checkbox v-model="isOut" @change="getExpireTable" :style="{ 'marginLeft': '12px' }">宸茶繃鏈�</el-checkbox>
</div>
<div class="serve-btn">
<!-- <el-button type="primary" icon="el-icon-plus">鏂板浜哄憳</el-button> -->
</div>
</div>
<div class="table-box">
- <el-table
- ref="equipmentTable"
- node-key="father_name"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="equipmentTable"
- style="width: 100%"
- >
- <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"
- />
- <el-table-column
- prop="specifications_models"
- label="瑙勬牸鍨嬪彿"
- min-width="150"
- />
- <el-table-column
- prop="name"
- label="淇濈浜�"
- min-width="200"
- />
- <el-table-column
- prop="termValidity"
- label="璁￠噺鎴鏈夋晥鏈�"
- min-width="200"
- />
- <el-table-column
- prop="conditions"
- label="璁惧鐘舵��"
- min-width="120"
- >
+ <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="equipmentTable" style="width: 100%">
+ <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" />
+ <el-table-column prop="specifications_models" label="瑙勬牸鍨嬪彿" min-width="150" />
+ <el-table-column prop="name" label="淇濈浜�" min-width="200" />
+ <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 :type="scope.row.conditions === 0 ? 'primary' : 'success'" disable-transitions>{{
+ scope.row.conditions | conditionsFilter }}</el-tag>
</template>
</el-table-column>
- <el-table-column
- prop="storage_place"
- label="瀛樻斁鍦�"
- min-width="200"
- />
+ <el-table-column prop="storage_place" label="瀛樻斁鍦�" min-width="200" />
- <el-table-column
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="openDetail(scope.row)">缂栬緫</el-button>
<el-button type="text" size="small" @click="clickDelete(scope.row)">鍒犻櫎</el-button>
@@ -133,45 +79,36 @@
<div>
<!-- 娣诲姞鍒嗙被 -->
<el-dialog title="娣诲姞鍒嗙被" :visible.sync="addClassVisible" width="33%">
- <el-form :model="addTreeForm">
- <el-form-item label="鍒嗙被鍚嶇О" label-width="100px">
- <el-input v-model="addTreeForm.name" autocomplete="off" />
+ <el-form :model="addTreeForm" ref="addTreeForm">
+ <el-form-item prop="name" label="鍒嗙被鍚嶇О" label-width="100px" :rules="[
+ { required: true, message: '鍒嗙被鍚嶇О涓嶈兘涓虹┖' }
+ ]">
+ <el-input v-model="addTreeForm.name"
+ />
</el-form-item>
<el-form-item label="鐖剁骇鍒嗙被" label-width="100px">
- <el-select v-model="addTreeForm.type" placeholder="璇烽�夋嫨">
+ <el-select style="width: 100%;" v-model="addTreeForm.type" placeholder="璇烽�夋嫨">
<el-option label="鍘熸潗鏂�" value="0" />
<el-option label="鐢电嚎鐢电紗" value="1" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="addClassVisible = false">鍙� 娑�</el-button>
- <el-button type="primary">纭� 瀹�</el-button>
+ <el-button @click="resetTreeForm('addTreeForm')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitTreeForm('addTreeForm')">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
<div>
- <el-pagination
- :current-page="currentPage"
- :page-sizes="[10, 15, 20, 25]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
</div>
</div>
</div>
</div>
<!-- 浠櫒璇︽儏-->
- <el-drawer
- title="浠櫒璁惧璇︽儏"
- :visible.sync="detailDrawer"
- size="80%"
- class="detailDrawer"
- @close="closeDetailDrawer"
- >
+ <el-drawer title="浠櫒璁惧璇︽儏" :visible.sync="detailDrawer" size="80%" class="detailDrawer" @close="closeDetailDrawer">
<div>
<div class="detail-info">
<div class="tips-main">
@@ -187,7 +124,7 @@
<div class="message-item"><span><i class="el-icon-edit" />鎵�灞炲垎绫伙細{{ equipmentDetail.classifyId }}</span></div>
<div class="message-item">
<span><i class="el-icon-edit" />鍒涘缓浜猴細{{ equipmentDetail.createUserId }}</span>
- <el-tag type="primary"><i class="el-icon-info" :style="{marginRight:'4px', color:'#409EFF'}" /></el-tag>
+ <el-tag type="primary"><i class="el-icon-info" :style="{ marginRight: '4px', color: '#409EFF' }" /></el-tag>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />寤烘。鏃ユ湡锛歿{ equipmentDetail.acceptanceDate }}</span>
@@ -220,10 +157,11 @@
<span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.userId }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition==1 ? '鏀寔': '涓嶆敮鎸�' }}</span>
+ <span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition == 1 ? '鏀寔' : '涓嶆敮鎸�'
+ }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />浠櫒璁惧璁￠噺锛歿{ equipmentDetail.equipmentMeasurement==1 ? '闇�瑕�': '涓嶉渶瑕�' }}</span>
+ <span><i class="el-icon-edit" />浠櫒璁惧璁￠噺锛歿{ equipmentDetail.equipmentMeasurement == 1 ? '闇�瑕�' : '涓嶉渶瑕�' }}</span>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />璁￠噺鍛ㄦ湡锛歿{ equipmentDetail.termValidity }}</span>
@@ -235,71 +173,40 @@
</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">
+ <el-button v-show="!codePointesTableStatus" :style="{ marginBottom: '18px' }"
+ @click="addCodePoints">鏂板璁惧鐮佺偣</el-button>
+ <div v-show="codePointesTableStatus" :style="{ marginBottom: '18px' }" class="btns">
<el-button @click="addNewCodePoints">娣诲姞</el-button>
<el-button @click="saveCodePoins">淇濆瓨</el-button>
<el-button @click="closeCodePoins">鍙栨秷</el-button>
</div>
- <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%"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- min-width="90"
- />
- <el-table-column
- prop="equipmentPoint"
- label="鐮佺偣缂栫爜"
- min-width="150"
- >
+ <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%">
+ <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" />
</template>
</el-table-column>
- <el-table-column
- prop="equipmentPointName"
- label="鐮佺偣鍚嶇О"
- min-width="150"
- >
+ <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" />
</template>
</el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- min-width="150"
- >
+ <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" />
</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"
- >
+ <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" />
@@ -309,54 +216,18 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="璁￠噺淇℃伅" name="measure">
- <el-button :style="{marginBottom: '18px'}" @click="measureFormVisible = true">鏂板璁￠噺淇℃伅</el-button>
- <el-table
- ref="measureTable"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="measureTable"
- style="width: 100%"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- min-width="90"
- />
- <el-table-column
- prop="name"
- label="璐熻矗浜�"
- min-width="200"
- />
- <el-table-column
- prop="measurement_unit"
- label="璁￠噺鍗曚綅"
- min-width="150"
- />
- <el-table-column
- prop="beginDate"
- label="寮�濮嬫棩鏈�"
- min-width="150"
- />
- <el-table-column
- prop="endDate"
- label="缁撴潫鏃ユ湡"
- min-width="150"
- />
- <el-table-column
- prop="performance_index"
- label="鎬ц兘鎸囨爣"
- min-width="200"
- />
- <el-table-column
- prop="uncertainty"
- label="涓嶇‘瀹氬害"
- min-width="200"
- />
- <el-table-column
- prop="conditions"
- label="缁撴灉"
- min-width="120"
- >
+ <el-button :style="{ marginBottom: '18px' }" @click="measureFormVisible = true">鏂板璁￠噺淇℃伅</el-button>
+ <el-table ref="measureTable" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="measureTable" style="width: 100%">
+ <el-table-column type="index" label="搴忓彿" min-width="90" />
+ <el-table-column prop="name" label="璐熻矗浜�" min-width="200" />
+ <el-table-column prop="measurement_unit" label="璁￠噺鍗曚綅" min-width="150" />
+ <el-table-column prop="beginDate" label="寮�濮嬫棩鏈�" min-width="150" />
+ <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="150" />
+ <el-table-column prop="performance_index" label="鎬ц兘鎸囨爣" min-width="200" />
+ <el-table-column prop="uncertainty" label="涓嶇‘瀹氬害" min-width="200" />
+ <el-table-column prop="conditions" label="缁撴灉" min-width="120">
<template slot-scope="scope">
{{ scope.row.result }}
<!-- <el-tag
@@ -365,26 +236,15 @@
>{{ scope.row.result === 0 ? '鏈悓鎰�' : '宸插悓鎰�' }}</el-tag> -->
</template>
</el-table-column>
- <el-table-column
- prop="remarks"
- label="澶囨敞"
- min-width="200"
- />
+ <el-table-column prop="remarks" label="澶囨敞" min-width="200" />
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</el-drawer>
<!-- 娣诲姞浠櫒/淇敼浠櫒淇℃伅 -->
- <el-drawer
- ref="addDrawer"
- :title="equipmentDetail.id?'淇敼浠櫒璁惧淇℃伅':'鏂板浠櫒璁惧'"
- :append-to-body="true"
- :visible.sync="addDrawerVisible"
- class="addDrawer"
- size="40%"
- @close="closeAddOrChangeDrawer"
- >
+ <el-drawer ref="addDrawer" :title="equipmentDetail.id ? '淇敼浠櫒璁惧淇℃伅' : '鏂板浠櫒璁惧'" :append-to-body="true"
+ :visible.sync="addDrawerVisible" class="addDrawer" size="40%" @close="closeAddOrChangeDrawer">
<div class="demo-drawer__content">
<el-form label-position="top" :model="equipmentform">
<el-row :gutter="50">
@@ -407,20 +267,10 @@
</el-col>
<el-col :span="11">
<el-form-item label="鐘舵�侊細" 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"
- :value="item.value"
- />
+ <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"
+ :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -457,42 +307,23 @@
</el-col>
<el-col :span="11">
<el-form-item label="鍒拌揣鏃ユ湡锛�" label-width="80">
- <el-date-picker
- v-model="equipmentform.arrivalDate"
- type="date"
- placeholder="璇烽�夋嫨鍒拌揣鏃ユ湡"
- style="width:100%"
- />
+ <el-date-picker v-model="equipmentform.arrivalDate" type="date" placeholder="璇烽�夋嫨鍒拌揣鏃ユ湡"
+ style="width:100%" />
</el-form-item>
</el-col>
</el-row>
<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="璇烽�夋嫨楠屾敹鏃ユ湡"
- style="width:100%"
- />
+ <el-date-picker v-model="equipmentform.acceptanceDate" type="date" placeholder="璇烽�夋嫨楠屾敹鏃ユ湡"
+ style="width:100%" />
</el-form-item>
</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="璇烽�夋嫨淇濈浜�"
- style="width:100%"
- >
- <el-option
- v-for="item in userOpetions"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="equipmentform.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" />
</el-select>
</el-form-item>
</el-col>
@@ -511,7 +342,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-show="equipmentform.equipmentMeasurement===1" :gutter="50">
+ <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" type="number" />
@@ -521,13 +352,8 @@
<el-row :gutter="50">
<el-col :span="11">
<el-form-item label="鎻忚堪锛�" label-width="80">
- <el-input
- v-model="equipmentform.descriptiveness"
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- style="width:217%"
- />
+ <el-input v-model="equipmentform.descriptiveness" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ style="width:217%" />
</el-form-item>
</el-col>
</el-row>
@@ -544,20 +370,9 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="璐熻矗浜�">
- <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"
- />
+ <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" />
</el-select>
</el-form-item>
</el-col>
@@ -570,13 +385,8 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="妫�瀹氭湁鏁堟湡">
- <el-date-picker
- v-model="measureForm.date"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
+ <el-date-picker v-model="measureForm.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡" />
</el-form-item>
</el-col>
</el-row>
@@ -588,20 +398,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="缁撴灉">
- <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"
- />
+ <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" />
</el-select>
</el-form-item>
</el-col>
@@ -609,36 +408,21 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="鎬ц兘鎸囨爣">
- <el-input
- v-model="measureForm.performanceIndex"
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
+ <el-input v-model="measureForm.performanceIndex" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="澶囨敞">
- <el-input
- v-model="measureForm.remarks"
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
+ <el-input v-model="measureForm.remarks" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-col>
</el-row>
<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 class="upload-demo" action="#" :on-change="handleUpload" :auto-upload="false">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
@@ -652,10 +436,7 @@
</span>
</el-dialog>
<!-- 鍒犻櫎浠櫒寮瑰嚭妗� -->
- <el-dialog
- title="鎻愮ず"
- :visible.sync="deletedialogVisible"
- width="30%">
+ <el-dialog title="鎻愮ず" :visible.sync="deletedialogVisible" width="30%">
<span>纭畾鍒犻櫎璇ヤ华鍣ㄥ悧锛�</span>
<span slot="footer" class="dialog-footer">
<el-button @click="deletedialogVisible = false">鍙� 娑�</el-button>
@@ -666,10 +447,12 @@
</template>
<script>
-import { getClassifyList, getInstrumentList,
+import {
+ getClassifyList, getInstrumentList,
addInstrumentUser, addInstrument, getInstrumentDetail,
getEquipmentPointList, addEquipmentPoint,
- getMetricalInformationList, changeInstrument, addMetricalInformation, deleteInstrument } from '@/api/laboratory/ledger'
+ getMetricalInformationList, changeInstrument, addMetricalInformation, deleteInstrument
+} from '@/api/laboratory/ledger'
import { parseTime } from '@/utils/index'
export default {
filters: {
@@ -1114,15 +897,30 @@
// console.log(row.id)
await deleteInstrument({ instrumentId: this.instrumentId })
this.deletedialogVisible = false
+ },
+ submitTreeForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!');
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ resetTreeForm(formName) {
+ this.$refs[formName].resetFields();
+ this.addClassVisible=false
}
}
}
</script>
<style lang="scss" scoped>
-.demo-drawer__content{
+.demo-drawer__content {
margin-left: 50px;
}
+
.demo-drawer__footer {
display: flex;
justify-content: space-between;
@@ -1142,148 +940,174 @@
margin-right: 60px;
margin-bottom: 24px;
}
-.ledger-main{
+
+.ledger-main {
width: 100%;
height: 100%;
- // 椤甸潰澶撮儴鏉′欢鎼滅储
- .page-header-search{
+
+ // 椤甸潰澶撮儴鏉′欢鎼滅储
+ .page-header-search {
background: #fff;
display: flex;
justify-content: space-between;
padding: 0 24px 12px 24px;
- .search-bar{
- .el-radio-button.is-active{
+
+ .search-bar {
+ .el-radio-button.is-active {
color: #409EFF !important;
background: #ecf5ff !important;
border-color: #b3d8ff !important;
}
- .el-form{
- .el-form-item{
- margin-bottom: 0px !important;
- .el-input{
- width: 360px;
- }
+
+ .el-form {
+ .el-form-item {
+ margin-bottom: 0px !important;
+
+ .el-input {
+ width: 360px;
+ }
}
}
}
}
-// 椤甸潰涓績鍐呭鍖哄煙
- .content-main{
+ // 椤甸潰涓績鍐呭鍖哄煙
+ .content-main {
display: flex;
height: 100%;
min-height: calc(100vh - 88px);
padding: 15px;
- >div{
+
+ >div {
padding: 20px;
background: #fff;
}
- .library-bom{
+
+ .library-bom {
flex: 2;
margin-right: 12px;
- .bom-item-search{
+
+ .bom-item-search {
margin-bottom: 12px;
- ::v-deep .el-input{
- input{
+
+ ::v-deep .el-input {
+ input {
height: 33px;
line-height: 33px;
}
}
}
- .bom-item-search .el-row{
- // display: flex;
- .el-col{
- text-align: right;
- }
- }
+
+ .bom-item-search .el-row {
+
+ // display: flex;
+ .el-col {
+ text-align: right;
+ }
+ }
+
.el-tree {
margin-top: 12px;
}
}
- .library-table{
+
+ .library-table {
flex: 8;
max-width: 80%;
margin-left: 12px;
display: flex;
flex-direction: column;
- .table-box{
- margin-top: 30px;
+
+ .table-box {
+ margin-top: 30px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+
+ .el-table {
flex: 1;
- background: #fff;
+ }
+
+ >div:nth-child(2) {
display: flex;
- flex-direction: column;
- .el-table {
- flex: 1;
- }
- >div:nth-child(2){
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
+ justify-content: end;
+ margin: 10px 0;
+ }
}
}
}
}
-.addDrawer{
- ::v-deep .el-drawer__body{
- // padding: 24px !important;
- overflow-y: scroll;
- overflow-x: hidden;
- }
+
+.addDrawer {
+ ::v-deep .el-drawer__body {
+ // padding: 24px !important;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ }
}
-.detailDrawer{
- ::v-deep .el-drawer__body{
- padding: 24px !important;
- overflow-y: scroll;
- }
- .detail-info{
+
+.detailDrawer {
+ ::v-deep .el-drawer__body {
+ padding: 24px !important;
+ overflow-y: scroll;
+ }
+
+ .detail-info {
background: #fff;
box-shadow: rgba(100, 100, 111, 0.2) 0px 5px 15px;
margin: 0;
margin-bottom: 12px;
border-radius: 6px;
overflow: hidden;
- .tips-main{
+
+ .tips-main {
padding: 10px 20px 0 20px;
display: flex;
justify-content: space-between;
align-items: center;
height: 50px;
- .tips-btn{
+
+ .tips-btn {
margin-bottom: 10px;
}
- .tips{
- height: 100%;
- display: flex;
- height: 24px;
- align-items: center;
- font-size: 16px;
- >span{
- display: inline-block;
- margin-right: 10px;
- width: 4px;
- height: 16px;
- background: #0077DB;
- }
- >div{
+
+ .tips {
height: 100%;
- line-height: 26px;
- }
- .el-button{
- padding: 0;
- }
+ display: flex;
+ height: 24px;
+ align-items: center;
+ font-size: 16px;
+
+ >span {
+ display: inline-block;
+ margin-right: 10px;
+ width: 4px;
+ height: 16px;
+ background: #0077DB;
+ }
+
+ >div {
+ height: 100%;
+ line-height: 26px;
+ }
+
+ .el-button {
+ padding: 0;
+ }
}
}
// 鍩烘湰淇℃伅鍜屼紒涓氫俊鎭殑姣忎竴涓俊鎭」鏍峰紡
- .message{
+ .message {
padding: 0px 20px 8px 20px;
display: flex;
flex-wrap: wrap;
border-top: 1px solid #F2F6FC;
- >div{
+
+ >div {
flex: 30%;
max-width: 30%;
padding: 8px;
@@ -1293,22 +1117,27 @@
height: 40px;
display: flex;
align-items: center;
- >span{
+
+ >span {
color: #303133;
font-size: 14px;
- >i{
+
+ >i {
margin-right: 8px;
}
}
}
}
}
- }
-.measureForm{
+}
+
+.measureForm {
+
//
- .el-form-item{
+ .el-form-item {
+
//
- .el-date-editor{
+ .el-date-editor {
width: 100%;
}
}
diff --git a/src/views/laboratory/personnel/index.vue b/src/views/laboratory/personnel/index.vue
index 3312928..26998b3 100644
--- a/src/views/laboratory/personnel/index.vue
+++ b/src/views/laboratory/personnel/index.vue
@@ -2,17 +2,14 @@
<div class="personnel-main ">
<div class="page-header-search">
<div class="search-bar">
- <el-form ref="form" inline="true" :model="searchData">
+ <el-form ref="form" :inline="true">
<el-form-item>
- <el-input
- v-model="keyword"
- placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�"
- >
+ <el-input v-model="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="searchData()">鏌ヨ</el-button>
+ <el-button type="primary" @click="getData()">鏌ヨ</el-button>
<el-button type="primary" plain @click="resetData()">閲嶇疆</el-button>
<!-- <el-button type="text">楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right" /></el-button> -->
</el-form-item>
@@ -52,64 +49,24 @@
</div>
<div class="content-main">
<div class="personner-table">
- <el-table
- ref="personnerlTable"
- :height="700"
- :max-height="700"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="personnerlTable"
- style="width: 100%"
- >
- <el-table-column
- prop="username"
- label="瑙掕壊鍚嶇О"
- min-width="120"
- />
- <el-table-column
- prop="roleName"
- label="瑙掕壊鏉冮檺"
- min-width="120"
- />
- <el-table-column
- prop="age"
- label="骞撮緞"
- min-width="150"
- />
- <el-table-column
- prop="createTime"
- label="鍒涘缓鏃堕棿"
- min-width="180"
- />
- <el-table-column
- prop="phone"
- label="鐢佃瘽"
- min-width="200"
- />
- <el-table-column
- prop="email"
- label="閭"
- min-width="200"
- />
- <el-table-column
- prop="jobState"
- label="鍦ㄨ亴鐘舵��"
- min-width="120"
- :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]"
- :filter-method="filterTag"
- filter-placement="bottom-end"
- >
+ <el-table ref="personnerlTable" :max-height="700" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="personnerlTable" style="width: 100%">
+ <el-table-column prop="username" label="瑙掕壊鍚嶇О" min-width="120" />
+ <el-table-column prop="roleName" label="瑙掕壊鏉冮檺" min-width="120" />
+ <el-table-column prop="age" label="骞撮緞" min-width="150" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="180" />
+ <el-table-column prop="phone" label="鐢佃瘽" min-width="200" />
+ <el-table-column prop="email" label="閭" min-width="200" />
+ <el-table-column prop="jobState" label="鍦ㄨ亴鐘舵��" min-width="120"
+ :filters="[{ text: 0, value: 0 }, { text: 1, value: 1 }]" :filter-method="filterTag"
+ filter-placement="bottom-end">
<template slot-scope="scope">
- <el-tag
- :type="scope.row.businessStatus === 0 ? 'primary' : 'success'"
- disable-transitions
- >{{ scope.row.businessStatus === 0 ? '鏈悓鎰�' : '宸插悓鎰�' }}</el-tag>
+ <el-tag :type="scope.row.jobState === 0 ? 'danger' : 'success'" disable-transitions>{{
+ scope.row.jobState === 0 ? '绂诲矖' : '鍦ㄨ亴' }}</el-tag>
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- min-width="120"
- >
+ <el-table-column label="鎿嶄綔" min-width="120">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">缂栬緫</el-button>
<!-- <el-button type="text" size="small">缂栬緫</el-button> -->
@@ -118,15 +75,9 @@
</el-table>
<div>
<!-- 鍒嗛〉鍣� -->
- <el-pagination
- :current-page="currentPage"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="this.personnerlTable.length"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination :current-page="currentPage" :page-sizes="[100, 200, 300, 400]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="this.personnerlTable.length"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
</div>
@@ -134,8 +85,8 @@
</template>
<script>
-import axios from 'axios'
-axios.defaults.baseURL = 'http://192.168.110.167:1234'
+import { get, post } from '@/api/util/requestUtil';
+import urlInfo from '../../../api/urlEnum/personnel.js'
export default {
data() {
return {
@@ -146,7 +97,7 @@
filteredpersonnerlTable: [],
currentindex: 1,
currentPage: 1, // 褰撳墠椤电爜
- total: 20, // 鎬绘潯鏁�
+ total: 0, // 鎬绘潯鏁�
pageSize: 100, // 姣忛〉鐨勬暟鎹潯鏁�
personData: [], // 鐢ㄦ潵瀛樻斁鎺ュ彛浼犺繃鏉ョ殑浜哄憳鍒楄〃鏁版嵁
dialogFormVisible: false,
@@ -193,24 +144,23 @@
this.currentPage = 1
this.pageSize = val
},
+ filterTag() {
+ console.log(11);
+ },
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
console.log(`褰撳墠椤�: ${val}`)
this.currentPage = val
},
- getData() {
- axios.get('/user/list_new_personnel', {
- params: {
- pageNo: 0,
- pageSize: 20
- }
- }).then(res => {
- // console.log(res)
- this.personData = res.data.data.row
- this.personnerlTable = this.personData
- }).catch(res => {
- console.log('error')
- })
+ async getData() {
+ let data = {
+ pageNo: 0,
+ pageSize: 20,
+ name: this.keyword
+ }
+ let res = await get(urlInfo.url.list_new_personnel, data);
+ this.personnerlTable=res.data.row
+ this.total=res.data.total
},
searchData() {
this.filteredpersonnerlTable = this.personnerlTable.filter((item) => {
@@ -245,36 +195,41 @@
return false
}
})
- }
+ },
}
}
</script>
<style lang="scss" scoped>
-.personnel-main{
+.personnel-main {
+
// width: 100%;
// height: 100%;
- .page-header-search{
+ .page-header-search {
background: #fff;
display: flex;
justify-content: space-between;
padding: 0 24px 12px 24px;
- .search-bar{
- .el-form{
- .el-form-item{
- margin-bottom: 0px !important;
- .el-input{
- width: 360px;
- }
+
+ .search-bar {
+ .el-form {
+ .el-form-item {
+ margin-bottom: 0px !important;
+
+ .el-input {
+ width: 360px;
+ }
}
}
}
}
- .personner-table{
+
+ .personner-table {
background: #fff;
padding: 20px 20px 10px 20px;
- >div:nth-child(2){
+
+ >div:nth-child(2) {
display: flex;
justify-content: end;
margin: 10px 0;
--
Gitblit v1.9.3