+
{{item.deptName}}{{item.userName}}
@@ -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;
+ }
+
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 974d44b..aadcaa4 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -5,7 +5,7 @@
-->
-
+
@@ -142,17 +142,18 @@
+
{{item.deptName}}{{item.userName}}
-
+
提交
发送
-
+
@@ -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;
+ }
+
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index d8d5929..4e8acd5 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/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;
});
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 1bae5c6..2776d09 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -102,9 +102,9 @@
/>
- 文件上传 (不多于9张)
+ 文件上传 (仅限PDF文档)
-
{{ file.name }}
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 9179af0..fba3913 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/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;
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 61cd92c..add67e9 100644
--- a/src/views/enforce/sign.vue
+++ b/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;
- }
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 27db390..a4f66ca 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -74,7 +74,7 @@
执法时间:{{ item.createTime }}
-
投诉