Browse Source

修改页面布局

行政检查通知时间 上午或下午
v3
chenrui 2 years ago
parent
commit
d8741a2260
  1. 28
      src/views/administrative/appointment.vue
  2. 5
      src/views/administrative/appointmentList.vue
  3. 4
      src/views/enterprise/compaint/compaintDetailIndex.vue
  4. 3
      src/views/enterprise/compaint/compaintFlowView.vue
  5. 32
      src/views/enterprise/complaintDetailView.vue
  6. 18
      src/views/enterprise/enterpriseInspectionDetail.vue
  7. 13
      src/views/enterprise/enterpriseInspectionList.vue
  8. 12
      src/views/enterprise/enterpriseInspectionNotice.vue

28
src/views/administrative/appointment.vue

@ -42,7 +42,22 @@
label="检查时间" label="检查时间"
:rules="[{ required: true, message: '必填项' }]" :rules="[{ required: true, message: '必填项' }]"
@click="data.showTimePicker = true" @click="data.showTimePicker = true"
/> >
<template #div>
<div class="plan-attach">
<div class="plan-time">
<van-field
v-model="data.fieldValue"
is-link
readonly
placeholder="选择时段"
@click="data.dateShowPicker = true"
/>
</div>
</div>
</template>
</van-field>
<van-field <van-field
v-model="submitData.checkItemText" v-model="submitData.checkItemText"
@ -795,5 +810,16 @@
font-size: 0.35rem; font-size: 0.35rem;
color: #1367fe; color: #1367fe;
} }
.plan-attach {
display: flex;
align-items: center;
width: 100%;
white-space: nowrap;
}
.plan-time {
margin-left: 2.67rem;
width: 2.25rem;
}
</style> </style>

5
src/views/administrative/appointmentList.vue

@ -150,6 +150,11 @@
refreshing: false, refreshing: false,
curPage: 1, curPage: 1,
total: 0, total: 0,
dateColumns: [
{ text: '年度', value: 'year' },
{ text: '季度', value: 'quarter' },
{ text: '月度', value: 'month' },
],
}); });
// 设置初始值为当前时间 // 设置初始值为当前时间

4
src/views/enterprise/compaint/compaintDetailIndex.vue

@ -28,7 +28,7 @@
</div> </div>
<!-- 处置流程页面 --> <!-- 处置流程页面 -->
<div v-if="data.TabId == 1" style="height: calc(100vh - 1.5rem);"> <div v-if="data.TabId == 1" style="height: calc(100vh - 1.5rem);">
<complaintNoScan isReg="1" :id="data.id" /> <compaintFlowView isReg="1" :id="data.id" />
</div> </div>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
@ -41,7 +41,7 @@
<script setup name="complaintBase"> <script setup name="complaintBase">
import complaintDetailView from '@/views/enterprise/complaintDetailView.vue'; import complaintDetailView from '@/views/enterprise/complaintDetailView.vue';
import complaintNoScan from '@/views/enterprise/complaintNoScan.vue'; import compaintFlowView from '@/views/enterprise/compaint/compaintFlowView.vue';
const {useCommon} = $globalStore; const {useCommon} = $globalStore;

3
src/views/enterprise/compaint/compaintFlowView.vue

@ -0,0 +1,3 @@
<template>
<div class="home app_content"></div>
</template>

32
src/views/enterprise/complaintDetailView.vue

@ -13,6 +13,33 @@
clickable clickable
/> />
</view> </view>
<view v-if="data.isNoScan==false">
<van-field
v-model="submitData.bureauDeptName"
label="执法部门"
placeholder="请选择"
readonly
clickable
/>
</view>
<view v-if="data.isNoScan==false">
<van-field
v-model="submitData.lawEnforcementIncidentText"
label="处理状态"
placeholder="请选择"
readonly
clickable
/>
</view>
<view v-if="data.isNoScan==false">
<van-field
v-model="submitData.lawEnforcementIncidentText"
label="处理时间"
placeholder="请选择"
readonly
clickable
/>
</view>
<Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/> <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
<van-field <van-field
v-model="submitData.enforceTypeText" v-model="submitData.enforceTypeText"
@ -164,6 +191,8 @@
//vant组件上传照片列表 //vant组件上传照片列表
fileListObj: [], fileListObj: [],
comOrOpi: 0, comOrOpi: 0,
//执法部门-局级
bureauDeptName:"",
}) })
//接收组件传参 //接收组件传参
const props = defineProps({ const props = defineProps({
@ -254,13 +283,14 @@
data.isSelect = route?.query?.isSelect; data.isSelect = route?.query?.isSelect;
submitData.comOrOpi = route?.query?.comOrOpi; submitData.comOrOpi = route?.query?.comOrOpi;
complaintInfoById({id:route?.query?.id},success =>{ complaintInfoById({id:route?.query?.id},success =>{
console.log("====> : ", success) console.log("====> : ", success)
submitData.enforceTypeText = success.data.enforceTypeText; submitData.enforceTypeText = success.data.enforceTypeText;
submitData.problemDescription = success.data.problemDescription; submitData.problemDescription = success.data.problemDescription;
submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident; submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
submitData.enterpriseAddress = success.data.enterpriseAddress; submitData.enterpriseAddress = success.data.enterpriseAddress;
submitData.linkman = success.data.linkman; submitData.linkman = success.data.linkman;
submitData.linkmanTel = success.data.linkmanTel; submitData.linkmanTel = success.data.linkmanTel;
submitData.bureauDeptName = success.data.bureauDeptName;
// 判断是否入企不扫码 // 判断是否入企不扫码
if (null == success.data.enforceType || null == success.data.relId) { if (null == success.data.enforceType || null == success.data.relId) {
data.isNoScan = true; data.isNoScan = true;

18
src/views/enterprise/enterpriseInspectionDetail.vue

@ -13,19 +13,12 @@
readonly readonly
label="检查时间" label="检查时间"
/> />
<van-field
v-model="submitData.bureauDeptName"
readonly
label="执法部门"
/>
<van-field <van-field
v-model="submitData.checkItem" v-model="submitData.checkItem"
label="检查事项" label="检查事项"
rows="2" rows="2"
autosize
readonly readonly
type="textarea" type="textarea"
maxlength="100"
placeholder="请输入检查事项" placeholder="请输入检查事项"
show-word-limit show-word-limit
/> />
@ -33,13 +26,16 @@
v-model="submitData.checkRequire" v-model="submitData.checkRequire"
label="检查要求" label="检查要求"
rows="2" rows="2"
autosize
readonly readonly
type="textarea" type="textarea"
maxlength="100"
placeholder="请输入检查要求" placeholder="请输入检查要求"
show-word-limit show-word-limit
/> />
<van-field
v-model="submitData.bureauDeptName"
readonly
label="执法部门"
/>
<!-- <van-field--> <!-- <van-field-->
<!-- v-model="submitData.enterpriseName"--> <!-- v-model="submitData.enterpriseName"-->
<!-- label="企业名称"--> <!-- label="企业名称"-->
@ -63,7 +59,9 @@
readonly readonly
label="执法人员" label="执法人员"
/> />
<van-field v-for="(item, index) in data.lawCer" :key="index" <van-field
v-if="!data.isEnterprise"
v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show" v-model="item.show"
label="执法人员" label="执法人员"
readonly readonly

13
src/views/enterprise/enterpriseInspectionList.vue

@ -71,10 +71,14 @@
<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>执法时间:{{ formattedTimeYYYYmmdd(item.checkTime) }} <span <p>执法时间:{{ formattedTimeYYYYmmdd(item.checkTime) }}
class="card_box_action"> <span v-if="item.checkTimeOrder == 1" >
<!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button> --> 上午 9:00~12:00
</span></p> </span>
<span v-if="item.checkTimeOrder == 2">
下午 14:00~17:00
</span>
</p>
</div> </div>
<!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> --> <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
<div @click="toDetailView(item.id)"> <div @click="toDetailView(item.id)">
@ -201,6 +205,7 @@
const queryList = () => { const queryList = () => {
// 区分即时查询还是历史查询 // 区分即时查询还是历史查询
searchParam.isReg = props?.isReg; searchParam.isReg = props?.isReg;
console.log(props?.isReg);
//TODO 临时注释 //TODO 临时注释
if (searchParam.enterpriseNumber == '' || searchParam.enterpriseNumber == null) { if (searchParam.enterpriseNumber == '' || searchParam.enterpriseNumber == null) {
console.log("该用户没有关联企业!"); console.log("该用户没有关联企业!");

12
src/views/enterprise/enterpriseInspectionNotice.vue

@ -21,7 +21,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<van-tabs v-model:active="active" sticky @click="onClickTab"> <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
<van-tab v-for="(item, index) in data.list" :title="item.title"> <van-tab v-for="(item, index) in data.list" :title="item.title">
<div v-if="data.TabId == 0" style="height: calc(100vh - 1.5rem);"> <div v-if="data.TabId == 0" style="height: calc(100vh - 1.5rem);">
<enterpriseInspectionList isReg="0"></enterpriseInspectionList> <enterpriseInspectionList isReg="0"></enterpriseInspectionList>
@ -44,6 +44,8 @@
import {Tab, Tabs} from 'vant'; import {Tab, Tabs} from 'vant';
const {useCommon} = $globalStore; const {useCommon} = $globalStore;
//tab切换参数
const active = ref(0);
//路由参数 //路由参数
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
@ -66,7 +68,13 @@
console.log("点击切换tab",e); console.log("点击切换tab",e);
data.TabId = index; data.TabId = index;
}; };
const onClickTab = ({ title }) => console.log(title); const onClickTab = ({ title }) => {
if(title == "检查通知"){
data.TabId = 0;
}else{
data.TabId = 1;
}
}
onMounted(() => { onMounted(() => {

Loading…
Cancel
Save