From a85cba77ce0de5589f1aa2467b357a67df58bda4 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Wed, 18 Sep 2024 15:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=90=8E=E5=8F=B0-=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E6=A8=A1=E5=9D=97=E6=90=AD=E5=BB=BA=E5=8F=8A=E8=B0=83?=
=?UTF-8?q?=E8=AF=95-d5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/base/person.js | 11 +++++
src/api/base/proj.js | 8 ++--
src/components/TableModel/index.vue | 8 ++--
src/views/base/crew/components/table-crew.vue | 6 +++
src/views/base/crew/config.js | 2 +-
src/views/base/crew/index.vue | 3 ++
src/views/base/crew/table-crew.js | 4 +-
src/views/base/person/index.vue | 42 +++++++++++++++----
.../base/proj/components/table-tower.vue | 28 +++++++++----
src/views/base/proj/config.js | 2 +-
src/views/base/projDept/config.js | 2 +-
src/views/base/projDept/index.vue | 6 +--
12 files changed, 90 insertions(+), 32 deletions(-)
diff --git a/src/api/base/person.js b/src/api/base/person.js
index 19f5839..26f9951 100644
--- a/src/api/base/person.js
+++ b/src/api/base/person.js
@@ -29,3 +29,14 @@ export const deletePersonApi = (id) => {
export const queryInfoApi = (id) => {
return request.get(`/base/tbPeople/${id}`)
}
+
+/** 文件上传 */
+export const personFileUpLoad = (data) => {
+ /* const formData = new FormData()
+ formData.append('file', param.fileData.file) */
+ return request({
+ url: '/base/tbPeople/importData',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/api/base/proj.js b/src/api/base/proj.js
index 22fd185..63b22b0 100644
--- a/src/api/base/proj.js
+++ b/src/api/base/proj.js
@@ -76,12 +76,12 @@ export const deleteTowerApi = (id) => {
}
/** 文件上传 */
-export const towerFileUpLoad = (param) => {
- const formData = new FormData()
- formData.append('file', param.file)
+export const towerFileUpLoad = (data) => {
+ /* const formData = new FormData()
+ formData.append('file', param.fileData.file) */
return request({
url: '/base/tbProPower/importData',
method: 'post',
- data: formData,
+ data
})
}
diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue
index 85ac445..1acb3ce 100644
--- a/src/components/TableModel/index.vue
+++ b/src/components/TableModel/index.vue
@@ -361,13 +361,13 @@ export default {
])
}
})
- /* if(this.sendParams !== null) {
+ if(this.sendParams !== null) {
Object.assign(this.queryParams, this.sendParams)
- for(let key in this.sendParams) {
+ /* for(let key in this.sendParams) {
console.log(key, this.sendParams[key])
this.$set(this.queryParams, key, this.sendParams[key])
- }
- } */
+ } */
+ }
if(this.sendId !== null) this.queryParams.id = this.sendId
this.getTableList()
},
diff --git a/src/views/base/crew/components/table-crew.vue b/src/views/base/crew/components/table-crew.vue
index 3d231c3..667d513 100644
--- a/src/views/base/crew/components/table-crew.vue
+++ b/src/views/base/crew/components/table-crew.vue
@@ -34,6 +34,12 @@
{{ data.sex === 1 ? '男' : '女' }}
+
+ {{ idCardCrypto(data.idCard) }}
+
+
+ {{ phoneCrypto(data.relPhone) }}
+
{{ data.relName }}
+
+ {{ data.relName.split('/')[0] }}/{{ phoneCrypto(data.relName.split('/')[1]) }}
+
数据模板下载
- 导入数据
+
导出数据
+
+ 导入数据
+
{
+ if(res.code === 200) {
+ this.$modal.msgSuccess('上传成功')
+ this.$refs.tableRef.getTableList()
+ }
+ }).catch(err => {})
+ },
+ fileExceed() {
+ this.$modal.msgError('最多上传1个文件！')
+ },
},
mixins: [commonMixin],
components: {
@@ -146,6 +173,7 @@ export default {
addDialogTitle: '新增人员',
// 修改时弹框标题
editDialogTitle: '修改人员',
+ fileList: []
}
},
}
diff --git a/src/views/base/proj/components/table-tower.vue b/src/views/base/proj/components/table-tower.vue
index 82e4809..05b98db 100644
--- a/src/views/base/proj/components/table-tower.vue
+++ b/src/views/base/proj/components/table-tower.vue
@@ -6,6 +6,7 @@
:formLabel="formLabelTower"
:columnsList="columnsListTower"
:request-api="queryTowerListApi"
+ :send-params="sendParams"
ref="tableRef"
@transIdList="getIdList"
:show-sel="false"
@@ -17,11 +18,11 @@
>
导出数据 {
- console.log(res)
+ console.log(param, this.sendData)
+ const formData = new FormData()
+ formData.append('id', this.sendData.id)
+ formData.append('file', param.file)
+ towerFileUpLoad(formData).then(res => {
+ if(res.code === 200) {
+ this.$modal.msgSuccess('上传成功')
+ this.$refs.tableRef.getTableList()
+ }
}).catch(err => {})
},
fileExceed() {
@@ -160,7 +167,9 @@ export default {
TableTowerAdd
},
created() {
-
+ this.sendParams = {
+ id: this.sendData.id
+ }
},
mounted() {
console.log(this.sendData, '-----------')
@@ -180,6 +189,7 @@ export default {
// 修改时弹框标题
editDialogTitle: '修改项目部',
fileList: [],
+ sendParams: undefined,
sendAddData: undefined
}
},
diff --git a/src/views/base/proj/config.js b/src/views/base/proj/config.js
index 5914da8..6749180 100644
--- a/src/views/base/proj/config.js
+++ b/src/views/base/proj/config.js
@@ -35,7 +35,7 @@ export const formLabel = [
{ label: '线路工程', value: '2' },
{ label: '电缆工程', value: '3' },
] },
- { f_label: '项目部名称', f_model: 'departId', f_type: 'ipt' },
+ { f_label: '项目部名称', f_model: 'departName', f_type: 'ipt' },
]
export const columnsList = [
{ t_props: 'departName', t_label: '所属项目部', },
diff --git a/src/views/base/projDept/config.js b/src/views/base/projDept/config.js
index a3c2449..73991ca 100644
--- a/src/views/base/projDept/config.js
+++ b/src/views/base/projDept/config.js
@@ -23,7 +23,7 @@ export const columnsList = [
{ t_props: 'departType', t_label: '项目部类型' },
{ t_props: 'areaName', t_label: '地区' },
{ t_props: 'headUser', t_label: '负责人', },
- { t_props: 'headUserPhone', t_label: '电话', },
+ { t_props: 'headUserPhone', t_label: '电话', t_slot: 'headUserPhone' },
{ t_props: 'remarks', t_label: '备注', },
]
diff --git a/src/views/base/projDept/index.vue b/src/views/base/projDept/index.vue
index 1017ea6..f27bc3f 100644
--- a/src/views/base/projDept/index.vue
+++ b/src/views/base/projDept/index.vue
@@ -39,9 +39,9 @@
>删除
-
+
+ {{ phoneCrypto(data.headUserPhone) }}
+