Browse Source

禅道应标bug修复

v2
蟑螂恶霸 2 years ago
parent
commit
4e7185d96c
  1. 1
      src/api/Home.js
  2. 11
      src/api/enforce.js
  3. 2
      src/api/enterprise.js
  4. 4
      src/common/globalRouter.js
  5. 3
      src/components/footer-nav/index.vue
  6. 8
      src/views/administrative/appointment.vue
  7. 8
      src/views/administrative/appointmentEdit.vue
  8. 4
      src/views/enforce/historyCheck.vue
  9. 26
      src/views/enforce/scanQrCode.vue
  10. 8
      src/views/enforce/sign.vue
  11. 20
      src/views/enforceHome.vue
  12. 25
      src/views/enterprise/complaintList.vue
  13. 4
      src/views/enterprise/qrCode.vue
  14. 869
      src/views/enterprise/qrCodeHistory.vue
  15. 8
      src/views/enterprise/registrationEdit.vue
  16. 4
      src/views/enterprise/registrationList.vue
  17. 9
      src/views/login.vue

1
src/api/Home.js

@ -3,6 +3,7 @@ export const getCarousel = "/getCarousel"
export const boutiqueGoods = "/boutiqueGoods"
export const recommendGoods = "/recommendGoods"
export const userLogin = (params, success, error) => _post("/appLogin", params, success, error);
export const testLogin = (params, success, error) => _get("/app/thirdLogin/testLogin/"+params, null, success, error);
//查询字典
export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);

11
src/api/enforce.js

@ -68,4 +68,13 @@ export const getAttr = (id, success, error) => _get("/app/code/registration/quer
export const queryStatisticalData = (params, success, error) => _get("/app/statistical/statisticalData",params,success,error)
// 查询执法登记详情
export const queryRegistrationById = (id,success, error) =>_get("/app/code/registration/queryById/" + id,null,success,error)
export const queryRegistrationById = (id,success, error) =>_get("/app/code/registration/queryById/" + id,null,success,error)
/** 判断二维码是否有效 */
export const checkIsState = (num, success, error) => _get("/app/enterpriseInformation/checkIsState/"+ num, null,success,error)
/** 二维码失效 */
export const unQrCode = (id, success, error) => _get("/app/enterpriseInformation/unQrCode/"+ id, null,success,error)
/** 生成新的企业二维码 */
export const addQrCode = (num, success, error) => _get("/app/enterpriseInformation/addQrCode/"+ num, null,success,error)

2
src/api/enterprise.js

@ -13,6 +13,8 @@ export const queryRegistrationList = (params, success, error) => _get("/app/code
export const addEnterpriseComplaint = (params, success, error) => _post("/app/code/complaint/add",params,success,error)
// 查询
export const getEnterpriseComplaintById = (id, success, error) => _get("/app/code/complaint/getById/"+id,null,success,error)
// 诉求工单评价页面
export const toMssqAppraise = (params, success, error) => _post("/app/code/complaint/mssqAppraise",params,success,error)
/**
* 查询企业行政执法通知记录

4
src/common/globalRouter.js

@ -3,8 +3,8 @@ import { createRouter, createWebHashHistory } from "vue-router";
let routes = [
{
path: "/",
// redirect: "/home",
redirect: "/enforceHome",
redirect: "/home",
// redirect: "/enforceHome",
name: "App",
},
{

3
src/components/footer-nav/index.vue

@ -7,6 +7,9 @@
<van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/enterpriseInspectionList">
行政检查通知
</van-tabbar-item>
<!-- <van-tabbar-item name="Classify" replace icon="description-o" to="/enterprise/complaintList">-->
<!-- 工单-->
<!-- </van-tabbar-item>-->
<!-- <van-tabbar-item name="My" replace icon="manager-o" to="">{{
$t("common.lang_my")
}}</van-tabbar-item> -->

8
src/views/administrative/appointment.vue

@ -281,8 +281,8 @@
submitData.lawEnforcerTwo = item.userName
submitData.lawCertificateNumTwo = item.lawCertificateNum;
submitData.lawEnforcerTwoId = item.userId;
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
}
const reciveDept = (item) => {
@ -431,8 +431,8 @@
console.log(success.data)
submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;

8
src/views/administrative/appointmentEdit.vue

@ -266,8 +266,8 @@
submitData.lawEnforcerTwo = item.userName
submitData.lawCertificateNumTwo = item.lawCertificateNum;
submitData.lawEnforcerTwoId = item.userId;
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
}
const reciveDept = (item) => {
@ -455,8 +455,8 @@
console.log(success.data)
submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;

4
src/views/enforce/historyCheck.vue

@ -84,8 +84,8 @@
size="mini">编辑</van-button></span>
</div>
<div class="card_box_action" v-if="item.comOrOpi == 1">
<span><van-button @click="toComplaint(item.id, item.lawEnforcementItemText)" type="primary"
size="mini">建议</van-button></span>
<!-- <span><van-button @click="toComplaint(item.id, item.lawEnforcementItemText)" type="primary"-->
<!-- size="mini">建议</van-button></span>-->
</div>
</div>
</van-swipe-cell>

26
src/views/enforce/scanQrCode.vue

@ -56,6 +56,7 @@
import {showFailToast} from 'vant';
import {getEnterpriseMerchantAuthorization} from '@/api/Home';
import {checkIsExists} from '@/api/enterprise';
import {checkIsState} from '@/api/enforce';
import {szyptGetToken} from "../../api/Home";
import wx from "weixin-js-sdk";
@ -132,24 +133,25 @@
// 页面跳转
console.log("=========== 扫码返回 ===========")
console.log(res)
// checkIsExists(res, success => {
// console.log(success.data)
// if (success.data) {
// 判断二维码是否过期, 如果已过期则跳转提示页
checkIsState(res.resultStr, success => {
console.log(success.data)
if (success.data) {
router.push({
path: "/enterpriseScanPreview",
query: {
enterpriseNumber: res.resultStr
}
})
// } else {
// showFailToast('企业信息不存在,请确认二维码是否正确!');
// router.push({
// path: "/enforce/scanQrCode",
// })
// }
// }, error => {
//
// })
} else {
showFailToast('企业信息不存在,请确认二维码是否正确!');
router.push({
path: "/enforce/scanQrCode",
})
}
}, error => {
})
// router.push({
// path: "/enterpriseScanPreview",
// query: {

8
src/views/enforce/sign.vue

@ -346,8 +346,8 @@ onMounted(() =>{
queryUserInfo(useCommon.userId,success =>{
if (null != success.data) {
submitData.lawEnforcer = success.data.userName
// submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
submitData.lawCertificateNumText = success.data.userName
submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
// submitData.lawCertificateNumText = success.data.userName
submitData.lawEnforcerId = success.data.userId
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
@ -496,8 +496,8 @@ const closePopup = () =>{
}
const reciveData = (item) =>{
submitData.lawEnforcerTwo = item.userName;
// submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
submitData.lawCertificateNumTwoText = item.userName;
submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
// submitData.lawCertificateNumTwoText = item.userName;
submitData.lawEnforcerIdTwo = item.userId;
}
const reciveData2 = (item) =>{

20
src/views/enforceHome.vue

@ -1,6 +1,6 @@
<template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />-->
<div class="home app_content">
<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />
<div class="home app_content" v-if="!isLoading">
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
@ -215,7 +215,7 @@
};
onMounted(() => {
// new Vconsolefrom();
new Vconsolefrom();
let fullUrl = window.location.href;
let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
console.log(useCommon.firstLoad)
@ -232,13 +232,13 @@
useCommon.SET_IS_FIRST_LOAD(false)
queryList();
// 如果不是执法用户 则跳转
// if (!success.data.lawOfficer) {
// router.push(
// {
// path: "/noAccess"
// });
// isLoading.value = false;
// }
if (!success.data.lawOfficer) {
router.push(
{
path: "/noAccess"
});
isLoading.value = false;
}
}, error => {
})

25
src/views/enterprise/complaintList.vue

@ -26,6 +26,7 @@
<van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">未处理</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">处理中</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">已处理</van-button>
<van-button plain hairline class="search-button" @click="mssq()" round type="primary" size="mini">临时按钮</van-button>
</div>
<div class="search-button-date">
@ -87,14 +88,14 @@
</div>
<!-- 底部 -->
<!-- <div class="shop_footer_body">
<div class="shop_footer_body">
<footer-nav></footer-nav>
</div> -->
</div>
</div>
</template>
<script setup name="registrationList">
import {queryRegistrationList} from '../../api/enterprise';
import {queryRegistrationList, toMssqAppraise} from '../../api/enterprise';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
import { setGoodsNum } from "@/util/util";
const { useCommon, useShopCard } = $globalStore;
@ -134,6 +135,24 @@ const data = reactive({
ga_columns: [],
});
const mssq = () => {
let params = {
assessServiceCode: "082407081009143119701",
assessObjectName: "气象局",
// assessObjectName: "深圳市司法局", // 实际使用环境用这个
assessObjectCode: "082407081009143119701",
deptCode: "151615",
// deptCode: "151617", // 司法局的deptCode
evaluatorName: "测试",
evaluatorPapersPhone: "18528845598",
// backUrl: "http://jdm.szssfj.cn/enterprise", // 正式环境用这个
backUrl: "http://192.168.31.196:3301/",
}
toMssqAppraise(params, success => {
window.location.href = success.data;
});
}
// 设置初始值为当前时间
onMounted(() => {
// getCard();

4
src/views/enterprise/qrCode.vue

@ -28,7 +28,7 @@
</div>
<van-action-bar>
<van-action-bar-button color="#2b75fd" text="下载二维码" @click="download(data.qrCodeUrl)" />
<!-- <van-action-bar-button color="#2b75fd" text="二维码管理" @click="toHisrotyView()" /> -->
<van-action-bar-button color="#2b75fd" text="二维码管理" @click="toHisrotyView()" />
</van-action-bar>
</div>
</div>
@ -224,7 +224,7 @@ const download = (url) =>{
}
const toHisrotyView = () =>{
router.push({ path: "/qrCodeHistory" });
router.push({ path: "/qrCodeHistory", query: {enterpriseNumber: route?.query?.enterpriseNumber} });
}
</script>
<style lang="less" scoped>

869
src/views/enterprise/qrCodeHistory.vue

@ -1,432 +1,475 @@
<template>
<div class="shop app_content">
<!-- 导航栏 -->
<!-- <div class="header_body">
<div class="shop app_content">
<!-- 导航栏 -->
<!-- <div class="header_body">
<header-nav
:slefBack="true"
@goBack="goBack"
@goBack="goBack"
titelText="二维码管理"></header-nav>
</div>-->
<van-search
v-model="searchParam.searchValue"
show-action
placeholder="请输入关键字查询"
@search="onSearch"
>
<template #action>
<div @click="onClickButton">搜索</div>
</template>
</van-search>
<!-- 顶部弹出 -->
<van-popup v-model:show="data.showTop" position="top" :style="{ height: '30%' }" >
<van-cell-group>
<van-field
v-model="searchParam.searchDate"
label="时间范围"
@click=""
readonly
/>
</van-cell-group>
</van-popup>
<!-- <div class="search-button-list">
<van-button plain hairline class="search-button" @click="searchDateType()" round type="primary" size="mini">全部</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本月</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本季度</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本年度</van-button>
<van-button plain hairline class="search-button" @click="searchFilter" round type="primary" size="mini">筛选</van-button>
</div> -->
<div class="search-button-date">
<span class="date-select" @click="selectDate">{{ data.dateSearch }} <van-icon name="play" /></span>
<div style="border-color: black;" class="van-hairline--bottom"></div>
<!-- <van-button class="search-button" type="primary" size="mini">统计分析</van-button> -->
<van-popup v-model:show="data.showDatePicker" position="bottom">
<van-date-picker
title="选择日期"
v-model="data.currentDate"
:min-date="data.minDate"
:max-date="data.maxDate"
:columns-type="data.columnsType"
@confirm="onDateConfirm"
@cancel="cancelSelectDate"
/>
</van-popup>
</div>
<!-- 中间 -->
<div class="shop-center">
<lodding-card :isLodding="isLodding">
<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
:resetScroll="resetScroll" class="refresh_box">
<div class="refresh_content" v-if="data?.dataList.length">
<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
<van-swipe-cell class="swipe_cell">
<div class="card_box">
<div class="card_box_span">
<p><span class="card_box_label">生成时间:</span>{{ item.generateTime }} <span class="card_box_action">
<!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button> -->
</div>-->
<!-- <van-search-->
<!-- v-model="searchParam.searchValue"-->
<!-- show-action-->
<!-- placeholder="请输入关键字查询"-->
<!-- @search="onSearch"-->
<!-- >-->
<!-- <template #action>-->
<!-- <div @click="onClickButton">搜索</div>-->
<!-- </template>-->
<!-- </van-search>-->
<!-- 顶部弹出 -->
<van-popup v-model:show="data.showTop" position="top" :style="{ height: '30%' }">
<van-cell-group>
<van-field
v-model="searchParam.searchDate"
label="时间范围"
@click=""
readonly
/>
</van-cell-group>
</van-popup>
<!-- <div class="search-button-list">
<van-button plain hairline class="search-button" @click="searchDateType()" round type="primary" size="mini">全部</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本月</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本季度</van-button>
<van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本年度</van-button>
<van-button plain hairline class="search-button" @click="searchFilter" round type="primary" size="mini">筛选</van-button>
</div> -->
<div class="search-button-date" style="justify-content: space-between;">
<span class="date-select" @click="selectDate">{{ data.dateSearch }} <van-icon name="play"/></span>
<div style="border-color: black;" class="van-hairline--bottom"></div>
<div style="padding-right: 20px;">
<van-button @click="toNewQrCode()" type="primary"
size="mini">新二维码</van-button>
</div>
<!-- <van-button class="search-button" type="primary" size="mini">统计分析</van-button> -->
<van-popup v-model:show="data.showDatePicker" position="bottom">
<van-date-picker
title="选择日期"
v-model="data.currentDate"
:min-date="data.minDate"
:max-date="data.maxDate"
:columns-type="data.columnsType"
@confirm="onDateConfirm"
@cancel="cancelSelectDate"
/>
</van-popup>
</div>
<!-- 中间 -->
<div class="shop-center">
<lodding-card :isLodding="isLodding">
<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
:resetScroll="resetScroll" class="refresh_box">
<div class="refresh_content" v-if="data?.dataList.length">
<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
<van-swipe-cell class="swipe_cell">
<div class="card_box">
<div class="card_box_span">
<p><span class="card_box_label">生成时间:</span>{{ item.generateTime }} <span
class="card_box_action">
<van-button v-if="item.status == 0" @click="toUnQrCode(item.id)" type="primary"
size="mini">失效</van-button>
<van-button v-else type="error" size="mini">已失效</van-button>
</span></p>
</div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
<div class="van-hairline--bottom"></div>
<!-- <div class="card_box_span">
<p>{{ item.checkItem }}</p>
</div> -->
<div class="card_box_span">
<p><span class="card_box_label">变更原因:</span> {{ item.reasonsChange }}</p>
</div>
</div>
</van-swipe-cell>
</div>
</div>
<van-empty v-else class="no_data" description="暂无数据" />
</refresh-list>
</lodding-card>
</div>
<!-- 底部 -->
<!-- <div class="shop_footer_body">
<footer-nav></footer-nav>
</div> -->
</div>
</div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
<div class="van-hairline--bottom"></div>
<!-- <div class="card_box_span">
<p>{{ item.checkItem }}</p>
</div> -->
<!-- <div class="card_box_span">-->
<!-- <p><span class="card_box_label">变更原因:</span> {{ item.reasonsChange }}</p>-->
<!-- </div>-->
</div>
</van-swipe-cell>
</div>
</div>
<van-empty v-else class="no_data" description="暂无数据"/>
</refresh-list>
</lodding-card>
</div>
<!-- 底部 -->
<!-- <div class="shop_footer_body">
<footer-nav></footer-nav>
</div> -->
</div>
</template>
<script setup name="registrationList">
import { showToast } from "vant";
import {queryHistoryQrCodeList} from '../../api/enterprise';
import { setGoodsNum } from "@/util/util";
const { useCommon, useShopCard } = $globalStore;
const router = useRouter();
let allchecked = ref(false); // 是否全选
let refreshLoad = ref(false); // 是否加载中
let value = ref('')
let totalPrice = ref(0); // 总钱数
let searchParam = reactive({
//执法事件
lawEnforcementIncident:"",
//执法部门
lawEnforcement:"",
//搜索框
searchText: ref(''),
//时间类型
dateType: null,
//是否投诉
isComplaint: null,
//企业统一信用码
enterpriseNumber: ref(useCommon.enterpriseNumber),
//查询日期
searchDate:null,
beginTime:"",
endTime:""
});
const data = reactive({
cartList: [],
dataList: [],
dateSearch: ref(),
showDatePicker:false,
currentDate:ref(['2024', '01']),
minDate: new Date(2020, 0, 1),
maxDate: new Date(2125, 5, 1),
columnsType :['year', 'month'],
showTop:false,
});
// 设置初始值为当前时间
onMounted(() => {
console.log(useCommon.enterpriseNumber);
// getCard();
searchParam.enterpriseNumber = useCommon.enterpriseNumber;
console.log(useCommon.enterpriseNumber)
queryList();
data.dateSearch = nowDate(new Date());
});
const queryList = () =>{
queryHistoryQrCodeList(searchParam,success =>{
console.log(success)
data.dataList = success.data;
},error =>{
})
}
const onSearch = (val) => {
queryRegistrationList(
{
"searchValue": searchParam.searchValue
import {showFailToast, showToast} from "vant";
import {queryHistoryQrCodeList} from '../../api/enterprise';
import {addQrCode, unQrCode} from '../../api/enforce';
import {setGoodsNum} from "@/util/util";
const {useCommon, useShopCard} = $globalStore;
const router = useRouter();
const route = useRoute();
let allchecked = ref(false); // 是否全选
let refreshLoad = ref(false); // 是否加载中
let value = ref('')
let totalPrice = ref(0); // 总钱数
let searchParam = reactive({
//执法事件
lawEnforcementIncident: "",
//执法部门
lawEnforcement: "",
//搜索框
searchText: ref(''),
//时间类型
dateType: null,
//是否投诉
isComplaint: null,
//企业统一信用码
enterpriseNumber: ref(useCommon.enterpriseNumber),
//查询日期
searchDate: null,
beginTime: "",
endTime: ""
});
const data = reactive({
cartList: [],
dataList: [],
dateSearch: ref(),
showDatePicker: false,
currentDate: ref(['2024', '01']),
minDate: new Date(2020, 0, 1),
maxDate: new Date(2125, 5, 1),
columnsType: ['year', 'month'],
showTop: false,
});
// 设置初始值为当前时间
onMounted(() => {
console.log(useCommon.enterpriseNumber);
useCommon.enterpriseNumber = route?.query?.enterpriseNumber;
// getCard();
searchParam.enterpriseNumber = useCommon.enterpriseNumber;
console.log(useCommon.enterpriseNumber)
queryList();
data.dateSearch = nowDate(new Date());
});
const queryList = () => {
queryHistoryQrCodeList(searchParam, success => {
console.log(success)
data.dataList = success.data;
}, error => {
})
}
const onSearch = (val) => {
queryRegistrationList(
{
"searchValue": searchParam.searchValue
}
, success => {
console.log(success)
data.dataList = success.data;
}, error => {
})
};
const onClickButton = () => {
console.log(searchParam.searchValue)
queryList();
}
const toNewQrCode = () => {
console.log("===========")
console.log(useCommon.enterpriseNumber)
addQrCode(useCommon.enterpriseNumber,success => {
console.log(success)
if (success.success) {
showToast('操作成功');
queryList();
} else {
showFailToast('操作失败!');
}
})
}
const toUnQrCode = (id) => {
unQrCode(id, success => {
if (success.success) {
showToast('操作成功');
queryList();
} else {
showFailToast('操作失败!');
}
})
}
const toDetailView = (id) => {
console.log(id)
router.push(
{
path: "/enterprise/enterpriseInspectionDetail",
query: {
id: id,
}
});
}
onActivated(() => {
});
onDeactivated(() => {
});
// 返回
const goBack = () => {
router.go(-1);
};
let resetScroll = ref(0); // 滚动记录
let isLodding = ref(true); // 是否加载中
let freshMap = reactive({
refreshLoad: false, // 是否刷新
listLoading: false, // 是否加载中
listFinished: false, // 是否加载完成标识
});
//下拉刷新
const onRefresh = () => {
freshMap.listFinished = false;
freshMap.listLoading = true;
getGoodslist();
};
// 触底加载
const onLoad = () => {
freshMap.listFinished = true;
getGoodslist(true);
};
//获取分类下的商品列表
const getGoodslist = async (onLoad) => {
// const res = await useClassify.classifyGoods();
// if (res?.code === 20000) {
// goodsList = onLoad ? goodsList.concat(res?.data) : res?.data;
// freshMap.refreshLoad = false;
// freshMap.listLoading = false;
// freshMap.listFinished = res?.listFinished;
// if (goodsList.length > 50) {
// freshMap.listFinished = true;
// }
// }
freshMap.refreshLoad = false;
freshMap.listLoading = false;
freshMap.listFinished = true;
isLodding.value = false;
};
onMounted(async () => {
// let res = await getClassify();
// if (res && res?.length) {
// classifyId = res?.[0]?.id;
// classifyId && getGoodslist();
// } else {
// isLodding.value = false;
// }
queryList();
isLodding.value = false;
});
const selectDate = () => {
data.showDatePicker = true;
console.log(data.showDatePicker)
}
const onDateConfirm = (value) => {
console.log(value);
value.selectedValues.forEach((item, index) => {
console.log(item);
});
data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1];
searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1];
data.showDatePicker = false;
//查询数据
queryList();
}
const nowDate = (time) => {
var year = time.getFullYear(); // 年
var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月
var date = time.getDate().toString().padStart(2, '0'); // 日
var hour = time.getHours().toString().padStart(2, '0'); // 时
var minute = time.getMinutes().toString().padStart(2, '0'); // 分
var second = time.getSeconds().toString().padStart(2, '0'); // 秒
return (
year + "/" + month
)
}
const searchDateType = (val) => {
searchParam.dateType = val;
searchParam.isComplaint = null;
queryList();
}
const searchFilter = () => {
data.showTop = true;
queryList();
}
const searchComplaint = (val) => {
searchParam.isComplaint = val;
searchParam.dateType = null;
queryList();
}
const cancelSelectDate = () => {
data.showDatePicker = false;
}
,success =>{
console.log(success)
data.dataList = success.data;
},error =>{
})
};
const onClickButton = () =>{
console.log(searchParam.searchValue)
queryList();
}
const toDetailView = (id) =>{
console.log(id)
router.push(
{
path: "/enterprise/enterpriseInspectionDetail",
query: {
id: id,
}
});
}
onActivated(() => {
});
onDeactivated(() => {
});
// 返回
const goBack = () => {
router.go(-1);
};
let resetScroll = ref(0); // 滚动记录
let isLodding = ref(true); // 是否加载中
let freshMap = reactive({
refreshLoad: false, // 是否刷新
listLoading: false, // 是否加载中
listFinished: false, // 是否加载完成标识
});
//下拉刷新
const onRefresh = () => {
freshMap.listFinished = false;
freshMap.listLoading = true;
getGoodslist();
};
// 触底加载
const onLoad = () => {
freshMap.listFinished = true;
getGoodslist(true);
};
//获取分类下的商品列表
const getGoodslist = async (onLoad) => {
// const res = await useClassify.classifyGoods();
// if (res?.code === 20000) {
// goodsList = onLoad ? goodsList.concat(res?.data) : res?.data;
// freshMap.refreshLoad = false;
// freshMap.listLoading = false;
// freshMap.listFinished = res?.listFinished;
// if (goodsList.length > 50) {
// freshMap.listFinished = true;
// }
// }
freshMap.refreshLoad = false;
freshMap.listLoading = false;
freshMap.listFinished = true;
isLodding.value = false;
};
onMounted(async () => {
// let res = await getClassify();
// if (res && res?.length) {
// classifyId = res?.[0]?.id;
// classifyId && getGoodslist();
// } else {
// isLodding.value = false;
// }
queryList();
isLodding.value = false;
});
const selectDate = () =>{
data.showDatePicker = true;
console.log(data.showDatePicker)
}
const onDateConfirm = (value)=> {
console.log(value);
value.selectedValues.forEach((item,index) => {
console.log(item);
});
data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1];
searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1];
data.showDatePicker = false;
//查询数据
queryList();
}
const nowDate = (time) => {
var year = time.getFullYear(); // 年
var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月
var date = time.getDate().toString().padStart(2, '0'); // 日
var hour = time.getHours().toString().padStart(2, '0'); // 时
var minute = time.getMinutes().toString().padStart(2, '0'); // 分
var second = time.getSeconds().toString().padStart(2, '0'); // 秒
return (
year + "/" + month
)
}
const searchDateType = (val) =>{
searchParam.dateType = val;
searchParam.isComplaint = null;
queryList();
}
const searchFilter = () =>{
data.showTop = true;
queryList();
}
const searchComplaint = (val) =>{
searchParam.isComplaint = val;
searchParam.dateType = null;
queryList();
}
const cancelSelectDate = () =>{
data.showDatePicker = false;
}
</script>
<style lang="less" scoped>
.shop {
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
background-color: #ebf3fb;
.header_body {
height: 1.33rem;
}
.shop-center {
flex: 1;
overflow-y: scroll;
position: relative;
.goods_box {
display: flex;
background-color: #fff;
margin: 0.27rem;
border-radius: 0.27rem;
.swipe_cell {
width: 100%;
}
.card_box {
display: flex;
width: 100%;
padding: 0.27rem 0;
.shop {
height: 100%;
display: flex;
flex-direction: column;
.card_body {
background-color: #fff;
border-radius: 0.27rem;
flex: 1;
}
.card_box_span {
display: flex;
align-items: center;
margin: 2% 0;
padding-left: 3%;
font-size: 0.35rem;
line-height: 1.5;
p {
margin: 0;
}
overflow: hidden;
background-color: #ebf3fb;
.header_body {
height: 1.33rem;
}
.card_box_action{
position: absolute;
right: 4%;
.shop-center {
flex: 1;
overflow-y: scroll;
position: relative;
.goods_box {
display: flex;
background-color: #fff;
margin: 0.27rem;
border-radius: 0.27rem;
.swipe_cell {
width: 100%;
}
.card_box {
display: flex;
width: 100%;
padding: 0.27rem 0;
flex-direction: column;
.card_body {
background-color: #fff;
border-radius: 0.27rem;
flex: 1;
}
.card_box_span {
display: flex;
align-items: center;
margin: 2% 0;
padding-left: 3%;
font-size: 0.35rem;
line-height: 1.5;
p {
margin: 0;
}
}
.card_box_action {
position: absolute;
right: 4%;
}
}
}
}
.shop_footer_body {
//height: 101px;
position: relative;
.footer-one-btn {
height: 1.33rem;
bottom: 1.34rem;
}
}
}
}
}
.shop_footer_body {
//height: 101px;
position: relative;
.footer-one-btn {
height: 1.33rem;
bottom: 1.34rem;
}
}
}
.search-button-list{
height: 0.7rem;
display: flex;
flex-direction: row;
padding-left: 0.27rem;
margin-top: 0.27rem;
align-items: end;
.search-button{
width: 15%;
height: 100%;
background: #e3e0e0;
border-color: #e3e0e0;
color: #4c4c4c;
font-size: 0.3rem;
}
}
.search-button-date {
display: flex;
flex-direction: row;
align-items: end;
position: relative;
.date-select {
font-size: 0.52rem;
margin: 3% 0 0 4%;
i {
transform: rotate(90deg);
font-size: 0.4rem;
}
.search-button-list {
height: 0.7rem;
display: flex;
flex-direction: row;
padding-left: 0.27rem;
margin-top: 0.27rem;
align-items: end;
.search-button {
width: 15%;
height: 100%;
background: #e3e0e0;
border-color: #e3e0e0;
color: #4c4c4c;
font-size: 0.3rem;
}
}
.search-button{
width: 15%;
height: 80%;
position: absolute;
top: 1%;
right: 1%;
.search-button-date {
display: flex;
flex-direction: row;
align-items: end;
position: relative;
.date-select {
font-size: 0.52rem;
margin: 3% 0 0 4%;
i {
transform: rotate(90deg);
font-size: 0.4rem;
}
}
.search-button {
width: 15%;
height: 80%;
position: absolute;
top: 1%;
right: 1%;
}
}
/deep/ .van-search__content {
height: 0.9rem;
border: 1px solid #ececec;
border-radius: 0.15rem 0 0 0.15rem;
}
/deep/ .van-search__action {
margin: 0 3% 0 0;
width: 10%;
height: 0.9rem;
background: #1367fe;
border: 0.01rem solid #1367fe;
border-radius: 0 0.15rem 0.15rem 0;
color: #fff;
text-align: center;
line-height: 0.9rem;
}
/deep/ .card_box_span p {
display: flex;
}
.card_box_label {
color: rgba(128, 128, 128, 0.65);
white-space: nowrap;
}
}
/deep/ .van-search__content {
height: 0.9rem;
border: 1px solid #ececec;
border-radius: 0.15rem 0 0 0.15rem;
}
/deep/ .van-search__action {
margin: 0 3% 0 0;
width: 10%;
height: 0.9rem;
background: #1367fe;
border: 0.01rem solid #1367fe;
border-radius: 0 0.15rem 0.15rem 0;
color: #fff;
text-align: center;
line-height: 0.9rem;
}
/deep/ .card_box_span p {
display: flex;
}
.card_box_label {
color: rgba(128, 128, 128, 0.65);
white-space: nowrap;
}
</style>

8
src/views/enterprise/registrationEdit.vue

@ -299,8 +299,8 @@
queryUserInfo(useCommon.userId,success =>{
if (null != success.data) {
submitData.lawEnforcer = success.data.userName
// submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
submitData.lawCertificateNumText = success.data.userName
submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
// submitData.lawCertificateNumText = success.data.userName
submitData.lawEnforcerId = success.data.userId
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
@ -440,8 +440,8 @@
}
const reciveData = (item) =>{
submitData.lawEnforcerTwo = item.userName;
// submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
submitData.lawCertificateNumTwoText = item.userName
submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
// submitData.lawCertificateNumTwoText = item.userName
submitData.lawEnforcerIdTwo = item.userId;
}
const reciveData2 = (item) =>{

4
src/views/enterprise/registrationList.vue

@ -104,8 +104,8 @@
</div> -->
</div>
<div class="card_box_action" v-if="item.comOrOpi == 0">
<span><van-button @click="toComplaint(item.id, item.lawEnforcementItemText)" type="primary"
size="mini">建议</van-button></span>
<!-- <span><van-button @click="toComplaint(item.id, item.lawEnforcementItemText)" type="primary"-->
<!-- size="mini">建议</van-button></span>-->
</div>
</div>
</van-swipe-cell>

9
src/views/login.vue

@ -23,7 +23,7 @@
</template>
<script setup>
import { reactive } from 'vue';
import {userLogin} from '../api/Home';
import {userLogin, testLogin} from '../api/Home';
import CryptoJS from "crypto-js";
const { useCommon } = $globalStore;
const router = useRouter();
@ -41,10 +41,11 @@ const onSubmit = async (values) => {
// values.secretName = values.name;
values.secretKey = Encrypt(values.secretKey);
// return;
userLogin(values,success=>{
// userLogin(values,success=>{
testLogin(loginParam.secretName,success=>{
console.log(success);
// router.push({ name: "Home" });
router.push({ name: "enforceHome" });
router.push({ name: "Home" });
// router.push({ name: "enforceHome" });
//设置全局变量
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId);

Loading…
Cancel
Save