From e7d382efc71d1a738a6a7c52d0978d6fdb077a8a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Sat, 14 Sep 2024 17:34:02 +0800
Subject: [PATCH] 提交
---
gz-wxparty/pages/register/index.json | 2
gz-wxparty/pages/speechToText/index.js | 7 +
gz-wxparty/pages/register/index.js | 8 +-
gz-customerSystem/src/views/comprehensive/index.jsx | 12 ++-
gz-wxparty/api/api.js | 2
gz-customerSystem/src/views/disputeLedger/index.jsx | 39 +++++++++++++
gz-customerSystem/src/views/comprehensive/index.less | 2
gz-customerSystem/src/router/router.js | 4
gz-customerSystem/src/styles/theme.less | 2
gz-customerSystem/src/views/disputeLedger/index.less | 0
gz-wxparty/pages/myRegisterList/index.wxml | 8 ++
gz-wxparty/pages/myRegisterList/index.js | 39 ++++++++++++
gz-wxparty/pages/register/index.wxml | 4
13 files changed, 109 insertions(+), 20 deletions(-)
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index f3b60a2..fdd2660 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-28 11:22:41
- * @LastEditTime: 2024-09-14 15:57:00
+ * @LastEditTime: 2024-09-14 16:09:40
* @LastEditors: lwh
* @Version: 1.0.0
* @Description: 路由
@@ -234,7 +234,7 @@
{/* 综合查询 */}
<Route path="comprehensive" element={<Comprehensive />} />
{/* 纠纷台账 */}
- <Route path="disputeLedger" element={<DisputeLedger />} />
+ <Route path="account" element={<DisputeLedger />} />
{/* 数据分析 */}
<Route path="dataSearch" element={<DataSearch />} />
{/* 调解视窗成功页 */}
diff --git a/gz-customerSystem/src/styles/theme.less b/gz-customerSystem/src/styles/theme.less
index 1d6201f..df1b3ac 100644
--- a/gz-customerSystem/src/styles/theme.less
+++ b/gz-customerSystem/src/styles/theme.less
@@ -16,7 +16,7 @@
@warning-color: #FA8C16; // 警告色
@warning-bg-color: #fdf6e0; // 警告色背景
@error-color: #F53F3F; // 错误色
-@font-size-base: 14px; // 主字号
+@font-size-base: 16px; // 主字号
@line-height-base: 1.5715;
@heading-color: rgba(0, 0, 0, 0.85); // 标题色
@text-color: rgba(0, 0, 0, 0.85); // 主文本色
diff --git a/gz-customerSystem/src/views/comprehensive/index.jsx b/gz-customerSystem/src/views/comprehensive/index.jsx
index 1812110..f06c4a7 100644
--- a/gz-customerSystem/src/views/comprehensive/index.jsx
+++ b/gz-customerSystem/src/views/comprehensive/index.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
-import Page from '../../components/Page/index';
+import NewPage from '../../components/NewPage/index';
import { Form, Typography, Space, Tooltip } from 'antd';
import { FolderFilled } from '@ant-design/icons';
import * as $$ from '../../utils/utility';
@@ -191,8 +191,12 @@
return (
- <Page pageHead={{ title: '综合查询', subtitle: '管理员名下综合查询列表' }}>
- <div className="mediateList">
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '综合查询' }], title: '综合查询' }
+ }
+ >
+ <div className="comprehensive">
<div className="pageSearch">
<div className='comprehensive-title'>查询条件</div>
<NewTableSearch
@@ -254,7 +258,7 @@
/>
</div>
</div>
- </Page>
+ </NewPage>
);
};
diff --git a/gz-customerSystem/src/views/comprehensive/index.less b/gz-customerSystem/src/views/comprehensive/index.less
index c389ffc..165fe16 100644
--- a/gz-customerSystem/src/views/comprehensive/index.less
+++ b/gz-customerSystem/src/views/comprehensive/index.less
@@ -1,4 +1,6 @@
.comprehensive {
+ position: relative;
+ margin: 0 16px;
&-title {
// margin: 0 16px;
font-size: 16px;
diff --git a/gz-customerSystem/src/views/disputeLedger/index.jsx b/gz-customerSystem/src/views/disputeLedger/index.jsx
new file mode 100644
index 0000000..402ed27
--- /dev/null
+++ b/gz-customerSystem/src/views/disputeLedger/index.jsx
@@ -0,0 +1,39 @@
+/*
+ * @Company: hugeInfo
+ * @Author: lwh
+ * @Date: 2024-09-14 15:59:17
+ * @LastEditTime: 2024-09-14 16:03:34
+ * @LastEditors: lwh
+ * @Version: 1.0.0
+ * @Description:
+ */
+import React, { useState, useEffect, useMemo } from 'react';
+import * as $$ from '../../utils/utility';
+import { Form, Typography, Button, Space } from 'antd';
+import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
+import NewPage from '../../components/NewPage/index';
+
+const { Link } = Typography;
+
+// 调度中心列表
+function getMyMediationDataApi(submitData) {
+ return $$.ax.request({ url: 'caseDisp/pageQuery', type: 'get', data: submitData, service: 'disp' });
+}
+
+// 获取列表分类tab
+function getTabsDataApi() {
+ return $$.ax.request({ url: 'caseDisp/getApplyCanal', type: 'get', service: 'disp' });
+}
+
+const DisputeLedger = () => {
+
+ return (
+ <NewPage
+ pageHead={
+ { breadcrumbData: [{ title: '工作台' }, { title: '纠纷台账' }], title: '纠纷台账' }
+ }
+ ></NewPage>
+ )
+}
+
+export default DisputeLedger;
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/disputeLedger/index.less b/gz-customerSystem/src/views/disputeLedger/index.less
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gz-customerSystem/src/views/disputeLedger/index.less
diff --git a/gz-wxparty/api/api.js b/gz-wxparty/api/api.js
index a1abe7b..1466303 100644
--- a/gz-wxparty/api/api.js
+++ b/gz-wxparty/api/api.js
@@ -8,7 +8,7 @@
// === 测试环境 ===
// debug: 'https://gz.hugeinfo.com.cn/',
- debug: 'http://h468pm.natappfree.cc/',
+ debug: 'http://h6pq6x.natappfree.cc/',
img: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/images/',
assets: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/js/',
txt: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/txt/',
diff --git a/gz-wxparty/pages/myRegisterList/index.js b/gz-wxparty/pages/myRegisterList/index.js
index 9df6b6f..be40cdc 100644
--- a/gz-wxparty/pages/myRegisterList/index.js
+++ b/gz-wxparty/pages/myRegisterList/index.js
@@ -12,6 +12,17 @@
})
}
+function getfilesApi(param) {
+ return $$.request({
+ url: 'fileInfo/listByMainIdAndType',
+ type: 'get',
+ submitData: param || {},
+ service: 'sys'
+ })
+}
+
+
+
Page({
/**
@@ -19,6 +30,7 @@
*/
data: {
imgUrl: $$.url.img,
+ fileUrl: $$.baseUrl + $$.url.fileShowUrl,
search: {
page: 1,
size: 10,
@@ -171,7 +183,7 @@
}
})
},
-
+ // 关闭协议要点
agreeContentClosePopup(e) {
this.setData({
showData: {
@@ -181,6 +193,31 @@
})
},
+ // 查看协议文书
+ async agreeClick(e) {
+ let item = e.currentTarget.dataset.item;
+ $$.showLoading();
+
+ const res = await getfilesApi({
+ mainId: item.id,
+ ownerType: '22_00018-302',
+ });
+ $$.hideLoading();
+ if (res.type) {
+ let data = res.data || [];
+ if (data?.length === 0) {
+ $$.showToast({
+ title: '暂无协议文书',
+ duration: 1000
+ });
+ }
+ wx.previewImage({
+ current: `${this.data.fileUrl}${data[0].showUrl}`,
+ urls: data.map(item => `${this.data.fileUrl}${item.showUrl}`) // 需要预览的图片http链接列表
+ });
+ }
+ },
+
// 评价
evaluate(e) {
let id = e.currentTarget.dataset.id;
diff --git a/gz-wxparty/pages/myRegisterList/index.wxml b/gz-wxparty/pages/myRegisterList/index.wxml
index b9be00b..f19511d 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxml
+++ b/gz-wxparty/pages/myRegisterList/index.wxml
@@ -49,9 +49,13 @@
<view wx:if="{{item.mediResult==='22_00025-1'}}" class="list-content-value green-title">{{item.mediResultName||'-'}}</view>
<view wx:if="{{item.mediResult==='22_00025-2'}}" class="list-content-value red-title">{{item.mediResultName||'-'}}</view>
</view>
- <view wx:if="{{item.agreeType==='24_00003-2'}}" class="list-content-flex margin-top">
+ <view wx:if="{{item.agreeType==='24_00003-1'}}" class="list-content-flex margin-top">
<view class="list-content-title">协议要点</view>
<view wx:if="{{item.agreeContentShow}}" class="list-content-value">{{item.newAgreeContent||'-'}}<text bindtap="agreeContentClick" data-item="{{item}}" class="public-color">更多</text></view>
+ </view>
+ <view wx:if="{{item.agreeType==='24_00003-2'}}" class="list-content-flex margin-top">
+ <view class="list-content-title">协议文书</view>
+ <view bindtap="agreeClick" data-item="{{item}}" class="list-content-value list-detail-r">查看</view>
</view>
<view class="list-border"></view>
<view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/myRegisterDetail/index?id='+item.id}}">
@@ -107,7 +111,7 @@
<view wx:if="{{ showData.visible }}" class="showData-title">
<view class="showData-title-view">
<view class="showData-title-label">协议要点</view>
- <view >{{showData.title}}</view>
+ <view>{{showData.title}}</view>
</view>
<view class="">
</view>
diff --git a/gz-wxparty/pages/register/index.js b/gz-wxparty/pages/register/index.js
index c74f81c..442d166 100644
--- a/gz-wxparty/pages/register/index.js
+++ b/gz-wxparty/pages/register/index.js
@@ -485,8 +485,10 @@
//选择纠纷类型 、跳转事项概况语音描述，跳转事项申请语音描述
caseTypeGoPage(e) {
let url = e.currentTarget.dataset.url;
+ let type = e.currentTarget.dataset.type;
+ let value = e.currentTarget.dataset.value;
wx.navigateTo({
- url: url,
+ url: url + '?type=' + type + '&value=' + value,
});
},
@@ -526,9 +528,9 @@
that.setData({
submitData: {
...that.data.submitData,
- [key]: that.data.submitData.caseDes + wordsResult
+ [key]: that.data.submitData[key] + wordsResult
},
- [keyNum]: (that.data.submitData.caseDes + wordsResult).length
+ [keyNum]: (that.data.submitData[keyNum] + wordsResult).length
});
}
},
diff --git a/gz-wxparty/pages/register/index.json b/gz-wxparty/pages/register/index.json
index 1dd4976..989ee32 100644
--- a/gz-wxparty/pages/register/index.json
+++ b/gz-wxparty/pages/register/index.json
@@ -3,8 +3,6 @@
"usingComponents": {
"steps": "../../components/steps/index",
"mediate-detail": "../../components/mediate-detail/index",
- "recording": "../../components/recording/index",
- "textarea": "../../components/textarea/index",
"ellipsis-text": "../../components/ellipsis-text/index"
}
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/register/index.wxml b/gz-wxparty/pages/register/index.wxml
index d18d8df..851c907 100644
--- a/gz-wxparty/pages/register/index.wxml
+++ b/gz-wxparty/pages/register/index.wxml
@@ -127,7 +127,7 @@
<image src="{{imgUrl}}imgOcr.png" mode="" />识别图片
</view>
<view style="padding: 0 8rpx;">|</view>
- <view bindtap="caseTypeGoPage" data-url="../../pages/speechToText/index?type=caseDes" class="textarea-img">
+ <view bindtap="caseTypeGoPage" data-type="caseDes" data-value="{{submitData.caseDes}}" data-url="../../pages/speechToText/index" class="textarea-img">
<image src="{{imgUrl}}voiceOcr.png" mode="" />语音描述
</view>
</view>
@@ -146,7 +146,7 @@
<image src="{{imgUrl}}imgOcr.png" mode="" />识别图片
</view>
<view style="padding: 0 8rpx;">|</view>
- <view bindtap="caseTypeGoPage" data-url="../../pages/speechToText/index?type=caseClaim" class="textarea-img">
+ <view bindtap="caseTypeGoPage" data-type="caseClaim" data-value="{{submitData.caseClaim}}" data-url="../../pages/speechToText/index" class="textarea-img">
<image src="{{imgUrl}}voiceOcr.png" mode="" />语音描述
</view>
</view>
diff --git a/gz-wxparty/pages/speechToText/index.js b/gz-wxparty/pages/speechToText/index.js
index a540c8f..28eafb2 100644
--- a/gz-wxparty/pages/speechToText/index.js
+++ b/gz-wxparty/pages/speechToText/index.js
@@ -166,11 +166,14 @@
*/
onLoad(options) {
let {
- type
+ type,
+ value
} = options
console.log('type', type);
this.setData({
- key: type
+ key: type,
+ value,
+ number: value?.length || 0,
})
wx.getSetting({
success(res) {
--
Gitblit v1.8.0