From 419c3d24afd1fb2fd8547c38069a21d6e474e706 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期六, 22 六月 2024 16:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
pages/message/details.vue | 45 ++++++++++++---
pages/message/list.vue | 50 ++++++++++++++--
api/index.js | 8 ++
pages/hqzc/details.vue | 34 ++++++++---
4 files changed, 109 insertions(+), 28 deletions(-)
diff --git a/api/index.js b/api/index.js
index 09c53e4..2c75ae4 100644
--- a/api/index.js
+++ b/api/index.js
@@ -9,9 +9,13 @@
export function showList(data){
return http.get('/enforce/order/showList', {params: data}, { custom: { loading: true }});
}
-// 鎯犱紒鏀跨瓥
+// 鎯犱紒鏀跨瓥璇︽儏
export function doc(id){
- return http.get('/system/doc/'+id, {params: data}, { custom: { loading: true }});
+ return http.get('/system/doc/'+id, { custom: { loading: true }});
+}
+// 淇℃伅鍏ず
+export function order(id){
+ return http.get('/enforce/order/'+id, { custom: { loading: true }});
}
// 浼佷笟娉ㄥ唽
export function companyRegister(data) {
diff --git a/pages/hqzc/details.vue b/pages/hqzc/details.vue
index 4e7bd6c..5565333 100644
--- a/pages/hqzc/details.vue
+++ b/pages/hqzc/details.vue
@@ -1,35 +1,51 @@
<template>
<view class="box">
<view class="name">
- 涓浗绀剧闄㈤兘闃筹細涓浗浜哄彛杞彉鐨勭嫭鐗规�у強鍏跺奖鍝�
+ {{msg.docTitle}}
</view>
<view class="font">
<view class="left">
- 鏀跨瓥绫诲瀷
+ {{type}}
</view>
<view class="right">
- 鍙戝竷鏃堕棿锛�2024-04-27
+ 鍙戝竷鏃堕棿锛歿{msg.createTime}}
</view>
+ </view>
+ <view v-html="msg.docContent">
+
</view>
</view>
</template>
<script>
import { doc } from '@/api/index.js'
+ import { getDicts } from '@/api/data.js'
export default {
data() {
return {
-
+ msg:{},
+ type:''
}
},
- onShow() {
- this.getdata()
+ onLoad(options) {
+ this.getdata(options.id)
},
methods: {
- getdata(){
- console.log(this.$route.query)
- //doc()
+
+ getdata(id){
+ doc(id).then(val => {
+ this.msg = val.data.data
+ this.msg.createTime = this.msg.createTime.slice(0, 10)
+ this.msg.docContent = decodeURIComponent(this.msg.docContent)
+ console.log(this.msg.docContent)
+ getDicts('doc_type').then(val => {
+ console.log(this.msg.docType)
+
+ const value = val.data.data.find(item => item.dictValue == this.msg.docType)
+ this.type = value.dictLabel
+ })
+ })
}
}
}
diff --git a/pages/message/details.vue b/pages/message/details.vue
index f76f854..86cf9d2 100644
--- a/pages/message/details.vue
+++ b/pages/message/details.vue
@@ -13,7 +13,7 @@
鎵ф硶绫诲瀷
</view>
<view class="v">
- 鍙告硶妫�鏌�
+ {{type}}
</view>
</view>
<view class="item">
@@ -21,7 +21,7 @@
鎵ф硶浜�
</view>
<view class="v">
- 鍒樻娆�
+ {{msg.executeUser}}
</view>
</view>
<view class="item">
@@ -29,7 +29,7 @@
鎵ф硶閮ㄩ棬
</view>
<view class="v">
- 鍐滀笟灞�
+ {{msg.executeDeptName}}
</view>
</view>
<view class="item">
@@ -37,7 +37,7 @@
浼佷笟
</view>
<view class="v">
- 姹夊涵閰掑簵
+ {{msg.companyName}}
</view>
</view>
</view>
@@ -48,7 +48,7 @@
鎵ф硶涓婚
</view>
<view class="v">
- 姹夊涵閰掑簵鍙告硶妫�鏌�233鍙锋枃浠�
+ {{msg.enforceReason}}
</view>
</view>
<view class="item">
@@ -57,17 +57,19 @@
</view>
</view>
<view class="imgbox">
- <img src="/static/i01.png" class="more" @click="imgclick('/static/i01.png')" alt="" />
+ <img v-for="(item,index) in img" :key="index" :src="item" class="more" alt="" @click="imgclick(item)" />
+
+ <!-- <img src="/static/i01.png" class="more" @click="imgclick('/static/i01.png')" alt="" />
<img src="/static/i02.png" class="more" alt="" />
<img src="/static/i03.png" class="more" alt="" />
- <img src="/static/i04.png" class="more" alt="" />
+ <img src="/static/i04.png" class="more" alt="" /> -->
</view>
<view class="item">
<view class="k">
鎵ф硶缁撴灉
</view>
<view class="v" style="color: #EB4746;">
- 鍋滀笟鏁撮】
+ {{msg.regionReason}}
</view>
</view>
<view class="item">
@@ -75,7 +77,7 @@
鎵ф硶鏃堕棿
</view>
<view class="v">
- 2024-10-10 16:24
+ {{msg.executeTime}}
</view>
</view>
</view>
@@ -85,13 +87,38 @@
</template>
<script>
+ import { order } from '@/api/index.js'
+ import { getDicts } from '@/api/data.js'
+ import { config } from '@/common/config'
+
export default {
data() {
return {
+ msg:{},
+ type:'',
+ img:[],
+ baseUrl: config.baseUrl
}
},
+ onLoad(options) {
+ this.getdata(options.id)
+ },
methods: {
+ getdata(id){
+ order(id).then(val => {
+ this.msg = val.data.data
+ let arr = this.msg.regionImgs.split(",");
+ for(let i = 0;i<arr.length;i++){
+ this.img.push(this.baseUrl+arr[i])
+ }
+ console.log(this.img)
+ getDicts('enforce_type').then(val => {
+ const value = val.data.data.find(item => item.dictCode == this.msg.enforceType)
+ this.type = value.dictLabel
+ })
+ })
+ },
imgclick(url){
uni.previewImage({
urls: [url]
diff --git a/pages/message/list.vue b/pages/message/list.vue
index 47c4fc7..21ed463 100644
--- a/pages/message/list.vue
+++ b/pages/message/list.vue
@@ -2,22 +2,22 @@
<view>
<u-sticky bgColor="white">
<view class="set-search">
- <u-search placeholder="璇疯緭鍏ヨ鏌ヨ鐨勪紒涓�" shape="square" :showAction="false"></u-search>
+ <u-search placeholder="璇疯緭鍏ヨ鏌ヨ鐨勪紒涓�" @search="search" @blur="search" shape="square" :showAction="false"></u-search>
</view>
<view class="border"></view>
</u-sticky>
- <view class="item">
+ <view class="item" v-for="(item,index) in list1">
<img src="/static/i05.png" class="img" alt="" />
<view class="right">
<view class="name">
- 鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃
+ {{item.companyName}}
</view>
<view class="box">
<view class="l">
- <p>鎵ф硶鍗曚綅锛氬啘涓氬啘鏉戝眬</p>
- <p>鎵ф硶鏃堕棿锛�2024-06-03 12:30:67</p>
+ <p>鎵ф硶鍗曚綅锛歿{item.executeDeptName}}</p>
+ <p>鎵ф硶鏃堕棿锛歿{item.executeTime}}</p>
</view>
- <view class="r">
+ <view class="r" @click="chakan(item.orderId)">
鍘绘煡鐪�
</view>
</view>
@@ -27,14 +27,48 @@
</template>
<script>
+ import { showList } from '@/api/index.js'
+
export default {
data() {
return {
-
+ list1:[],
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10
+ },
+ total: 1,
}
},
+ onShow() {
+ this.getList()
+ },
+ onReachBottom() {
+ if(this.list1.length == this.total) {
+ return
+ }
+ this.queryParams.pageNum++
+ this.getList()
+ },
methods: {
-
+ search(e){
+ this.list1 = []
+ this.queryParams.pageNum =1
+ this.queryParams.companyName = e
+ this.getList()
+ },
+ chakan(id){
+ uni.navigateTo({
+ url: `/pages/message/details?id=${id}`
+ })
+ },
+ getList() {
+ showList({...this.queryParams}).then(val => {
+ // console.log(val.data)
+ this.total = val.data.total
+ this.list1 = [...this.list1,...val.data.rows]
+ })
+ },
}
}
</script>
--
Gitblit v1.9.1