diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index 1c36ad8..d8cc358 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -61,8 +61,8 @@

预警级别: - {{ item.warningLevel==1?"Ⅰ级 (特别严重)":item.warningLevel==2?"Ⅱ级 (严重)": - item.warningLevel==3?"Ⅲ级 (较重)": "Ⅳ (一般)"}} + {{ item.warningLevel==1?"Ⅰ级 (严重)":item.warningLevel==2?"Ⅱ级 (较重)": + item.warningLevel==3?"Ⅲ级 (一般)": "Ⅳ (一般)"}}

@@ -109,7 +109,8 @@ //企业统一信用码 enterpriseNumber: ref(useCommon.enterpriseNumber), //搜索时间 - searchDate: ref() + searchDate: ref(), + warnType: 1, }); const data = reactive({ diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 3ec980f..09f3c90 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -80,7 +80,7 @@

执法区域: {{ item.enforcementArea }}

-

执法部门: {{ item.enforcementDepartment }} +

执法部门: {{ item.bureauDeptName }}

diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 34c204e..a5b997a 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -69,7 +69,7 @@

{{ item.lawEnforcementItemText }}

-

执法部门: {{ item.lawEnforcement }}

+

执法部门: {{ item.bureauDeptName }}

执法人员: {{ item.lawEnforcer }} , {{ diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index e2c6e81..7eae973 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -206,6 +206,13 @@ @cancel="gaCancel" /> + + + @@ -270,6 +277,9 @@ const data = reactive({ lawList: [{ text:"", id:"" }], lawCerFlag: 0, lawCer:[{ text:"", id:"" }], + lawFieldShow: false, + lawField_columns: [], + lawFieldText:"", }); var fileSize = 0; //保存参数 @@ -319,6 +329,8 @@ const submitData = reactive({ enforce: "", checkCss: "", enforceReason: "", + lawField:"", + }) const tapGood = () => { @@ -398,7 +410,9 @@ onMounted(() =>{ submitData.lawEnforcerId = success.data.userId submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; - submitData.bureauDeptName = success.data.dept.deptName; + //局级部门 + submitData.bureauDeptName = success.data.bureauDept.deptName; + submitData.bureauDeptId = success.data.bureauDept.deptId; } },error=>{ @@ -408,6 +422,15 @@ onMounted(() =>{ getLinkageByValueAndParentId("check_item", "100"); //初始化时间 submitData.enforcementTime = formattedTime(new Date()); + // getDict({},success =>{ + + // },error =>{}); + // 查询检查要求字典信息 + getDict({"dictType": "law_field"}, success => { + for(var i=0; i{}); }) // 返回 @@ -466,6 +489,7 @@ const itemChange =({ selectedOptions }) => { const gaCancel = () => { data.showGA = false; data.showItem = false; + data.lawFieldShow = false; } /* 检查要求 end */ diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue index 76fa00f..4acaafb 100644 --- a/src/views/enterprise/enterpriseInspectionDetail.vue +++ b/src/views/enterprise/enterpriseInspectionDetail.vue @@ -77,7 +77,7 @@ { submitData.remark = success.data.remark; submitData.isReg = success.data.isReg; submitData.status = success.data.status; + submitData.bureauDeptName = success.data.bureauDeptName; + submitData.bureauDeptId = success.data.bureauDeptId; setLinkageItem(submitData.checkItem); setLinkageGA(submitData.checkRequire);