Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessAdd.vue

@@ -35,16 +35,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
-              <div class="span-sty">其他说明</div>
-              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">打款时需备注内容</div>
               <el-form-item><el-input v-model="formobj.payRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其他说明</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">

anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue

@@ -28,16 +28,14 @@
               <div class="span-sty">财务付款形式</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
             </el-col>
-            <el-col :span="16">
-              <div class="span-sty">其他说明</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">打款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -149,4 +147,17 @@ export default {
 .addinputInfo {
   margin-left: 130px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessDaiBan.vue

@@ -31,16 +31,14 @@
               <div class="span-sty">财务付款形式</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
             </el-col>
-            <el-col :span="16">
-              <div class="span-sty">其他说明</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">打款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -406,6 +404,19 @@ export default {
 .addinputInfo {
   margin-left: 130px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessEdit.vue

@@ -34,16 +34,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="16">
-              <div class="span-sty">其他说明</div>
-              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="span-sty">打款时需备注内容</div>
               <el-form-item><el-input v-model="formobj.payRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其他说明</div>
+              <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">

anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessYiBan.vue

@@ -28,16 +28,14 @@
               <div class="span-sty">财务付款形式</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
             </el-col>
-            <el-col :span="16">
-              <div class="span-sty">其他说明</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">打款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
+            <el-col :span="8" class="tlineheightb">
+              <div class="span-sty">其他说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -201,4 +199,17 @@ export default {
 .addinputInfo {
   margin-left: 130px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>