Commit f14ed06e authored by 刘予佳's avatar 刘予佳

表单样式更改

parent 42cd36bd
...@@ -5,16 +5,11 @@ ...@@ -5,16 +5,11 @@
:style="item.styles" :style="item.styles"
:class="{ isDefects: defectsSet.includes(item.prop) }" :class="{ isDefects: defectsSet.includes(item.prop) }"
> >
<el-col <el-col :lg="item.width" :style="{ height: item.type === 'upload' ? '116px' : '53px' }">
:lg="item.width"
:style="{ height: item.type === 'upload' ? '116px' : '53px' }"
>
<div <div
v-if="showIndex || (configForms && configForms.showIndex)" v-if="showIndex || (configForms && configForms.showIndex)||item.showIndex"
:class="['formIndex', item.labelSuffix == '5' ? 'computeIndex' : '']" :class="['formIndex', item.labelSuffix == '5' ? 'computeIndex' : '']"
> >{{ item.labelSuffix || columnIndex + 1 }}</div>
{{ item.labelSuffix || columnIndex + 1 }}
</div>
<!-- <el-form-item <!-- <el-form-item
:label=" :label="
!hiddenLabel && item.label !hiddenLabel && item.label
...@@ -25,7 +20,7 @@ ...@@ -25,7 +20,7 @@
:prop="item.prop" :prop="item.prop"
:rules="item.rules" :rules="item.rules"
:class="isEmpty" :class="isEmpty"
> --> >-->
<el-form-item <el-form-item
:label="!hiddenLabel && item.label ? `${item.label}` : ''" :label="!hiddenLabel && item.label ? `${item.label}` : ''"
:label-width="item.labelWidth ? `${item.labelWidth}px` : ''" :label-width="item.labelWidth ? `${item.labelWidth}px` : ''"
...@@ -75,14 +70,9 @@ ...@@ -75,14 +70,9 @@
slot="append" slot="append"
class="toothBit" class="toothBit"
@click="openToothBit" @click="openToothBit"
>{{ item.append || "牙位" }}</el-button >{{ item.append || "牙位" }}</el-button>
> <template v-else-if="item.append" slot="append">{{ item.append }}</template>
<template v-else-if="item.append" slot="append"> <template v-if="item.prepend" slot="prepend">{{ item.prepend }}</template>
{{ item.append }}
</template>
<template v-if="item.prepend" slot="prepend">
{{ item.prepend }}
</template>
</el-input> </el-input>
<!-- 密码框 --> <!-- 密码框 -->
...@@ -105,12 +95,8 @@ ...@@ -105,12 +95,8 @@
" "
@blur="handleBlur" @blur="handleBlur"
> >
<template v-if="item.append" slot="append"> <template v-if="item.append" slot="append">{{ item.append }}</template>
{{ item.append }} <template v-if="item.prepend" slot="prepend">{{ item.prepend }}</template>
</template>
<template v-if="item.prepend" slot="prepend">
{{ item.prepend }}
</template>
</el-input> </el-input>
<!-- 文本域 --> <!-- 文本域 -->
...@@ -156,8 +142,7 @@ ...@@ -156,8 +142,7 @@
v-if="item.append" v-if="item.append"
class="el-input-group__append" class="el-input-group__append"
style="line-height: 28px" style="line-height: 28px"
>{{ item.append }}</span >{{ item.append }}</span>
>
</div> </div>
<!-- 单选框 --> <!-- 单选框 -->
...@@ -171,8 +156,7 @@ ...@@ -171,8 +156,7 @@
v-for="(opt, optIndex) in item.dicData" v-for="(opt, optIndex) in item.dicData"
:key="optIndex" :key="optIndex"
:label="opt.value" :label="opt.value"
>{{ opt.label }}</el-radio >{{ opt.label }}</el-radio>
>
</el-radio-group> </el-radio-group>
<!-- 多选框 --> <!-- 多选框 -->
...@@ -186,8 +170,7 @@ ...@@ -186,8 +170,7 @@
v-for="(opt, optIndex) in item.dicData" v-for="(opt, optIndex) in item.dicData"
:key="optIndex" :key="optIndex"
:label="opt.value" :label="opt.value"
>{{ opt.label }}</el-checkbox >{{ opt.label }}</el-checkbox>
>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
...@@ -359,8 +342,7 @@ ...@@ -359,8 +342,7 @@
<span <span
v-if="item.importantField && !getVwForm.detail" v-if="item.importantField && !getVwForm.detail"
class="important_field" class="important_field"
>{{ item.importantFieldDesc || "*" }}</span >{{ item.importantFieldDesc || "*" }}</span>
>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
<template> <template>
<div <div id="publicContent" :class="activeName == 'index0' && formClass ? formClass : ''">
id="publicContent"
:class="activeName == 'index0' && formClass ? formClass : ''"
>
<div v-if="formTabs && formTabs.length > 0"> <div v-if="formTabs && formTabs.length > 0">
<el-button <el-button
class="draftButton" class="draftButton"
@click="onSubmit(formType)" @click="onSubmit(formType)"
:loading="loading" :loading="loading"
> >{{ formType == 1 ? "临时保存" : "返回" }}</el-button>
{{ formType == 1 ? "临时保存" : "返回" }}
</el-button>
<el-tabs <el-tabs
v-model="activeName" v-model="activeName"
type="card" type="card"
...@@ -46,24 +41,18 @@ ...@@ -46,24 +41,18 @@
</el-tabs> </el-tabs>
</div> </div>
<el-empty v-else description="暂无数据"></el-empty> <el-empty v-else description="暂无数据"></el-empty>
<public-dialog <public-dialog ref="showDialog" @onSubmit="dialogSubmit" @onCancel="dialogCancel">
ref="showDialog"
@onSubmit="dialogSubmit"
@onCancel="dialogCancel"
>
<!-- 保存草稿 --> <!-- 保存草稿 -->
<template v-if="dialogType == 'draft'" slot="content"> <template v-if="dialogType == 'draft'" slot="content">
<div class="title center">已保存至草稿箱!</div> <div class="title center">已保存至草稿箱!</div>
<div class="content center"> <div class="content center">
<div class="img"> <div class="img">
<img src="~@/assets/img/DataCenter/draft.png" alt="" /> <img src="~@/assets/img/DataCenter/draft.png" alt />
</div> </div>
<div class="showTips">您可以在【草稿箱】页面找到该数据</div> <div class="showTips">您可以在【草稿箱】页面找到该数据</div>
</div> </div>
<div class="btn"> <div class="btn">
<el-button type="primary" :loading="loading" @click="continueSubmit" <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
>继续添加</el-button
>
</div> </div>
</template> </template>
<!-- 保存提交 --> <!-- 保存提交 -->
...@@ -71,21 +60,13 @@ ...@@ -71,21 +60,13 @@
<div class="title center">提交成功!</div> <div class="title center">提交成功!</div>
<div class="content center"> <div class="content center">
<div class="img"> <div class="img">
<img src="~@/assets/img/DataCenter/submit.png" alt="" /> <img src="~@/assets/img/DataCenter/submit.png" alt />
</div> </div>
<div class="showTips">您可以在【筛查查询】页面查询到该数据</div> <div class="showTips">您可以在【筛查查询】页面查询到该数据</div>
</div> </div>
<div class="btn"> <div class="btn">
<el-button <el-button type="primary" :loading="loading" @click="view" class="textBtn">查看</el-button>
type="primary" <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
:loading="loading"
@click="view"
class="textBtn"
>查看</el-button
>
<el-button type="primary" :loading="loading" @click="continueSubmit"
>继续添加</el-button
>
</div> </div>
</template> </template>
</public-dialog> </public-dialog>
...@@ -269,6 +250,9 @@ export default { ...@@ -269,6 +250,9 @@ export default {
} }
.el-collapse-item__wrap { .el-collapse-item__wrap {
border: none; border: none;
.el-collapse {
margin: 10px 10px 20px;
}
} }
// .row24.el-col-lg-12:nth-child(2n) { // .row24.el-col-lg-12:nth-child(2n) {
// border-width: 0px 0px 0px 1px; // border-width: 0px 0px 0px 1px;
...@@ -280,7 +264,8 @@ export default { ...@@ -280,7 +264,8 @@ export default {
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
border-right: 1px solid #cccccc; border-right: 1px solid #cccccc;
width: 80px !important; // width: 100px !important;
white-space: nowrap;
padding: 18px 10px; padding: 18px 10px;
margin-right: 20px; margin-right: 20px;
text-align: center; text-align: center;
......
...@@ -42,16 +42,12 @@ ...@@ -42,16 +42,12 @@
</el-switch>--> </el-switch>-->
</div> </div>
</el-row> </el-row>
<div <div class="my-form" ref="my-form" :class="externalScroll ? 'no-scroll' : ''">
class="my-form" <!-- <read-form
ref="my-form"
:class="externalScroll ? 'no-scroll' : ''"
>
<read-form
ref="form" ref="form"
:options="survivalForm" :options="survivalForm"
v-if="survivalFlag" v-if="survivalFlag"
></read-form> ></read-form>-->
<custom-form <custom-form
ref="form" ref="form"
@scrollTop="scrollTop" @scrollTop="scrollTop"
......
...@@ -59,10 +59,7 @@ export default { ...@@ -59,10 +59,7 @@ export default {
if (res.data) { if (res.data) {
this.isUpdated = true this.isUpdated = true
this.patientStandbyId = res.data.patientId this.patientStandbyId = res.data.patientId
if ( if (cb && Object.prototype.toString.call(cb) === "[object Function]") {
cb &&
Object.prototype.toString.call(cb) === "[object Function]"
) {
cb(res) cb(res)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment