chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

预约联合执法重做

v2
蟑螂恶霸 2 years ago
parent
fa191dfb37
commit
d6ca9c498f
7 changed files with 174 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/router/administrative.js
  2. 53
      src/views/administrative/appointment.vue
  3. 127
      src/views/administrative/appointmentEdit.vue
  4. 3
      src/views/administrative/appointmentList.vue
  5. 4
      src/views/administrative/deptFilter.vue
  6. 44
      src/views/enforce/sign.vue
  7. 2
      src/views/enterprise/enterpriseInspectionDetail.vue

6
src/router/administrative.js
View File

@ -17,6 +17,12 @@ const routes = [
name: "appointmentEdit",
component: () => import("@/views/administrative/appointmentEdit.vue"),
},
// 行政检查预约详情
{
path: "/appointmentDetail",
name: "appointmentDetail",
component: () => import("@/views/administrative/appointmentDetail.vue"),
},
];
export { routes };

53
src/views/administrative/appointment.vue
View File

@ -128,27 +128,27 @@
<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>
<van-field
v-if="data.checked"
v-model="submitData.deptTexts"
label="检查部门"
rows="2"
autosize
type="textarea"
placeholder="请选择"
is-link
show-word-limit
readonly
@click="data.deptChecked=true"
/>
<div class="add-inspect">
<p><span class="add-dept">深圳市财政局</span><span class="add-name">执法人员1</span><span>执法人员2</span></p>
<p><span class="add-dept">深圳市发展和改革委员会</span><span class="add-name">执法人员1</span><span>执法人员2</span></p>
<p><span class="add-dept">深圳市水务局</span><span class="add-name">执法人员1</span><span>执法人员2</span></p>
</div>
<!-- <van-field-->
<!-- v-if="data.checked"-->
<!-- v-model="submitData.deptTexts"-->
<!-- label="检查部门"-->
<!-- rows="2"-->
<!-- autosize-->
<!-- type="textarea"-->
<!-- placeholder="请选择"-->
<!-- is-link-->
<!-- show-word-limit-->
<!-- readonly-->
<!-- @click="data.deptChecked=true"-->
<!-- />-->
<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>
</van-cell-group>
@ -297,6 +297,7 @@
userId: useCommon.userId,
deptTexts: "",
deptObjs: [],
userObjs: [],
isUnite: 0,
bureauDeptId:"",
bureauDeptName:""
@ -338,7 +339,7 @@
}
});
}
};
}
const validator = (val) => /^1[34578]\d{9}$/.test(val);
@ -370,12 +371,22 @@
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
}
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.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 });
}
}

127
src/views/administrative/appointmentEdit.vue
View File

@ -122,25 +122,30 @@
show-word-limit
/>
<van-cell v-if="data.mainDeputyOrder == 1" center title="开启联合检查">
<van-cell v-if="data.mainDeputyOrder == 1 && submitData.isSubmit == 0" 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>
<van-field
v-if="data.checked"
v-model="submitData.deptTexts"
label="检查部门"
rows="2"
autosize
type="textarea"
maxlength="50"
placeholder="请选择"
is-link
show-word-limit
readonly
@click="selectDepts"
/>
<!-- <van-field-->
<!-- v-if="data.checked"-->
<!-- v-model="submitData.deptTexts"-->
<!-- label="检查部门"-->
<!-- rows="2"-->
<!-- autosize-->
<!-- type="textarea"-->
<!-- maxlength="50"-->
<!-- placeholder="请选择"-->
<!-- is-link-->
<!-- show-word-limit-->
<!-- readonly-->
<!-- @click="selectDepts"-->
<!-- />-->
<div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
<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>
@ -272,7 +277,9 @@
remark:"",
deptTexts: "",
deptObjs: [],
userObjs: [],
isUnite: 0,
isSubmit: 0,
uniteCheck:"",
/**局级部门 */
bureauDeptId:"",
@ -316,12 +323,22 @@
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
}
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.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 });
}
}
@ -364,7 +381,7 @@
const dataFillIn = (id) => {
getByIdToDataFillIn(id,success =>{
console.log(success);
console.log("getByIdToDataFillIn : ", success);
//跳转企业二维码地址
if(success.success){
data.mainDeputyOrder = success.data.mainDeputyOrder;
@ -375,19 +392,25 @@
data.checkRequireText =success.data['params'].checkRequireText;
submitData.lawEnforcerText =success.data['lawEnforcer'];
submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
submitData.isSubmit =success.data['isSubmit'];
submitData.bureauDeptName = success.data['bureauDeptName'];
if (success.data.deptObjs.length > 1) {
// 是否联合执法
if (success.data.userObjs.length > 1) {
data.checked = true;
}
submitData.deptTexts = "";
submitData.deptObjs = [];
for (var i=0; i<success.data.deptObjs.length; i++) {
submitData.deptTexts += success.data.deptObjs[i].deptName+";";
submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// submitData.deptTexts = "";
// submitData.deptObjs = [];
// for (var i=0; i<success.data.deptObjs.length; i++) {
// submitData.deptTexts += success.data.deptObjs[i].deptName+";";
// submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// }
submitData.userObjs = [];
console.log("success.data.userObjs : ", success.data.userObjs);
for (var i=0; i<success.data.userObjs.length; i++) {
submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
}
// 执法人员
console.log("===========> : ", success.data)
submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
var lawEnforcer2ShowStr = success.data['lawEnforcer2Show'];
@ -401,7 +424,20 @@
data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
}
}
// showSuccessToast('保存成功');
//查询当前登录人员信息
if (submitData.isSubmit == 0) {
queryUserInfo(useCommon.userId,success =>{
console.log("queryUserInfo : ", success.data)
submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
},error=>{});
}
}
},error=>{
console.log("保存失败")
@ -543,17 +579,7 @@
// 数据填充
dataFillIn(route?.query?.id);
//查询当前登录人员信息
queryUserInfo(useCommon.userId,success =>{
console.log(success.data)
submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum
submitData.lawEnforcerText = submitData.lawEnforcer +" "+ submitData.lawCertificateNum
// submitData.lawEnforcerText = submitData.lawEnforcer
submitData.lawEnforcerId = success.data.userId;
submitData.lawEnforcement = success.data.dept.deptName;
submitData.lawEnforcementId = success.data.dept.deptId;
},error=>{});
// getLinkageByValueAndParentId("check_item", "100");
@ -573,7 +599,6 @@
})
const reciveData = (item) =>{
console.log(item);
submitData.enterpriseName = item.enterpriseName;
submitData.linkTel = item.enterpriseTel;
submitData.linkMan = item.legalPerson;
@ -656,4 +681,30 @@
margin-right: 0.1rem;
}
.add-inspect {
margin: 0 0.425rem 0 3.06rem;
padding-bottom: 0.3rem;
font-size: 0.35rem;
color: #323233;
}
.add-inspect p {
margin: 0.1rem 0;
padding: 0.2rem 0;
//border-bottom: 1px solid #f4f5f6;
}
.add-inspect p:nth-child(even) {
background-color: #f3f4f5;
}
.add-inspect span {
margin-right: 0.2rem;
color: #999;
}
.add-inspect span.add-dept {
color: #323233;
}
</style>

3
src/views/administrative/appointmentList.vue
View File

@ -329,7 +329,8 @@
console.log(id)
router.push(
{
path: "/enterprise/enterpriseInspectionDetail",
// path: "/enterprise/enterpriseInspectionDetail",
path: "/appointmentDetail",
query: {
id: id,
}

4
src/views/administrative/deptFilter.vue
View File

@ -52,7 +52,7 @@
<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" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>
<van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop>
{{item.userName}}
</van-checkbox>
</div>
@ -149,7 +149,7 @@
let checkeds = JSON.parse(JSON.stringify(this.checked));
for (var i=0; i<checkeds.length; i++) {
var item = checkeds[i].split(";-;");
res.push({"deptId":item[0], "deptName":item[1]});
res.push({"userId":item[0], "userName":item[1], "deptId":item[2], "deptName":item[3]});
}
// this.$emit("reciveData", JSON.parse(JSON.stringify(this.checked)));
this.$emit("reciveData", res);

44
src/views/enforce/sign.vue
View File

@ -77,7 +77,8 @@
label="检查时间"
readonly
placeholder="请选择"
is-link
:rules="[{ required: true, message: '必填项' }]"
@click="data.showTimePicker = true"
/>
<van-field
v-model="submitData.lawField"
@ -200,6 +201,14 @@
</van-form>
</div>
<van-popup v-model:show="data.showTimePicker" position="bottom" :style="{ height: '30%' }">
<van-date-picker
type="time"
v-model="data.currentDate"
@confirm="onConfirm"
@cancel="data.showTimePicker = false"
/>
</van-popup>
<Popup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup" @reciveData="reciveData" />
<Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
@ -250,7 +259,11 @@ import PopupA from './assistUserFilter.vue';
import Popupzq from './zqyjjdmFilter.vue';
import {getDict} from "../../api/Home";
import { queryLinkage, queryLinkageDictByValueAndParentId } from "../../api/linkage";
import {addEnterpriseLawEnforcement, getByUserIdAndZero} from "../../api/administrative";
import {
addEnterpriseLawEnforcement,
getByUserIdAndZero,
queryEnterpriseLawEnforcementList
} from "../../api/administrative";
const { useCommon,useMy } = $globalStore
@ -286,6 +299,10 @@ const data = reactive({
lawFieldShow: false,
lawField_columns: [],
lawFieldText:"",
currentDate: [],
showTimePicker: false,
minDate:null,
maxDate:null,
});
var fileSize = 0;
//保存参数
@ -392,6 +409,11 @@ onMounted(() =>{
submitData.enforce = route?.query?.reason;
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'));
// 数据填充
dataFillIn();
@ -625,6 +647,24 @@ const submit = (type) =>{
});
}
const currentDate =() => {
const now = new Date();
const year = now.getFullYear();
const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0');
data.currentDate = [year, month, day]
}
const onConfirm = (time) => {
if (time != null) {
var times = time.selectedValues;
submitData.checkTime = times[0] + "-" + times[1] + "-" + times[2];
data.tempDate = times[1] + "月" + times[2] + "号";
}
data.showTimePicker = false;
}
const showPopup = (flag) =>{
data.lawCerFlag = flag;
data.popupVisible = true;

2
src/views/enterprise/enterpriseInspectionDetail.vue
View File

@ -230,7 +230,7 @@ onMounted(() =>{
getEnterpriseLawEnforcement(route?.query?.id,success =>{
//跳转企业二维码地址
if(success.success){
console.log("===> : ", success.data)
console.log("===> 0 : ", success.data)
submitData.lawEnforcementCode = success.data.lawEnforcementCode;
submitData.lawEnforcement = success.data.lawEnforcement;
submitData.lawEnforcer = success.data.lawEnforcer;

Write Preview
Loading…
Cancel
Save