diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 4eafad9a..4c821df0 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -74,15 +74,14 @@ export default { getList() { this.$http.post('/app/appvillagerintegraldeclare/list',null,{ params: { - current: 1, - size: 10, + current: this.current, description : this.keyword, applyIntegralType: this.applyIntegralType, auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1 } }).then(res => { if(res?.data){ - this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records + this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records]:res.data.records this.$forceUpdate() this.flag = true } @@ -108,6 +107,10 @@ export default { onShow() { document.title = '积分审核' }, + onReachBottom() { + this.current ++, + this.getList() + } } diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue index 6394c8ad..24986122 100644 --- a/src/apps/AppVillagersCircle/commentList.vue +++ b/src/apps/AppVillagersCircle/commentList.vue @@ -43,7 +43,6 @@ export default { tabIndex: '', showType: false, content: '', - // typeList: [], current: 1, topic: '', topicType: '', @@ -83,8 +82,7 @@ export default { getList() { this.$http.post('/app/appvillagercirclecomment/list',null,{ params: { - current: 1, - size: 10, + current: this.current, topic:this.topic, content: this.content, auditType: this.tabIndex==0? '': this.tabIndex==1? 0 : 1, @@ -92,7 +90,7 @@ export default { } }).then(res=>{ if(res?.data) { - this.data = this.current >1 ? [...this.data, ...this.res.data.records] : res.data.records + this.data = this.current >1 ? [...this.data, ...res.data.records]:res.data.records } }) }, @@ -104,6 +102,10 @@ export default { onShow() { document.title = '发布评论审核' }, + onReachBottom() { + this.current ++, + this.getList() + } } diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue index 8da6b0cc..f67bccd8 100644 --- a/src/apps/AppVillagersCircle/infoList.vue +++ b/src/apps/AppVillagersCircle/infoList.vue @@ -72,15 +72,14 @@ export default { getList() { this.$http.post('app/appvillagercircleinfo/list',null,{ params: { - current: 1, - size: 10, + current: this.current, auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1, topic: this.topic, content: this.content } }).then(res=>{ if(res?.data) { - this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records + this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records]:res.data.records } }) }, @@ -100,6 +99,10 @@ export default { onShow() { document.title = '发布信息审核' }, + onReachBottom() { + this.current ++, + this.getList() + } } diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue index a0f127ca..04221485 100644 --- a/src/apps/AppWorkonline/Detail.vue +++ b/src/apps/AppWorkonline/Detail.vue @@ -89,19 +89,22 @@
- +
{{ items.fieldName }} - - - {{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }} - - {{ $dict.getLabel(items.dictionaryCode, itemL) }} - - + + + + + {{ $dict.getDict(items.dictionaryCode, items.fieldValue)[$dict.getLabel(items.dictionaryCode, items.fieldValue)].dictName }} + + + {{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }} + + + {{ $dict.getLabel(items.dictionaryCode, itemL) }}
@@ -174,7 +177,10 @@ {{ item4.fieldValue }}
--> - 审批意见:{{ item.opinion }} + + 审批意见: + {{ item.opinion }} +
@@ -285,20 +291,17 @@ export default { this.inforlist = [[], [], [], [], [], [], [], [], [], []] res.data.tableInfo.tableFieldInfos.map((item) => { - if (item.groupIndex) { - this.inforlist[item.groupIndex - 1].push(item) - } + this.inforlist[item.groupIndex].push(item) if (item.dictionaryCode) { this.dictList.push(item.dictionaryCode) - } - if (item.fieldDataType == 5) { - // item.fieldValue = item.fieldValue.split(',') - } - }) - this.$dict.load(this.dictList).then(() => { - // this.pageShow = true + this.$dict.load(this.dictList) + } + + if (item.fieldDataType == 5) { + item.fieldValue = item.fieldValue && item.fieldValue.split(',') + } }) } } diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue index b0f670ad..13126744 100644 --- a/src/apps/AppWorkonline/Opinion.vue +++ b/src/apps/AppWorkonline/Opinion.vue @@ -20,11 +20,22 @@
+
+ + 同意意见: + + +
清空内容
+
+ {{ opinion.length }} + /150 +
+
+
- -
+ + {{ item.fieldName }}: @@ -33,7 +44,7 @@ {{ item.fieldValue && item.fieldValue.length }} /{{ item.fieldLength }}
-
+
--> @@ -48,13 +59,15 @@
-
+
* {{ item.fieldName }}:
- + + +
@@ -110,36 +123,31 @@ export default { filedIndex: 0, fileNameList: [], opinion: '', + showStstus: false, } }, onLoad(options) { this.objid = options.id this.type = options.type - this.getList() }, onShow() { document.title = '审批详情' }, - computed: {}, watch: {}, - onShow() {}, - mounted() {}, methods: { getList() { this.$http .post(`/app/approv-alapply-info/approval-popup?type=${this.type}&id=${this.objid}`) .then((res) => { if (res.code == 0) { - this.list = res.data.fieldInfos - console.log(this.list) res.data.fieldInfos.map((item) => { - // this.list.push(item) - // if (item.fieldDataType == 1) { - // item.fieldValue = '' - // } - // if (item.fieldType == 3) { - // } + if (item.fieldType != 3) { + item.fieldValue = '' + } + if (item.fieldType == 3) { + this.list.push(item) + } }) } }) @@ -162,6 +170,10 @@ export default { }) }, + selectStatus(e) { + this.$set(this.list[index], 'fieldValue', this.value) + }, + btn() { // if (this.type == 0 && this.opinion == '') { // return uni.showToast({ @@ -304,6 +316,39 @@ export default { } } } + .textarea_msgfont { + position: relative; + height: 400px; + padding: 32px; + background-color: #fff; + + .msgfont { + font-size: 32px; + + .icon { + margin-right: 8px; + color: #ff4466; + } + } + + .textarea { + margin-top: 10px; + } + + .clearns { + color: #1365dd; + } + + .msg_length { + position: absolute; + bottom: 42px; + right: 32px; + + .font { + color: #999; + } + } + } } .reply_files {