Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue

@@ -14,7 +14,7 @@
         <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">发起部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
             </el-col>
@@ -28,7 +28,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">销售部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
             </el-col>
@@ -46,7 +46,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">客户名称</div>
               <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
@@ -98,7 +98,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
@@ -792,6 +792,19 @@ export default {
 .addinputw {
   margin-left: 110px !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;
+}
 /deep/ .el-form-item__error {
   margin-left: 110px !important;
 }

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@@ -43,7 +43,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">客户名称</div>
               <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
@@ -333,7 +333,7 @@ export default {
   justify-content: flex-start;
   align-items: center;
 }
-/deep/ .tlineheightb .el-form-item .el-form-item__content {
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
   line-height: 15px !important;
   display: flex;
   flex-direction: row;

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@@ -45,7 +45,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">客户名称</div>
               <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
@@ -581,7 +581,7 @@ export default {
   justify-content: flex-start;
   align-items: center;
 }
-/deep/ .tlineheightb .el-form-item .el-form-item__content {
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
   line-height: 15px !important;
   display: flex;
   flex-direction: row;

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue

@@ -13,7 +13,7 @@
         <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">发起部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
             </el-col>
@@ -27,7 +27,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">销售部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
             </el-col>
@@ -45,7 +45,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">客户名称</div>
               <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
@@ -97,7 +97,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
@@ -734,6 +734,19 @@ export default {
 .addinputw {
   margin-left: 110px !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;
+}
 /deep/ .el-form-item__error {
   margin-left: 110px !important;
 }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@@ -43,7 +43,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">客户名称</div>
               <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
@@ -453,7 +453,7 @@ export default {
   justify-content: flex-start;
   align-items: center;
 }
-/deep/ .tlineheightb .el-form-item .el-form-item__content {
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
   line-height: 15px !important;
   display: flex;
   flex-direction: row;