Browse Source

修改通知行政检查计划展示

预警查询修改
v3
chenrui 2 years ago
parent
commit
a2db291c1b
  1. 2
      src/util/fileUpload.js
  2. 2
      src/views/administrative/appointment.vue
  3. 4
      src/views/administrative/appointmentDetail.vue
  4. 3
      src/views/enforce/earlyWarning.vue
  5. 17
      src/views/enforce/enforceNotice.vue
  6. 29
      src/views/enforce/enforcementPlanAdd.vue
  7. 8
      src/views/enforce/sign.vue
  8. 37
      src/views/enterprise/enterpriseEvaluate/evaluate.vue
  9. 131
      src/views/enterprise/registrationDetail.vue

2
src/util/fileUpload.js

@ -41,7 +41,7 @@ const nameCorrect=(name)=>{
//筛选出两个字人名
let name1=[{}];
name1=String(name).split(" ");
console.log(name1);
// console.log(name1);
if(name1[0].length==2){
if(name1.length>1){
return (String(name1[0]).substr(0,1)+"\u3000"+String(name1[0]).substr(1)+" "+name1[1]);

2
src/views/administrative/appointment.vue

@ -45,6 +45,7 @@
is-link
label="检查时间"
placeholder="日期"
readonly
:rules="[{ required: true, message: '必填项' }]"
@click="data.showTimePicker = true"
/>
@ -54,6 +55,7 @@
is-link
label=""
placeholder="时段"
readonly
:rules="[{ required: true, message: '必填项' }]"
@click="data.checkTimePicker = true"
/>

4
src/views/administrative/appointmentDetail.vue

@ -99,12 +99,12 @@
</div>-->
<van-divider class="divdsty" />
<div class="add-inspect">
<!-- <div class="add-inspect" v-show="submitData.userObjs.length > 0">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{nameCorrect(item.userName)}}</span>
</p>
</div>
</div> -->
<van-action-bar v-if="submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
<van-button round block type="info" native-type="submit" @click="data.showIsCancel = true">取消</van-button>

3
src/views/enforce/earlyWarning.vue

@ -192,7 +192,7 @@
// 设置初始值为当前时间
onMounted(() => {
// getCard();
searchParam.enterpriseNumber = useCommon.enterpriseNumber;
// searchParam.enterpriseNumber = useCommon.enterpriseNumber;
queryList();
data.dateSearch = nowDate(new Date());
isLodding.value = false;
@ -390,6 +390,7 @@
}
}
}
searchParam.enterpriseNumber = "";
},error =>{
})

17
src/views/enforce/enforceNotice.vue

@ -123,6 +123,23 @@
data.finished = ref(true);
return;
}
for (let index = 0; index < success.rows.length; index++) {
const element = success.rows[index];
console.log(element);
// element.planName = element.planYear + element.planName;
if(element.timeType == 'quarter'){
let val = "";
if(element.quarter == "1") val = "一季度";
if(element.quarter == "2") val = "二季度";
if(element.quarter == "3") val = "三季度";
if(element.quarter == "4") val = "四季度";
element.planName = element.planYear + "年" + val + element.planName;
}else if (element.timeType == 'mouth') {
const val = element.mouth + "月";
element.planName = element.planYear + "年" + val + element.planName;
}
element.planName = element.bureauDeptName + element.planName;
}
// data.dataList = success.data;
data.dataList.push(...success.rows);
freshMap.refreshLoad = false;

29
src/views/enforce/enforcementPlanAdd.vue

@ -31,6 +31,7 @@
:columns-type="data.columnsType"
@confirm="onDateConfirm"
@cancel="cancelSelectDate"
readonly
/>
</van-popup>
<van-popup v-model:show="data.showMouthPicker" position="bottom">
@ -60,6 +61,7 @@
placeholder="请选择年份"
required
@click="data.showDatePicker = true"
readonly
/>
<div class="flex-div">
@ -69,6 +71,8 @@
placeholder="请选择年/季/月度"
is-link
@click="data.dateShowPicker = true"
required
readonly
/>
<div class="right-txt" v-if="data.showMouth">
<van-field
@ -76,6 +80,8 @@
placeholder="请选择月度"
is-link
@click="data.showMouthPicker = true"
required
readonly
/>
</div>
<div class="right-txt" v-if="data.showQuarter">
@ -84,13 +90,15 @@
placeholder="请选择季度"
is-link
@click="data.dataQuarterShowPicker = true"
readonly
required
/>
</div>
</div>
<!-- @update:model-value="foucePlan" -->
<van-field
label=" "
v-model="submitData.planName"
@focus="foucePlan"
placeholder="行政检查计划"
/>
</div>
@ -296,11 +304,14 @@
//跳转企业二维码地址
if (success.success) {
console.log("保存成功");
data.showIsPublish = false;
showSuccessToast('保存成功');
goBack();
}
}, error => {
console.log("保存失败")
console.log("保存失败");
data.showIsPublish = false;
})
// showConfirmDialog(submitData).then(() => {
@ -393,6 +404,8 @@
return true;
}
onMounted(() => {
submitData.planName = "行政检查计划";
nameObj.planName = '行政检查计划';
console.log(route?.query?.id);
console.log(route?.query?.lawEnforcementIncident);
submitData.relId = route?.query?.id;
@ -497,10 +510,14 @@
};
const foucePlan = () =>{
nameObj.planName = '行政检查计划';
submitData.planName = '行政检查计划';
}
console.log(submitData.planName);
nameObj.planName = submitData.planName;
}
//写函数(开启深度监视): 监听内容属相变化
watch(()=>submitData.planName,(newValue,oldValue)=>{
console.log('submitData.planName变化了',newValue,oldValue)
nameObj.planName = newValue;
},{deep:true})
</script>

8
src/views/enforce/sign.vue

@ -142,12 +142,12 @@
<van-divider class="divdsty" />
<van-cell center title="开启联合检查">
<!-- <van-cell center title="开启联合检查">
<template #right-icon>
<van-switch v-model="data.checked" @click="!data.checked"/>
<van-switch v-model="data.checked" @click="!data.checked"/> -->
<!-- <van-switch v-model="data.checked" @click="checkUnite"/>-->
</template>
</van-cell>
<!-- </template>
</van-cell> -->
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门+人员</label></p>

37
src/views/enterprise/enterpriseEvaluate/evaluate.vue

@ -6,20 +6,20 @@
<div class="cardsty">
<h4>您对我们的执法检查满意吗?</h4>
<div class="eval-item">
<label>检查效率</label>
<label>请评价</label>
<span class="eval-star">
<van-icon @click="checkDealSpeedMetrics(n)" class="active" name="star"
v-for="n in data.dataObj.dealSpeedMetrics"/>
<van-icon @click="checkDealSpeedMetrics(n + data.dataObj.dealSpeedMetrics)" name="star"
v-for="n in (5 - data.dataObj.dealSpeedMetrics)"/>
v-for="n in (3 - data.dataObj.dealSpeedMetrics)"/>
</span>
<span v-if="data.dataObj.dealSpeedMetrics == 1">非常不满意</span>
<span v-if="data.dataObj.dealSpeedMetrics == 2">不满意</span>
<span v-if="data.dataObj.dealSpeedMetrics == 3">基本满意</span>
<span v-if="data.dataObj.dealSpeedMetrics == 4">满意</span>
<span v-if="data.dataObj.dealSpeedMetrics == 5">非常满意</span>
<span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 1">不满意</span>
<span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 2">较满意</span>
<span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 3">满意</span>
<!-- <span v-if="data.dataObj.dealSpeedMetrics == 4">满意</span>
<span v-if="data.dataObj.dealSpeedMetrics == 5">非常满意</span> -->
</div>
<div class="eval-item">
<!-- <div class="eval-item">
<label>检查效果</label>
<span class="eval-star">
<van-icon @click="checkDealEffectMetrics(n)" class="active" name="star"
@ -32,8 +32,8 @@
<span v-if="data.dataObj.dealEffectMetrics == 3">基本满意</span>
<span v-if="data.dataObj.dealEffectMetrics == 4">满意</span>
<span v-if="data.dataObj.dealEffectMetrics == 5">非常满意</span>
</div>
<div class="eval-item">
</div> -->
<!-- <div class="eval-item">
<label>服务体验</label>
<span class="eval-star">
<van-icon @click="checkServiceMetrics(n)" class="active" name="star"
@ -46,8 +46,8 @@
<span v-if="data.dataObj.serviceMetrics == 3">基本满意</span>
<span v-if="data.dataObj.serviceMetrics == 4">满意</span>
<span v-if="data.dataObj.serviceMetrics == 5">非常满意</span>
</div>
<div class="eval-item">
</div> -->
<!-- <div class="eval-item">
<label>检查质量</label>
<span class="eval-star">
<van-icon @click="checkDealEffectMetrics(n)" class="active" name="star"
@ -60,9 +60,9 @@
<span v-if="data.dataObj.feedbackQualityMetrics == 3">基本满意</span>
<span v-if="data.dataObj.feedbackQualityMetrics == 4">满意</span>
<span v-if="data.dataObj.feedbackQualityMetrics == 5">非常满意</span>
</div>
</div> -->
<div class="eval-all">
<!-- <div class="eval-all">
<span>整体评价:</span>
<i class="verygood bad" v-if="data.dataObj.approveCode == 1 || data.dataObj.approveCode == 2"></i>
<i class="verygood good" v-if="data.dataObj.approveCode == 3 || data.dataObj.approveCode == 4"></i>
@ -74,7 +74,7 @@
<span v-if="data.dataObj.approveCode == 5">非常满意</span>
<span v-if="data.dataObj.approveCode == 6">未评价</span>
<span v-if="data.dataObj.approveCode == 7">无效评价</span>
</div>
</div> -->
</div>
<div class="cardsty">
@ -293,11 +293,11 @@
}
.eval-star {
margin: 0 0.3rem 0 0.2rem;
margin: 0 0.7rem 0 0.2rem;
}
.eval-star i {
margin: 0 0.1rem;
margin: 0 0.3rem;
color: #ddd;
font-size: 0.5rem;
}
@ -305,6 +305,9 @@
.eval-star i.active {
color: #fbb516;
}
.eval-star-font{
font-weight: bold;
}
.eval-all {
display: flex;

131
src/views/enterprise/registrationDetail.vue

@ -22,61 +22,53 @@
<van-divider class="divdsty" />
<van-cell-group>
<div class="zf-name">执法信息<span class="joint-mark">联</span></div>
<van-field
v-model="submitData.lawEnforcement"
label="执法部门"
readonly
/>
<div class="one-label">
<van-field
v-model="submitData.lawEnforcer"
label="执法人员"
readonly
/>
<van-field class="no-label"
v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
label=" "
readonly
/>
</div>
<van-field
v-model="submitData.lawEnforcement"
label="执法部门"
readonly
/>
<div class="one-label">
<van-field
v-model="submitData.lawEnforcer"
label="执法人员"
<div class="zf-name">执法信息
<div v-if="submitData.uniteCheck != '' && submitData.uniteCheck != null" >
<span class="joint-mark">联</span></div>
<div v-for="(item,index) in data.dataList" :key="index">
<van-field
v-model="item.deptName"
label="执法部门"
readonly
/>
<van-field class="no-label"
v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
label=" "
readonly
/>
/>
<div class="one-label">
<van-field
v-model="item.userList[0]"
label="执法人员"
readonly
/>
<van-field class="no-label"
v-for="(it, i) in item.userList" :key="i"
v-model="item.userList[i+1]"
label=" "
readonly
/>
</div>
</div>
<van-field
v-model="submitData.lawEnforcement"
label="执法部门"
readonly
/>
<div class="one-label">
<div v-if="submitData.uniteCheck == '' && submitData.uniteCheck == null">
<van-field
v-model="submitData.lawEnforcer"
label="执法人员"
v-model="submitData.bureauDeptName"
label="执法部门"
readonly
/>
<van-field class="no-label"
v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
label=" "
readonly
/>
/>
<div class="one-label">
<van-field
label="执法人员"
readonly
/>
<van-field class="no-label"
v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
label=" "
readonly
/>
</div>
</div>
</div>
<!--
<van-field v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
@ -214,12 +206,13 @@
<script setup name="register">
import { showSuccessToast,showImagePreview } from 'vant';
import {queryEnforcementRegistrationById, getAttr} from '../../api/enforce'
import {queryEnforcementRegistrationById, getAttr} from '@/api/enforce'
import { reactive, ref,nextTick } from "vue";
import {uploadFile} from "../../util/fileUpload";
import {getDict} from "../../api/Home";
import {queryLinkageById} from "../../api/linkage";
import {nameCorrect} from'../../util/fileUpload'
import {uploadFile} from "@/util/fileUpload";
import {getDict} from "@/api/Home";
import {queryLinkageById} from "@/api/linkage";
import {nameCorrect} from'@/util/fileUpload'
import {selectRegistrationList } from '@/api/enterprise'
//用户筛选弹窗
// import Popup from './userFilter.vue';
@ -241,7 +234,8 @@ const data = reactive({
lawList: [{ text:"", id:"" }],
lawCer:[{ text:"", id:"" }],
imageList:[],
show: ref(false)
show: ref(false),
dataList:[],
});
//保存参数
const submitData = reactive({
@ -400,7 +394,7 @@ onMounted(() =>{
// 执法依据
submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
// submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
if ((null != submitData.lawEnforcementBasis && submitData.lawEnforcementBasis.length > 0)
&& (null != submitData.lawEnforcementBasisText && submitData.lawEnforcementBasisText.length > 0)) {
var tmpBasis = submitData.lawEnforcementBasis.split(',');
@ -424,11 +418,34 @@ onMounted(() =>{
for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: nameCorrect(lawEnforcer2Show[i])});
}
console.log(data.lawCer)
}
// setLinkageItem(submitData.lawEnforcementItem);
// setLinkageGA(submitData.lawEnforcementBasis);
if(success.data.uniteCheck!= null && success.data.uniteCheck != ''){
selectRegistrationList({"uniteCheck":success.data.uniteCheck},success =>{
console.log(success.data);
for (let index = 0; index < success.data.length; index++) {
const element = success.data[index];
var arr = [];
arr.push(element.lawEnforcer);
let tow = element.lawEnforcerTwo.split(",");
arr.push(...tow);
var obj = {
"deptName": element.bureauDeptName,
"deptId": element.bureauDeptId,
"userList": arr
}
data.dataList.push(obj)
console.log(data.da)
}
},error =>{
})
}
},error=>{
})

Loading…
Cancel
Save