Commit 29cc0e72 authored by 何远江's avatar 何远江

添加删格布局下表单样式调整

parent 49782f65
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
@import './element-ui.scss'; @import './element-ui.scss';
@import './sidebar.scss'; @import './sidebar.scss';
@import './btn.scss'; @import './btn.scss';
@import './page-form.scss';
body { body {
height: 100%; height: 100%;
......
.page-form.el-form--inline {
.el-form-item {
display: flex;
.el-form-item__content {
flex: 1;
.el-date-editor {
width: 100%;
}
}
}
}
<template>
<el-tooltip :content="tip || title">
<div class="form-label-tip">{{ title }}</div>
</el-tooltip>
</template>
<script>
export default {
props: {
title: String,
tip: String,
},
data() {
return {};
}
};
</script>
<style scoped>
.form-label-tip {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
...@@ -21,6 +21,7 @@ import { getConfigKey } from "@/api/system/config"; ...@@ -21,6 +21,7 @@ import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, formatMoney } from "@/utils/ruoyi"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, formatMoney } from "@/utils/ruoyi";
import TipLabel from '@/components/TipLabel/index.vue'
import PageTitle from '@/components/Page/PageTitle.vue' import PageTitle from '@/components/Page/PageTitle.vue'
import PageWrapper from '@/components/Page/PageWrapper.vue' import PageWrapper from '@/components/Page/PageWrapper.vue'
// 分页组件 // 分页组件
...@@ -75,6 +76,7 @@ Vue.component('SapPropertyData', SapPropertyData) ...@@ -75,6 +76,7 @@ Vue.component('SapPropertyData', SapPropertyData)
Vue.component('FileUpload', FileUpload) Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload) Vue.component('ImageUpload', ImageUpload)
Vue.component('ImagePreview', ImagePreview) Vue.component('ImagePreview', ImagePreview)
Vue.component('TipLabel', TipLabel)
Vue.use(directive) Vue.use(directive)
Vue.use(plugins) Vue.use(plugins)
......
...@@ -16,15 +16,17 @@ ...@@ -16,15 +16,17 @@
<PageWrapper> <PageWrapper>
<el-form <el-form
class="page-form"
:model="form" :model="form"
ref="form" ref="form"
size="small" size="small"
:inline="true" :inline="true"
label-width="8em" label-width="100px"
> >
<el-row> <el-row>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="申请单编码" prop="prototypeRequestCode"> <el-form-item prop="prototypeRequestCode">
<template slot="label"> 申请单编码 </template>
<el-input <el-input
disabled disabled
v-model="form.prototypeRequestCode" v-model="form.prototypeRequestCode"
...@@ -33,7 +35,7 @@ ...@@ -33,7 +35,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="产品" prop="itemId"> <el-form-item label="产品" prop="itemId">
<el-input <el-input
v-model="form.itemName" v-model="form.itemName"
...@@ -49,7 +51,7 @@ ...@@ -49,7 +51,7 @@
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12" style="height: 50.5px"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="工艺路线" prop="routeId"> <el-form-item label="工艺路线" prop="routeId">
<el-input <el-input
v-model="form.routeName" v-model="form.routeName"
...@@ -68,9 +70,7 @@ ...@@ -68,9 +70,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :md="6" :sm="12" :xs="12">
<el-row>
<el-col :md="8" :xs="12">
<el-form-item label="简称" prop="abbreviation"> <el-form-item label="简称" prop="abbreviation">
<el-input <el-input
v-model="form.abbreviation" v-model="form.abbreviation"
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> </el-row>
<el-row>
<el-col :md="6" :sm="12" :xs="12">
<el-form-item label="样品英文名" prop="enName"> <el-form-item label="样品英文名" prop="enName">
<el-input <el-input
v-model="form.enName" v-model="form.enName"
...@@ -86,14 +88,14 @@ ...@@ -86,14 +88,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="样品数量" prop="num"> <el-form-item label="样品数量" prop="num">
<el-input v-model="form.num" placeholder="请输入样品数量"> <el-input v-model="form.num" placeholder="请输入样品数量">
<template slot="suffix">{{ form.unit }}</template> <template slot="suffix">{{ form.unit }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="打样形式" prop="type"> <el-form-item label="打样形式" prop="type">
<el-input <el-input
v-model="form.type" v-model="form.type"
...@@ -101,7 +103,7 @@ ...@@ -101,7 +103,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="分配方式" prop="modality"> <el-form-item label="分配方式" prop="modality">
<el-input <el-input
v-model="form.modality" v-model="form.modality"
...@@ -109,7 +111,7 @@ ...@@ -109,7 +111,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="表面处理" prop="surfaceTreatment"> <el-form-item label="表面处理" prop="surfaceTreatment">
<el-input <el-input
v-model="form.surfaceTreatment" v-model="form.surfaceTreatment"
...@@ -117,7 +119,7 @@ ...@@ -117,7 +119,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="NG原因" prop="ngReason"> <el-form-item label="NG原因" prop="ngReason">
<el-input <el-input
v-model="form.ngReason" v-model="form.ngReason"
...@@ -125,8 +127,11 @@ ...@@ -125,8 +127,11 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="计划完成日期" prop="plannedFinishDate"> <el-form-item prop="plannedFinishDate">
<template slot="label">
<TipLabel title="完成日期" tip="计划完成日期" />
</template>
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedFinishDate" v-model="form.plannedFinishDate"
...@@ -134,8 +139,11 @@ ...@@ -134,8 +139,11 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="版面需求时间" prop="plannedLayoutDate"> <el-form-item prop="plannedLayoutDate">
<template slot="label">
<TipLabel title="版面时间" tip="版面需求时间" />
</template>
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="form.plannedLayoutDate" v-model="form.plannedLayoutDate"
...@@ -143,7 +151,7 @@ ...@@ -143,7 +151,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="测试标准" prop="testStandard"> <el-form-item label="测试标准" prop="testStandard">
<el-input <el-input
v-model="form.testStandard" v-model="form.testStandard"
...@@ -153,7 +161,7 @@ ...@@ -153,7 +161,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="8" :xs="12"> <el-col :md="6" :sm="12" :xs="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
...@@ -360,4 +368,4 @@ export default { ...@@ -360,4 +368,4 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped></style> <style lang="scss"></style>
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