diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 5174e47..8510535 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -31,7 +31,6 @@ :columns-type="data.columnsType" @confirm="onDateConfirm" @cancel="cancelSelectDate" - readonly /> @@ -61,7 +60,6 @@ placeholder="请选择年份" required @click="data.showDatePicker = true" - readonly />
diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index 6cef92f..6f7232e 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -60,9 +60,12 @@ listFinished: false, // 是否加载完成标识 }); const data = reactive({ - enterpriseNumber: route?.query?.enterpriseNumber, + enterpriseNumber: "", warningInfo: {}, - searchParam: {}, + searchParam: { + enterpriseNumber:"", + warnType: 0, + }, status: 0, TabId: 0, list: [ @@ -146,11 +149,14 @@ }; onMounted(() => { - getEnterpriseInformation(data.enterpriseNumber, success => { - if (null != success.rows) { + console.log(route?.query?.enterpriseNumber); + getEnterpriseInformation(route?.query?.enterpriseNumber, success => { + if (success.success) { console.log(success.data); data.searchParam.enterpriseNumber = success.data.enterpriseNumber; + data.enterpriseNumber = success.data.enterpriseNumber; data.searchParam.warnType = 1; + data.enterpriseNumber = success.data.enterpriseNumber; console.log(data.searchParam.enterpriseNumber); //查询企业历史检查案件 queryEarlyWarning(data.searchParam, success => { diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue index e4d57be..f56744a 100644 --- a/src/views/enforce/enterpriseWarningInfo.vue +++ b/src/views/enforce/enterpriseWarningInfo.vue @@ -96,6 +96,8 @@ const { useCommon, useShopCard } = $globalStore; const router = useRouter(); + //路由参数 + const route = useRoute(); let allchecked = ref(false); // 是否全选 let refreshLoad = ref(false); // 是否加载中 let value = ref('') @@ -147,6 +149,7 @@ const warnListInfoList = ref([]) // getCard(); // searchParam.enterpriseNumber = useCommon.enterpriseNumber; searchParam.enterpriseNumber = props.enterpriseNumber; + debugger queryList(); data.dateSearch = nowDate(new Date()); }); diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue index b0b4631..914e53b 100644 --- a/src/views/enforce/noScanFilter.vue +++ b/src/views/enforce/noScanFilter.vue @@ -101,7 +101,7 @@ const props = defineProps( { // } // }, onMounted(() =>{ - getDict({"dictType":"no-scan-reason","status": 0}, success => { + getDict({"dictType":"no-scan-reason"}, success => { if (success.success) { dicts.value.push(...success.data); } @@ -170,7 +170,7 @@ const props = defineProps( { query: { reason: reason.value, checkCss: checkCss.value, - enterpriseNumber: item.enterpriseNumber, + enterpriseNumber: item.salt, isNoScan: true, } }); @@ -231,10 +231,11 @@ const props = defineProps( { } .popup-content { - margin: 0.25rem 0 0 3%; + margin: 0.25rem 3% 0; padding-bottom: 3rem; width: 94%; - height: calc(100% - 1rem); + height: calc(100% - 1.6rem); + overflow-y: auto; font-size: 0.37rem; } @@ -243,7 +244,7 @@ const props = defineProps( { align-items: center; justify-content: space-between; margin: 1%; - width: 97%; + width: 96%; height: 1.25rem; font-size: 0.37rem; } @@ -331,9 +332,7 @@ const props = defineProps( { .search-result { width: 100%; - height: calc(100% - 5rem); padding-bottom: 2rem; - overflow: auto; } .case-item {