From 95688fbabcde0e4fd8dbb622cc1b890aee1cc8ca Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期六, 22 六月 2024 19:39:26 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
qiye/qiyeIndex/qiyeIndex.vue | 5 +
pages/hqzc/list.vue | 2
qiye/complaint/complaint.vue | 92 +++++++++++++++++++++++++-----
api/qiye.js | 10 +++
pages/message/list.vue | 2
qiye/my/my.vue | 23 +++++++
qiye/record/record.vue | 4 +
7 files changed, 117 insertions(+), 21 deletions(-)
diff --git a/api/qiye.js b/api/qiye.js
index 4286143..ccd8812 100644
--- a/api/qiye.js
+++ b/api/qiye.js
@@ -21,4 +21,14 @@
// 鍙戣捣鎶曡瘔
export function orderComplaint(param) {
return http.post('/enforce/order/orderComplaint', param, { custom: { loading: true }});
+}
+
+// 鎶曡瘔鍒楄〃
+export function logList(data){
+ return http.get('/enforce/complaint/log/list', {params: data}, { custom: { loading: true }});
+}
+
+// 鎶曡瘔璇︽儏
+export function complaint(id){
+ return http.get('/enforce/complaint/'+id, { custom: { loading: true }});
}
\ No newline at end of file
diff --git a/pages/hqzc/list.vue b/pages/hqzc/list.vue
index 1074006..9119695 100644
--- a/pages/hqzc/list.vue
+++ b/pages/hqzc/list.vue
@@ -75,6 +75,8 @@
}
},
onShow() {
+ this.list1 = []
+ this.queryParams.pageNum = 1
this.getList()
},
onReachBottom() {
diff --git a/pages/message/list.vue b/pages/message/list.vue
index 21ed463..ac92ab8 100644
--- a/pages/message/list.vue
+++ b/pages/message/list.vue
@@ -41,6 +41,8 @@
}
},
onShow() {
+ this.list1 = []
+ this.queryParams.pageNum = 1
this.getList()
},
onReachBottom() {
diff --git a/qiye/complaint/complaint.vue b/qiye/complaint/complaint.vue
index a9b360e..accf0db 100644
--- a/qiye/complaint/complaint.vue
+++ b/qiye/complaint/complaint.vue
@@ -5,31 +5,46 @@
<u-search placeholder="璇疯緭鍏�" @search="search" @blur="search" shape="square" :showAction="false"></u-search>
</view>
<view class="border"></view>
- <u-tabs :list="list1" @click="click" :current="current" :scrollable="false" bgColor="white"></u-tabs>
+ <u-tabs :list="list" @change="click" :current="current" :scrollable="false" bgColor="white"></u-tabs>
</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">
<view class="l">
- 鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃鍖椾含灏氱瓥浜掑姩绉戞妧鏈夐檺鍏徃
+ {{item.companyName}}
</view>
- <view class="r color1">
+ <template v-if="item.complaintStatus==0">
+ <view class="r color3">
+ 寰呭搷搴�
+ </view>
+ </template>
+ <template v-if="item.complaintStatus==1">
+ <view class="r color2">
+ 澶勭悊涓�
+ </view>
+ </template>
+ <template v-if="item.complaintStatus==2">
+ <view class="r color1">
+ 宸插姙缁�
+ </view>
+ </template>
+ <!-- <view class="r color1">
寰呰瘎浠�
- </view>
+ </view> -->
</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()">
鍘绘煡鐪�
</view>
</view>
</view>
</view>
- <view class="item">
+ <!-- <view class="item">
<img src="/static/i05.png" class="img" alt="" />
<view class="right">
<view class="name">
@@ -72,37 +87,80 @@
</view>
</view>
</view>
- </view>
+ </view> -->
<view style="height: 50rpx;"></view>
</view>
</template>
<script>
+ import { logList } from '@/api/qiye.js'
+
export default {
data() {
return {
current: 0,
- list1: [{
+ list: [{
name: '鍏ㄩ儴',
value: ''
}, {
name: '寰呭搷搴�',
- value: 1
+ value: 0
}, {
name: '澶勭悊涓�',
- value: 2
+ value: 1
}, {
name: '宸插姙缁�',
- value: 3
+ value: 2
}],
+ list1:[],
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ companyId:'',
+ },
+ total: 1,
}
},
+ onShow() {
+ this.list1 = []
+ this.queryParams.pageNum = 1
+ this.getList()
+ },
+ onReachBottom() {
+ if(this.list1.length == this.total) {
+ return
+ }
+ this.queryParams.pageNum++
+ this.getList()
+ },
methods: {
+ chakan(id){
+ uni.navigateTo({
+ url: `/qiye/complaint/details?id=${id}`
+ })
+ },
+ getList() {
+ let data = uni.getStorageSync("qiyedata")
+ //this.queryParams.companyId = data.companyId
+ logList({...this.queryParams}).then(val => {
+ // console.log(val.data)
+ this.total = val.data.total
+ this.list1 = [...this.list1,...val.data.rows]
+ })
+ },
search(e){
- // this.queryParams.pageNum =1
- // this.queryParams.companyName = e
- // this.orderList()
+ this.queryParams.pageNum =1
+ this.queryParams.companyName = e
+ this.getList()
+ },
+ click(i) {
+
+ this.list1 = []
+ this.queryParams.pageNum = 1
+ this.queryParams.complaintStatus = this.list[i.index].value
+
+ this.getList()
}
}
}
diff --git a/qiye/my/my.vue b/qiye/my/my.vue
index 63d3551..f5cf9eb 100644
--- a/qiye/my/my.vue
+++ b/qiye/my/my.vue
@@ -20,7 +20,7 @@
<text>{{msg.companyPhone}}</text>
</view>
<view class="wbox">
- <view class="item">
+ <view class="item" @click="tousu()">
<view class="set-flex">
<image src="/static/qiye/q06.png" mode="widthFix"></image>
<text class="change">鎶曡瘔璁板綍</text>
@@ -50,7 +50,7 @@
</view> -->
- <view class="logout">
+ <view class="logout" @click="logout()">
閫�鍑虹櫥褰�
</view>
<tabsCom :activeNumber.sync="activeNumber"></tabsCom>
@@ -77,6 +77,25 @@
uni.navigateTo({
url: '/policy/changePhone/changePhone?code=02'
})
+ },
+ tousu(){
+ uni.navigateTo({
+ url: '/qiye/complaint/complaint'
+ })
+ },
+ logout(){
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭閫�鍑虹櫥褰曪紵',
+ success: res => {
+ if(res.confirm) {
+ uni.clearStorageSync()
+ uni.redirectTo({
+ url: '/pages/index/index'
+ })
+ }
+ }
+ })
}
}
}
diff --git a/qiye/qiyeIndex/qiyeIndex.vue b/qiye/qiyeIndex/qiyeIndex.vue
index 4b462b9..9666440 100644
--- a/qiye/qiyeIndex/qiyeIndex.vue
+++ b/qiye/qiyeIndex/qiyeIndex.vue
@@ -45,7 +45,7 @@
companyCode: 'code===',
uqrcodeImage: '',
list1:[],
- companyId:33,//todo
+ companyId:'',
msg:{}
}
},
@@ -56,6 +56,9 @@
}
});
},
+ onLoad(options) {
+ this.companyId = options.id||33
+ },
methods: {
more1(){
uni.navigateTo({
diff --git a/qiye/record/record.vue b/qiye/record/record.vue
index 56199e5..5ba117c 100644
--- a/qiye/record/record.vue
+++ b/qiye/record/record.vue
@@ -11,7 +11,7 @@
{{item.companyName}}
</view>
<template v-if="item.orderStatus==2">
- <view class="r color2">
+ <view class="r color3">
鏈墽娉�
</view>
</template>
@@ -118,6 +118,8 @@
}
},
onShow() {
+ this.list1 = []
+ this.queryParams.pageNum = 1
this.getList()
},
onReachBottom() {
--
Gitblit v1.9.1