From 9f21c588d43cccd2fc894cedce8a41dc13b3792b Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Tue, 6 Aug 2024 16:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=80=89=E7=94=A8=E6=88=B7=E5=88=A0?=
=?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/administrative/appointment.vue | 64 +++++++++--
src/views/administrative/appointmentEdit.vue | 45 +++++++-
src/views/enforce/enforcementPlan.vue | 2 +-
src/views/enforce/enforcementPlanAdd.vue | 5 +-
src/views/enforce/sign.vue | 105 +++++++++++++------
5 files changed, 173 insertions(+), 48 deletions(-)
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index d4e00c6..523bf8e 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -99,14 +99,17 @@
readonly
label="执法人员"
/>
-
+
增加执法人员
@@ -205,6 +208,12 @@
{{data.notifyContent}}
+
+
+
+
@@ -250,6 +259,7 @@
deptContent: '',
notifyShow: false,
notifyContent: "",
+ overlayShow: false,
tempDate: null,
lawCerFlag: 0,
lawCer:[{ text:"", id:"", show:"", num:"" }],
@@ -349,6 +359,9 @@
console.log('failed', errorInfo);
};
+ const cancelUser = (index) =>{
+ data.lawCer.splice(index, 1);
+ }
const addLawCer = () =>{
data.lawCer.push({ text:"", id:"", show:"", num:"" });
}
@@ -442,6 +455,11 @@
}
const tmpSave = () => {
+ if (submitData.enterpriseName == ""
+ || submitData.linkMan == ""
+ || submitData.linkTel == ""
+ || submitData.checkTime == "") { return null; }
+ data.overlayShow = true; // 遮罩层
submitData.lawCertificateNum = null;
submitData.isUnite = 0;
if (data.checked) { submitData.isUnite = 1; }
@@ -461,6 +479,7 @@
submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
addEnterpriseLawEnforcement(submitData, success => {
+ data.overlayShow = false;
//跳转企业二维码地址
if (success.success) {
showSuccessToast('保存成功');
@@ -475,6 +494,11 @@
}
const submit112 = () => {
+ if (submitData.enterpriseName == ""
+ || submitData.linkMan == ""
+ || submitData.linkTel == ""
+ || submitData.checkTime == "") { return null; }
+ data.overlayShow = true; // 遮罩层
// showSuccessToast('登记成功');
submitData.lawCertificateNum = null;
submitData.isUnite = 0;
@@ -495,6 +519,7 @@
submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
editEnterpriseLawEnforcement(submitData, success => {
+ data.overlayShow = false;
//跳转企业二维码地址
if (success.success) {
showSuccessToast('登记成功');
@@ -729,7 +754,30 @@
color: #323233;
}
+ .wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ }
+ .block {
+ width: 120px;
+ height: 120px;
+ text-align: center;
+ }
+ .item-delete {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 1% 4.5%;
+ width: 100%;
+ background: #f3f4f5;
+ line-height: 2.0;
+ font-size: 0.3rem;
+ color: #999;
+ box-sizing: border-box;
+ }
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index aadcaa4..4908063 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -96,7 +96,9 @@
readonly
label="执法人员"
/>
-
+
+
+
增加执法人员
@@ -192,6 +195,12 @@
+
+
+
+
@@ -230,6 +239,7 @@
checked: false,
deptChecked: false,
deptContent: '',
+ overlayShow: false,
mainDeputyOrder: 1,
lawCerFlag: 0,
lawCer:[{ text:"", id:"", show:"", num:"" }],
@@ -446,7 +456,11 @@
}
const tmpSave = () => {
- showSuccessToast('临时保存');
+ if (submitData.enterpriseName == ""
+ || submitData.linkMan == ""
+ || submitData.linkTel == ""
+ || submitData.checkTime == "") { return null; }
+ data.overlayShow = true; // 遮罩层
submitData.isUnite = 0;
if (data.checked) {
submitData.isUnite = 1;
@@ -470,9 +484,10 @@
submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
addEnterpriseLawEnforcement(submitData,success =>{
+ data.overlayShow = false; // 遮罩层
//跳转企业二维码地址
if(success.success){
- showSuccessToast('保存成功');
+ showSuccessToast('临时保存成功');
router.push(
{
path: "/appointmentList"
@@ -484,7 +499,11 @@
}
const submit112 = () =>{
- showSuccessToast('登记成功');
+ if (submitData.enterpriseName == ""
+ || submitData.linkMan == ""
+ || submitData.linkTel == ""
+ || submitData.checkTime == "") { return null; }
+ data.overlayShow = true; // 遮罩层
submitData.isUnite = 0;
if (data.checked) {
submitData.isUnite = 1;
@@ -509,6 +528,7 @@
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
if(data.mainDeputyOrder == 0) {
editEnterpriseLawEnforcementDeputyOrder(submitData,success =>{
+ data.overlayShow = false; // 遮罩层
//跳转企业二维码地址
if(success.success){
showSuccessToast('登记成功');
@@ -522,6 +542,7 @@
})
} else {
editEnterpriseLawEnforcement(submitData,success =>{
+ data.overlayShow = false; // 遮罩层
//跳转企业二维码地址
if(success.success){
showSuccessToast('登记成功');
@@ -536,6 +557,9 @@
}
}
+ const cancelUser = (index) =>{
+ data.lawCer.splice(index, 1);
+ }
const addLawCer = () =>{
data.lawCer.push({ text:"", id:"", show:"", num:"" });
}
@@ -724,4 +748,17 @@
margin-left: -0.1rem;
}
+ .item-delete {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 1% 4.5%;
+ width: 100%;
+ background: #f3f4f5;
+ line-height: 2.0;
+ font-size: 0.3rem;
+ color: #999;
+ box-sizing: border-box;
+ }
+
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 935565d..135ae43 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -11,7 +11,7 @@
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 2776d09..bc14b31 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -161,8 +161,8 @@
fieldValue: "年度",
dateColumns: [
{ text: '年度', value: 'year' },
- { text: '月度', value: 'month' },
{ text: '季度', value: 'quarter' },
+ { text: '月度', value: 'month' },
],
showIsPublish:false,
});
@@ -340,10 +340,7 @@
console.log(data.showDatePicker)
}
const onDateConfirm = (value) => {
- console.log(value);
-
value.selectedValues.forEach((item, index) => {
- console.log(item);
submitData.planYear = item;
});
// submitData.establishmentTime = "2023-04-21"
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 98f435a..8a69176 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -33,23 +33,25 @@
required
:rules="[{ required: true, message: '请加载执法人员' }]"
/>
-
-
-
+
+
+
+
+
+
+
+
+
增加执法人员
-
-
+
+
+
+
+
+
+
+
+
+
+
增加检查依据
@@ -258,6 +272,12 @@
+
+
+
+
@@ -325,6 +345,7 @@ const data = reactive({
showNom: false,
minDate: null,
maxDate: null,
+ overlayShow: false,
fileListObj: [],
});
var fileSize = 0;
@@ -625,7 +646,7 @@ const dataFillIn = () => {
}
const tmpSave = () => {
- showSuccessToast('临时保存');
+ data.overlayShow = true; // 遮罩层
submitData.userId = useCommon.userId;
// 处理回显附件
@@ -656,9 +677,10 @@ const tmpSave = () => {
submitData.lawEnforcerIdTwo = submitData.lawEnforcerIdTwo.substring(0, submitData.lawEnforcerIdTwo.length - 1);
submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
addEnforcementRegistration(submitData,success =>{
+ data.overlayShow = false; // 遮罩层
//跳转企业二维码地址
if(success.success){
- showSuccessToast('保存成功');
+ showSuccessToast('临时保存成功');
router.push({ path: "/enforceHome" });
}
},error=>{
@@ -667,6 +689,7 @@ const tmpSave = () => {
}
const submit = (type) =>{
+ data.overlayShow = true; // 遮罩层
submitData.isSubmit = type;
submitData.userId = useCommon.userId;
@@ -700,6 +723,7 @@ const submit = (type) =>{
form.value.validate().then(() => {
editEnforcementRegistration(submitData, success => {
+ data.overlayShow = false; // 遮罩层
//跳转首页
if (success.success) {
showSuccessToast('登记成功');
@@ -711,7 +735,6 @@ const submit = (type) =>{
});
}
-
const currentDate =() => {
const now = new Date();
const year = now.getFullYear();
@@ -765,9 +788,15 @@ const showPopupqz = (flag) =>{
data.lawCliekFlag = flag;
data.popupVisibleqz = true;
}
+const cancelEnforcement = (index) =>{
+ data.lawList.splice(index, 1);
+}
const addField = () =>{
data.lawList.push({ text:"", id:"", "show":"" });
}
+const cancelUser = (index) =>{
+ data.lawCer.splice(index, 1);
+}
const addLawCer = () =>{
data.lawCer.push({ text:"", id:"" });
}
@@ -777,6 +806,7 @@ const closePopup = () =>{
data.popupVisibleqz = false;
data.lawChecked = false;
}
+
const reciveData = (item) =>{
data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName;
@@ -1040,4 +1070,17 @@ const beforeRead = (file) =>{
color: #1367fe;
}
+.wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+
+.block {
+ width: 120px;
+ height: 120px;
+ text-align: center;
+}
+