From 36f976d81c7b013efba8032330c56f3512065c72 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 15 Apr 2024 17:44:52 +0800
Subject: [PATCH] 更新
---
/dev/null | 21 ----------
subPackage/workbench/views/reportDetail.vue | 7 +++
pages/home/index.vue | 15 +++++++
subPackage/search/index.vue | 2
subPackage/workbench/views/reportList.vue | 4 ++
static/icon/nav-28.png | 0
subPackage/user/district/index.vue | 8 ++--
common/setting.js | 4 +-
subPackage/workbench/views/reportAudit.vue | 7 +++
subPackage/bs/views/repairList.vue | 7 +++
subPackage/house/member/householdLabel.vue | 17 +++++++-
subPackage/workbench/views/report.vue | 4 ++
12 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 1d2fd98..d954d12 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- // devUrl: 'http://192.168.2.111:9528',
- devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ devUrl: 'http://192.168.2.111:9528',
+ // devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 0e10430..c776cb5 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -419,6 +419,11 @@
text: "便民热线",
path: '/subPackage/hotLine/index'
},
+ {
+ icon: "/static/icon/nav-28.png",
+ text: "统战上报",
+ path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
+ },
]
},
{
@@ -492,6 +497,11 @@
icon: "/static/icon/nav-03.png",
text: "便民热线",
path: '/subPackage/hotLine/index'
+ },
+ {
+ icon: "/static/icon/nav-26.png",
+ text: "统战上报",
+ path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
},
]
}, {
@@ -571,6 +581,11 @@
text: "便民热线",
path: '/subPackage/hotLine/index'
},
+ {
+ icon: "/static/icon/nav-28.png",
+ text: "统战上报",
+ path: "/subPackage/bs/views/addRepair?title=统战上报&type=6"
+ },
]
},
{
diff --git a/static/icon/nav-28.png b/static/icon/nav-28.png
new file mode 100644
index 0000000..decdfa0
--- /dev/null
+++ b/static/icon/nav-28.png
Binary files differ
diff --git a/subPackage/bs/views/repairList.vue b/subPackage/bs/views/repairList.vue
index 4cd3d1b..ab10fac 100644
--- a/subPackage/bs/views/repairList.vue
+++ b/subPackage/bs/views/repairList.vue
@@ -24,7 +24,8 @@
<view class="list-item bgc-ff mb-20" v-for="item in dataList" :key="item.id" @click="pushPage(item)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{ getTypeName(item.type) }}</text>
- <u-tag class="u_tag" size="mini" plain plainFill :text="getStatusName(item.status)"></u-tag>
+ <u-tag class="u_tag" size="mini" plain plainFill
+ :text="getStatusName(item.confirmFlag)"></u-tag>
</view>
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">时间</text>
@@ -85,6 +86,10 @@
{
name: "企业商户上报",
type: 5
+ },
+ {
+ name: "统战上报",
+ type: 6
}
],
diff --git a/subPackage/house/member/householdLabel.vue b/subPackage/house/member/householdLabel.vue
index d730c0a..d70c892 100644
--- a/subPackage/house/member/householdLabel.vue
+++ b/subPackage/house/member/householdLabel.vue
@@ -23,13 +23,26 @@
</view>
<view v-for="(item, index) in labelBtnList" :key="index" class="label-crad">
<newBoxTitle :title="item.name"></newBoxTitle>
- <view class="label-btn-box">
+ <!-- <block v-if="item.children[0].children.length"> -->
+ <u-collapse accordion :border="false" v-for="(c, k) in item.children" :key="k">
+ <u-collapse-item :title="c.name">
+ <view class="label-btn-box">
+ <view v-for="(i, k) in c.children" :key="k">
+ <u-button size="mini" type="primary" :color="$setLabelColor(i.color)"
+ :style="{color: $setLabelColor(i.color) && '#fff'}" :text="i.name"
+ @click="showLabelPopup(i,index,k)"></u-button>
+ </view>
+ </view>
+ </u-collapse-item>
+ </u-collapse>
+ <!-- </block> -->
+ <!-- <view class="label-btn-box" v-else>
<view v-for="(item, k) in item.children" :key="k">
<u-button size="mini" type="primary" :color="$setLabelColor(item.color)"
:style="{color: $setLabelColor(item.color) && '#fff'}" :text="item.name"
@click="showLabelPopup(item,index,k)"></u-button>
</view>
- </view>
+ </view> -->
</view>
</view>
</view>
diff --git a/subPackage/search/index.vue b/subPackage/search/index.vue
index 2af5586..cf95b82 100644
--- a/subPackage/search/index.vue
+++ b/subPackage/search/index.vue
@@ -63,7 +63,7 @@
switch (item.typeName) {
case "通知公告":
uni.navigateTo({
- url: "/subPackage/article/detail?id=${item.tableId}&type=${item.type}"
+ url: `/subPackage/article/detail?id=${item.tableId}&type=${item.type}`
})
break;
case "经营场所":
diff --git a/subPackage/user/district/index.vue b/subPackage/user/district/index.vue
index 090b3a0..61798bc 100644
--- a/subPackage/user/district/index.vue
+++ b/subPackage/user/district/index.vue
@@ -10,12 +10,12 @@
<text>{{detail.communityName}}</text>
</view>
<view class="item-row flex j-c-s-b a-i-c">
- <text>房屋住址</text>
+ <text>小区住址</text>
<text class="address">{{detail.address}}</text>
</view>
<view class="item-row flex j-c-s-b a-i-c">
<text>党组织名称</text>
- <text class="address">{{detail.organizationName}}</text>
+ <text class="address">{{detail.organizationName || ""}}</text>
</view>
<view class="item-row flex j-c-s-b a-i-c">
<text>党组织类型</text>
@@ -27,11 +27,11 @@
</view>
<view class="item-row flex j-c-s-b a-i-c">
<text>负责人姓名</text>
- <text class="address">{{detail.chargePerson}}</text>
+ <text class="address">{{detail.chargePerson || ""}}</text>
</view>
<view class="item-row flex j-c-s-b a-i-c">
<text>负责人手机号</text>
- <text class="address">{{detail.phone}}</text>
+ <text class="address">{{detail.phone || ""}}</text>
</view>
</view>
<view class="box bgc-ff" v-if="detail.remark">
diff --git a/subPackage/user/test.vue b/subPackage/user/test.vue
deleted file mode 100644
index 722a1db..0000000
--- a/subPackage/user/test.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-</template>
-
-<script>
- ↵
- # # # Error updating database.Cause: java.sql.SQLSyntaxErrorException: Table 'jczz.jczz_backblast_pub_record'
- doesn 't exist↵
- # # # The error may exist in org / springblade / modules / backblast / mapper / BackblastPubRecordMapper.java(
- best guess)↵ # # # The error may involve org.springblade.modules.backblast.mapper.BackblastPubRecordMapper
- .insert - Inline↵ # # # The error occurred
- while setting parameters↵ # # # SQL: INSERT INTO jczz_backblast_pub_record(id, house_code, policeman, policeman_phone,
- pub_content, pub_urls, grid_code, jw_grid_code, lng, lat, address, create_time) VALUES( ? , ? , ? , ? , ? , ?
- , ? , ? , ? , ? , ? , ? )↵ # # # Cause: java.sql.SQLSyntaxErrorException:
- Table 'jczz.jczz_backblast_pub_record'
- doesn 't exist↵; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table '
- jczz.jczz_backblast_pub_record ' doesn'
- t exist "
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/report.vue b/subPackage/workbench/views/report.vue
index eb58887..43a6e61 100644
--- a/subPackage/workbench/views/report.vue
+++ b/subPackage/workbench/views/report.vue
@@ -105,6 +105,10 @@
{
name: "企业商户上报",
type: 5
+ },
+ {
+ name: "统战上报",
+ type: 6
}
],
tabIndex: 0,
diff --git a/subPackage/workbench/views/reportAudit.vue b/subPackage/workbench/views/reportAudit.vue
index 956d6fa..be04491 100644
--- a/subPackage/workbench/views/reportAudit.vue
+++ b/subPackage/workbench/views/reportAudit.vue
@@ -28,6 +28,9 @@
<view class="text">审核信息</view>
</view> -->
<caption-row title="审核信息" />
+ <view class="stauts mt-20" v-if="confirmFlag == 3 && !defaultData.taskRepairStepList">
+ 已处理
+ </view>
<view class="step">
<view class="step-list " v-for="i in defaultData.taskRepairStepList"
v-if="defaultData.taskRepairStepList.length">
@@ -204,6 +207,10 @@
{
name: "企业商户上报",
type: 5
+ },
+ {
+ name: "统战上报",
+ type: 6
}
],
form: {
diff --git a/subPackage/workbench/views/reportDetail.vue b/subPackage/workbench/views/reportDetail.vue
index 47935e4..f5df78e 100644
--- a/subPackage/workbench/views/reportDetail.vue
+++ b/subPackage/workbench/views/reportDetail.vue
@@ -29,6 +29,9 @@
<view class="text">审核信息</view>
</view> -->
<caption-row title="审核信息" />
+ <view class="stauts mt-20" v-if="confirmFlag == 3 && !defaultData.taskRepairStepList">
+ 已处理
+ </view>
<view class="step">
<view class="step-list " v-for="i in defaultData.taskRepairStepList"
v-if="defaultData.taskRepairStepList.length">
@@ -188,6 +191,10 @@
{
name: "企业商户上报",
type: 5
+ },
+ {
+ name: "统战上报",
+ type: 6
}
],
form: {
diff --git a/subPackage/workbench/views/reportList.vue b/subPackage/workbench/views/reportList.vue
index 531e085..17666d4 100644
--- a/subPackage/workbench/views/reportList.vue
+++ b/subPackage/workbench/views/reportList.vue
@@ -105,6 +105,10 @@
{
name: "企业商户上报",
type: 5
+ },
+ {
+ name: "统战上报",
+ type: 6
}
],
tabIndex: 0,
--
Gitblit v1.9.3