From d0f3d5a9414e6acc89d2ef245f3a3d4dd3d51ad0 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 9 Jul 2024 16:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=89=A7=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/administrative.js | 1 + src/views/administrative/appointment.vue | 3 +- src/views/administrative/appointmentEdit.vue | 59 ++++++++++++++------ src/views/enforceHome.vue | 6 +- 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/src/api/administrative.js b/src/api/administrative.js index 386f55c..98f4a21 100644 --- a/src/api/administrative.js +++ b/src/api/administrative.js @@ -4,6 +4,7 @@ import { _get, _post,_form,_delete } from "../http/index"; export const addEnterpriseLawEnforcement = (params, success, error) => _post("/app/code/enforcement/add",params,success,error) export const editEnterpriseLawEnforcement = (params, success, error) => _post("/app/code/enforcement/edit",params,success,error) +export const editEnterpriseLawEnforcementDeputyOrder = (params, success, error) => _post("/app/code/enforcement/editDeputyOrder",params,success,error) //行政检查预约详情 export const getEnterpriseLawEnforcement = (id, success, error) => _get("/app/code/enforcement/getById/" + id,null,success,error) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 267e3e9..fc794a5 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -70,7 +70,6 @@ v-model="submitData.lawEnforcement" readonly label="执法部门" - :rules="[{ required: true, message: '必填项' }]" /> - + diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index c82b49a..fe704f8 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -90,7 +90,7 @@ show-word-limit /> - + @@ -106,7 +106,7 @@ placeholder="请选择" show-word-limit readonly - @click="data.deptChecked=true" + @click="selectDepts" />
@@ -160,7 +160,7 @@ import { showSuccessToast } from 'vant'; import 'vant/es/toast/style'; - import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, getByIdToDataFillIn} from '../../api/administrative' + import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, editEnterpriseLawEnforcementDeputyOrder, getByIdToDataFillIn} from '../../api/administrative' import {queryUserInfo} from '../../api/enforce' import { queryEnterpriseInfoList } from '../../api/enterprise' import { reactive, ref } from "vue"; @@ -191,6 +191,7 @@ checked: false, deptChecked: false, deptContent: '', + mainDeputyOrder: 1, }); //保存参数 const submitData = reactive({ @@ -238,9 +239,8 @@ uniteCheck:"", }) - - const onConfirm = (time) => { + console.log(time) if(time != null) { var times = time.selectedValues; submitData.checkTime = times[0] +"-"+ times[1] +"-"+ times[2]; @@ -310,11 +310,21 @@ router.go(-1); }; + const selectDepts = () => { + if (data.mainDeputyOrder == 1) { + data.deptChecked=true; + } + } + const dataFillIn = (id) => { getByIdToDataFillIn(id,success =>{ console.log(success); //跳转企业二维码地址 if(success.success){ + console.log("==================") + console.log(success.data) + console.log("==================") + data.mainDeputyOrder = success.data.mainDeputyOrder; Object.keys(submitData).forEach((item) => { submitData[item] = success.data[item] ? success.data[item] : ""; }) @@ -371,18 +381,33 @@ submitData.deptTexts = ""; submitData.deptObjs = []; } - editEnterpriseLawEnforcement(submitData,success =>{ - //跳转企业二维码地址 - if(success.success){ - showSuccessToast('登记成功'); - router.push( - { - path: "/appointmentList" - }); - } - },error=>{ - console.log("登记失败") - }) + if(data.mainDeputyOrder == 0) { + editEnterpriseLawEnforcementDeputyOrder(submitData,success =>{ + //跳转企业二维码地址 + if(success.success){ + showSuccessToast('登记成功'); + router.push( + { + path: "/appointmentList" + }); + } + },error=>{ + console.log("登记失败") + }) + } else { + editEnterpriseLawEnforcement(submitData,success =>{ + //跳转企业二维码地址 + if(success.success){ + showSuccessToast('登记成功'); + router.push( + { + path: "/appointmentList" + }); + } + },error=>{ + console.log("登记失败") + }) + } } const getLinkageByValueAndParentId = (value, parentId) => { diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index 38abdbc..465a76c 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -1,6 +1,6 @@