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

修改二维码样式， 

bug修改
master
chenrui 2 years ago
parent
e971ea8994
commit
bce6cbd167
10 changed files with 85 additions and 51 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. 9
      src/api/enforce.js
  2. 6
      src/views/administrative/appointment.vue
  3. 10
      src/views/enforce/enforceNotice.vue
  4. 2
      src/views/enforce/enforcementPlanAdd.vue
  5. 11
      src/views/enforce/enterpriseBaseInfo.vue
  6. 8
      src/views/enforce/enterpriseScanPreview.vue
  7. 47
      src/views/enforce/historyCheck.vue
  8. 4
      src/views/enforce/scanPage.vue
  9. 32
      src/views/enforce/sign.vue
  10. 7
      src/views/enterprise/register.vue

9
src/api/enforce.js
View File

@ -11,7 +11,14 @@ import { _get, _post,_form,_delete } from "../http/index";
* @returns * @returns
*/ */
export const queryEnforcementInspectionProgramList = (params, success, error) => _get("/code/enforcementInspectionProgram/queryList", params, success, error); export const queryEnforcementInspectionProgramList = (params, success, error) => _get("/code/enforcementInspectionProgram/queryList", params, success, error);
/**
* 执法计划列表 无权限接口
* @param {*} params
* @param {*} success
* @param {*} error
* @returns
*/
export const queryEnforcementInspectionProgramListNoPermission = (params, success, error) => _get("/code/enforcementInspectionProgram/queryListNoPermission", params, success, error);
/** /**
* 添加年度执法计划 * 添加年度执法计划
* @param {*} params * @param {*} params

6
src/views/administrative/appointment.vue
View File

@ -45,6 +45,9 @@
label="检查事项" label="检查事项"
:rules="[{ required: true, message: '必填项' }]" :rules="[{ required: true, message: '必填项' }]"
@click="data.showItem = true" @click="data.showItem = true"
type="textarea"
rows="1"
autosize
/> />
<van-field v-model="submitData.checkItem" v-show="false" /> <van-field v-model="submitData.checkItem" v-show="false" />
<van-field <van-field
@ -54,6 +57,9 @@
label="检查要求" label="检查要求"
:rules="[{ required: true, message: '必填项' }]" :rules="[{ required: true, message: '必填项' }]"
@click="data.showGA = true" @click="data.showGA = true"
type="textarea"
rows="1"
autosize
/> />
<van-field v-model="submitData.checkRequire" v-show="false" /> <van-field v-model="submitData.checkRequire" v-show="false" />
<van-field <van-field

10
src/views/enforce/enforceNotice.vue
View File

@ -26,8 +26,8 @@
<div class="shop-center"> <div class="shop-center">
<lodding-card :isLodding="isLodding"> <lodding-card :isLodding="isLodding">
<div class="noticebox" v-for="(item, index) in data.dataList" :key="index"> <div class="noticebox">
<div class="notice-item"><i></i> <div class="notice-item" v-for="(item, index) in data.dataList" :key="index"><i></i>
<div class="item-cont"> <div class="item-cont">
<span class="item-title">{{ item.enforcementDepartment }}</span> <span class="item-title">{{ item.enforcementDepartment }}</span>
<span class="item-time">{{ item.createTime }}</span> <span class="item-time">{{ item.createTime }}</span>
@ -57,7 +57,7 @@
</template> </template>
<script setup name="enforcementInspectionProgram"> <script setup name="enforcementInspectionProgram">
import {queryEnforcementInspectionProgramList} from "@/api/enforce"; import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
const { useCommon} = $globalStore; const { useCommon} = $globalStore;
const router = useRouter(); const router = useRouter();
@ -94,7 +94,7 @@ onMounted(() => {
data.dateSearch = nowDate(new Date()); data.dateSearch = nowDate(new Date());
}); });
const queryList = () =>{ const queryList = () =>{
queryEnforcementInspectionProgramList(searchParam,success =>{ queryEnforcementInspectionProgramListNoPermission(searchParam,success =>{
console.log(success) console.log(success)
data.dataList = success.data; data.dataList = success.data;
freshMap.refreshLoad = false; freshMap.refreshLoad = false;
@ -107,7 +107,7 @@ const queryList = () =>{
} }
const onSearch = (val) => { const onSearch = (val) => {
queryEnforcementInspectionProgramList( queryEnforcementInspectionProgramListNoPermission(
{ {
"searchText": searchParam.searchText "searchText": searchParam.searchText
} }

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

@ -156,6 +156,7 @@ const submit = () =>{
title: '公布执法计划', title: '公布执法计划',
message: '对外公布本部门年度执法计划', message: '对外公布本部门年度执法计划',
}).then(() => { }).then(() => {
console.log(1)
submitData.isPublish = 1 submitData.isPublish = 1
addEnforcementInspectionProgram(submitData,success =>{ addEnforcementInspectionProgram(submitData,success =>{
console.log(success) console.log(success)
@ -169,6 +170,7 @@ const submit = () =>{
console.log("保存失败") console.log("保存失败")
}) })
}).catch(() => { }).catch(() => {
console.log(0)
showSuccessToast('保存成功'); showSuccessToast('保存成功');
submitData.isPublish = 0 submitData.isPublish = 0
addEnforcementInspectionProgram(submitData,success =>{ addEnforcementInspectionProgram(submitData,success =>{

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

@ -51,13 +51,10 @@
readonly readonly
/> />
<van-field <van-field
v-model="data.enterpriseInfo.businessScope"
label="经营范围:" label="经营范围:"
readonly
type="textarea"
autosize
rows="1"
/> />
<van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" expand-text="展开" collapse-text="收起" />
</van-cell-group> </van-cell-group>
@ -425,4 +422,8 @@ const reciveData2 = (item) =>{
font-size: 0.3rem; font-size: 0.3rem;
} }
/deep/ .van-text-ellipsis {
font-size: 0.37333rem;
padding: 0 1%
}
</style> </style>

8
src/views/enforce/enterpriseScanPreview.vue
View File

@ -18,10 +18,10 @@
<ul> <ul>
<li v-for='(item,index) in data.list' @click='check(index)' :class="{ active: index === data.TabId }"> <li v-for='(item,index) in data.list' @click='check(index)' :class="{ active: index === data.TabId }">
<span v-if="index === 0"> {{item.title}}</span> <span v-if="index === 0"> {{item.title}}</span>
<span v-else-if="index === 1 && item.warningLevel==0" class="warn-tab"> {{item.title}}</span> <span v-else-if="index === 1 && data.warningInfo.warningLevel ==0" class="warn-tab"> {{item.title}}</span>
<span v-else-if="index === 1 && item.warningLevel==1" class="warn-tab level1"> {{item.title}}</span> <span v-else-if="index === 1 && data.warningInfo.warningLevel==1" class="warn-tab level1"> {{item.title}}</span>
<span v-else-if="index === 1 && item.warningLevel==2" class="warn-tab level2"> {{item.title}}</span> <span v-else-if="index === 1 && data.warningInfo.warningLevel==2" class="warn-tab level2"> {{item.title}}</span>
<span v-else-if="index === 1 && item.warningLevel==3" class="warn-tab level3"> {{item.title}}</span> <span v-else-if="index === 1 && data.warningInfo.warningLevel==3" class="warn-tab level3"> {{item.title}}</span>
<span v-else-if="index === 1" class="warn-tab"> {{item.title}}</span> <span v-else-if="index === 1" class="warn-tab"> {{item.title}}</span>
</li> </li>
</ul> </ul>

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

@ -3,6 +3,7 @@
<div class="shop app_content"> <div class="shop app_content">
<!-- 导航栏 --> <!-- 导航栏 -->
<div class="header_body"> <div class="header_body">
<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">
@ -19,6 +20,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-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
@ -41,28 +43,30 @@
<div class="refresh_content" v-if="data?.dataList.length"> <div class="refresh_content" v-if="data?.dataList.length">
<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index"> <div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
<van-swipe-cell class="swipe_cell"> <van-swipe-cell class="swipe_cell">
<div class="card_box" @click="toDetailView(item.id)"> <div class="card_box" >
<div class="card_box_span"> <div class="card_box_span">
<p>执法时间：{{ item.createTime }} <p>执法时间：{{ item.createTime }}
<!-- <span class="card_box_action">--> <span class="card_box_action" v-if="item.isSubmit == 0">
<!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button>--> <van-button @click="toComplaintView(item.id)" type="primary" size="mini">编辑</van-button>
<!-- </span>--> </span>
</p> </p>
</div> </div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />--> <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
<div style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline--bottom"></div> <div @click="toDetailView(item.id)">
<div class="card_box_span"> <div style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline--bottom"></div>
<p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p> <div class="card_box_span">
</div> <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
<div class="card_box_span"> </div>
<p><span class="card_box_label">执法部门：</span> {{ item.lawEnforcement }}</p> <div class="card_box_span">
</div> <p><span class="card_box_label">执法部门：</span> {{ item.lawEnforcement }}</p>
<div class="card_box_span"> </div>
<p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }}，{{ item.lawEnforcerTwo }}</p> <div class="card_box_span">
</div> <p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}</p>
<div class="card_box_span"> </div>
<p><span class="card_box_label">备注：</span> {{ item.remark }}</p> <div class="card_box_span">
</div> <p><span class="card_box_label">备注：</span> {{ item.remark }}</p>
</div>
</div>
</div> </div>
</van-swipe-cell> </van-swipe-cell>
</div> </div>
@ -80,7 +84,6 @@
</template> </template>
<script setup name="registrationList"> <script setup name="registrationList">
import { showToast } from "vant";
import {queryRegistrationList,getAttr} from '../../api/enforce'; import {queryRegistrationList,getAttr} from '../../api/enforce';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
const { useCommon, useShopCard } = $globalStore; const { useCommon, useShopCard } = $globalStore;
@ -101,6 +104,8 @@
//是否投诉 //是否投诉
isComplaint: null, isComplaint: null,
//企业统一信用码 //企业统一信用码
// enterpriseNumber: ref(useCommon.enterpriseNumber),
lawEnforcerId: ref(useCommon.userId),
enterpriseNumber: ref(useCommon.enterpriseNumber), enterpriseNumber: ref(useCommon.enterpriseNumber),
//日期搜索 //日期搜索
dateSearch: ref(), dateSearch: ref(),
@ -121,6 +126,9 @@
// 设置初始值为当前时间 // 设置初始值为当前时间
onMounted(() => { onMounted(() => {
// getCard(); // getCard();
// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
searchParam.lawEnforcerId = useCommon.userId;
queryList();
searchParam.enterpriseNumber = useCommon.enterpriseNumber; searchParam.enterpriseNumber = useCommon.enterpriseNumber;
data.dateSearch = nowDate(new Date()); data.dateSearch = nowDate(new Date());
@ -143,6 +151,7 @@
const queryList = () =>{ const queryList = () =>{
console.log(data.ga_columns) console.log(data.ga_columns)
queryRegistrationList(searchParam,success =>{ queryRegistrationList(searchParam,success =>{
data.dataList = success.data;
for (var i=0; i<success.data.length; i++) { for (var i=0; i<success.data.length; i++) {
// var itemTxt = success.data[i].lawEnforcementItem; // var itemTxt = success.data[i].lawEnforcementItem;
// console.log(itemTxt); // console.log(itemTxt);
@ -249,6 +258,7 @@
// } else { // } else {
// isLodding.value = false; // isLodding.value = false;
// } // }
queryList();
// queryList(); // queryList();
isLodding.value = false; isLodding.value = false;
}); });
@ -419,3 +429,4 @@ const setLinkageItem = (id,item) => {
} }
</style> </style>

4
src/views/enforce/scanPage.vue
View File

@ -13,7 +13,7 @@
<!-- new Vconsolefrom(); --> <!-- new Vconsolefrom(); -->
<script> <script>
// 看到这个没，这个是一个小插件，能在手机上打开控制台，你打印的控制台信息和报错都能在这显示，具体方法自己百度 // 看到这个没，这个是一个小插件，能在手机上打开控制台，你打印的控制台信息和报错都能在这显示，具体方法自己百度
import Vconsole from "vconsole"; // import Vconsole from "vconsole";
import { BrowserMultiFormatReader } from "@zxing/library"; import { BrowserMultiFormatReader } from "@zxing/library";
export default { export default {
name: "QrCodeSearch", name: "QrCodeSearch",
@ -36,7 +36,7 @@ export default {
// vconsole; // vconsole;
// 让我们调用这个方法尝试打开摄像头 // 让我们调用这个方法尝试打开摄像头
this.openScan(); this.openScan();
new Vconsole(); // new Vconsole();
}, },
methods: { methods: {
// 开打开打 // 开打开打

32
src/views/enforce/sign.vue
View File

@ -7,7 +7,7 @@
<span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span> <span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
<!-- 中间 --> <!-- 中间 -->
<div class="warp_body"> <div class="warp_body">
<van-form @failed="onFailed" @submit="submit"> <van-form @failed="onFailed">
<van-cell-group> <van-cell-group>
<div style="font-size:large" class="zf-name">执法信息</div> <div style="font-size:large" class="zf-name">执法信息</div>
<van-field <van-field
@ -16,12 +16,12 @@
readonly readonly
/> />
<van-field <van-field
v-model="submitData.lawEnforcer" v-model="submitData.lawCertificateNumText"
label="执法人员" label="执法人员"
readonly readonly
/> />
<van-field <van-field
v-model="submitData.lawEnforcerTwo" v-model="submitData.lawCertificateNumTwoText"
label="执法人员" label="执法人员"
readonly readonly
placeholder="请选择" placeholder="请选择"
@ -29,7 +29,7 @@
@click="showPopup" @click="showPopup"
/> />
<van-field <van-field
v-model="submitData.subsidiaryer" v-model="submitData.subsidiaryerText"
label="辅助人员" label="辅助人员"
readonly readonly
placeholder="请选择" placeholder="请选择"
@ -127,7 +127,8 @@
</van-cell-group> </van-cell-group>
<van-action-bar> <van-action-bar>
<van-button round block type="info" native-type="submit">提交</van-button> <van-button round block type="info" native-type="submit" @click="submit(0)">保存</van-button>
<van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button>
</van-action-bar> </van-action-bar>
</van-form> </van-form>
</div> </div>
@ -178,13 +179,10 @@ const data = reactive({
currentPage: 1, currentPage: 1,
good:"", good:"",
bad:"", bad:"",
popupVisible: false, popupVisible: false,
popupContent: '', popupContent: '',
popupVisible2: false, popupVisible2: false,
popupContent2: '', popupContent2: '',
showGA:false, showGA:false,
showItem:false, showItem:false,
lawEnforcementBasisText:"", lawEnforcementBasisText:"",
@ -200,12 +198,16 @@ const submitData = reactive({
//执法人员1 //执法人员1
lawEnforcer:"", lawEnforcer:"",
lawEnforcerId:"", lawEnforcerId:"",
lawCertificateNumText:"",
//执法人员2 //执法人员2
lawEnforcerTwo: "", lawEnforcerTwo: "",
lawEnforcerIdTwo: "", lawEnforcerIdTwo: "",
lawCertificateNumTwoText: "",
//辅助人员 //辅助人员
subsidiaryer: "", subsidiaryer: "",
subsidiaryerId: "", subsidiaryerId: "",
subsidiaryerText: "",
//执法事项 //执法事项
lawEnforcementItem:"", lawEnforcementItem:"",
//执法依据 //执法依据
@ -224,6 +226,8 @@ const submitData = reactive({
fileList:[], fileList:[],
//vant组件上传照片列表 //vant组件上传照片列表
fileListObj:[], fileListObj:[],
// 数据保存或提交 0 保存 1提交
isSubmit: 0,
}) })
const tapGood = () => { const tapGood = () => {
@ -287,7 +291,8 @@ onMounted(() =>{
//查询执法部门信息 //查询执法部门信息
queryUserInfo({},success =>{ queryUserInfo({},success =>{
if (null != success.data) { if (null != success.data) {
submitData.lawEnforcer = success.data.userName + " " + success.data.lawCertificateNum submitData.lawEnforcer = success.data.userName
submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
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;
@ -360,7 +365,8 @@ const gaCancel = () => {
} }
/* 检查要求 end */ /* 检查要求 end */
const submit = () =>{ const submit = (type) =>{
submitData.isSubmit = type;
addEnforcementRegistration(submitData,success =>{ addEnforcementRegistration(submitData,success =>{
//跳转首页 //跳转首页
if(success.success){ if(success.success){
@ -383,12 +389,14 @@ const closePopup = () =>{
data.popupVisible2 = false; data.popupVisible2 = false;
} }
const reciveData = (item) =>{ const reciveData = (item) =>{
submitData.lawEnforcerTwo = item.userName + " "+item.lawCertificateNum; submitData.lawEnforcerTwo = item.userName;
submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
submitData.lawEnforcerIdTwo = item.userId; submitData.lawEnforcerIdTwo = item.userId;
} }
const reciveData2 = (item) =>{ const reciveData2 = (item) =>{
submitData.subsidiaryer = item.userName + " " + item.lawCertificateNum; submitData.subsidiaryer = item.userName;
submitData.subsidiaryerId = item.userId; submitData.subsidiaryerId = item.userId;
submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum;
} }
</script> </script>

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

@ -103,12 +103,12 @@
label="经营范围" label="经营范围"
placeholder="选填 经营范围" placeholder="选填 经营范围"
rows="1" rows="1"
autosize autosize="{ maxHeight: 100, minHeight: 50 }"
type="textarea" type="textarea"
/> />
</van-cell-group> </van-cell-group>
<van-action-bar> <van-action-bar>
<van-action-bar-button text="保存" @click="submit" /> <van-action-bar-button text="提交" @click="submit()" />
</van-action-bar> </van-action-bar>
</div> </div>
</div> </div>
@ -157,7 +157,7 @@ const submitData = reactive({
//营业期限 //营业期限
operatingTerm:"", operatingTerm:"",
//经营范围 //经营范围
businessScope:"" businessScope:"",
}) })
@ -168,7 +168,6 @@ const goBack = () => {
const submit = () =>{ const submit = () =>{
// console.log(submitData); // console.log(submitData);
addEnterpriseInformation(submitData,success =>{ addEnterpriseInformation(submitData,success =>{
//重新设置本地存储 //重新设置本地存储
useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber); useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber);

Write Preview
Loading…
Cancel
Save