@@ -19,6 +19,7 @@ export function getVillageAffairs(id) { | |||||
// 查询地区下的账套列表 | // 查询地区下的账套列表 | ||||
export function bookListByDept(deptId, bookType) { | export function bookListByDept(deptId, bookType) { | ||||
console.log(deptId); | |||||
return request({ | return request({ | ||||
url: '/open/villageAffairs/public/bookList/' + deptId, | url: '/open/villageAffairs/public/bookList/' + deptId, | ||||
method: 'get', | method: 'get', | ||||
@@ -1229,12 +1229,29 @@ export function listSiyigongkai(query) { | |||||
}) | }) | ||||
} | } | ||||
// 查询四议两公开列表 | |||||
export function listSiyigongkaiOpen(query) { | |||||
return request({ | |||||
url: '/open/villageAffairs/public/siyigongkaiList', | |||||
method: 'get', | |||||
params: query | |||||
}) | |||||
} | |||||
// 查询四议两公开详细 | // 查询四议两公开详细 | ||||
export function getSiyigongkai(id) { | export function getSiyigongkai(id) { | ||||
return request({ | return request({ | ||||
url: '/subcontract/siyigongkai/get/' + id, | url: '/subcontract/siyigongkai/get/' + id, | ||||
method: 'get' | |||||
}) | |||||
} | |||||
// 查询四议两公开详细 | |||||
export function getSiyigongkaiOpen(id) { | |||||
return request({ | |||||
url: '/open/villageAffairs/public/siyigongkaiDetail', | |||||
method: 'get', | method: 'get', | ||||
params: arguments[1] || {} | |||||
params: { id } | |||||
}) | }) | ||||
} | } | ||||
@@ -99,6 +99,7 @@ import {bookListByDept} from "@/api/onlineHome/villageAffairs"; | |||||
bookVisbile:false, | bookVisbile:false, | ||||
bookList:[], | bookList:[], | ||||
bookId:"", | bookId:"", | ||||
deptId:"", | |||||
book:"", | book:"", | ||||
configValue:'' | configValue:'' | ||||
@@ -106,7 +107,6 @@ import {bookListByDept} from "@/api/onlineHome/villageAffairs"; | |||||
}, | }, | ||||
created() { | created() { | ||||
//console.log(this.$store) | //console.log(this.$store) | ||||
if(this.$route.query.bookId){ | if(this.$route.query.bookId){ | ||||
bookInfo(this.$route.query.bookId).then((res) => { | bookInfo(this.$route.query.bookId).then((res) => { | ||||
if (res.code == 200) { | if (res.code == 200) { | ||||
@@ -58,7 +58,7 @@ | |||||
<script> | <script> | ||||
import {Dialog, Toast} from "vant"; | import {Dialog, Toast} from "vant"; | ||||
import {listSiyigongkai, delSiyigongkai} from "@/api/sunVillage_info/fixedAssets"; | |||||
import {listSiyigongkai, delSiyigongkai, listSiyigongkaiOpen} from "@/api/sunVillage_info/fixedAssets"; | |||||
export default { | export default { | ||||
name: "otherOpenList", | name: "otherOpenList", | ||||
data() { | data() { | ||||
@@ -81,7 +81,7 @@ import {listSiyigongkai, delSiyigongkai} from "@/api/sunVillage_info/fixedAssets | |||||
finished: false, | finished: false, | ||||
applicationList:[], | applicationList:[], | ||||
listLength:'0', | listLength:'0', | ||||
showBtn:true, | |||||
showBtn:false, | |||||
}; | }; | ||||
}, | }, | ||||
created() { | created() { | ||||
@@ -92,20 +92,37 @@ import {listSiyigongkai, delSiyigongkai} from "@/api/sunVillage_info/fixedAssets | |||||
methods: { | methods: { | ||||
getList(){ | getList(){ | ||||
var _this = this; | var _this = this; | ||||
listSiyigongkai(_this.queryParams).then(response => { | |||||
_this.listLength = response.total; | |||||
response.rows.map(res=>{ | |||||
_this.applicationList.push(res); | |||||
}) | |||||
if (this.showBtn){ | |||||
listSiyigongkai(_this.queryParams).then(response => { | |||||
_this.listLength = response.total; | |||||
response.rows.map(res=>{ | |||||
_this.applicationList.push(res); | |||||
}) | |||||
if(_this.applicationList.length >= response.total){ | |||||
_this.finished = true; | |||||
return; | |||||
}else{ | |||||
_this.loading = false; | |||||
_this.queryParams.pageNum += 1 ; | |||||
} | |||||
}); | |||||
if(_this.applicationList.length >= response.total){ | |||||
_this.finished = true; | |||||
return; | |||||
}else{ | |||||
_this.loading = false; | |||||
_this.queryParams.pageNum += 1 ; | |||||
} | |||||
}); | |||||
}else{ | |||||
listSiyigongkaiOpen(_this.queryParams).then(response => { | |||||
_this.listLength = response.total; | |||||
response.rows.map(res=>{ | |||||
_this.applicationList.push(res); | |||||
}) | |||||
if(_this.applicationList.length >= response.total){ | |||||
_this.finished = true; | |||||
return; | |||||
}else{ | |||||
_this.loading = false; | |||||
_this.queryParams.pageNum += 1 ; | |||||
} | |||||
}); | |||||
} | |||||
}, | }, | ||||
viewItem(id){ | viewItem(id){ | ||||
this.$router.push({path:'/sunVillage_info/list_discussions_new_detail',query: {id:id,type:this.$route.query.typeX,showBtn:this.showBtn}}); | this.$router.push({path:'/sunVillage_info/list_discussions_new_detail',query: {id:id,type:this.$route.query.typeX,showBtn:this.showBtn}}); | ||||
@@ -41,7 +41,7 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import CommonUpload from "@/components/form/CommonUpload.vue"; | import CommonUpload from "@/components/form/CommonUpload.vue"; | ||||
import {getSiyigongkai} from "@/api/sunVillage_info/fixedAssets"; | |||||
import {getSiyigongkai,getSiyigongkaiOpen} from "@/api/sunVillage_info/fixedAssets"; | |||||
export default { | export default { | ||||
name: "otherOpenDetail", | name: "otherOpenDetail", | ||||
components: {CommonUpload}, | components: {CommonUpload}, | ||||
@@ -61,9 +61,15 @@ | |||||
}, | }, | ||||
methods: { | methods: { | ||||
getDetail() { | getDetail() { | ||||
getSiyigongkai(this.id).then((resp) => { | |||||
this.form = resp.data; | |||||
}); | |||||
if (this.showBtn){ | |||||
getSiyigongkai(this.id).then((resp) => { | |||||
this.form = resp.data; | |||||
}); | |||||
}else{ | |||||
getSiyigongkaiOpen(this.id).then((resp) => { | |||||
this.form = resp.data; | |||||
}); | |||||
} | |||||
}, | }, | ||||
back() { | back() { | ||||
this.$router.back(); | this.$router.back(); | ||||