diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue index 71cbb407..d3a257eb 100644 --- a/src/views/modules/workRecord/dailyrecordinfo.vue +++ b/src/views/modules/workRecord/dailyrecordinfo.vue @@ -138,7 +138,9 @@ export default { } }, dataForm: { - id: '' + id: '', + content: '', + nickName: '' }, meetTypeArr: [], dailyTypeArr: [], @@ -185,7 +187,7 @@ export default { }, btKeyUpNickName (e) { e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~!@#¥%……&*()——+={}|《》?:“”【】、;‘’,。、]/g, '') - this.dataForm.createdBy = e.target.value + this.dataForm.nickName = e.target.value }, addHandle (id, disabled) { this.$parent.selectComponent = 'DailyrecordinfoDetail' diff --git a/src/views/modules/workRecord/weekrecordinfo.vue b/src/views/modules/workRecord/weekrecordinfo.vue index f7ab53b0..b2ffd65a 100644 --- a/src/views/modules/workRecord/weekrecordinfo.vue +++ b/src/views/modules/workRecord/weekrecordinfo.vue @@ -110,7 +110,9 @@ export default { exportURL: '/workRecord/weekrecordinfo/export' }, dataForm: { - id: '' + id: '', + content: '', + nickName: '' }, pickerBeginDateBefore: { disabledDate: (time) => { @@ -178,7 +180,7 @@ export default { }, btKeyUpNickName (e) { e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~!@#¥%……&*()——+={}|《》?:“”【】、;‘’,。、]/g, '') - this.dataForm.createdBy = e.target.value + this.dataForm.nickName = e.target.value } } } diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue index c3dcbbe4..a5a1cb4f 100644 --- a/src/views/modules/workRecord/weekrecordinfoDetail.vue +++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue @@ -125,8 +125,8 @@ export default { } }, created: function () { - // this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}` - this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}` + this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}` + // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}` }, mounted () { this.pageDisabled = this.$route.query.disabled @@ -188,8 +188,8 @@ export default { }, // ----------文件上传下载---------- handleFileCardPreview (file) { - // window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}` - window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}` + window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}` + // window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}` }, beforeFileRemove (file, fileList) { return this.$confirm(`确定移除${file.name}?`) @@ -247,7 +247,7 @@ export default { let remindInfo = '' for (var i = 0; i < this.dataForm.totalConfigList.length; i++) { for (var j = 0; j < this.dataForm.totalConfigList[i].configList.length; j++) { - if (this.dataForm.totalConfigList[i].configList[j].total <= 0 && this.dataForm.totalConfigList[i].showFlag === '1') { + if (this.dataForm.totalConfigList[i].configList[j].total <= 0 && this.dataForm.totalConfigList[i].showFlag === '1' && this.dataForm.totalConfigList[i].configList[j].mustFlag === '1') { remindInfo += '第' + (i + 1) + '项、' break }