From d18d3899e53d115d77f32198af23edae1a9b2f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Mon, 10 Feb 2025 11:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E6=BA=90?=
=?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=9B=9E?=
=?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../smartExcel/cpts/acceptingPersonel.vue | 92 +++++++++----------
.../cpts/excel-template-confirmation.vue | 11 ++-
.../smartExcel/cpts/excel-upload-data.vue | 31 +++----
3 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
index a81ce49d8..7048c59d4 100644
--- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
+++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
@@ -21,7 +21,7 @@
- {{ tag.name }}
+ {{ tag.userName?tag.userName:tag.name }}
@@ -97,50 +97,51 @@ export default {
created() { },
methods: {
handleConfirm() {
- let userIdList = this.selfTag.map(item => {
- return item.staffId
- })
- if (this.showType == "adjust") {
- let parms = {
- userIdList: userIdList,
- taskId: this.taskId,
- }
- this.updateState()
- requestPost('/actual/base/communityOneTablePeriodPublish/changeAssignWorker', parms).then(res => {
- if (res.code === 0) {
- this.$message.success('转派成功')
- return this.$emit('handelPersonel')
- } else {
- this.$message.error(res.internalMsg)
- }
- });
- } else if (this.showType == "adjust1") {
- let parms = {
- userId: userIdList.toString(),
- id: this.taskId,
- reassignedReason: ""
- }
- this.updateState()
- requestPost('/actual/base/communityOneTablePeriodPublish/reAssignWorker', parms).then(res => {
- if (res.code === 0) {
- this.$message.success('转派成功')
- return this.$emit('handelPersonel')
- } else {
- this.$message.error(res.internalMsg)
- }
- });
- }
- else {
- let parms = {
- userIdList: userIdList,
- id: this.taskId,
- taskIntroduction: this.formData.taskIntroduction
+ console.log(this.selfTag),"dsfkljdslk";
+ // let userIdList = this.selfTag.map(item => {
+ // return item.staffId
+ // })
+ // if (this.showType == "adjust") {
+ // let parms = {
+ // userIdList: userIdList,
+ // taskId: this.taskId,
+ // }
+ // this.updateState()
+ // requestPost('/actual/base/communityOneTablePeriodPublish/changeAssignWorker', parms).then(res => {
+ // if (res.code === 0) {
+ // this.$message.success('转派成功')
+ // return this.$emit('handelPersonel')
+ // } else {
+ // this.$message.error(res.internalMsg)
+ // }
+ // });
+ // } else if (this.showType == "adjust1") {
+ // let parms = {
+ // userId: userIdList.toString(),
+ // id: this.taskId,
+ // reassignedReason: ""
+ // }
+ // this.updateState()
+ // requestPost('/actual/base/communityOneTablePeriodPublish/reAssignWorker', parms).then(res => {
+ // if (res.code === 0) {
+ // this.$message.success('转派成功')
+ // return this.$emit('handelPersonel')
+ // } else {
+ // this.$message.error(res.internalMsg)
+ // }
+ // });
+ // }
+ // else {
+ // let parms = {
+ // userIdList: userIdList,
+ // id: this.taskId,
+ // taskIntroduction: this.formData.taskIntroduction
- }
- requestPost('/actual/base/communityOneTablePublish/update', parms).then(res => {
- return this.$emit('handelPersonel')
- });
- }
+ // }
+ // requestPost('/actual/base/communityOneTablePublish/update', parms).then(res => {
+ // return this.$emit('handelPersonel')
+ // });
+ // }
},
async updateState() {
@@ -165,7 +166,7 @@ export default {
taskNum: 0
}
requestGet('/actual/base/communityOneTablePeriodPublish/page', parms).then(res => {
- this.tableData = res.data.list
+ this.selfTag = res.data.list
});
},
getLastItem(list, vals, key) {
@@ -232,7 +233,6 @@ export default {
return this.$message.error('网络错误')
})
},
-
handleCancel() {
this.$emit('handelPersonel')
},
diff --git a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
index c18fb3e20..5cc4dc41c 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
@@ -72,11 +72,12 @@ export default {
},
mounted() {
console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx'
- const newUrl = this.fileUrl.replace(
- /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/,
- `${location.origin}`
- );
- this.urlToFile(newUrl,this.fileName)
+ // const newUrl = this.fileUrl.replace(
+ // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/,
+ // `${location.origin}`
+ // );
+ // this.urlToFile(newUrl,this.fileName)
+ this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)
},
props: {
diff --git a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
index 7aa9adfec..af546fb02 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
@@ -2,26 +2,16 @@
-
-
-
+
+
-
-
-
-
-
- （5-30个字符）
-
-
-
-
-
+
+
![]()
{{ item.name }}
@@ -32,7 +22,7 @@
-
+
@@ -66,7 +56,7 @@
-
-
+
+
上一步
下一步
+
+