Browse Source

修改查询条件,样式调整

master
chenrui 3 years ago
parent
commit
118fc9912f
  1. 19
      src/components/footer-enforcement-nav/index.vue
  2. 2
      src/views/Home.vue
  3. 6
      src/views/enforce/enforcementPlan.vue
  4. 1
      src/views/enforce/sign.vue
  5. 12
      src/views/enterprise/complaint.vue
  6. 14
      src/views/enterprise/complaintNoScan.vue
  7. 2
      src/views/enterprise/enterpriseInspectionList.vue
  8. 22
      src/views/enterprise/registrationList.vue

19
src/components/footer-enforcement-nav/index.vue

@ -4,31 +4,22 @@
<van-tabbar-item name="Home" replace icon="wap-home-o" to="/enforceHome">{{ <van-tabbar-item name="Home" replace icon="wap-home-o" to="/enforceHome">{{
$t("common.lang_home") $t("common.lang_home")
}}</van-tabbar-item> }}</van-tabbar-item>
<van-tabbar-item name="Classify" replace icon="shop-o" to="/earlyWarning"> <van-tabbar-item name="Classify" replace icon="warn-o" to="/earlyWarning">预警</van-tabbar-item>
<span>预警</span>
<template #icon="props">
<img :src="props.active ? icon.warn : icon.warn" />
</template>
</van-tabbar-item>
<van-tabbar-item <van-tabbar-item
name="Shop" name="plan"
replace replace
icon="cart-o" icon="clock-o"
to="/appointmentList" to="/appointmentList"
:dot="data.dot"
:badge="goodsNum"
>预约</van-tabbar-item >预约</van-tabbar-item
> >
<van-tabbar-item <van-tabbar-item
name="Shop" name="Shop"
replace replace
icon="cart-o" icon="records-o"
to="/enforce/enforcementPlan" to="/enforce/enforcementPlan"
:dot="data.dot"
:badge="goodsNum"
>计划</van-tabbar-item >计划</van-tabbar-item
> >
<van-tabbar-item name="My" replace icon="manager-o" to="/my">{{ <van-tabbar-item name="My" replace icon="manager-o" to="">{{
$t("common.lang_my") $t("common.lang_my")
}}</van-tabbar-item> }}</van-tabbar-item>
</van-tabbar> </van-tabbar>

2
src/views/Home.vue

@ -22,7 +22,7 @@
<div class="boutique_body"> <div class="boutique_body">
<!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> --> <!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> -->
<div class="box-info" @click="toRegistrationListView"> <div class="box-info" @click="toRegistrationListView">
<span class="box-info-text" >历史检查信息</span> <span class="box-info-text" >执法记录查询</span>
</div> </div>
<div class="box-complaint" @click="toComplaintView"> <div class="box-complaint" @click="toComplaintView">
<span class="box-complaint-text">执法投诉</span> <span class="box-complaint-text">执法投诉</span>

6
src/views/enforce/enforcementPlan.vue

@ -4,8 +4,7 @@
<!-- 导航栏 --> <!-- 导航栏 -->
<div class="header_body"> <div class="header_body">
<header-nav <header-nav
:slefBack="true" :leftArrow="false"
@goBack="goBack"
:titelText="`公布执法检查计划`" :titelText="`公布执法检查计划`"
> >
</header-nav> </header-nav>
@ -71,6 +70,9 @@
<div class="card_box_span"> <div class="card_box_span">
<p><span class="card_box_label">执法计划:</span> {{ item.fileObject.fileName }}</p> <p><span class="card_box_label">执法计划:</span> {{ item.fileObject.fileName }}</p>
</div> </div>
<!-- <div class="card_box_span">
<p><span class="card_box_label">执法计划:</span> {{ item.fileObject.fileName }}</p>
</div> -->
</div> </div>
</van-swipe-cell> </van-swipe-cell>
</div> </div>

1
src/views/enforce/sign.vue

@ -187,6 +187,7 @@ const tapBad = () => {
data.bad = "#7FFFD4"; data.bad = "#7FFFD4";
submitData.reslut = 1; submitData.reslut = 1;
} }
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数,获取扫码的企业统一信用编码 //初始化参数,获取扫码的企业统一信用编码
onMounted(() =>{ onMounted(() =>{
//查询企业信息 //查询企业信息

12
src/views/enterprise/complaint.vue

@ -503,4 +503,16 @@ export default {
color: #333; color: #333;
line-height: 1.25; line-height: 1.25;
} }
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast{
background: var(--van-toast-background) !important;
box-sizing: content-box !important;
/* 下面3条css,影响不大 */
transition: all var(--van-duration-fast) !important;
width: var(--van-toast-default-width) !important;
max-width: var(--van-toast-max-width) !important;
}
.van-popup.van-toast .van-toast__icon{
font-size: var(--van-toast-icon-size) !important;
}
</style> </style>

14
src/views/enterprise/complaintNoScan.vue

@ -89,7 +89,7 @@
<script setup name="register"> <script setup name="register">
import { showSuccessToast,showLoadingToast,closeToast } from 'vant'; import { showSuccessToast} from 'vant';
import {addEnterpriseComplaint} from '../../api/enterprise' import {addEnterpriseComplaint} from '../../api/enterprise'
import {getDict} from '../../api/Home' import {getDict} from '../../api/Home'
import {uploadFile} from '../../util/fileUpload' import {uploadFile} from '../../util/fileUpload'
@ -339,7 +339,7 @@ export default {
border-radius: 1rem; border-radius: 1rem;
font-size: 0.3rem; font-size: 0.3rem;
} }
.popup { .popup {
position: fixed; position: fixed;
z-index: 999; z-index: 999;
top: 3rem; top: 3rem;
@ -496,14 +496,4 @@ export default {
} }
.van-toast__text{
background:rgba(63, 196, 6, 0.7) !important;
// color: black !important;
}
.van-toast{
color:#333 !important;
}
.van-popup{
background: var(--van-gray-5) !important;
}
</style> </style>

2
src/views/enterprise/enterpriseInspectionList.vue

@ -115,7 +115,7 @@ let searchParam = reactive({
//执法部门 //执法部门
lawEnforcement:"", lawEnforcement:"",
//搜索框 //搜索框
searchValue: ref(''), searchText: ref(''),
//时间类型 //时间类型
dateType: null, dateType: null,
//是否投诉 //是否投诉

22
src/views/enterprise/registrationList.vue

@ -6,12 +6,12 @@
<header-nav <header-nav
:slefBack="true" :slefBack="true"
@goBack="goBack" @goBack="goBack"
:titelText="`历史检查信息`" :titelText="`执法记录查询`"
> >
</header-nav> </header-nav>
</div> </div>
<van-search <van-search
v-model="searchParam.searchText" v-model="searchParam.searchValue"
show-action show-action
placeholder="请输入关键字查询" placeholder="请输入关键字查询"
@search="onSearch" @search="onSearch"
@ -30,7 +30,7 @@
<div class="search-button-date"> <div class="search-button-date">
<span class="date-select" @click="selectDate">{{ data.dateSearch }}</span> <span class="date-select" @click="selectDate">{{ data.dateSearch }}</span>
<div style="border-color: black;" class="van-hairline--bottom"></div> <div style="border-color: black;" class="van-hairline--bottom"></div>
<van-button class="search-button" type="primary" size="mini">统计分析</van-button> <!-- <van-button class="search-button" type="primary" size="mini">统计分析</van-button> -->
<van-popup v-model:show="data.showDatePicker" position="bottom"> <van-popup v-model:show="data.showDatePicker" position="bottom">
<van-date-picker <van-date-picker
title="选择日期" title="选择日期"
@ -61,7 +61,7 @@
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> --> <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
<div style="border-color: aqua; border: 2px;" class="van-hairline--bottom"></div> <div style="border-color: aqua; border: 2px;" class="van-hairline--bottom"></div>
<div class="card_box_span"> <div class="card_box_span">
<p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementIncident }}</p> <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
</div> </div>
<div class="card_box_span"> <div class="card_box_span">
@ -106,13 +106,15 @@ let searchParam = reactive({
//执法部门 //执法部门
lawEnforcement:"", lawEnforcement:"",
//搜索框 //搜索框
searchText: ref(''), searchValue: ref(''),
//时间类型 //时间类型
dateType: null, dateType: null,
//是否投诉 //是否投诉
isComplaint: null, isComplaint: null,
//企业统一信用码 //企业统一信用码
enterpriseNumber: ref(useCommon.enterpriseNumber), enterpriseNumber: ref(useCommon.enterpriseNumber),
//时间搜索
dateSearch:""
}); });
const data = reactive({ const data = reactive({
@ -147,7 +149,7 @@ const queryList = () =>{
const onSearch = (val) => { const onSearch = (val) => {
queryRegistrationList( queryRegistrationList(
{ {
"searchText": searchParam.searchText "searchValue": searchParam.searchText
} }
,success =>{ ,success =>{
console.log(success) console.log(success)
@ -157,7 +159,7 @@ const onSearch = (val) => {
}) })
}; };
const onClickButton = () =>{ const onClickButton = () =>{
console.log(searchParam.searchText) console.log(searchParam.searchValue)
queryList(); queryList();
} }
@ -251,6 +253,9 @@ const onDateConfirm = (value)=> {
}); });
data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1] data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1]
data.showDatePicker = false; data.showDatePicker = false;
//搜索数据
searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1]
queryList();
} }
const nowDate = (time) => { const nowDate = (time) => {
var year = time.getFullYear(); // 年 var year = time.getFullYear(); // 年
@ -268,6 +273,9 @@ const nowDate = (time) => {
const searchDateType = (val) =>{ const searchDateType = (val) =>{
searchParam.dateType = val; searchParam.dateType = val;
searchParam.isComplaint = null; searchParam.isComplaint = null;
if(val == null){
searchParam.dateSearch = null;
}
queryList(); queryList();
} }
const searchComplaint = (val) =>{ const searchComplaint = (val) =>{

Loading…
Cancel
Save