|
|
@@ -5,7 +5,7 @@
|
|
|
v-model="isDialogShow"
|
|
|
width="650px"
|
|
|
top="7%"
|
|
|
- title="申请账号"
|
|
|
+ :title="dialogTitle"
|
|
|
:close-on-click-modal="false"
|
|
|
:before-close="dialogBeforeClose"
|
|
|
style="overflow: auto; height: 700px"
|
|
|
@@ -61,15 +61,16 @@
|
|
|
:disabled="isView"
|
|
|
/> -->
|
|
|
<!--日期时间 formItem.describe-->
|
|
|
- <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1">
|
|
|
+ <span v-else-if="['date_time'].indexOf(formItem.frontType) > -1" style="width: 100%">
|
|
|
<el-date-picker
|
|
|
v-if="!isView"
|
|
|
type="datetime"
|
|
|
v-model="dataForm[formItem.name]"
|
|
|
value-format="x"
|
|
|
:placeholder="`请输入${formItem.alias}`"
|
|
|
+ style="width: 100%"
|
|
|
/>
|
|
|
- <span v-else>{{
|
|
|
+ <span v-else style="width: 100%">{{
|
|
|
dataForm[formItem.name] == "" ||
|
|
|
dataForm[formItem.name] == undefined ||
|
|
|
dataForm[formItem.name] == null
|
|
|
@@ -81,7 +82,7 @@
|
|
|
<!--整数类型 formItem.describe-->
|
|
|
<el-input-number
|
|
|
v-if="['int_num'].indexOf(formItem.frontType) > -1"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 100%"
|
|
|
v-model="dataForm[formItem.name]"
|
|
|
:placeholder="`请输入${formItem.alias}`"
|
|
|
:disabled="isView"
|
|
|
@@ -91,7 +92,7 @@
|
|
|
v-if="['float_num'].indexOf(formItem.frontType) > -1"
|
|
|
:min="formItem.min"
|
|
|
:max="formItem.max"
|
|
|
- style="width: 80%"
|
|
|
+ style="width: 100%"
|
|
|
v-model="dataForm[formItem.name]"
|
|
|
:placeholder="`请输入${formItem.alias}`"
|
|
|
:disabled="isView"
|
|
|
@@ -285,7 +286,7 @@
|
|
|
</span>
|
|
|
<template #tip>
|
|
|
<span class="el-upload__tip" style="display: inline-block; margin-left: 10px">
|
|
|
- {{ formItem.alias }}
|
|
|
+ {{ formItem.describe }}
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-upload>
|
|
|
@@ -339,7 +340,7 @@
|
|
|
</span>
|
|
|
<template #tip>
|
|
|
<span class="el-upload__tip" style="display: inline-block; margin-left: 10px">
|
|
|
- {{ formItem.alias }}
|
|
|
+ {{ formItem.describe }}
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-upload>
|
|
|
@@ -531,6 +532,7 @@ export default {
|
|
|
},
|
|
|
props: {
|
|
|
isShow: Boolean,
|
|
|
+ dialogTitle: String,
|
|
|
columnModel: Object,
|
|
|
column: Object,
|
|
|
item: Object,
|
|
|
@@ -623,7 +625,7 @@ export default {
|
|
|
that.item[data.name] = val;
|
|
|
}
|
|
|
} else if (["check", "select", "multiple_select"].indexOf(data.frontType) > -1) {
|
|
|
- that.item[data.name] = Number(that.item[data.name]);
|
|
|
+ that.item[data.name] = isNaN(Number(that.item[data.name])) ? '' : Number(that.item[data.name]);
|
|
|
} else if (["files", "picture", "audio", "video"].indexOf(data.frontType) > -1) {
|
|
|
if (!that.item[data.name]) return;
|
|
|
api
|