From d5022ad825e6eae81f97a29b946175c7a3f1b457 Mon Sep 17 00:00:00 2001
From: a123456 <1209165801@qq.com>
Date: Fri, 15 Feb 2019 11:59:39 +0800
Subject: [PATCH] Signed-off-by: a123456 <1209165801@qq.com>

---
 .../webapp/WEB-INF/manager/mdiy/diy-model/form.ftl   | 10 ++++++----
 src/main/webapp/static/mdiy/css/model-form.css       |  8 ++++++++
 src/main/webapp/static/mdiy/less/model-form.less     | 12 ++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
index 54b65573..dc707d14 100644
--- a/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/mdiy/diy-model/form.ftl
@@ -1,5 +1,4 @@
 <link rel="stylesheet" href="../../../static/mdiy/css/model-form.css">
-
 <div id="model-form" class="ms-mdiy-model-form" v-if="modelListVue.href == '表单'">
    <el-container>
       <el-header class="ms-header" height="50px">
@@ -143,9 +142,12 @@
 
                   <!--金额-->
                   <el-form-item label="单位" :label-width="'70px'" v-if="controlTypeActive.id === '3'">
-                     <el-input maxlength="20" type="text" v-model="controlTypeActive.unit" placeholder="选填" autocomplete="off"></el-input>
-                     <el-radio v-model="controlTypeActive.fieldType" label="3-1">前缀</el-radio>
-                     <el-radio v-model="controlTypeActive.fieldType" label="3-2">后缀</el-radio>
+                     <el-input autocomplete="off" placeholder="选填" maxlength="20" type="text" v-model="controlTypeActive.unit" class="input-with-select">
+                        <el-select v-model="controlTypeActive.fieldType" slot="append" placeholder="请选择">
+                           <el-option label="前缀" value="3-1"></el-option>
+                           <el-option label="后缀" value="3-2"></el-option>
+                        </el-select>
+                     </el-input>
                   </el-form-item>
                   <el-form-item label="保留几位小数" :label-width="'70px'" v-if="controlTypeActive.id === '3'">
                      <el-input min="0" max="9" type="number" v-model="controlTypeActive.data4" placeholder="选填，数字" autocomplete="off"></el-input>
diff --git a/src/main/webapp/static/mdiy/css/model-form.css b/src/main/webapp/static/mdiy/css/model-form.css
index 8081889d..2241a645 100644
--- a/src/main/webapp/static/mdiy/css/model-form.css
+++ b/src/main/webapp/static/mdiy/css/model-form.css
@@ -242,6 +242,14 @@ textarea::-webkit-input-placeholder {
 .ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr .form .el-form-item {
   margin-bottom: 14px;
 }
+.ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr .form .el-form-item .input-with-select .el-input-group__append {
+  width: 90px;
+}
+.ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr .form .el-form-item .input-with-select .el-input-group__append .el-input input {
+  background-color: #fff;
+  border-top: 1px solid #dcdfe6;
+  border-bottom: 1px solid #dcdfe6;
+}
 .ms-mdiy-model-form .ms-editor-attr-layout .ms-editor-attr .form .ms-down-list {
   margin: 0;
   padding: 0;
diff --git a/src/main/webapp/static/mdiy/less/model-form.less b/src/main/webapp/static/mdiy/less/model-form.less
index 2485e8c4..9bbda805 100644
--- a/src/main/webapp/static/mdiy/less/model-form.less
+++ b/src/main/webapp/static/mdiy/less/model-form.less
@@ -90,6 +90,18 @@
                 }
                 .el-form-item {
                     margin-bottom: 14px;
+                    .input-with-select {
+                        .el-input-group__append {
+                            width: 90px;
+                            .el-input {
+                                input {
+                                    background-color: #fff;
+                                    border-top: 1px solid #dcdfe6;
+                                    border-bottom: 1px solid #dcdfe6;
+                                }
+                            }
+                        }
+                    }
                 }
                 //下拉排序添加选项
                 .ms-down-list {