Browse Source

1.执法登记:添加联合检查

2.bug修改
v3
蟑螂恶霸 2 years ago
parent
commit
6b88ad836f
  1. 12
      src/views/administrative/appointment.vue
  2. 7
      src/views/administrative/appointmentDetail.vue
  3. 10
      src/views/administrative/appointmentEdit.vue
  4. 42
      src/views/administrative/deptFilter.vue
  5. 83
      src/views/enforce/sign.vue
  6. 10
      src/views/enterprise/registrationEdit.vue

12
src/views/administrative/appointment.vue

@ -811,7 +811,15 @@
.add-box {
position: relative;
margin-top: -1px;
border-bottom: 1px solid #f6f7f8;
}
.add-box::after {
position: absolute;
left: 0.43rem;
bottom: 0;
width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7;
content: "";
}
.addbtn {
@ -849,7 +857,7 @@
}
.add-inspect span.add-dept {
color: #323233;
color: #666;
}
.wrapper {

7
src/views/administrative/appointmentDetail.vue

@ -684,11 +684,12 @@
.add-inspect p {
margin: 0.1rem 0;
padding: 0.2rem 0.1rem;
background-color: #f3f4f5;
//border-bottom: 1px solid #f4f5f6;
}
.add-inspect p:nth-child(even) {
background-color: #f3f4f5;
.add-inspect p:nth-child(1) {
background-color: #fff;
}
.add-inspect span {
@ -697,7 +698,7 @@
}
.add-inspect span.add-dept {
color: #323233;
color: #666;
}
.add-inspect label {

10
src/views/administrative/appointmentEdit.vue

@ -738,7 +738,15 @@
.add-box {
position: relative;
margin-top: -1px;
border-bottom: 1px solid #f6f7f8;
}
.add-box::after {
position: absolute;
left: 0.43rem;
bottom: 0;
width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7;
content: "";
}
.addbtn {

42
src/views/administrative/deptFilter.vue

@ -56,10 +56,13 @@
<van-cell-group inset>
<van-cell v-for="(item, index) in userList" :key="item" clickable>
<div style="display: flex; justify-content: space-between;">
<div style="width: 70%;" @click="toggle(item.deptId)">
<van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop>
<div style="width: 100%;" @click="toggle(item.deptId)">
<van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop>
{{item.userName}}
</van-checkbox>
<div class="add-staff">
<van-checkbox></van-checkbox><span class="add-dept">行政执法监督处</span><span class="add-name">{{item.userName}}</span>
</div>
</div>
</div>
</van-cell>
@ -366,22 +369,31 @@
padding-bottom: 2rem;
}
.case-item {
margin: 3% 2%;
padding: 2% 0;
width: 96%;
font-size: 0.35rem;
border-bottom: 1px solid #f4f4f4;
color: #999;
line-height: 2;
.van-checkbox-group .van-cell-group {
margin: 0;
}
.add-inspect {
margin: 0 0.425rem;
padding-bottom: 0.3rem;
min-height: 2rem;
font-size: 0.37rem;
color: #323233;
}
.case-title {
margin: 2% 0;
font-size: 0.42rem;
color: #333;
line-height: 1.25;
.add-staff {
display: flex;
align-items: center;
margin: 0.1rem 0;
padding: 0.2rem 0.1rem;
}
.add-staff span {
margin: auto 0.2rem;
color: #999;
}
.add-staff span.add-dept {
color: #323233;
}
</style>

83
src/views/enforce/sign.vue

@ -137,6 +137,19 @@
:rules="[{ required: true, message: '必填项' }]"
@click="data.showTimePicker = true"
/>
<van-cell center title="开启联合检查">
<template #right-icon>
<van-switch v-model="data.checked" @click="!data.checked"/>
<!-- <van-switch v-model="data.checked" @click="checkUnite"/>-->
</template>
</van-cell>
<div class="add-inspect" v-if="data.checked">
<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-divider class="divdsty"/>
@ -221,6 +234,17 @@
<van-popup v-model:show="data.showCheckCategoryPicker" round position="bottom">
<van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" />
</van-popup>
<DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
@reciveData="reciveDept"/>
<van-popup v-model:show="data.checkTimePicker" round position="bottom">
<van-picker
:columns="data.checkTimeColumns"
@cancel="data.checkTimePicker = false"
@confirm="checkTimeOnConfirm"
/>
</van-popup>
</div>
</template>
@ -304,6 +328,9 @@
lawFields: [],
showCheckCategoryPicker: false,
checkCategorys: [],
checked: false,
deptChecked: false,
deptContent: '',
});
var fileSize = 0;
//保存参数
@ -413,6 +440,25 @@
});
}
const checkUnite = () => {
if (data.checked) {
data.deptChecked=true;
} else {
data.deptChecked=false;
}
}
const reciveDept = (item) => {
submitData.deptTexts = "";
submitData.deptObjs = [];
submitData.userObjs = [];
for (var i=0; i<item.length; i++) {
submitData.deptTexts += item[i].deptName+";";
submitData.deptObjs.push({deptId: item[i].deptId, deptName: item[i].deptName });
submitData.userObjs.push({strUserId: item[i].userId, userName: item[i].userName, deptId: item[i].deptId, deptName: item[i].deptName });
}
}
//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
//初始化参数,获取扫码的企业统一信用编码
onMounted(() => {
@ -657,6 +703,9 @@
}
data.overlayShow = true; // 遮罩层
submitData.userId = useCommon.userId;
submitData.isUnite = 0;
if (data.checked) { submitData.isUnite = 1; }
//联合检查
// 处理回显附件
for (var k = 0; k < data.fileListObj.length; k++) {
@ -708,6 +757,8 @@
data.overlayShow = true; // 遮罩层
submitData.isSubmit = type;
submitData.userId = useCommon.userId;
submitData.isUnite = 0;
if (data.checked) { submitData.isUnite = 1; }
// 处理回显附件
for (var k = 0; k < data.fileListObj.length; k++) {
@ -823,6 +874,7 @@
data.popupVisible2 = false;
data.popupVisibleqz = false;
data.lawChecked = false;
data.deptChecked = false;
}
const reciveData = (item) => {
@ -1080,23 +1132,34 @@
.add-box {
position: relative;
margin-top: -1px;
border-bottom: 1px solid #f6f7f8;
}
.add-box::after {
position: absolute;
left: 0.43rem;
bottom: 0;
width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7;
content: "";
}
.add-inspect {
margin: 0 0.425rem;
padding-bottom: 0.3rem;
min-height: 2rem;
font-size: 0.37rem;
color: #323233;
}
.addbtn {
margin: 3%;
padding: 0 0.35rem;
width: 94%;
font-size: 0.35rem;
color: #1367fe;
line-height: 1.5;
margin: 3% 0;
width: 100%;
text-align: right;
box-sizing: border-box;
}
.addbtn i {
margin-right: -0.1rem;
font-size: 0.4rem;
font-size: 0.5rem;
color: #999;
}
.item-delete {

10
src/views/enterprise/registrationEdit.vue

@ -943,7 +943,15 @@
.add-box {
position: relative;
margin-top: -1px;
border-bottom: 1px solid #f6f7f8;
}
.add-box::after {
position: absolute;
left: 0.43rem;
bottom: 0;
width: calc(100% - 0.86rem);
border-bottom: 1px solid #f5f6f7;
content: "";
}
.addbtn {

Loading…
Cancel
Save