都市项目建设、宅基地-乡镇

src/api/projectAudit.js

@@ -106,6 +106,16 @@ export function GetDsjsList(form,pageNum, pageSize) {
     }
   })
 }
+// 列表（时间参数）
+export function GetDsjsList2(form,pageNum, pageSize) {
+  return request({
+    url: `/dsxmjs/listbysb`,
+    method: "get",
+    params: {
+      ...form,pageNum, pageSize
+    }
+  })
+}
 
 //查看
 export function GetDsjsDetail(id) {
@@ -249,6 +259,18 @@ export function exportCityConstructionFile(params){
     }
   })
 }
+//都市项目建设导出（有时间参数）
+export function exportCityConstructionFile2(params){
+  return setConfigInstance({
+    method:'get',
+  })({
+    url:'/dsxmjs/exportbysb',
+
+    params:{
+     ...params
+    }
+  })
+}
 export function getDxsmAllYear(){
   return setConfigInstance({
     method:'get',

src/components/Pagination.vue

@@ -37,6 +37,7 @@ const props = defineProps({
 const emit = defineEmits(['pageChange'])
 
 function handlePageChange(page) {
+  // console.log(page);
   emit('pageChange', page)
 }
 

src/views/xmfzsb/projectConstruction/Index.vue

@@ -87,8 +87,8 @@ import { constructStateArr,HylyArr,SsksArr,XZArr } from '../../../utils/data/sel
 import { useRouter } from "vue-router";
 import {
   DeleteDsxm,
-  exportCityConstructionFile,
-  GetDsjsList,
+  exportCityConstructionFile, exportCityConstructionFile2,
+  GetDsjsList, GetDsjsList2,
   GetDsxmDetail,
   getDxsmAllYear
 } from '../../../api/projectAudit'
@@ -106,7 +106,8 @@ const data_detail = ref({})
 const previewIsShow = ref(false)
 const select_year = ref([])
 onMounted(() => {
-	toList()
+  console.log(11);
+  toList()
   getDxsmAllYear().then(res =>{
     let data = res.data
     data.sort((pre,cur) => {
@@ -175,11 +176,16 @@ function getExportTime(){
   }
 }
 function toList() {
-  console.log(getExportTime())
+  // console.log(getExportTime())
   tableData.value = []
   tableTotal.value = 0
   stateFilterAll.value[0].count = 0
-	GetDsjsList({
+  let isSj = false //是否包含时间参数
+  if(formInline.sbsj && formInline.sbsj[1] && formInline.sbsj[0]){
+    isSj = true
+  }
+  let fun = isSj ? GetDsjsList2 : GetDsjsList
+  fun({
     hyly:formInline.hyly,
     nd:formInline.nd,
     ssks:formInline.ssks,
@@ -190,10 +196,10 @@ function toList() {
     zzsbsj:formInline.sbsj && formInline.sbsj[0],
   },currentPage.value,pageSize.value).then(res => {
 
-		tableData.value = res.data.list
-		tableTotal.value = res.data.total
-		stateFilterAll.value[0].count = res.data.total
-	})
+    tableData.value = res.data.list
+    tableTotal.value = res.data.total
+    stateFilterAll.value[0].count = res.data.total
+  })
 }
  function exportList(){
   let exportArr = getExportTime()
@@ -201,8 +207,17 @@ function toList() {
      elAlert('只能导出半年左右数据')
      return
    }
+   let urlArr = []
+   let isSj = false //是否包含时间参数
+   if(formInline.sbsj && formInline.sbsj[1] && formInline.sbsj[0]){
+     isSj = true
+   }else{
+     exportArr.value = [[]]
+   }
+   console.log(exportArr.value);
+   let fun = isSj ? exportCityConstructionFile2 : exportCityConstructionFile
    exportArr.value.forEach(item => {
-     exportCityConstructionFile({
+     fun({
        hyly:formInline.hyly,
        nd:formInline.nd,
        ssks:formInline.ssks,
@@ -223,7 +238,21 @@ function toList() {
            isSuccess = false
          }
          if (isSuccess){
-           window.open(res.data,'_self')
+           urlArr.push(res.data)
+           // window.open(res.data,'_self') //使用window.open会被浏览器拦截，改成在iframe中打开
+           if(urlArr.length === exportArr.value.length){
+             console.log(urlArr);
+             let count = 0
+             for(let i = 0; i < urlArr.length; i++){
+               // window.open(url,'_blank')
+               let hiddenIFrameID = 'hiddenDownloader' + count++;
+               let iframe = document.createElement('iframe');
+               iframe.id = hiddenIFrameID;
+               iframe.style.display = 'none';
+               document.body.appendChild(iframe);
+               iframe.src = urlArr[i];//直接下载，不会弹出新的页面
+             }
+           }
          }else {
            showMessage({
              type:'error',

src/views/xmfzsb/projectDeclare/Check.vue

@@ -416,6 +416,8 @@ onMounted(() => {
       currentProcessInfo.value = 1
     }else if (res.data.xmshzt === '待业务科室审核'){
       currentProcessInfo.value = 2
+    }else if (res.data.xmshzt === '待委领导终审'){
+      currentProcessInfo.value = 3
     }
     if (res.data.xmshzt.includes('不通过')){
       finishStatus.value = 'error'

src/views/xmfzsb/projectDeclare/Index.vue

@@ -68,7 +68,7 @@
             <el-button link type="primary" @click="toDetail(scope.row)">查看</el-button>
             <el-button link type="primary" @click="toEdit(scope.row)" v-if="getRootFun('都市项目申报修改')">编辑</el-button>
 <!--            v-if="scope.row.xmshzt==='待业务科室审核'"-->
-            <el-button v-if="(scope.row.xmshzt==='待业务科室审核' && getRootFun('都市项目申报业务科室审核查看')) || (scope.row.xmshzt==='待产业科审核'&& getRootFun('都市项目申报产业科审核查看'))"  link type="primary" @click="toCheck(scope.row)">审核</el-button>
+            <el-button v-if="(scope.row.xmshzt==='待业务科室审核' && getRootFun('都市项目申报业务科室审核查看')) || (scope.row.xmshzt==='待产业科审核'&& getRootFun('都市项目申报产业科审核查看')) || (scope.row.xmshzt==='待委领导终审'&& getRootFun('都市项目申报委领导终审查看'))"  link type="primary" @click="toCheck(scope.row)">审核</el-button>
             <el-button  link type="primary" v-if="scope.row.xmshzt==='待批复' && getRootFun('都市项目申报批复添加')" @click="handleReply(scope.row)">批复</el-button>
             <el-button link type="danger" @click="toDelete(scope.row)" v-if="getRootFun('都市项目申报删除')">删除</el-button>
 

src/views/zjdfzsp/HomeSubApprove/Index.vue

@@ -109,13 +109,15 @@
 					<div>
 						<el-select @change="changeTown" v-model="sort_zjd.town" class="input-small">
 							<el-option label="全部街镇" value="all"></el-option>
-							<el-option v-for="item in zjd_select" :label="item.value" :key="item.value"
-								:value="item.value"></el-option>
+<!--							<el-option v-for="item in zjd_select" :label="item.value" :key="item.value"-->
+<!--								:value="item.value"></el-option>-->
+              <el-option v-for="item in townList" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 						<el-select v-model="sort_zjd.village" @change="changeVillage" class="input-small">
 							<el-option label="全部村" value="all"></el-option>
-							<el-option v-for="item in zjd_select.find(i => i.value === sort_zjd.town)?.children || []"
-								:label="item" :key="item" :value="item"></el-option>
+<!--							<el-option v-for="item in zjd_select.find(i => i.value === sort_zjd.town)?.children || []"-->
+<!--								:label="item" :key="item" :value="item"></el-option>-->
+              <el-option v-for="item in villageList" :key="item.value" :label="item.label" :value="item.value" />
 						</el-select>
 					</div>
 				</div>
@@ -435,6 +437,12 @@ import { searchAddress } from '@/api/ny'
 import PreviewPdf from "@/components/PreviewPdf.vue";
 import {getIsTrue} from "@/utils/math";
 import MyLegend from "@/components/MyLegend.vue";
+import {getAllTownMy} from "../../../api/projectAudit";
+import {GetTownVillageList} from "../../../api/landTransfer";
+
+const townList = ref([])
+const villageList = ref([])
+
 const isShowFullFileInfo = ref(false)
 const activeName = ref('info')
 const isMainPanleIsShow = ref(true)
@@ -484,7 +492,7 @@ function changeTown(town){
     clearTownAndVillageMap()
     // layerQueryGet(getLayerByName('镇界线').url, "name='" + '' + "'")
   }
-
+  getVillageList()
 }
 function getFidle(row,type){
   if (type === 'sfbl'){
@@ -593,6 +601,42 @@ function changePanel(item,type){
   panelOpenType.value.currentObj = item
   panelOpenType.value.type = type
 }
+
+//获取村
+function getVillageList() {
+  GetTownVillageList(2, sort_zjd.town).then(res => {
+    // console.log(res);
+    villageList.value = []
+    for (let item of res.data) {
+      villageList.value.push({
+        label: item,
+        value: item
+      })
+    }
+  })
+}
+//获取镇
+function getTownList() {
+  // GetTownVillageList(1, "").then(res => {
+  // 	// console.log(res);
+  // 	for (let item of res.data) {
+  // 		townList.value.push({
+  // 			label: item,
+  // 			value: item
+  // 		})
+  // 	}
+  // })
+  getAllTownMy().then(res => {
+    // console.log(res);
+    for (let item of res.data) {
+      townList.value.push({
+        label: item.name,
+        value: item.name
+      })
+    }
+  })
+}
+
 onMounted(() => {
 	createMap()
 	let allLayers = [
@@ -605,6 +649,9 @@ onMounted(() => {
 		...getLayerByName('航空影像').children,
 
 	]
+
+  getTownList()
+
 	watch(() => panelShow.search, (val) => {
 		if (val !== 'address') {
 			searchObj.town = ''