diff --git a/ruoyi-ui/src/api/data/computeResidenceRentPrice.js b/ruoyi-ui/src/api/data/computeResidenceRentPrice.js index fe25c589e..ad6bc3671 100644 --- a/ruoyi-ui/src/api/data/computeResidenceRentPrice.js +++ b/ruoyi-ui/src/api/data/computeResidenceRentPrice.js @@ -34,3 +34,10 @@ export function export2File(query) { params: query }) } + +export function getYearMonthList() { + return request({ + url: '/data/rentprice/residence/compute/yearmonth', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/data/lianJiaCommunity.js b/ruoyi-ui/src/api/data/lianJiaCommunity.js new file mode 100644 index 000000000..e75a4fcee --- /dev/null +++ b/ruoyi-ui/src/api/data/lianJiaCommunity.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +// 查询链家小区列表 +export function list(query) { + return request({ + url: '/data/adrdict/lianjia/list', + method: 'get', + params: query + }) +} + +// 查询链家小区详细 +export function get(id) { + return request({ + url: '/data/adrdict/lianjia/' + id, + method: 'get' + }) +} + +// 修改链家小区 +export function update(data) { + return request({ + url: '/data/adrdict/lianjia', + method: 'put', + data: data + }) +} + +// 导出链家小区 +export function export2File(query) { + return request({ + url: '/data/adrdict/lianjia/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/api/data/ultimateOfficeBasePrice.js b/ruoyi-ui/src/api/data/ultimateOfficeBasePrice.js index 3518a1663..08af4ce9b 100644 --- a/ruoyi-ui/src/api/data/ultimateOfficeBasePrice.js +++ b/ruoyi-ui/src/api/data/ultimateOfficeBasePrice.js @@ -1,7 +1,7 @@ import request from '@/utils/request' -// 查询【请填写功能名称】列表 -export function listUltimate(query) { +// 查询办公基价列表 +export function list(query) { return request({ url: '/data/compute/price/office/list', method: 'get', @@ -9,25 +9,16 @@ export function listUltimate(query) { }) } -// 查询【请填写功能名称】详细 -export function getUltimate(id) { +// 查询办公基价详细 +export function getById(yearMonth, id) { return request({ - url: '/data/compute/price/office/' + id, + url: '/data/compute/price/office/' + yearMonth + '/' + id, method: 'get' }) } -// // 新增【请填写功能名称】 -// export function addUltimate(data) { -// return request({ -// url: '/data/compute/price/office', -// method: 'post', -// data: data -// }) -// } - -// 修改【请填写功能名称】 -export function updateUltimate(data) { +// 修改办公基价 +export function update(data) { return request({ url: '/data/compute/price/office', method: 'put', @@ -35,19 +26,19 @@ export function updateUltimate(data) { }) } -// // 删除【请填写功能名称】 -// export function delUltimate(id) { -// return request({ -// url: '/data/compute/price/office/' + id, -// method: 'delete' -// }) -// } - -// 导出【请填写功能名称】 -export function exportUltimate(query) { +// 导出办公基价 +export function export2File(query) { return request({ url: '/data/compute/price/office/export', method: 'get', params: query }) } + +// 年月 +export function getYearMonthList() { + return request({ + url: '/data/compute/price/office/yearmonth', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/data/ultimateResidenceRentPrice.js b/ruoyi-ui/src/api/data/ultimateResidenceRentPrice.js new file mode 100644 index 000000000..41c472071 --- /dev/null +++ b/ruoyi-ui/src/api/data/ultimateResidenceRentPrice.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +// 查询最终住宅租赁基价列表 +export function list(query) { + return request({ + url: '/data/rentprice/residence/ultimate/list', + method: 'get', + params: query + }) +} + +// 查询最终住宅租赁基价详细 +export function get(id) { + return request({ + url: '/data/rentprice/residence/ultimate/' + id, + method: 'get' + }) +} + +// 修改最终住宅租赁基价 +export function update(data) { + return request({ + url: '/data/rentprice/residence/ultimate', + method: 'put', + data: data + }) +} + +// 导出最终住宅租赁基价 +export function export2File(query) { + return request({ + url: '/data/rentprice/residence/ultimate/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/data/basis/LianJiaCommunity.vue b/ruoyi-ui/src/views/data/basis/LianJiaCommunity.vue new file mode 100644 index 000000000..edcdb7f8f --- /dev/null +++ b/ruoyi-ui/src/views/data/basis/LianJiaCommunity.vue @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 修改 + + + 导出 + + + 导入 + + + + + + + + + + + {{scope.row.lianJiaCommunityUrl}} + + + + + {{scope.row.lianJiaUrl}} + + + + + + + + + + + + 修改 + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/data/price/ComputeResidenceRentPrice.vue b/ruoyi-ui/src/views/data/price/ComputeResidenceRentPrice.vue index 9ff7ffebf..066625f35 100644 --- a/ruoyi-ui/src/views/data/price/ComputeResidenceRentPrice.vue +++ b/ruoyi-ui/src/views/data/price/ComputeResidenceRentPrice.vue @@ -1,15 +1,15 @@ - - - + + + + + { - console.log(value); - if (value === "" || !isNaN(parseInt(value))) { + if (!value) { + callback(new Error("请输入年月")); + } else if (value === "" || isNaN(parseInt(value))) { callback(new Error("请输入年月")); } else { callback(); @@ -300,6 +302,7 @@ export default { pageIndex: 1, pageSize: 10 }, + yearMonthList: [], statusOptions: [ { value: 1, text: "正常" }, { value: 1, text: "失效" } @@ -322,13 +325,18 @@ export default { form: {}, // 表单校验 rules: { - yearMonth: [{ validator: checkYearMonth, trigger: "blur" }] + yearMonth: [ + { validator: checkYearMonth, trigger: "blur" }, + { validator: checkYearMonth, trigger: "change" } + ] } }; }, created() { this.loading = false; - // this.getList(); + getYearMonthList().then(response => { + this.yearMonthList = response.data; + }); }, methods: { yesOrNotFormatter: function(row, column, cellValue, index) { @@ -346,10 +354,10 @@ export default { return ""; }, /** 查询办公基价列表 */ - getList() { - this.loading = true; - this.$refs["queryForm"].validate(valid => { + getList(formName) { + this.$refs[formName].validate(valid => { if (valid) { + this.loading = true; list(this.queryParams).then(response => { this.dataList = response.rows; this.total = response.total; @@ -373,7 +381,7 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageIndex = 1; - this.getList(); + this.getList("queryForm"); }, /** 重置按钮操作 */ resetQuery() { diff --git a/ruoyi-ui/src/views/data/cases/UltimateOfficeBasePrice.vue b/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue similarity index 78% rename from ruoyi-ui/src/views/data/cases/UltimateOfficeBasePrice.vue rename to ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue index ce2f40e67..1ace6b2db 100644 --- a/ruoyi-ui/src/views/data/cases/UltimateOfficeBasePrice.vue +++ b/ruoyi-ui/src/views/data/price/UltimateOfficeBasePrice.vue @@ -1,14 +1,15 @@ - - - + + + + + - + + + + + + + + + + + + + @@ -208,15 +221,27 @@