Merge branch 'master' of gitlab.interstrangers.com:crm/forbes_crm

jeethink/jeethink-admin/src/main/resources/templates/crm/order/add.html

@@ -9,7 +9,7 @@
         <form class="form-horizontal m" id="form-order-add">
             <div class="panel-group" id="accordion">
                 <div class="panel panel-default">
-                    <div  class="panel-heading">
+                    <div  class="panel-heading" style="margin-bottom: 20px">
                         <h4 class="form-header h4 panel-title">
                             <a data-toggle="collapse"
                                href="#collapseOne">

jeethink/jeethink-admin/src/main/resources/templates/crm/orderPrice/add.html

@@ -15,7 +15,7 @@
         <form class="form-horizontal m" id="form-order-add">
             <div class="panel-group" id="accordion">
                 <div class="panel panel-default">
-                    <div  class="panel-heading">
+                    <div  class="panel-heading"  style="margin-bottom: 20px">
                         <h4 class="form-header h4 panel-title">
                             <a data-toggle="collapse"
                                href="#collapseOne">
@@ -25,7 +25,7 @@
                     </div>
                     <div id="collapseOne" class="panel-collapse collapse in">
                        <input name="customerId" type="hidden" id="customerId" />
-                       <div class="form-group">
+                       <div class="form-group flex">
                            <label class="col-sm-3 control-label is-required">报价客户：</label>
                            <div class="col-sm-7">
                                <div class="input-group">
@@ -33,13 +33,12 @@
                                    <span class="input-group-addon"><i class="fa fa-search"></i></span>
                                </div>
                            </div>
-                       </div>
-                       <div class="form-group">
                            <label class="col-sm-3 control-label is-required">主题：</label>
                            <div class="col-sm-7">
                                <input name="orderName" class="form-control" type="text" required>
                            </div>
                        </div>
+
                        <div class="form-group flex">
                            <label class="col-sm-3 control-label">报价总额：</label>
                            <div class="col-sm-7">
@@ -160,7 +159,7 @@
 
 
                 <div class="panel panel-default">
-                    <div  class="panel-heading">
+                    <div  class="panel-heading" style="margin-bottom: 20px">
                         <h4 class="form-header h4 panel-title">
                             <a data-toggle="collapse"
                                href="#collapseTwo">