parent
ce13296d4d
commit
3b70219747
@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="jnpf.mapper.SpaceMapper">
|
||||
|
||||
|
||||
<select id="querySpaceList" resultType="jnpf.entity.SpaceEntity">
|
||||
SELECT
|
||||
a.id,
|
||||
a.code,
|
||||
a.name,
|
||||
a.pid,
|
||||
a.description,
|
||||
a.type,
|
||||
a.space_num as spaceNum,
|
||||
a.space_area as spaceArea,
|
||||
a.space_type as spaceType,
|
||||
a.state,
|
||||
a.unit_price as unitPrice,
|
||||
a.lease_start_time as leaseStartTime,
|
||||
a.lease_end_ime as leaseEndIme,
|
||||
a.sort,
|
||||
a.remark,
|
||||
a.f_creator_time as createTime,
|
||||
a.f_creator_user_id as creatorUserId,
|
||||
a.f_last_modify_time as laseModifyTime,
|
||||
a.f_last_modify_user_id as lastModifyUserId,
|
||||
a.f_delete_time as deleteTime,
|
||||
a.f_delete_user_id as deleteUserId,
|
||||
a.f_delete_mark as deleteMark,
|
||||
a.f_tenant_id as tenantId,
|
||||
a.company_id as companyId,
|
||||
a.department_id as departmentId,
|
||||
a.organize_json_id as organizeJsonId,
|
||||
a.f_version as version,
|
||||
a.f_flow_id as flowId,
|
||||
b.name as areaName,
|
||||
case a.state
|
||||
when '10' then '待租'
|
||||
when '20' then '已租'
|
||||
when '30' then '装修'
|
||||
when '40' then '预约'
|
||||
end as state1,
|
||||
case a.space_type
|
||||
when '10' then '办公室'
|
||||
when '20' then '加工车间'
|
||||
end as spaceType1
|
||||
FROM
|
||||
yq_park_area_space a
|
||||
LEFT JOIN yq_park_area_space b on a.pid = b.id and b.f_delete_mark is null
|
||||
${ew.customSqlSegment}
|
||||
<if test="spacePagination.sidx != null and spacePagination.sidx != ''">
|
||||
ORDER BY ${spacePagination.sidx} ${spacePagination.sort}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
</mapper>
|
File diff suppressed because one or more lines are too long
@ -0,0 +1,171 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="详情"
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:visible.sync="visible"
|
||||
class="JNPF-dialog JNPF-dialog_center"
|
||||
lock-scroll
|
||||
width="1000px"
|
||||
>
|
||||
<el-row :gutter="15" class="">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="dataForm"
|
||||
size="small"
|
||||
label-width="100px"
|
||||
label-position="right"
|
||||
>
|
||||
<template v-if="!loading">
|
||||
<!-- <el-col :span="24">
|
||||
<jnpf-form-tip-item label="区域名称" prop="pid">
|
||||
<p>{{ dataForm.pid }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col> -->
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="空间编码" prop="code">
|
||||
<p>{{ dataForm.code }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="空间名称" prop="name">
|
||||
<p>{{ dataForm.name }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="空间面积" prop="spaceArea">
|
||||
<JnpfNumber
|
||||
v-model="dataForm.spaceArea"
|
||||
placeholder="数字文本"
|
||||
disabled
|
||||
:step="1"
|
||||
addonAfter="m²"
|
||||
>
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="空间类型" prop="spaceType">
|
||||
<p>{{ dataForm.spaceType }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="单价" prop="unitPrice">
|
||||
<JnpfNumber
|
||||
v-model="dataForm.unitPrice"
|
||||
placeholder="数字文本"
|
||||
disabled
|
||||
:step="1"
|
||||
addonAfter="元/m²"
|
||||
>
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<jnpf-form-tip-item label="状态" prop="state">
|
||||
<p>{{ dataForm.state }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<jnpf-form-tip-item label="备注" prop="remark">
|
||||
<p>{{ dataForm.remark }}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</template>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false"> 取 消</el-button>
|
||||
</span>
|
||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import request from "@/utils/request";
|
||||
|
||||
import { getConfigData } from "@/api/onlineDev/visualDev";
|
||||
import jnpf from "@/utils/jnpf";
|
||||
import Detail from "@/views/basic/dynamicModel/list/detail";
|
||||
import { thousandsFormat } from "@/components/Generator/utils/index";
|
||||
export default {
|
||||
components: { Detail },
|
||||
props: [],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
detailVisible: false,
|
||||
loading: false,
|
||||
|
||||
dataForm: {
|
||||
id: "",
|
||||
pid: "",
|
||||
code: "",
|
||||
name: "",
|
||||
spaceArea: "",
|
||||
spaceType: "",
|
||||
unitPrice: "",
|
||||
state: "10",
|
||||
remark: "",
|
||||
type: "3"
|
||||
},
|
||||
spaceTypeOptions: [
|
||||
{ fullName: "办公室", id: "10" },
|
||||
{ fullName: "加工车间", id: "20" }
|
||||
],
|
||||
spaceTypeProps: { label: "fullName", value: "id" },
|
||||
stateOptions: [
|
||||
{ fullName: "待租", id: "10" },
|
||||
{ fullName: "已租", id: "20" },
|
||||
{ fullName: "装修", id: "30" },
|
||||
{ fullName: "预约", id: "40" }
|
||||
],
|
||||
stateProps: { label: "fullName", value: "id" },
|
||||
typeOptions: [
|
||||
{ fullName: "园区", id: "1" },
|
||||
{ fullName: "区域", id: "2" },
|
||||
{ fullName: "空间", id: "3" }
|
||||
],
|
||||
typeProps: { label: "fullName", value: "id" }
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {},
|
||||
mounted() {},
|
||||
methods: {
|
||||
toDetail(defaultValue, modelId) {
|
||||
if (!defaultValue) return;
|
||||
getConfigData(modelId).then(res => {
|
||||
if (!res.data || !res.data.formData) return;
|
||||
let formData = JSON.parse(res.data.formData);
|
||||
formData.popupType = "general";
|
||||
this.detailVisible = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.Detail.init(formData, modelId, defaultValue);
|
||||
});
|
||||
});
|
||||
},
|
||||
dataInfo(dataAll) {
|
||||
let _dataAll = dataAll;
|
||||
this.dataForm = _dataAll;
|
||||
},
|
||||
|
||||
init(id) {
|
||||
this.dataForm.id = id || 0;
|
||||
this.visible = true;
|
||||
this.$nextTick(() => {
|
||||
if (this.dataForm.id) {
|
||||
this.loading = true;
|
||||
request({
|
||||
url: "/api/example/Space/detail/" + this.dataForm.id,
|
||||
method: "get"
|
||||
}).then(res => {
|
||||
this.dataInfo(res.data);
|
||||
this.loading = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,156 +0,0 @@
|
||||
<template>
|
||||
<transition name="el-zoom-in-center">
|
||||
<div class="JNPF-preview-main">
|
||||
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
|
||||
<div class="JNPF-common-page-header">
|
||||
<el-page-header @back="goBack"
|
||||
content="详情"/>
|
||||
<div class="options">
|
||||
<el-button @click="goBack">取 消</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
|
||||
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
|
||||
<template v-if="!loading">
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="区域名称"
|
||||
prop="regionId" >
|
||||
<p>{{dataForm.regionId}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="空间编码"
|
||||
prop="spaceCode" >
|
||||
<p>{{dataForm.spaceCode}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="空间名称"
|
||||
prop="spaceName" >
|
||||
<p>{{dataForm.spaceName}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="空间面积"
|
||||
prop="spaceArea" >
|
||||
<JnpfNumber v-model="dataForm.spaceArea"
|
||||
placeholder="数字文本" disabled
|
||||
:step="1" addonAfter="m²" >
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="空间类型"
|
||||
prop="spaceType" >
|
||||
<p>{{ dataForm.spaceType }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="单价"
|
||||
prop="unitPrice" >
|
||||
<JnpfNumber v-model="dataForm.unitPrice"
|
||||
placeholder="数字文本" disabled
|
||||
:step="1" addonAfter="元/m²" >
|
||||
</JnpfNumber>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="12" >
|
||||
<jnpf-form-tip-item label="状态"
|
||||
prop="state" >
|
||||
<p>{{ dataForm.state }} </p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
<el-col :span="24" >
|
||||
<jnpf-form-tip-item label="备注"
|
||||
prop="remark" >
|
||||
<p>{{dataForm.remark}}</p>
|
||||
</jnpf-form-tip-item>
|
||||
</el-col>
|
||||
</template>
|
||||
</el-form>
|
||||
</el-row>
|
||||
</div>
|
||||
</transition>
|
||||
</template>
|
||||
<script>
|
||||
import request from '@/utils/request'
|
||||
|
||||
import { getConfigData } from '@/api/onlineDev/visualDev'
|
||||
import jnpf from '@/utils/jnpf'
|
||||
import Detail from '@/views/basic/dynamicModel/list/detail'
|
||||
import { thousandsFormat } from "@/components/Generator/utils/index"
|
||||
export default {
|
||||
components: { Detail},
|
||||
props: [],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
detailVisible: false,
|
||||
loading: false,
|
||||
|
||||
dataForm: {
|
||||
id :'',
|
||||
regionId : "",
|
||||
spaceCode : '',
|
||||
spaceName : '',
|
||||
spaceArea : '',
|
||||
spaceType : "",
|
||||
unitPrice : '',
|
||||
state : "10",
|
||||
remark : '',
|
||||
},
|
||||
spaceTypeOptions:[{"fullName":"办公室","id":"10"},{"fullName":"加工车间","id":"20"}],
|
||||
spaceTypeProps:{"label":"fullName","value":"id" },
|
||||
stateOptions:[{"fullName":"待租","id":"10"},{"fullName":"已租","id":"20"},{"fullName":"装修","id":"30"},{"fullName":"预约","id":"40"}],
|
||||
stateProps:{"label":"fullName","value":"id" },
|
||||
|
||||
}
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
toDetail(defaultValue, modelId) {
|
||||
if (!defaultValue) return
|
||||
getConfigData(modelId).then(res => {
|
||||
if (!res.data || !res.data.formData) return
|
||||
let formData = JSON.parse(res.data.formData)
|
||||
formData.popupType = 'general'
|
||||
this.detailVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.Detail.init(formData, modelId, defaultValue)
|
||||
})
|
||||
})
|
||||
},
|
||||
dataInfo(dataAll){
|
||||
let _dataAll =dataAll
|
||||
this.dataForm = _dataAll
|
||||
},
|
||||
|
||||
goBack() {
|
||||
this.$emit('refresh')
|
||||
},
|
||||
init(id) {
|
||||
this.dataForm.id = id || 0;
|
||||
this.visible = true;
|
||||
this.$nextTick(() => {
|
||||
if(this.dataForm.id){
|
||||
this.loading = true
|
||||
request({
|
||||
url: '/api/example/Spatial/detail/'+this.dataForm.id,
|
||||
method: 'get'
|
||||
}).then(res => {
|
||||
this.dataInfo(res.data)
|
||||
this.loading = false
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
</script>
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue