yangshiqiang
/
NX-zhihui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面优化

Browse Source
master
vayne 3 months ago
parent 3b70219747
commit 548524916b
6 changed files with 158 additions and 42 deletions
Show Stats Download Patch File Download Diff File

34
jnpf-java-boot/jnpf-web/src/views/scm/area/form.vue
Unescape View File

@ -6,7 +6,7 @@
:visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
width="1000px"
width="800px"
>
<el-row :gutter="15" class="">
<el-form
@ -31,7 +31,7 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="12">
<el-col :span="24">
<jnpf-form-tip-item label="区域编码" prop="code">
<JnpfInput
v-model="dataForm.code"
@ -39,22 +39,12 @@
placeholder="请输入"
clearable
:style="{ width: '100%' }"
:disabled="disFlag"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="空间数量" prop="spaceNum">
<JnpfInputNumber
v-model="dataForm.spaceNum"
@change="changeData('spaceNum', -1)"
placeholder="数字文本"
:step="1"
>
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<jnpf-form-tip-item label="区域名称" prop="name">
<JnpfInput
v-model="dataForm.name"
@ -66,6 +56,18 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="空间数量" prop="spaceNum">
<el-input-number
v-model="dataForm.spaceNum"
@change="changeData('spaceNum', -1)"
placeholder="数字文本"
:step="1"
:style="{ width: '100%' }"
>
</el-input-number>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="区域描述" prop="description">
<JnpfInput
@ -146,6 +148,7 @@ export default {
props: [],
data() {
return {
disFlag: false,
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
@ -313,6 +316,9 @@ export default {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
},
init(id, isDetail, allList, treeActiveId) {
if (id) {
this.disFlag = true;
}
this.prevDis = false;
this.nextDis = false;
this.allList = allList || [];

45
jnpf-java-boot/jnpf-web/src/views/scm/area/index.vue
Unescape View File

@ -126,23 +126,54 @@
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column prop="parkName" label="园区名称" align="left">
<el-table-column
prop="parkName"
label="园区名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="code" label="区域编码" align="left">
<el-table-column
prop="code"
label="区域编码"
align="center"
width="200"
>
</el-table-column>
<el-table-column prop="spaceNum" label="空间数量" align="left">
<el-table-column
prop="spaceNum"
label="空间数量"
align="center"
width="100"
>
<template slot-scope="scope" v-if="scope.row.spaceNum">
<JnpfNumber v-model="scope.row.spaceNum" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="name" label="区域名称" align="left">
<el-table-column
prop="name"
label="区域名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="description" label="区域描述" align="left">
<el-table-column
prop="description"
label="区域描述"
align="center"
width="500"
>
</el-table-column>
<el-table-column prop="remark" label="备注" align="left">
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑

11
jnpf-java-boot/jnpf-web/src/views/scm/park/form.vue
Unescape View File

@ -19,7 +19,7 @@
>
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="12">
<el-col :span="24">
<jnpf-form-tip-item label="园区编码" prop="code">
<JnpfInput
v-model="dataForm.code"
@ -27,11 +27,12 @@
placeholder="请输入"
clearable
:style="{ width: '100%' }"
:disabled="disFlag"
>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<jnpf-form-tip-item label="园区名称" prop="name">
<JnpfInput
v-model="dataForm.name"
@ -43,7 +44,7 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<jnpf-form-tip-item label="园区描述" prop="description">
<JnpfInput
v-model="dataForm.description"
@ -123,6 +124,7 @@ export default {
props: [],
data() {
return {
disFlag: false,
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
@ -279,6 +281,9 @@ export default {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
},
init(id, isDetail, allList) {
if (id) {
this.disFlag = true;
}
this.prevDis = false;
this.nextDis = false;
this.allList = allList || [];

26
jnpf-java-boot/jnpf-web/src/views/scm/park/index.vue
Unescape View File

@ -77,16 +77,32 @@
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column prop="code" label="园区编码" align="left">
<el-table-column
prop="code"
label="园区编码"
align="center"
width="400"
>
</el-table-column>
<el-table-column prop="name" label="园区名称" align="left">
<el-table-column
prop="name"
label="园区名称"
align="center"
width="400"
>
</el-table-column>
<el-table-column prop="description" label="园区描述" align="left">
<el-table-column prop="description" label="园区描述" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="left">
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑

25
jnpf-java-boot/jnpf-web/src/views/scm/space/form.vue
Unescape View File

@ -39,6 +39,7 @@
placeholder="请输入"
clearable
:style="{ width: '100%' }"
:disabled="disFlag"
>
</JnpfInput>
</jnpf-form-tip-item>
@ -57,14 +58,14 @@
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="空间面积" prop="spaceArea">
<JnpfInputNumber
<JnpfInput
v-model="dataForm.spaceArea"
@change="changeData('spaceArea', -1)"
placeholder="数字文本"
addonAfter="m²"
:step="1"
>
</JnpfInputNumber>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
@ -83,14 +84,14 @@
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="单价" prop="unitPrice">
<JnpfInputNumber
<JnpfInput
v-model="dataForm.unitPrice"
@change="changeData('unitPrice', -1)"
placeholder="数字文本"
addonAfter="元/m²"
:step="1"
>
</JnpfInputNumber>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
@ -175,6 +176,7 @@ export default {
props: [],
data() {
return {
disFlag: false,
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
@ -237,6 +239,11 @@ export default {
required: true,
message: "数字文本",
trigger: ["blur", "change"]
},
{
pattern: /^\d+$/,
message: "请输入正确的数字",
trigger: "blur"
}
],
spaceType: [
@ -245,6 +252,13 @@ export default {
message: "请选择",
trigger: "change"
}
],
unitPrice: [
{
pattern: /^\d+$/,
message: "请输入正确的数字",
trigger: "blur"
}
]
},
spaceTypeOptions: [
@ -372,6 +386,9 @@ export default {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
},
init(id, isDetail, allList, treeActiveId) {
if (id) {
this.disFlag = true;
}
this.prevDis = false;
this.nextDis = false;
this.allList = allList || [];

59
jnpf-java-boot/jnpf-web/src/views/scm/space/index.vue
Unescape View File

@ -126,36 +126,77 @@
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
>
<el-table-column prop="areaName" label="区域名称" align="left">
<el-table-column
prop="areaName"
label="区域名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column label="状态" prop="state1" algin="left">
<el-table-column
label="状态"
prop="state1"
align="center"
width="100"
>
<template slot-scope="scope">
{{ scope.row.state1 }}
</template>
</el-table-column>
<el-table-column prop="code" label="空间编码" align="left">
<el-table-column
prop="code"
label="空间编码"
align="center"
width="200"
>
</el-table-column>
<el-table-column prop="name" label="空间名称" align="left">
<el-table-column
prop="name"
label="空间名称"
align="center"
width="250"
>
</el-table-column>
<el-table-column prop="spaceArea" label="空间面积" align="left">
<el-table-column
prop="spaceArea"
label="空间面积"
align="center"
width="120"
>
<template slot-scope="scope" v-if="scope.row.spaceArea">
<JnpfNumber v-model="scope.row.spaceArea" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="空间类型" prop="spaceType1" algin="left">
<el-table-column
label="空间类型"
prop="spaceType1"
align="center"
width="150"
>
<template slot-scope="scope">
{{ scope.row.spaceType1 }}
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" align="left">
<el-table-column
prop="unitPrice"
label="单价"
align="center"
width="120"
>
<template slot-scope="scope" v-if="scope.row.unitPrice">
<JnpfNumber v-model="scope.row.unitPrice" :thousands="false" />
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="left">
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column
label="操作"
fixed="right"
width="150"
align="center"
>
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑

Write Preview
Loading…
Cancel
Save