+
转交事件
diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue
index daf22223..d67f92d7 100644
--- a/src/apps/AppHelpDeclaration/result.vue
+++ b/src/apps/AppHelpDeclaration/result.vue
@@ -9,9 +9,10 @@
-
+
+
通过审核
diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index da8ea457..3a7dfe51 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -1,6 +1,6 @@
-
@@ -39,6 +39,14 @@
MeetingMminutes
},
+ computed: {
+ currConfig () {
+ if (this.currIndex < 0 || !this.configList.length) return []
+
+ return this.configList[this.currIndex].itemList
+ }
+ },
+
onLoad () {
this.getConfig()
},
@@ -52,6 +60,37 @@
})
},
+ save () {
+ this.$loading()
+ this.$refs.reportItem.screenshot().then(canvas => {
+ let dataURL = canvas.toDataURL('image/png')
+ const file = this.dataURLtoFile(dataURL, 'photo.png')
+ let formData = new FormData()
+ formData.append('file', file)
+ this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+ if (res.code === 0) {
+ console.log(res.data.url)
+ }
+
+ uni.hideLoading()
+ })
+ }).catch(e => {
+ console.log(e)
+ })
+ },
+
+ dataURLtoFile (dataurl, filename) {
+ let arr = dataurl.split(',')
+ let mime = arr[0].match(/:(.*?);/)[1]
+ let bstr = atob(arr[1])
+ let n = bstr.length
+ let u8arr = new Uint8Array(n)
+ while (n--) {
+ u8arr[n] = bstr.charCodeAt(n)
+ }
+ return new File([u8arr], filename, { type: mime })
+ },
+
changeComponent (e, index) {
this.currIndex = index
this.component = this.mapComponent(e.watermarkType)
diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index da4dd7b4..8f29ef40 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -1,33 +1,36 @@
- 完成
+ 完成
-
- 请输入汇报单位
+
+
+ {{ unit }}
-
-
今日工作
-工作拍照汇总
+
+
{{ title }}
+{{ subTitle }}
-
+
-
- 鄢然
+ {{ reporter }}
- 2022-04-14
+ {{ date }}
+
-
- 鄢鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然然
+ {{ remark }}
+
+
+
-
+
@@ -37,33 +40,96 @@
import html2canvas from 'html2canvas'
export default {
name: 'Daily',
-
label: '日报',
+ props: ['config'],
+
data () {
return {
-
+ imgs: [],
+ configList: [],
+ title: '',
+ subTitle: '',
+ reporter: '',
+ date: '',
+ unit: '',
+ remark: '',
+ isShowTitle: true,
+ isShowSubTitle: true,
+ isShowDate: true,
+ isShowReporter: true,
+ isShowUnit: true,
+ isShowRemark: false,
}
},
- onLoad () {
+ watch: {
+ configList: {
+ handler: function (v) {
+ if (v.length) {
+ const title = v.filter(v => v.type === '17')[0]
+ const subTitle = v.filter(v => v.type === '18')[0]
+ const reporter = v.filter(v => v.type === '19')[0]
+ const date = v.filter(v => v.type === '1')[0]
+ const unit = v.filter(v => v.type === '22')[0]
+ const remark = v.filter(v => v.type === '32')[0]
+ this.isShowTitle = title.status === '1'
+ this.isShowRemark = remark.status === '1'
+ this.isShowUnit = unit.status === '1'
+ this.isShowReporter = reporter.status === '1'
+ this.isShowDate = date.status === '1'
+ this.isShowSubTitle = subTitle.status === '1'
+ this.title = title.defaultValue || ''
+ this.subTitle = subTitle.defaultValue || ''
+ this.reporter = reporter.defaultValue || ''
+ this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
+ this.unit = unit.defaultValue || ''
+ this.remark = remark.defaultValue || ''
+ }
+ },
+ deep: true
+ },
+ },
+ mounted () {
+ this.configList = JSON.parse(JSON.stringify(this.config))
+
+ uni.$on('change', e => {
+ this.configList = e
+ })
},
methods: {
- choose () {
- html2canvas(this.$refs.home, {
+ screenshot () {
+ const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
+
+ return html2canvas(this.$refs.report, {
allowTaint: true,
useCORS: true,
- backgroundColor: '#fff',
- width: this.$refs.home.offsetWidth,
- scale: 4,
- }).then((canvas) => {
- let dataURL = canvas.toDataURL("image/png");
- this.src = dataURL
- console.log(dataURL)
- }).catch(e => {
- console.log(e)
+ height
+ })
+ },
+
+ addPhoto () {
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['compressed'],
+ success: res => {
+ let formData = new FormData()
+ formData.append('file', res.tempFiles[0])
+ this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+ if (res.code === 0) {
+ this.imgs.push(res.data.url)
+ }
+ })
+ }
+ })
+ },
+
+ linkTo () {
+ uni.setStorageSync('waterConfig', this.configList)
+ uni.navigateTo({
+ url: './WatermarkConfig'
})
}
}
@@ -79,6 +145,15 @@
box-sizing: border-box;
}
+ .imgs {
+ margin-top: 20px;
+
+ image {
+ display: block;
+ width: 100%;
+ }
+ }
+
.top {
display: flex;
align-items: center;
@@ -123,7 +198,7 @@
font-style: normal;
}
- &:last-child {
+ &.bottom-item__remark {
height: auto;
line-height: 1.3;
padding: 12px 16px;
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index 47e6cf44..1b9aba57 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -1,55 +1,137 @@
-
+
添加图片
-
+
-
+
+
-
-
今日工作
-工作拍照汇总
+
+
{{ title }}
+{{ address }}
-
+
-
+
-
- 鄢然
+ {{ reporter }}
+
+
+ {{ date }}
+ {{ weather }}
- 2022-04-14 晴 22℃
+
-
- 鄢鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然鄢然然
+ {{ remark }}
+
+
+
-
@@ -63,6 +145,14 @@
box-sizing: border-box;
}
+ .imgs {
+ margin-top: 2px;
+ image {
+ display: block;
+ width: 100%;
+ }
+ }
+
.top {
width: 100%;
height: 16px;
@@ -102,11 +192,20 @@
font-size: 28px;
background: #F9FC4D;
- i {
- font-style: normal;
+ .right {
+ display: flex;
+ align-items: center;
+
+ i {
+ font-style: normal;
+
+ &:last-child {
+ margin-left: 8px;
+ }
+ }
}
- &:last-child {
+ &.bottom-item__remark {
height: auto;
line-height: 1.3;
padding: 12px 16px;
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 7d44cb99..76437256 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -1,6 +1,6 @@
-
+
+
添加图片
-
- 添加文字
-
-
+
| 会议纪要 | 2022-01-21 周五 |
|---|
+
@@ -53,30 +53,95 @@
label: '会议纪要',
+ props: ['config'],
+
data () {
return {
-
+ title: '巡查日志',
+ subTitle: '',
+ reporter: '',
+ date: '',
+ remark: '',
+ address: '',
+ weather: '',
+ isShowTitle: true,
+ isShowWeather: true,
+ isShowDate: true,
+ isShowReporter: false,
+ isShowAddress: false,
+ isShowRemark: false,
+ imgs: [],
+ configList: []
}
},
- onLoad () {
+ watch: {
+ configList: {
+ handler: function (v) {
+ if (v.length) {
+ const title = v.filter(v => v.type === '17')[0]
+ const reporter = v.filter(v => v.type === '24')[0]
+ const date = v.filter(v => v.type === '1')[0]
+ const address = v.filter(v => v.type === '23')[0]
+ const remark = v.filter(v => v.type === '25')[0]
+ const weather = v.filter(v => v.type === '2')[0]
+ this.isShowTitle = title.status === '1'
+ this.isShowRemark = remark.status === '1'
+ this.isShowReporter = reporter.status === '1'
+ this.isShowWeather = weather.status === '1'
+ this.isShowDate = date.status === '1'
+ this.isShowAddress = address.status === '1'
+ this.title = title.defaultValue || '巡查日志'
+ this.weather = weather.defaultValue || '晴转多云'
+ this.address = date.defaultValue || '武汉天地'
+ this.reporter = reporter.defaultValue || ''
+ this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
+ this.remark = remark.defaultValue || ''
+ }
+ },
+ deep: true
+ }
+ },
+ mounted () {
+ this.configList = JSON.parse(JSON.stringify(this.config))
+
+ uni.$on('change', e => {
+ this.configList = e
+ })
},
methods: {
- choose () {
- html2canvas(this.$refs.home, {
+ screenshot () {
+ const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
+
+ return html2canvas(this.$refs.report, {
allowTaint: true,
useCORS: true,
- backgroundColor: '#fff',
- width: this.$refs.home.offsetWidth,
- scale: 2,
- }).then((canvas) => {
- let dataURL = canvas.toDataURL("image/png");
- this.src = dataURL
- console.log(dataURL)
- }).catch(e => {
- console.log(e)
+ height
+ })
+ },
+
+ addPhoto () {
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['compressed'],
+ success: res => {
+ let formData = new FormData()
+ formData.append('file', res.tempFiles[0])
+ this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+ if (res.code === 0) {
+ this.imgs.push(res.data.url)
+ }
+ })
+ }
+ })
+ },
+
+ linkTo () {
+ uni.setStorageSync('waterConfig', this.configList)
+ uni.navigateTo({
+ url: './WatermarkConfig'
})
}
}
@@ -88,6 +153,14 @@
padding: 48px 32px 0;
background: #fff;
+ .imgs {
+ margin-top: 2px;
+ image {
+ display: block;
+ width: 100%;
+ }
+ }
+
.table {
width: 100%;
margin: 0;
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 9594980a..7d399f78 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -1,29 +1,29 @@
+
+
-
+
添加图片
-
- 添加文字
-
-
- {{ form.unit || '请输入汇报单位' }}
- {{ form.date || '请选择日期' }}
+
+ {{ unit || '请输入汇报单位' }}
+ {{ date || '请选择日期' }}
-
-
工作汇报
-{{ form.title || '请输入标题' }}
+
+
{{ title }}
+{{ subTitle || '请输入标题' }}
-
-
-
+
@@ -40,44 +39,73 @@
import html2canvas from 'html2canvas'
export default {
name: 'WorkReport',
-
label: '工作汇报',
+ props: ['config'],
+
data () {
return {
- waterSrc: '',
- form: {
- unit: '',
- title: '',
- date: '',
- name: '',
- remark: ''
- },
- imgs: []
+ title: '工作汇报',
+ subTitle: '',
+ reporter: '',
+ date: '',
+ unit: '',
+ remark: '',
+ isShowTitle: true,
+ isShowSubTitle: true,
+ isShowDate: true,
+ isShowReporter: true,
+ isShowUnit: true,
+ isShowRemark: false,
+ imgs: [],
+ configList: []
}
},
+ watch: {
+ configList: {
+ handler: function (v) {
+ if (v.length) {
+ const title = v.filter(v => v.type === '17')[0]
+ const subTitle = v.filter(v => v.type === '18')[0]
+ const reporter = v.filter(v => v.type === '19')[0]
+ const date = v.filter(v => v.type === '1')[0]
+ const unit = v.filter(v => v.type === '20')[0]
+ const remark = v.filter(v => v.type === '4')[0]
+ this.isShowTitle = title.status === '1'
+ this.isShowRemark = remark.status === '1'
+ this.isShowUnit = unit.status === '1'
+ this.isShowReporter = reporter.status === '1'
+ this.isShowDate = date.status === '1'
+ this.isShowSubTitle = subTitle.status === '1'
+ this.title = title.defaultValue || ''
+ this.subTitle = subTitle.defaultValue || ''
+ this.reporter = reporter.defaultValue || ''
+ this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
+ this.unit = unit.defaultValue || ''
+ this.remark = remark.defaultValue || ''
+ }
+ },
+ deep: true
+ },
+ },
+
mounted () {
+ this.configList = JSON.parse(JSON.stringify(this.config))
+
uni.$on('change', e => {
- console.log(e)
- e.forEach(v => {
- this.form[v.key] = v.value
- })
+ this.configList = e
})
},
methods: {
- save () {
+ screenshot () {
const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
- html2canvas(this.$refs.report, {
+
+ return html2canvas(this.$refs.report, {
allowTaint: true,
useCORS: true,
height
- }).then((canvas) => {
- let dataURL = canvas.toDataURL('image/png')
- this.waterSrc = dataURL
- }).catch(e => {
- console.log(e)
})
},
@@ -90,7 +118,6 @@
formData.append('file', res.tempFiles[0])
this.$http.post('/admin/file/add2?type=image', formData).then(res => {
if (res.code === 0) {
- console.log(res.data)
this.imgs.push(res.data.url)
}
})
@@ -98,41 +125,10 @@
})
},
- linkTo (path) {
- const data = [
- {
- type: 'text',
- key: 'unit',
- value: '',
- label: '汇报单位'
- },
- {
- type: 'text',
- key: 'title',
- value: '',
- label: '标题'
- },
- {
- type: 'text',
- key: 'name',
- value: '',
- label: '汇报人'
- },
- {
- type: 'date',
- key: 'date',
- value: '',
- label: '汇报日期'
- },
- {
- type: 'textarea',
- key: 'remark',
- value: '',
- label: '备注'
- }
- ]
+ linkTo () {
+ uni.setStorageSync('waterConfig', this.configList)
uni.navigateTo({
- url: `${path}?params=${JSON.stringify(data)}`
+ url: './WatermarkConfig'
})
}
}
@@ -158,6 +154,7 @@
}
.imgs {
+ margin-top: 20px;
image {
display: block;
width: 100%;
+
-
+
-
- 备注：{{ form.remark || '请输入备注' }}
+
-
+ 备注：{{ remark }}
+
-->
添加图片
@@ -32,7 +32,6 @@