Browse Source

禅道应标bug修复

v2
蟑螂恶霸 2 years ago
parent
commit
4e7185d96c
  1. 1
      src/api/Home.js
  2. 9
      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. 81
      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 boutiqueGoods = "/boutiqueGoods"
export const recommendGoods = "/recommendGoods" export const recommendGoods = "/recommendGoods"
export const userLogin = (params, success, error) => _post("/appLogin", params, success, error); 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); export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);

9
src/api/enforce.js

@ -69,3 +69,12 @@ export const queryStatisticalData = (params, success, error) => _get("/app/stati
// 查询执法登记详情 // 查询执法登记详情
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 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 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 = [ let routes = [
{ {
path: "/", path: "/",
// redirect: "/home", redirect: "/home",
redirect: "/enforceHome", // redirect: "/enforceHome",
name: "App", 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 name="Classify" replace icon="description-o" to="/enterprise/enterpriseInspectionList">
行政检查通知 行政检查通知
</van-tabbar-item> </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="">{{ <!-- <van-tabbar-item name="My" replace icon="manager-o" to="">{{
$t("common.lang_my") $t("common.lang_my")
}}</van-tabbar-item> --> }}</van-tabbar-item> -->

8
src/views/administrative/appointment.vue

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

8
src/views/administrative/appointmentEdit.vue

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

4
src/views/enforce/historyCheck.vue

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

26
src/views/enforce/scanQrCode.vue

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

8
src/views/enforce/sign.vue

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

20
src/views/enforceHome.vue

@ -1,6 +1,6 @@
<template> <template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />--> <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa" />
<div class="home app_content"> <div class="home app_content" v-if="!isLoading">
<!-- 导航栏 --> <!-- 导航栏 -->
<!-- <div class="header_body"> <!-- <div class="header_body">
<header-nav :leftArrow="false" titelText="执法监督码"></header-nav> <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
@ -215,7 +215,7 @@
}; };
onMounted(() => { onMounted(() => {
// new Vconsolefrom(); new Vconsolefrom();
let fullUrl = window.location.href; let fullUrl = window.location.href;
let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state=')); let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
console.log(useCommon.firstLoad) console.log(useCommon.firstLoad)
@ -232,13 +232,13 @@
useCommon.SET_IS_FIRST_LOAD(false) useCommon.SET_IS_FIRST_LOAD(false)
queryList(); queryList();
// 如果不是执法用户 则跳转 // 如果不是执法用户 则跳转
// if (!success.data.lawOfficer) { if (!success.data.lawOfficer) {
// router.push( router.push(
// { {
// path: "/noAccess" path: "/noAccess"
// }); });
// isLoading.value = false; isLoading.value = false;
// } }
}, error => { }, 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(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(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="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>
<div class="search-button-date"> <div class="search-button-date">
@ -87,14 +88,14 @@
</div> </div>
<!-- 底部 --> <!-- 底部 -->
<!-- <div class="shop_footer_body"> <div class="shop_footer_body">
<footer-nav></footer-nav> <footer-nav></footer-nav>
</div> --> </div>
</div> </div>
</template> </template>
<script setup name="registrationList"> <script setup name="registrationList">
import {queryRegistrationList} from '../../api/enterprise'; import {queryRegistrationList, toMssqAppraise} from '../../api/enterprise';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
import { setGoodsNum } from "@/util/util"; import { setGoodsNum } from "@/util/util";
const { useCommon, useShopCard } = $globalStore; const { useCommon, useShopCard } = $globalStore;
@ -134,6 +135,24 @@ const data = reactive({
ga_columns: [], 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(() => { onMounted(() => {
// getCard(); // getCard();

4
src/views/enterprise/qrCode.vue

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

81
src/views/enterprise/qrCodeHistory.vue

@ -1,4 +1,3 @@
<template> <template>
<div class="shop app_content"> <div class="shop app_content">
<!-- 导航栏 --> <!-- 导航栏 -->
@ -8,16 +7,16 @@
@goBack="goBack" @goBack="goBack"
titelText="二维码管理"></header-nav> titelText="二维码管理"></header-nav>
</div>--> </div>-->
<van-search <!-- <van-search-->
v-model="searchParam.searchValue" <!-- v-model="searchParam.searchValue"-->
show-action <!-- show-action-->
placeholder="请输入关键字查询" <!-- placeholder="请输入关键字查询"-->
@search="onSearch" <!-- @search="onSearch"-->
> <!-- >-->
<template #action> <!-- <template #action>-->
<div @click="onClickButton">搜索</div> <!-- <div @click="onClickButton">搜索</div>-->
</template> <!-- </template>-->
</van-search> <!-- </van-search>-->
<!-- 顶部弹出 --> <!-- 顶部弹出 -->
@ -38,9 +37,13 @@
<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(3)" round type="primary" size="mini">本年度</van-button>
<van-button plain hairline class="search-button" @click="searchFilter" 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> -->
<div class="search-button-date"> <div class="search-button-date" style="justify-content: space-between;">
<span class="date-select" @click="selectDate">{{ data.dateSearch }} <van-icon name="play"/></span> <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="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-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
@ -65,8 +68,11 @@
<van-swipe-cell class="swipe_cell"> <van-swipe-cell class="swipe_cell">
<div class="card_box"> <div class="card_box">
<div class="card_box_span"> <div class="card_box_span">
<p><span class="card_box_label">生成时间:</span>{{ item.generateTime }} <span class="card_box_action"> <p><span class="card_box_label">生成时间:</span>{{ item.generateTime }} <span
<!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button> --> 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> </span></p>
</div> </div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> --> <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
@ -75,9 +81,9 @@
<p>{{ item.checkItem }}</p> <p>{{ item.checkItem }}</p>
</div> --> </div> -->
<div class="card_box_span"> <!-- <div class="card_box_span">-->
<p><span class="card_box_label">变更原因:</span> {{ item.reasonsChange }}</p> <!-- <p><span class="card_box_label">变更原因:</span> {{ item.reasonsChange }}</p>-->
</div> <!-- </div>-->
</div> </div>
</van-swipe-cell> </van-swipe-cell>
</div> </div>
@ -95,12 +101,15 @@
</template> </template>
<script setup name="registrationList"> <script setup name="registrationList">
import { showToast } from "vant"; import {showFailToast, showToast} from "vant";
import {queryHistoryQrCodeList} from '../../api/enterprise'; import {queryHistoryQrCodeList} from '../../api/enterprise';
import {addQrCode, unQrCode} from '../../api/enforce';
import {setGoodsNum} from "@/util/util"; import {setGoodsNum} from "@/util/util";
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;
const router = useRouter(); const router = useRouter();
const route = useRoute();
let allchecked = ref(false); // 是否全选 let allchecked = ref(false); // 是否全选
let refreshLoad = ref(false); // 是否加载中 let refreshLoad = ref(false); // 是否加载中
let value = ref('') let value = ref('')
@ -141,6 +150,7 @@ const data = reactive({
// 设置初始值为当前时间 // 设置初始值为当前时间
onMounted(() => { onMounted(() => {
console.log(useCommon.enterpriseNumber); console.log(useCommon.enterpriseNumber);
useCommon.enterpriseNumber = route?.query?.enterpriseNumber;
// getCard(); // getCard();
searchParam.enterpriseNumber = useCommon.enterpriseNumber; searchParam.enterpriseNumber = useCommon.enterpriseNumber;
console.log(useCommon.enterpriseNumber) console.log(useCommon.enterpriseNumber)
@ -174,6 +184,31 @@ const onClickButton = () =>{
queryList(); 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) => { const toDetailView = (id) => {
console.log(id) console.log(id)
router.push( router.push(
@ -219,7 +254,6 @@ const onLoad = () => {
}; };
//获取分类下的商品列表 //获取分类下的商品列表
const getGoodslist = async (onLoad) => { const getGoodslist = async (onLoad) => {
// const res = await useClassify.classifyGoods(); // const res = await useClassify.classifyGoods();
@ -330,11 +364,13 @@ const cancelSelectDate = () =>{
width: 100%; width: 100%;
padding: 0.27rem 0; padding: 0.27rem 0;
flex-direction: column; flex-direction: column;
.card_body { .card_body {
background-color: #fff; background-color: #fff;
border-radius: 0.27rem; border-radius: 0.27rem;
flex: 1; flex: 1;
} }
.card_box_span { .card_box_span {
display: flex; display: flex;
align-items: center; align-items: center;
@ -347,6 +383,7 @@ const cancelSelectDate = () =>{
margin: 0; margin: 0;
} }
} }
.card_box_action { .card_box_action {
position: absolute; position: absolute;
right: 4%; right: 4%;
@ -358,6 +395,7 @@ const cancelSelectDate = () =>{
.shop_footer_body { .shop_footer_body {
//height: 101px; //height: 101px;
position: relative; position: relative;
.footer-one-btn { .footer-one-btn {
height: 1.33rem; height: 1.33rem;
bottom: 1.34rem; bottom: 1.34rem;
@ -372,6 +410,7 @@ const cancelSelectDate = () =>{
padding-left: 0.27rem; padding-left: 0.27rem;
margin-top: 0.27rem; margin-top: 0.27rem;
align-items: end; align-items: end;
.search-button { .search-button {
width: 15%; width: 15%;
height: 100%; height: 100%;
@ -381,6 +420,7 @@ const cancelSelectDate = () =>{
font-size: 0.3rem; font-size: 0.3rem;
} }
} }
.search-button-date { .search-button-date {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -390,11 +430,13 @@ const cancelSelectDate = () =>{
.date-select { .date-select {
font-size: 0.52rem; font-size: 0.52rem;
margin: 3% 0 0 4%; margin: 3% 0 0 4%;
i { i {
transform: rotate(90deg); transform: rotate(90deg);
font-size: 0.4rem; font-size: 0.4rem;
} }
} }
.search-button { .search-button {
width: 15%; width: 15%;
height: 80%; height: 80%;
@ -403,6 +445,7 @@ const cancelSelectDate = () =>{
right: 1%; right: 1%;
} }
} }
/deep/ .van-search__content { /deep/ .van-search__content {
height: 0.9rem; height: 0.9rem;
border: 1px solid #ececec; border: 1px solid #ececec;

8
src/views/enterprise/registrationEdit.vue

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

4
src/views/enterprise/registrationList.vue

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

9
src/views/login.vue

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

Loading…
Cancel
Save