Browse Source

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

# Conflicts:
#	src/views/enforce/sign.vue
v2
chenrui 2 years ago
parent
commit
1923813257
  1. 11
      src/views/administrative/appointment.vue
  2. 37
      src/views/administrative/appointmentDetail.vue
  3. 41
      src/views/administrative/appointmentEdit.vue
  4. 10
      src/views/administrative/appointmentList.vue
  5. 4
      src/views/enforce/enforcementPlanAdd.vue
  6. 1
      src/views/enforce/historyCheck.vue
  7. 85
      src/views/enforce/sign.vue
  8. 19
      src/views/enterprise/complaintDetail.vue
  9. 7
      src/views/enterprise/complaintDetailView.vue
  10. 18
      src/views/enterprise/complaintList.vue
  11. 8
      src/views/enterprise/complaintNoScan.vue
  12. 7
      src/views/enterprise/registrationDetail.vue
  13. 2
      src/views/enterprise/registrationList.vue

11
src/views/administrative/appointment.vue

@ -128,7 +128,8 @@
<van-cell center title="开启联合检查">
<template #right-icon>
<van-switch v-model="data.checked" @click="checkUnite"/>
<van-switch v-model="data.checked" @click="!data.checked"/>
<!-- <van-switch v-model="data.checked" @click="checkUnite"/>-->
</template>
</van-cell>
<!-- <van-field-->
@ -148,6 +149,7 @@
<p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
</p>
<div class="addbtn" @click.stop="data.deptChecked=true"><van-icon name="add-o" />增加联合人员</div>
</div>
</van-cell-group>
@ -701,15 +703,16 @@
}
.add-inspect {
margin: 0 0.425rem 0 3.06rem;
margin: 0 0.425rem;
padding-bottom: 0.3rem;
font-size: 0.35rem;
min-height: 2rem;
font-size: 0.37rem;
color: #323233;
}
.add-inspect p {
margin: 0.1rem 0;
padding: 0.2rem 0;
padding: 0.2rem 0.1rem;
//border-bottom: 1px solid #f4f5f6;
}

37
src/views/administrative/appointmentDetail.vue

@ -1,6 +1,6 @@
<template>
<div class="address_edit">
<div>
<div class="warp_body">
<van-form @failed="onFailed" @submit="submit">
<van-cell-group>
<van-field
@ -82,6 +82,7 @@
show-word-limit
/>
<div class="add-inspect">
<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">{{item.userName}}</span>
</p>
@ -374,7 +375,7 @@
}
//查询当前登录人员信息
if (submitData.isSubmit == 0) {
// if (submitData.isSubmit == 0) {
queryUserInfo(useCommon.userId,success =>{
console.log("queryUserInfo : ", success.data)
submitData.lawEnforcer = success.data.userName;
@ -385,7 +386,7 @@
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
},error=>{});
}
// }
}
},error=>{
console.log("保存失败")
@ -585,6 +586,17 @@
overflow: hidden;
background-color: #ebf3fb;
}
.warp_body {
margin: 0 3%;
padding-bottom: 3rem;
width: 94%;
height: 100%;
background-color: #ebf3fb;
overflow-y: auto;
margin-top: 0.15rem;
}
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast{
background: var(--van-toast-background) !important;
@ -630,16 +642,17 @@
}
.add-inspect {
margin: 0 0.425rem 0 3.06rem;
padding-bottom: 0.3rem;
font-size: 0.35rem;
color: #323233;
margin: 0 0.425rem;
padding-bottom: 0.3rem;
min-height: 2rem;
font-size: 0.37rem;
color: #323233;
}
.add-inspect p {
margin: 0.1rem 0;
padding: 0.2rem 0;
//border-bottom: 1px solid #f4f5f6;
margin: 0.1rem 0;
padding: 0.2rem 0.1rem;
//border-bottom: 1px solid #f4f5f6;
}
.add-inspect p:nth-child(even) {
@ -655,4 +668,8 @@
color: #323233;
}
.add-inspect label {
margin-left: -0.1rem;
}
</style>

41
src/views/administrative/appointmentEdit.vue

@ -5,7 +5,7 @@
<header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查预约`"></header-nav>
</div>-->
<!-- 中间 -->
<div>
<div class="warp_body">
<!-- <van-cell-group>-->
<van-form @failed="onFailed" @submit="submit">
<van-cell-group>
@ -142,17 +142,18 @@
<!-- @click="selectDepts"-->
<!-- />-->
<div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
<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">{{item.userName}}</span>
</p>
</div>
</van-cell-group>
<div class="warp_body">
<van-action-bar>
<van-button round block type="info" native-type="submit" @click="tmpSave">提交</van-button>
<van-button round block type="info" native-type="submit" @click="submit112">发送</van-button>
</van-action-bar>
</div>
</van-form>
<!-- </van-cell-group>-->
</div>
@ -426,7 +427,7 @@
}
//查询当前登录人员信息
if (submitData.isSubmit == 0) {
// if (submitData.isSubmit == 0) {
queryUserInfo(useCommon.userId,success =>{
console.log("queryUserInfo : ", success.data)
submitData.lawEnforcer = success.data.userName;
@ -437,7 +438,7 @@
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
},error=>{});
}
// }
}
},error=>{
console.log("保存失败")
@ -637,6 +638,17 @@
overflow: hidden;
background-color: #ebf3fb;
}
.warp_body {
margin: 0 3%;
padding-bottom: 3rem;
width: 94%;
height: 100%;
background-color: #ebf3fb;
overflow-y: auto;
margin-top: 0.15rem;
}
/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
.van-popup.van-toast{
background: var(--van-toast-background) !important;
@ -682,16 +694,17 @@
}
.add-inspect {
margin: 0 0.425rem 0 3.06rem;
padding-bottom: 0.3rem;
font-size: 0.35rem;
color: #323233;
margin: 0 0.425rem;
padding-bottom: 0.3rem;
min-height: 2rem;
font-size: 0.37rem;
color: #323233;
}
.add-inspect p {
margin: 0.1rem 0;
padding: 0.2rem 0;
//border-bottom: 1px solid #f4f5f6;
margin: 0.1rem 0;
padding: 0.2rem 0.1rem;
//border-bottom: 1px solid #f4f5f6;
}
.add-inspect p:nth-child(even) {
@ -707,4 +720,8 @@
color: #323233;
}
.add-inspect label {
margin-left: -0.1rem;
}
</style>

10
src/views/administrative/appointmentList.vue

@ -147,12 +147,12 @@
// 设置初始值为当前时间
onMounted(() => {
queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => {
getLinkageByParentIdToItem(success.id)
}, error => {
});
// queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => {
// getLinkageByParentIdToItem(success.id)
// }, error => {
// });
// queryList();
queryList();
data.dateSearch = nowDate(new Date());
isLodding.value = false;
});

4
src/views/enforce/enforcementPlanAdd.vue

@ -102,9 +102,9 @@
/>
<div class="file-upload">
<div class="file-upload-center">
文件上传 <span>(不多于9张)</span>
文件上传 <span>(仅限PDF文档)</span>
</div>
<van-uploader v-model="data.fileListObj" max-count="9" class="file" :after-read="uploadFiles"
<van-uploader v-model="data.fileListObj" max-count="1" class="file" :after-read="uploadFiles"
multiple @oversize="onOversize" :before-delete="deleteFile" accept=".pdf">
<template #preview-cover="{ file }">
<div class="preview-cover van-ellipsis">{{ file.name }}</div>

1
src/views/enforce/historyCheck.vue

@ -186,6 +186,7 @@
});
}
const queryList = () => {
searchParam.isSubmit = 1;
queryRegistrationList(searchParam, success => {
console.log("====> : ",success.data);
data.dataList = success.data;

85
src/views/enforce/sign.vue

@ -309,12 +309,13 @@ const data = reactive({
lawFieldShow: false,
lawField_columns: [],
lawFieldText:"",
tempDate: null,
currentDate: [],
showTimePicker: false,
minDate:null,
maxDate:null,
showBl:false,
showNom: false,
minDate: null,
maxDate: null,
});
var fileSize = 0;
//保存参数
@ -422,7 +423,6 @@ onMounted(() =>{
submitData.checkCss = route?.query?.checkCss;
data.isNoScan = route?.query?.isNoScan;
currentDate();
// let dateLimit = new Date();
// data.maxDate = new Date(this.$moment(dateLimit).format('YYYY/MM/DD'));
@ -458,7 +458,9 @@ onMounted(() =>{
// getLinkageByValueAndParentId("law_item", "100");
getLinkageByValueAndParentId("check_item", "100");
//初始化时间
submitData.enforcementTime = formattedTime(new Date());
currentDate();
// getDateScpoe();
// submitData.enforcementTime = formattedTime(new Date());
// getDict({},success =>{
// },error =>{});
@ -479,7 +481,7 @@ onMounted(() =>{
let year = now.getFullYear();
let mon = now.getMonth() + 1;
let day = now.getDate();
mon = (mon < 10 ? ('0' + mon) : mon);
day = (day < 10 ? ('0' + day) : day);
data.maxDate = ref(new Date(year,mon -1,day));
@ -684,12 +686,41 @@ const currentDate =() => {
const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0');
data.currentDate = [year, month, day]
console.log("function currentDate -----: ",year, month, day);
}
const getDateScpoe =() => {
let date = new Date();
let frontDate = new Date()
let year = date.getFullYear();
frontDate.setDate(frontDate.getDate() - 5)//前7天减7,前N天减N
let dateArr1 = [frontDate.getMonth() + 1,frontDate.getDate()];
let dateArr2 = [date.getMonth() + 1,date.getDate()];
//开始格式是M,经过以下循环变为MM
for (let i = 0; i < dateArr1.length; i++) {
if (dateArr1[i] >= 1 && dateArr1[i] <= 9) {
dateArr1[i] = "0" + dateArr1[i];
}
}
for (let i = 0; i < dateArr2.length; i++) {
if (dateArr2[i] >= 1 && dateArr2[i] <= 9) {
dateArr2[i] = "0" + dateArr2[i];
}
}
data.minDate = new Date(year, dateArr1[0], dateArr1[1]);
data.maxDate = new Date(year, dateArr2[0], dateArr2[1]);
let strDate1 =year +"/" + dateArr1[0] +"/" +dateArr1[1] +" "
let strDate2 =year +"/" + dateArr2[0] +"/" +dateArr2[1] +" "
let time_list = [strDate1,strDate2] //[2023-08-31,2023-09-07]
console.log("getDateScpoe ----- ", time_list);
console.log("function getMinDate -----: ",year, month, day)
console.log("function getMaxDate -----: ",year, month, day)
}
const onConfirm = (time) => {
if (time != null) {
var times = time.selectedValues;
submitData.checkTime = times[0] + "-" + times[1] + "-" + times[2];
submitData.enforcementTime = times[0] + "-" + times[1] + "-" + times[2];
data.tempDate = times[1] + "月" + times[2] + "号";
}
data.showTimePicker = false;
@ -751,6 +782,22 @@ const reciveLaw = (item) => {
submitData.lawText = item.enterpriseName;
submitData.lawEnforcementItemText = item.checkItemText;
submitData.uniteCheck = item.uniteCheck;
console.log("reciveLaw ----< > ", item)
// 执法人员
submitData.lawEnforcerIdTwo = item.lawEnforcerTwoId;
submitData.lawEnforcerTwo = item.lawEnforcerTwo;
var lawEnforcer2ShowStr = item.lawEnforcer2Show;
if ((null != submitData.lawEnforcerIdTwo && submitData.lawEnforcerIdTwo.length > 0)
&& (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) {
var tmpEnforceId = submitData.lawEnforcerIdTwo.split(',');
var tmpEnforceText = submitData.lawEnforcerTwo.split(',');
var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
data.lawCer = [];
for (var i = 0; i < tmpEnforceId.length; i++) {
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
}
}
}
const beforeRead = (file) =>{
@ -796,32 +843,6 @@ const beforeRead = (file) =>{
});
return true;
}
const getBeforeDate = (num, time) =>{
let n = num;
let d = '';
if(time) {
d = new Date(time);
} else {
d = new Date();
}
let year = d.getFullYear();
let mon = d.getMonth() + 1;
let day = d.getDate();
if(day <= n) {
if(mon > 1) {
mon = mon - 1;
} else {
year = year - 1;
mon = 12;
}
}
d.setDate(d.getDate() - n);
year = d.getFullYear();
mon = d.getMonth() + 1;
day = d.getDate();
let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day);
return s;
}
</script>
<style lang="less" scoped>

19
src/views/enterprise/complaintDetail.vue

@ -150,7 +150,7 @@
<van-divider class="divdsty"/>
<div class="file-upload">
<div class="file-upload-center">
<label>上传附件</label> <span>(不多于9张)</span>
<label>附件</label>
</div>
<!-- <van-uploader v-model="submitData.fileListObj" class="file" :after-read="uploadFiles" multiple :max-size="500 * 1024" @oversize="onOversize" :before-delete="deleteFile">-->
<!-- <template #preview-cover="{ file }">-->
@ -534,8 +534,8 @@
.file-upload-center {
position: absolute;
height: 20%;
top: 10%;
width: 90%;
height: 0.65rem;
left: 0.43rem;
font-size: 0.38rem;
@ -564,6 +564,19 @@
background: rgba(0, 0, 0, 0.3);
}
.zoom {
margin-top: 0.65rem;
padding-top: 0.27rem;
padding-left: 0.27rem;
img {
width: 1.92rem;
height: 2rem;
/* padding-right: 0.27rem; */
margin: 0 0.21rem 0.21rem 0;
font-size: 0.35rem;
}
}
.rigbtn {
float: right;
position: relative;

7
src/views/enterprise/complaintDetailView.vue

@ -463,8 +463,7 @@
.file-upload-center {
position: absolute;
width: 90%;
height: 20%;
top: 10%;
height: 0.65rem;
left: 0.43rem;
font-size: 0.38rem;
@ -500,7 +499,9 @@
img {
width: 1.92rem;
height: 2rem;
padding-right: 0.27rem;
/* padding-right: 0.27rem; */
margin: 0 0.21rem 0.21rem 0;
font-size: 0.35rem;
}
}

18
src/views/enterprise/complaintList.vue

@ -2,15 +2,15 @@
<template>
<div class="shop app_content">
<!-- 导航栏 -->
<div class="header_body">
<!-- <header-nav
:slefBack="true"
@goBack="goBack"
:titelText="`投诉信息查询`"
>
</header-nav>
-->
</div>
<!-- <div class="header_body">
<header-nav
:slefBack="true"
@goBack="goBack"
:titelText="`投诉信息查询`"
>
</header-nav>
</div>-->
<van-search
v-model="searchParam.searchValue"
show-action

8
src/views/enterprise/complaintNoScan.vue

@ -56,9 +56,9 @@
<van-divider class="divdsty"/>
<div class="file-upload">
<div class="file-upload-center">
<label>上传附件</label> <span>(不多于9张)</span>
<label>上传附件</label> <span>(不多于 8张)</span>
</div>
<van-uploader v-model="submitData.fileListObj" max-count="9" class="file"
<van-uploader v-model="submitData.fileListObj" max-count="8" class="file"
:after-read="uploadFiles" multiple @oversize="onOversize"
:before-delete="deleteFile">
<template #preview-cover="{ file }">
@ -375,6 +375,10 @@ const goBack = () => {
width: calc(100% - 0.86rem);
}
/deep/ .van-uploader__upload, /deep/ .van-uploader__preview-image {
width: 1.92rem !important;
}
.preview-cover {
position: absolute;
bottom: 0;

7
src/views/enterprise/registrationDetail.vue

@ -478,8 +478,7 @@ const reciveData2 = (item) =>{
.file-upload-center {
position: absolute;
width: 90%;
height: 20%;
top: 10%;
height: 0.65rem;
left: 0.43rem;
font-size: 0.38rem;
span {
@ -512,7 +511,9 @@ const reciveData2 = (item) =>{
img {
width: 1.92rem;
height: 2rem;
padding-right: 0.27rem;
/* padding-right: 0.27rem; */
margin: 0 0.21rem 0.21rem 0;
font-size: 0.35rem;
}
}
</style>

2
src/views/enterprise/registrationList.vue

@ -74,7 +74,7 @@
<div class="card_box_span">
<p>执法时间:{{ item.createTime }} <span class="card_box_action">
</span></p>
<van-button v-if="item.outTimeDayNum<=4" class="trbtn"
<van-button v-if="item.outTimeDayNum<=4 && isComplaint==0" class="trbtn"
@click="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText)"
type="primary"
size="mini">投诉

Loading…
Cancel
Save