diff --git a/src/views/modules/base/smartExcel/cpts/data-excel.vue b/src/views/modules/base/smartExcel/cpts/data-excel.vue
new file mode 100644
index 000000000..dd509b640
--- /dev/null
+++ b/src/views/modules/base/smartExcel/cpts/data-excel.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/base/smartExcel/cpts/data-sharing.vue b/src/views/modules/base/smartExcel/cpts/data-sharing.vue
index baee7b0d9..5fdeb79ae 100644
--- a/src/views/modules/base/smartExcel/cpts/data-sharing.vue
+++ b/src/views/modules/base/smartExcel/cpts/data-sharing.vue
@@ -2,13 +2,16 @@
-
-
-
+
+
![]()
-
{{ scope.row.name
+ {{ scope.row.name
}}
+
+
@@ -31,7 +34,7 @@
+ title="上传共享数据" namewidth="950px" top="5vh" class="dialog-h" @closed="closeAdd">
@@ -40,7 +43,7 @@
-
+
-
-
-
+
+
-
-
-
-
+
+
+
+ 将文件拖到此处,或
点击上传
+
支持扩展名:.xls,.xlsx
+
+
+
-
-
+
+
{{ label }}
@@ -64,6 +68,7 @@
export default {
data() {
return {
+ uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
orgOptionProps: {
emitPath: false,
multiple: true,
@@ -100,9 +105,10 @@
formType:"add",
agencyIdArray: [],
formData:
- {
- coverPicture:"",
- albumName:"",
+ { format:"xlsx",
+ name:"",
+ url:"",
+ type:"excel",
sharedScope:""
},
corganizerList: [],
@@ -119,16 +125,68 @@
},
methods: {
- handleCascaderChange() {
- let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
- console.log(this.agencyIdArray,"Sdjksdflkj");
- if(obj.subOrgList){
- this.findNodeByValue(obj.subOrgList)
+ handleFileDownload(file) {
+
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = file.name;
+
+ a.href = file.url;
+ a.dispatchEvent(event);
+
+
+ },
+ handleFileRemove(file) {
+
+ if (file && file.status === "success") {
+ this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+ }
+ },
+ handleFileSuccess(res, file) {
+ console.log(res,file,"dsflkjsdlkj");
+
+ if (res.code === 0 && res.msg === 'success') {
+ this.formData.size=file.size
+ this.formData.url=res.data.url
+ const array = file.name.split('.')
+ const fileType = array[array.length - 1]
+ file.url = res.data.url
+ file.type = fileType
+ this.fileList.push(file)
+ console.log(this.fileList)
+ } else this.$message.error(res.msg)
+ },
+ beforeImgUpload(file) {
+ const array = file.name.split('.')
+ const extension = array[array.length - 1]
+
+ if (extension !== 'xls'
+ && extension !== 'xlsx'
+ ) {
+ this.$message.error('只能上传excel文件!')
+ return false
}
- // 遍历当前选中的值,如果是父节点,则选中其所有子节点
-
- // this.agencyIdArray = Array.from(allSelected); // 赋值回去
},
+ handleChangeAgency(val){
+ console.log(val,"dskljlkdfs");
+ this.formData.sharedScope=""
+ if (val.length > 0) {
+ this.formData.sharedScope = val.toString();
+ } else {
+ this.formData.sharedScope = ""; // 或者设置默认值
+ }
+
+ },
+ // handleCascaderChange() {
+ // let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+ // console.log(this.agencyIdArray,"Sdjksdflkj");
+ // if(obj.subOrgList){
+ // this.findNodeByValue(obj.subOrgList)
+ // }
+ // // 遍历当前选中的值,如果是父节点,则选中其所有子节点
+
+ // // this.agencyIdArray = Array.from(allSelected); // 赋值回去
+ // },
async findNodeByValue(option, value) {
obj.subOrgList.forEach(value => {
console.log(value, "dsfjkhfsdl");
@@ -197,20 +255,20 @@
},
async handleComfirm() {
- if(!this.formData.albumName){
- return this.$message.error("请输入图片集名称")
+ if(!this.formData.name){
+ return this.$message.error("请输入标题名称")
}
- if(!this.formData.coverPicture){
- return this.$message.error("请上传封面图片")
+ if(!this.formData.url){
+ return this.$message.error("请上传表格文件")
}
- if(!this.agencyIdArray){
+ if(!this.formData.sharedScope){
return this.$message.error("请选择共享范围")
}
+ console.log(this.formData,"dsfkjsdlkf");
this.addActivity()
},
async addActivity() {
- if(this.formType=="add"){
- let url = '/actual/base/albums/save'
+ let url = '/actual/base/sharedData/save'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
@@ -220,24 +278,12 @@
} else {
this.$message.error(msg)
}
- this.$emit('closeAdd')
- }else{
- let url = '/actual/base/albums/update'
- const { data, code, internalMsg } = await requestPost(url, this.formData)
- if (code === 0) {
- this.$message({
- type: 'success',
- message: '操作成功'
- })
- } else {
- this.$message.error(internalMsg)
- }
- this.$emit('closeAdd')
- }
+ this.$emit('closeUpdataAdd')
+
},
handleCancle() {
- this.$emit('closeAdd')
+ this.$emit('closeUpdataAdd')
},
@@ -261,14 +307,14 @@
computed: {
dataRule() {
return {
- albumName: [
- { required: true, message: '请输入图片集名称', trigger: 'blur' }
+ name: [
+ { required: true, message: '请输入标题名称', trigger: 'blur' }
],
- agencyIdArray: [
- { required: true, message: '请选择共享范围', trigger: 'blur' }
+ fileList: [
+ { required: true, message: '请上传表格文件', trigger: 'blur' }
],
- coverPicture: [
- { required: true, message: '请选择图片集封面', trigger: 'blur' }
+ sharedScope: [
+ { required: true, message: '请选择共享范围', trigger: 'blur' }
]
}
},
diff --git a/src/views/modules/base/smartExcel/sharedSpace.vue b/src/views/modules/base/smartExcel/sharedSpace.vue
index df5e64412..f231749eb 100644
--- a/src/views/modules/base/smartExcel/sharedSpace.vue
+++ b/src/views/modules/base/smartExcel/sharedSpace.vue
@@ -12,13 +12,6 @@
上传共享数据
-
新建图片库
@@ -39,15 +32,15 @@
-
-
+
+
{{ scope.row.taskPeriod === 'once' ? '一次性' : scope.row.taskPeriod === 'weekly' ? '每周' :
scope.row.taskPeriod
=== 'halfMonth'?'每半月': scope.row.taskPeriod === 'month'?'每月':'每季度'}}
-
+
{{
@@ -55,14 +48,14 @@
}}
-
+
{{ scope.row.redDot}}
-
+
@@ -80,7 +73,7 @@
-
+
@@ -117,9 +110,9 @@
import pictureCollection from "./cpts/picture-collection.vue"
import * as echarts from "echarts";
import pictureAdd from './cpts/picture-add.vue'
- import uploaddDataAdd from "./cpts/upload-data-add.vue"
+ import uploadDataAdd from "./cpts/upload-data-add.vue"
export default {
- components: { exportShared,dataSharing,pictureCollection,shareExcel,pictureAdd,uploaddDataAdd},
+ components: { exportShared,dataSharing,pictureCollection,shareExcel,pictureAdd,uploadDataAdd},
data() {
@@ -229,6 +222,7 @@
methods: {
closeUpdataAdd(){
this.showUpdate=false
+ this.$refs.dataSharing.getTableData()
},
handeleUpdate(){
console.log("东方军事对抗疗法");
@@ -333,6 +327,16 @@
this.formData.taskTitle=this.name
this.getTableData()
}
+ else if (this.selectedIndex===1) {
+ console.log(this.name,"sdfkl;sd");
+ // this.formData.taskTitle=this.name
+ this.$nextTick(() => {
+ console.log("dsfjsdklf");
+ this.$refs.dataSharing.formData.name=this.name;
+ this.$refs.dataSharing.getTableData();
+ });
+
+ }
},