diff --git a/src/api/enforce.js b/src/api/enforce.js index 30c6a31..ec021c3 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -65,6 +65,7 @@ export const queryRegistrationList = (params, success, error) => _get("/app/code //查询预警列表 // export const queryEarlyWarning = (params, success, error) => _get("/code/registration/queryEarlyWarning",params,success,error) export const queryEarlyWarning = (params, success, error) => _get("/app/code/LawEnforcementWarningList/queryList",params,success,error) + /** * 查询当前企业本月预警信息列表 * @param {*} params diff --git a/src/views/administrative/appointmentRelaunch.vue b/src/views/administrative/appointmentRelaunch.vue index f3a291b..5f78ab6 100644 --- a/src/views/administrative/appointmentRelaunch.vue +++ b/src/views/administrative/appointmentRelaunch.vue @@ -13,23 +13,27 @@ + + @@ -189,6 +198,7 @@ @@ -238,6 +248,7 @@ import { getDict } from "@/api/Home"; import { queryLinkage, queryLinkageDictByValueAndParentId } from "@/api/linkage"; import {uploadFile} from "@/util/fileUpload"; + import { formattedTimeYYYYmmdd } from "@/util/util"; //用户筛选弹窗 import UserPopup from './userFilter.vue'; import DeptPopup from './deptFilter.vue'; @@ -271,6 +282,7 @@ { text: '9:00 ~ 12:00', value: '1' }, { text: '14:00 ~ 17:00', value: '2' }, ], + minDate: null }); //保存参数 const submitData = reactive({ @@ -437,6 +449,21 @@ submitData.isSubmit =success.data['isSubmit']; submitData.bureauDeptName = success.data['bureauDeptName']; + let nowDate = formattedTimeYYYYmmdd(new Date()) + submitData.checkTime = nowDate; + + let dateArr = nowDate.split("-"); + console.log(dateArr) + // data.minDate = [dateArr[0],dateArr[1],dateArr[2]]; + var now = new Date(); + 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.minDate = ref(new Date(year, mon - 1, day)); + // data.minDate = ref(new Date(dateArr[0],dateArr[1]+1,dateArr[2])); // 是否联合执法 if (success.data.userObjs.length > 1) { data.checked = true; @@ -481,6 +508,7 @@ },error=>{}); // } } + },error=>{ console.log("保存失败") }) @@ -633,8 +661,6 @@ // 数据填充 dataFillIn(route?.query?.id); - - // getLinkageByValueAndParentId("check_item", "100"); // 查询检查要求字典信息 diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue index d64d427..1bfbc47 100644 --- a/src/views/administrative/deptFilter.vue +++ b/src/views/administrative/deptFilter.vue @@ -57,11 +57,11 @@
- +
- 行政执法监督处{{item.userName}} + {{ item.dept.deptName}}{{item.userName}}
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index 171092c..d1f8a75 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -66,7 +66,7 @@
-

{{ item.createTime }} +

{{ formattedTimeYYYYmmdd(item.createTime) }}

@@ -92,7 +92,7 @@
-
{{ t.createTime }}
+
{{ formattedTimeYYYYmmdd(t.createTime) }}
{{ t.warningCause }}
{{ t.warningLevel==1?"Ⅰ级 (严重)":t.warningLevel==2?"Ⅱ级 (较重)": @@ -137,7 +137,7 @@ diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index b542d24..318c702 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -22,59 +22,81 @@ -
执法信息 - -
- 联
-
+
+ -
- - -
+
+ + +
-
- +
+ 执法信息 + 联 +
+ +
+ -
- - -
+ +
- -
- - - + /> +
+ + +
--> + +
@@ -168,10 +190,19 @@ -
+
评价
+ + + + + 不满意 + 较满意 + 满意 +
+
+ +
+ +
+ 预览图片 + + + + +
+
@@ -197,6 +252,8 @@
+ +
@@ -213,6 +270,7 @@ import {getDict} from "@/api/Home"; import {queryLinkageById} from "@/api/linkage"; import {nameCorrect} from'@/util/fileUpload' import {selectRegistrationList } from '@/api/enterprise' +import { formattedTimeYYYYmmdd } from'@/util/util'; //用户筛选弹窗 // import Popup from './userFilter.vue'; @@ -236,6 +294,7 @@ const data = reactive({ imageList:[], show: ref(false), dataList:[], + evaluateImageList:[], }); //保存参数 const submitData = reactive({ @@ -280,6 +339,8 @@ const submitData = reactive({ authorization:0, lawFieldText:"", checkCategoryText:"", + uniteCheck:"", + inspectionEfficiency: 0, }) const tapGood = () => { @@ -342,6 +403,26 @@ const setAttr = () =>{ } },error=>{}); } +const setEvaluateFile = (id) =>{ + // 查询检查要求字典信息 + getAttr(id, success => { + if (success.data.filePreview != null) { + if(success.data.filePreview.fileList != null) { + for (var i=0; i{}); +} const onChange = (newIndex) => { index.value = newIndex; @@ -350,7 +431,7 @@ const onChange = (newIndex) => { //初始化参数,获取扫码的企业统一信用编码 onMounted(() =>{ - nameCorrect(); + // nameCorrect(); //查询执法登记信息 queryEnforcementRegistrationById(route?.query?.id,success =>{ submitData.enterpriseName = success.data.enterpriseName; @@ -374,7 +455,7 @@ onMounted(() =>{ // 执法类别 submitData.checkCategoryText = success.data.checkCategoryText; // 检查时间 - submitData.enforcementTime = success.data.enforcementTime; + submitData.enforcementTime = formattedTimeYYYYmmdd(success.data.enforcementTime); //评价信息 submitData.isEvaluate = success.data.isEvaluate; if (null != success.data.enterpriseEvaluate && "" != success.data.enterpriseEvaluate) { @@ -382,6 +463,8 @@ onMounted(() =>{ submitData.linkman = success.data.enterpriseEvaluate.linkman; submitData.linkmanTel = success.data.enterpriseEvaluate.linkmanTel; submitData.authorization = success.data.enterpriseEvaluate.authorization; + submitData.inspectionEfficiency = success.data.enterpriseEvaluate.inspectionEfficiency; + setEvaluateFile(success.data.enterpriseEvaluate.id) } if(success.data.reslut == 0){ @@ -420,6 +503,7 @@ onMounted(() =>{ } console.log(data.lawCer) } + submitData.uniteCheck = success.data.uniteCheck; // setLinkageItem(submitData.lawEnforcementItem); // setLinkageGA(submitData.lawEnforcementBasis); @@ -430,21 +514,23 @@ onMounted(() =>{ for (let index = 0; index < success.data.length; index++) { const element = success.data[index]; var arr = []; - arr.push(element.lawEnforcer); + arr.push(nameCorrect(element.lawEnforcer)); let tow = element.lawEnforcerTwo.split(","); - arr.push(...tow); + for (const key in tow) { + arr.push(nameCorrect(tow[key])); + } var obj = { "deptName": element.bureauDeptName, "deptId": element.bureauDeptId, "userList": arr } data.dataList.push(obj) - console.log(data.da) } },error =>{ }) } + console.log(data.dataList) },error=>{ @@ -801,7 +887,23 @@ export default { } /***/ +.eval-star { + margin: 0 0.7rem 0 0.2rem; + } + .eval-star i { + margin: 0 0.3rem; + color: #ddd; + font-size: 0.5rem; + } + + .eval-star i.active { + color: #fbb516; + } + .eval-star-font{ + font-weight: bold; + font-size: 0.4rem; + } diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index ec5458f..4d80d46 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -72,9 +72,9 @@
-
-

检查时间:{{ item.createTime }}

-
+
+

检查时间:{{ formattedTimeYYYYmmdd(item.createTime) }}

+
联
@@ -110,7 +110,7 @@

-
+
@@ -140,7 +140,7 @@