Browse Source

修改二维码样式,

bug修改
master
chenrui 2 years ago
parent
commit
bce6cbd167
  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

@ -11,7 +11,14 @@ import { _get, _post,_form,_delete } from "../http/index";
* @returns
*/
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

6
src/views/administrative/appointment.vue

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

10
src/views/enforce/enforceNotice.vue

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

2
src/views/enforce/enforcementPlanAdd.vue

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

11
src/views/enforce/enterpriseBaseInfo.vue

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

8
src/views/enforce/enterpriseScanPreview.vue

@ -18,10 +18,10 @@
<ul>
<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-else-if="index === 1 && item.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 && item.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 ==0" class="warn-tab"> {{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 && data.warningInfo.warningLevel==2" class="warn-tab level2"> {{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>
</li>
</ul>

47
src/views/enforce/historyCheck.vue

@ -3,6 +3,7 @@
<div class="shop app_content">
<!-- 导航栏 -->
<div class="header_body">
<header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/>
<header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/>
</div>
<van-search v-model="searchParam.searchValue" show-action placeholder="执法事项/部门/人员" @search="onSearch">
@ -19,6 +20,7 @@
<div class="search-button-date">
<span class="date-select" @click="selectDate">{{ data.dateSearch }}</span>
<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-date-picker
@ -41,28 +43,30 @@
<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" @click="toDetailView(item.id)">
<div class="card_box" >
<div class="card_box_span">
<p>执法时间{{ item.createTime }}
<!-- <span class="card_box_action">-->
<!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button>-->
<!-- </span>-->
<span class="card_box_action" v-if="item.isSubmit == 0">
<van-button @click="toComplaintView(item.id)" type="primary" size="mini">编辑</van-button>
</span>
</p>
</div>
<!-- <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 class="card_box_span">
<p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">执法部门</span> {{ item.lawEnforcement }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">执法人员</span> {{ item.lawEnforcer }}{{ item.lawEnforcerTwo }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">备注</span> {{ item.remark }}</p>
</div>
<div @click="toDetailView(item.id)">
<div style="background-color: aqua; border: 2px; height: .1px;" class="van-hairline--bottom"></div>
<div class="card_box_span">
<p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">执法部门</span> {{ item.lawEnforcement }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">执法人员</span> {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}</p>
</div>
<div class="card_box_span">
<p><span class="card_box_label">备注</span> {{ item.remark }}</p>
</div>
</div>
</div>
</van-swipe-cell>
</div>
@ -80,7 +84,6 @@
</template>
<script setup name="registrationList">
import { showToast } from "vant";
import {queryRegistrationList,getAttr} from '../../api/enforce';
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
const { useCommon, useShopCard } = $globalStore;
@ -101,6 +104,8 @@
//
isComplaint: null,
//
// enterpriseNumber: ref(useCommon.enterpriseNumber),
lawEnforcerId: ref(useCommon.userId),
enterpriseNumber: ref(useCommon.enterpriseNumber),
//
dateSearch: ref(),
@ -121,6 +126,9 @@
//
onMounted(() => {
// getCard();
// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
searchParam.lawEnforcerId = useCommon.userId;
queryList();
searchParam.enterpriseNumber = useCommon.enterpriseNumber;
data.dateSearch = nowDate(new Date());
@ -143,6 +151,7 @@
const queryList = () =>{
console.log(data.ga_columns)
queryRegistrationList(searchParam,success =>{
data.dataList = success.data;
for (var i=0; i<success.data.length; i++) {
// var itemTxt = success.data[i].lawEnforcementItem;
// console.log(itemTxt);
@ -249,6 +258,7 @@
// } else {
// isLodding.value = false;
// }
queryList();
// queryList();
isLodding.value = false;
});
@ -419,3 +429,4 @@ const setLinkageItem = (id,item) => {
}
</style>

4
src/views/enforce/scanPage.vue

@ -13,7 +13,7 @@
<!-- new Vconsolefrom(); -->
<script>
//
import Vconsole from "vconsole";
// import Vconsole from "vconsole";
import { BrowserMultiFormatReader } from "@zxing/library";
export default {
name: "QrCodeSearch",
@ -36,7 +36,7 @@ export default {
// vconsole;
//
this.openScan();
new Vconsole();
// new Vconsole();
},
methods: {
//

32
src/views/enforce/sign.vue

@ -7,7 +7,7 @@
<span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
<!-- 中间 -->
<div class="warp_body">
<van-form @failed="onFailed" @submit="submit">
<van-form @failed="onFailed">
<van-cell-group>
<div style="font-size:large" class="zf-name">执法信息</div>
<van-field
@ -16,12 +16,12 @@
readonly
/>
<van-field
v-model="submitData.lawEnforcer"
v-model="submitData.lawCertificateNumText"
label="执法人员"
readonly
/>
<van-field
v-model="submitData.lawEnforcerTwo"
v-model="submitData.lawCertificateNumTwoText"
label="执法人员"
readonly
placeholder="请选择"
@ -29,7 +29,7 @@
@click="showPopup"
/>
<van-field
v-model="submitData.subsidiaryer"
v-model="submitData.subsidiaryerText"
label="辅助人员"
readonly
placeholder="请选择"
@ -127,7 +127,8 @@
</van-cell-group>
<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-form>
</div>
@ -178,13 +179,10 @@ const data = reactive({
currentPage: 1,
good:"",
bad:"",
popupVisible: false,
popupContent: '',
popupVisible2: false,
popupContent2: '',
showGA:false,
showItem:false,
lawEnforcementBasisText:"",
@ -200,12 +198,16 @@ const submitData = reactive({
//1
lawEnforcer:"",
lawEnforcerId:"",
lawCertificateNumText:"",
//2
lawEnforcerTwo: "",
lawEnforcerIdTwo: "",
lawCertificateNumTwoText: "",
//
subsidiaryer: "",
subsidiaryerId: "",
subsidiaryerText: "",
//
lawEnforcementItem:"",
//
@ -224,6 +226,8 @@ const submitData = reactive({
fileList:[],
//vant
fileListObj:[],
// 0 1
isSubmit: 0,
})
const tapGood = () => {
@ -287,7 +291,8 @@ onMounted(() =>{
//
queryUserInfo({},success =>{
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.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
@ -360,7 +365,8 @@ const gaCancel = () => {
}
/* 检查要求 end */
const submit = () =>{
const submit = (type) =>{
submitData.isSubmit = type;
addEnforcementRegistration(submitData,success =>{
//
if(success.success){
@ -383,12 +389,14 @@ const closePopup = () =>{
data.popupVisible2 = false;
}
const reciveData = (item) =>{
submitData.lawEnforcerTwo = item.userName + " "+item.lawCertificateNum;
submitData.lawEnforcerTwo = item.userName;
submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
submitData.lawEnforcerIdTwo = item.userId;
}
const reciveData2 = (item) =>{
submitData.subsidiaryer = item.userName + " " + item.lawCertificateNum;
submitData.subsidiaryer = item.userName;
submitData.subsidiaryerId = item.userId;
submitData.subsidiaryerText = item.userName + " " + item.lawCertificateNum;
}
</script>

7
src/views/enterprise/register.vue

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

Loading…
Cancel
Save