chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/v3' into v3

v3
chenrui 2 years ago
parent
9141c09686 cda4ab36f8
commit
881adf5d05
10 changed files with 105 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/views/Home.vue
  2. 6
      src/views/HomeWx.vue
  3. 49
      src/views/administrative/appointmentDetail.vue
  4. 2
      src/views/enforce/enforcementPlanDetailed.vue
  5. 2
      src/views/enforce/enterpriseBaseInfo.vue
  6. 7
      src/views/enforce/historyCheck.vue
  7. 9
      src/views/enforceHome.vue
  8. 2
      src/views/enterprise/compaint/registrationListView.vue
  9. 40
      src/views/enterprise/enterpriseInspectionDetail.vue
  10. 2
      src/views/enterprise/register.vue

28
src/views/Home.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> --> <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<!-- v-if="!isLoading" --> <div class="home app_content" v-if="!isLoading">
<div class="home app_content"> <!-- <div class="home app_content">-->
<!-- 导航栏 --> <!-- 导航栏 -->
<!-- <div class="header_body">--> <!-- <div class="header_body">-->
<!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>--> <!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@ -52,9 +52,8 @@
import Vconsolefrom from 'vconsole'; import Vconsolefrom from 'vconsole';
import * as w6s from 'szient-js-sdk'; import * as w6s from 'szient-js-sdk';
import sha1 from 'crypto-js/sha1'; import sha1 from 'crypto-js/sha1';
import { Loading } from 'vant';
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home'; import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home';
import {showSuccessToast} from "vant"; import {Loading, showFailToast, showSuccessToast} from "vant";
import 'vant/es/toast/style'; import 'vant/es/toast/style';
const {useCommon} = $globalStore; const {useCommon} = $globalStore;
const router = useRouter(); const router = useRouter();
@ -181,16 +180,15 @@
// console.log(success.data); // console.log(success.data);
// 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);
// console.log("-----> success.data: ", success.data);
// useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
// useCommon.SET_TOKEN(success.data.token); // useCommon.SET_TOKEN(success.data.token);
// console.log(useCommon.userId); // console.log("-----> useCommon.userId: ", useCommon.userId);
// console.log(useCommon.firstLoad); // console.log("-----> useCommon.firstLoad: ", useCommon.firstLoad);
// if(useCommon.firstLoad){
// isLoading.value = false;
// }
// //设置已经初始化 // //设置已经初始化
// useCommon.SET_IS_FIRST_LOAD(false) // useCommon.SET_IS_FIRST_LOAD(false)
// getEnterpriseMerchant(success.data.phonenumber.toString()); // getEnterpriseMerchant(success.data.phonenumber.toString());
// isLoading.value = false;
// }, error => { // }, error => {
// }) // })
@ -234,9 +232,7 @@
//设置已经初始化 //设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false) useCommon.SET_IS_FIRST_LOAD(false)
getEnterpriseMerchant(success.data.phonenumber.toString()); getEnterpriseMerchant(success.data.phonenumber.toString());
if(useCommon.firstLoad){ isLoading.value = false;
isLoading.value = false;
}
}, error => { }, error => {
console.log("error : " + error) console.log("error : " + error)
}) })
@ -295,10 +291,10 @@
} }
.boutique_box { .boutique_box {
position: fixed; position: absolute;
width: 100%; width: 100%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom)); bottom: calc(0.5rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom)); bottom: calc(0.5rem + env(safe-area-inset-bottom));
.boutique_body { .boutique_body {
padding: 0 0 0.27rem 0; padding: 0 0 0.27rem 0;

6
src/views/HomeWx.vue
View File

@ -248,10 +248,10 @@
} }
.boutique_box { .boutique_box {
position: fixed; position: absolute;
width: 100%; width: 100%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom)); bottom: calc(0.5rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom)); bottom: calc(0.5rem + env(safe-area-inset-bottom));
.boutique_body { .boutique_body {
padding: 0 0 0.27rem 0; padding: 0 0 0.27rem 0;

49
src/views/administrative/appointmentDetail.vue
View File

@ -28,24 +28,32 @@
:rules="[{ required: true, message: '必填项' }]" :rules="[{ required: true, message: '必填项' }]"
/> />
<van-field <!-- <van-field
v-model="submitData.checkItemText" v-model="submitData.checkItemText"
label="检查事项" label="检查事项"
rows="2" rows="1"
autosize autosize
readonly readonly
type="textarea" type="textarea"
show-word-limit show-word-limit
/> />-->
<van-field <div class="fold-div">
<label>检查事项</label>
<van-text-ellipsis :content="submitData.checkItemText" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<!-- <van-field
v-model="submitData.checkRequireText" v-model="submitData.checkRequireText"
label="检查要求" label="检查要求"
rows="2" rows="1"
autosize autosize
readonly readonly
type="textarea" type="textarea"
show-word-limit show-word-limit
/> />-->
<div class="fold-div">
<label>检查要求</label>
<van-text-ellipsis :content="submitData.checkRequireText" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<van-field <van-field
v-model="submitData.lawEnforcement" v-model="submitData.lawEnforcement"
readonly readonly
@ -63,7 +71,7 @@
readonly readonly
/> />
<van-field <!-- <van-field
v-model="submitData.remark" v-model="submitData.remark"
label="备注" label="备注"
rows="2" rows="2"
@ -71,7 +79,11 @@
readonly readonly
type="textarea" type="textarea"
show-word-limit show-word-limit
/> />-->
<div class="fold-div">
<label>备注</label>
<van-text-ellipsis :content="submitData.remark" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<div class="add-inspect"> <div class="add-inspect">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p> <p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index"> <p v-for="(item, index) in submitData.userObjs" :key="index">
@ -670,4 +682,25 @@
color: #666; color: #666;
} }
.fold-div {
position: relative;
display: flex;
margin: -1px 0.3rem 0;
padding: 0.05rem 0;
border-bottom: 1px solid #f6f7f8;
color: #323233;
font-size: 0.37rem;
}
.fold-div label {
width: 2.6rem;
padding: 0.27rem 0px 0.27rem 0.15rem;
}
.fold-div .van-text-ellipsis {
padding: 0.24rem 0;
width: calc(100% - 2.7rem);
color: #666;
}
</style> </style>

2
src/views/enforce/enforcementPlanDetailed.vue
View File

@ -135,7 +135,7 @@ onMounted(() => {
display: flex; display: flex;
margin: 0 0.3rem; margin: 0 0.3rem;
padding-bottom: 0.13rem; padding-bottom: 0.13rem;
border-bottom: 1px solid #f5f6f7; border-bottom: 1px solid #f6f7f8;
color: rgb(50, 50, 51); color: rgb(50, 50, 51);
font-size: 0.37rem; font-size: 0.37rem;
} }

2
src/views/enforce/enterpriseBaseInfo.vue
View File

@ -783,7 +783,7 @@
display: flex; display: flex;
margin: 0 0.3rem; margin: 0 0.3rem;
padding-bottom: 0.13rem; padding-bottom: 0.13rem;
border-bottom: 1px solid #f5f6f7; border-bottom: 1px solid #f6f7f8;
color: rgb(50, 50, 51); color: rgb(50, 50, 51);
font-size: 0.37rem; font-size: 0.37rem;
} }

7
src/views/enforce/historyCheck.vue
View File

@ -5,8 +5,11 @@
<header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/> <header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/>
<header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/> <header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/>
</div> --> </div> -->
<van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/执法人员/企业名称 " @search="onSearch"> <van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/执法人员/企业名称 " @search="onSearch">
<van-search <template #action>
<div @click="onClickButton">搜索</div>
</template>
</van-search>
<div class="search-button-list"> <div class="search-button-list">
<van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'" <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'"

9
src/views/enforceHome.vue
View File

@ -335,7 +335,8 @@
position: relative; position: relative;
margin: 0; margin: 0;
width: 100%; width: 100%;
height: 100%; height: calc(100% - constant(safe-area-inset-bottom));
height: calc(100% - env(safe-area-inset-bottom));
background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top; background: #c6e6ff url("../assets/images/bg_el.jpg") no-repeat top;
background-size: auto 100%; background-size: auto 100%;
overflow-x: hidden; overflow-x: hidden;
@ -351,10 +352,10 @@
} }
.boutique_box { .boutique_box {
position: fixed; position: absolute;
width: 100%; width: 100%;
bottom: calc(1.67rem + constant(safe-area-inset-bottom)); bottom: calc(0.5rem + constant(safe-area-inset-bottom));
bottom: calc(1.67rem + env(safe-area-inset-bottom)); bottom: calc(0.5rem + env(safe-area-inset-bottom));
.boutique_body { .boutique_body {
padding: 0 0 0.27rem 0; padding: 0 0 0.27rem 0;

2
src/views/enterprise/compaint/registrationListView.vue
View File

@ -41,7 +41,7 @@
</van-popup> </van-popup>
</div> </div>
<div class="warning-rule"> <div class="warning-rule">
<span><van-icon name="warning-o" /></span><span>行政执法检查事项的投诉有效期，为检查次日起<b><i>5</i></b>个自然日内。</span> <span><van-icon name="warning-o" /></span><span>行政执法检查事项投诉有效期为检查次日起<b><i>5</i></b>个自然日内。</span>
</div> </div>
<!-- 中间 --> <!-- 中间 -->
<div class="shop-center"> <div class="shop-center">

40
src/views/enterprise/enterpriseInspectionDetail.vue
View File

@ -6,8 +6,9 @@
<!-- </div> --> <!-- </div> -->
<!-- 中间 --> <!-- 中间 -->
<div class="warp_body"> <div class="warp_body">
<!-- <van-cell-group>-->
<van-form @failed="onFailed" @submit="submit"> <van-form @failed="onFailed" @submit="submit">
<van-cell-group>
<van-field <van-field
v-model="submitData.checkTime" v-model="submitData.checkTime"
readonly readonly
@ -18,7 +19,7 @@
readonly readonly
label="执法部门" label="执法部门"
/> />
<van-field <!-- <van-field
v-model="submitData.checkItem" v-model="submitData.checkItem"
label="检查事项" label="检查事项"
rows="2" rows="2"
@ -33,7 +34,16 @@
readonly readonly
type="textarea" type="textarea"
show-word-limit show-word-limit
/> />-->
<div class="fold-div">
<label>检查事项</label>
<van-text-ellipsis :content="submitData.checkItem" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<div class="fold-div">
<label>检查要求</label>
<van-text-ellipsis :content="submitData.checkRequire" rows="2" autosize expand-text="展开" collapse-text="收起" />
</div>
<!-- <van-field--> <!-- <van-field-->
<!-- v-model="submitData.enterpriseName"--> <!-- v-model="submitData.enterpriseName"-->
@ -78,8 +88,9 @@
<van-action-bar v-if="!data.isEnterprise && submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3"> <van-action-bar v-if="!data.isEnterprise && submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
<van-button round block type="info" native-type="submit" @click="cancel">取消</van-button> <van-button round block type="info" native-type="submit" @click="cancel">取消</van-button>
</van-action-bar> </van-action-bar>
</van-cell-group>
</van-form> </van-form>
<!-- </van-cell-group>-->
</div> </div>
<!-- <div class="warp_body">--> <!-- <div class="warp_body">-->
@ -270,7 +281,7 @@ onMounted(() =>{
padding-bottom: 3rem; padding-bottom: 3rem;
width: 94%; width: 94%;
height: 100%; height: 100%;
/*background-image: linear-gradient(to bottom, #ebf3fb, #fff);*/ background: #ebf3fb;
overflow-y: auto; overflow-y: auto;
margin-top: 0.15rem; margin-top: 0.15rem;
} }
@ -296,5 +307,24 @@ onMounted(() =>{
cursor: default; cursor: default;
color: #666; color: #666;
} }
.fold-div {
position: relative;
display: flex;
margin: -1px 0.3rem 0;
padding: 0.05rem 0;
border-bottom: 1px solid #f6f7f8;
color: #323233;
font-size: 0.37rem;
}
.fold-div label {
width: 2.6rem;
padding: 0.27rem 0px 0.27rem 0.15rem;
}
.fold-div .van-text-ellipsis {
padding: 0.24rem 0;
width: calc(100% - 2.7rem);
color: #666;
}
</style> </style>

2
src/views/enterprise/register.vue
View File

@ -375,7 +375,7 @@ export default {
display: flex; display: flex;
margin: 0 0.3rem; margin: 0 0.3rem;
padding-bottom: 0.13rem; padding-bottom: 0.13rem;
border-bottom: 1px solid #f5f6f7; border-bottom: 1px solid #f6f7f8;
color: rgb(50, 50, 51); color: rgb(50, 50, 51);
font-size: 0.37rem; font-size: 0.37rem;
} }

Write Preview
Loading…
Cancel
Save