From e7e586da38606c67d4bd61e5bbc5f3d38f3013b9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 二月 2025 09:53:00 +0800
Subject: [PATCH] 人员-人员基本信息搬迁
---
src/views/CNAS/personnel/personnelInfo/index.vue | 6 +
src/api/cnas/personal/personalList.js | 4
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 6 -
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue | 110 ++++++++++++++++++++++++++----------
src/views/business/materialOrder/index.vue | 24 ++++++-
5 files changed, 106 insertions(+), 44 deletions(-)
diff --git a/src/api/cnas/personal/personalList.js b/src/api/cnas/personal/personalList.js
index 8170df3..567c481 100644
--- a/src/api/cnas/personal/personalList.js
+++ b/src/api/cnas/personal/personalList.js
@@ -3,7 +3,7 @@
// 鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
export function delUserDepardLimsId(query) {
return request({
- url: "/user/delUserDepardLimsId",
+ url: "/system/newUser/delUserDepardLimsId",
method: "delete",
params: query,
});
@@ -20,7 +20,7 @@
export function exportPersonBasicInfo(query) {
return request({
url: "/personBasicInfo/exportPersonBasicInfo",
- method: "post",
+ method: "get",
data: query,
responseType: "blob"
});
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index 20667db..a55381e 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/index.vue
@@ -22,7 +22,7 @@
<el-tree
ref="tree"
:data="list"
- :default-expanded-keys="[1]"
+ :default-expanded-keys="[22]"
:expand-on-click-node="false"
:filter-node-method="filterNode"
:props="{ children: 'children', label: 'name' }"
@@ -270,6 +270,10 @@
</script>
<style scoped>
+>>>.el-table__body-wrapper::-webkit-scrollbar {
+ height: 14px;
+ /* 璁剧疆婊氬姩鏉″搴� */
+}
.custom-tree-node {
width: 80%;
line-height: 32px;
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
index 4615cad..2b71f75 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
@@ -277,7 +277,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-upload ref="upload" :action="action" :on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'pictureUrl')"
+ <el-upload ref="upload" :action="action"
+ :headers="uploadHeader"
+ :on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'pictureUrl')"
:show-file-list="false"
style="float: left; margin: 0 10px 0 10px;">
<el-button slot="trigger" class="uploadFile" size="mini" type="primary">涓婁紶</el-button>
@@ -296,7 +298,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-upload ref="upload" :action="action" :on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'signatureUrl')"
+ <el-upload ref="upload" :action="action"
+ :headers="uploadHeader"
+ :on-success="(response, file, fileList) => onSuccess(response, file, fileList, 'signatureUrl')"
:show-file-list="false"
style="float: left; margin: 0 10px 0 10px;">
<el-button slot="trigger" class="uploadFile" size="small" type="primary">涓婁紶</el-button>
@@ -314,30 +318,9 @@
<el-button size="mini" style="float: right;margin-right: 25px" type="primary" @click="annexAdd(0)">鏂板</el-button>
</el-col>
</el-row>
- <el-table :data="annexList" border height="200" style="width: 96%;float: right;">
- <el-table-column label="搴忓彿" type="index" width="80px">
- </el-table-column>
- <el-table-column label="璇佷欢鍙�" prop="idNumber" width="150px">
- </el-table-column>
- <el-table-column label="鍙戣瘉鍗曚綅" prop="issueUnit" width="150px">
- </el-table-column>
- <el-table-column label="鏂囦欢鍚嶇О" prop="fileName" show-overflow-tooltip width="200px">
- </el-table-column>
- <el-table-column label="绾у埆" prop="level" width="150px">
- </el-table-column>
- <el-table-column label="鏈夋晥鏈�" prop="periodValidity" width="150px">
- </el-table-column>
- <el-table-column label="娣诲姞鏃堕棿" prop="createTime" width="150px">
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="150px">
- <template slot-scope="scope">
- <el-button size="mini" type="text" @click="downloadFile(scope.row.fileName)">涓嬭浇</el-button>
- <el-button size="mini" type="text" @click="annexAdd(1,scope.row)">缂栬緫</el-button>
- <el-button size="mini" type="text" @click="deleteAnnex(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-row>
+ <lims-table :tableData="annexList" :column="columnData2" style="width: 96%;margin-left: 34px"
+ height="200" :tableLoading="tableLoading2"></lims-table>
+ <el-row style="margin-top: 10px">
<el-col :span="20">
<el-form-item label="闄勪欢璧勬枡" >
</el-form-item>
@@ -351,13 +334,13 @@
:on-success="handleSuccessUp"
:show-file-list="false"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' style="width: 80px !important;">
- <el-button size="small" style="margin-top: 10px" type="primary">闄勪欢涓婁紶</el-button>
+ <el-button size="small" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</el-col>
</el-row>
<lims-table :tableData="tableData" :column="columnData" style="width: 96%;float: right;"
height="200" :tableLoading="tableLoading"></lims-table>
- <el-row>
+ <el-row style="margin-top: 10px">
<el-col :span="20">
<el-form-item label="宸ヤ綔缁忓巻" >
</el-form-item>
@@ -367,14 +350,14 @@
</el-col>
</el-row>
<el-table :data="tableData1" border height="200" style="width: 96%;float: right;" v-loading="tableLoading1">
- <el-table-column label="搴忓彿" type="index" width="80px" align="center">
+ <el-table-column label="搴忓彿" type="index" width="55px" align="center">
</el-table-column>
<el-table-column label="宸ヤ綔缁忓巻" prop="workExperience">
</el-table-column>
<el-table-column align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button type="text" @click="annexAdd1('edit',scope.row)">缂栬緫</el-button>
- <el-button type="text" @click="deleteAnnex1(scope.row)" style="color: #f56c6c">鍒犻櫎</el-button>
+ <el-button type="text" size="mini" @click="annexAdd1('edit',scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="mini" @click="deleteAnnex1(scope.row)" style="color: #f56c6c">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -458,6 +441,7 @@
<el-upload
:action="action"
:before-upload="beforeAvatarUpload"
+ :headers="uploadHeader"
:on-success="(response,file,fileList) => onSuccess(response, file, fileList, 'fileName')"
:show-file-list="false">
<span v-if="annex.fileName">{{annex.fileName}}</span>
@@ -560,7 +544,65 @@
]
}
],
+ columnData2: [
+ {
+ label: '璇佷欢鍙�',
+ prop: 'idNumber',
+ minWidth: '150px'
+ },{
+ label: '鍙戣瘉鍗曚綅',
+ prop: 'issueUnit',
+ minWidth: '150px'
+ },{
+ label: '鏂囦欢鍚嶇О',
+ prop: 'fileName',
+ minWidth: '200px'
+ },{
+ label: '绾у埆',
+ prop: 'level',
+ minWidth: '150px'
+ },{
+ label: '鏈夋晥鏈�',
+ prop: 'periodValidity',
+ minWidth: '150px'
+ },{
+ label: '娣诲姞鏃堕棿',
+ prop: 'createTime',
+ minWidth: '150px'
+ },
+ {
+ dataType: 'action',
+ minWidth: '130',
+ label: '鎿嶄綔',
+ fixed: 'right',
+ operation: [
+ {
+ name: '涓嬭浇',
+ type: 'text',
+ clickFun: (row) => {
+ this.downloadFile(row.fileName)
+ }
+ },
+ {
+ name: '缂栬緫',
+ type: 'text',
+ clickFun: (row) => {
+ this.annexAdd(1,row)
+ }
+ },
+ {
+ name: '鍒犻櫎',
+ type: 'text',
+ color: '#f56c6c',
+ clickFun: (row) => {
+ this.deleteAnnex(row)
+ }
+ }
+ ]
+ }
+ ],
tableLoading1: false,
+ tableLoading2: false,
tableData1: [],
addOrupdate: null,
title: '',
@@ -792,6 +834,8 @@
this.tableLoading1 = false
this.$message.success('鍒犻櫎鎴愬姛')
this.searchTableList2();
+ }).catch(err => {
+ this.tableLoading1 = false
})
}).catch(() => {
this.$message({
@@ -1032,6 +1076,10 @@
</script>
<style scoped>
+>>>.el-table__body-wrapper::-webkit-scrollbar {
+ height: 12px;
+ /* 璁剧疆婊氬姩鏉″搴� */
+}
>>>.el-form-item {
margin-bottom: 3px;
}
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index d241d9e..edf7b44 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -36,7 +36,7 @@
<el-table-column fixed="right" label="鎿嶄綔" width="120" align="center">
<template slot-scope="scope">
<el-button size="small" type="text" @click="$emit('updatePerson', scope.row)">缂栬緫</el-button>
- <el-button size="small" type="text" @click="deletePerson(scope.row)">鍒犻櫎</el-button>
+ <el-button size="small" type="text" @click="deletePerson(scope.row)" style="color: #f56c6c">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -310,10 +310,6 @@
</script>
<style scoped>
-.search-table {
- padding: 0 16px;
-}
-
.search_thing {
display: flex;
align-items: center;
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index c8e8854..3c09dec 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -72,30 +72,38 @@
</div>
<!--寰呬笅鍗�-->
<div class="table">
- <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
- :height="'calc(100vh - 290px)'" key="tableData" :page="page" :tableLoading="tableLoading"></lims-table>
+ <lims-table :tableData="tableData" :column="column"
+ v-if="tabIndex === 0" @pagination="pagination"
+ :rowClassName="changeRowClass"
+ :height="'calc(100vh - 290px)'" key="tableData"
+ :page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!--妫�楠屼腑-->
<div class="table">
- <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination1" :height="'calc(100vh - 290px)'"
- key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
+ <lims-table :tableData="tableData1" :column="column1"
+ v-if="tabIndex === 1" :isSelection="true"
+ :rowClassName="changeRowClass"
+ :handleSelectionChange="selectMethod" @pagination="pagination1" :height="'calc(100vh - 290px)'"
+ key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
</div>
<!--宸叉楠�-->
<div class="table">
<lims-table :tableData="tableData2" :column="column2" v-if="tabIndex === 2" :isSelection="true"
+ :rowClassName="changeRowClass"
:handleSelectionChange="selectMethod" @pagination="pagination2" :height="'calc(100vh - 290px)'"
key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
</div>
<!--鍏ㄩ儴-->
<div class="table">
<lims-table :tableData="tableData3" :column="column3" v-if="tabIndex === 3" :isSelection="true"
+ :rowClassName="changeRowClass"
:handleSelectionChange="selectMethod" @pagination="pagination3" :height="'calc(100vh - 290px)'"
key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
</div>
<!--瀛ｅ害妫�楠�-->
<div class="table">
<lims-table :tableData="tableData4" :column="column4" v-if="tabIndex === 4" :isSelection="true"
+ :rowClassName="changeRowClass"
:handleSelectionChange="selectMethod" @pagination="pagination4" :height="'calc(100vh - 290px)'"
key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
</div>
@@ -1108,6 +1116,12 @@
selectMethod(val) {
this.multipleSelection = val
},
+ changeRowClass({row, rowIndex}) {
+ if (row.isFirst == 1) {
+ return 'highlight-danger-row-border'
+ }
+ return ''
+ },
},
}
</script>
--
Gitblit v1.9.3