Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Bctdor/Ptyp.vue

@@ -29,7 +29,7 @@
           :disabled="true"
           :isAdrblk="false"
           @onSeainf="onSeainf"
-          @onAplpDet="onDrrpDet"
+          @onAplpDet="onCo2pDet"
         >
         </c-ptap>
       </c-col>	
@@ -49,7 +49,7 @@
           :disabled="true"
           :isAdrblk="false"
           @onSeainf="onSeainf"
-          @onAplpDet="onDrrpDet"
+          @onAplpDet="onRmipDet"
         >
         </c-ptap>
       </c-col>

src/views/Business/Bctset/Ptyp.vue

@@ -29,7 +29,7 @@
           :disabled="true"
           :isAdrblk="false"
           @onSeainf="onSeainf"
-          @onAplpDet="onDrrpDet"
+          @onAplpDet="onCo2pDet"
         >
         </c-ptap>
       </c-col>	
@@ -49,7 +49,7 @@
           :disabled="true"
           :isAdrblk="false"
           @onSeainf="onSeainf"
-          @onAplpDet="onDrrpDet"
+          @onAplpDet="onRmipDet"
         >
         </c-ptap>
       </c-col>

src/views/Business/Infcpd/index.vue

@@ -30,12 +30,14 @@
         </div> -->
 
     <div class="eContainer">
-        <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="left" size="small"
+        <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small"
             :validate-on-rule-change="false">
             <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" class="infcpdTab">
 
                 <el-tab-pane label="查询信息" name="infsea">
+                    <c-content :height="120">
                     <m-infsea :model="model" :codes="codes" />
+                    </c-content>
                 </el-tab-pane>
 
                 <el-tab-pane label="汇款信息" name="infconp">
@@ -179,4 +181,11 @@
     .infcpdTab .infrow {
         padding: 0 10px 0 10px;
     }
+    .m-table-search-form {
+  position: flex;
+  flex-direction: row;
+}
+.m-table-search-form .el-form-item__content {
+  width: calc(100% - 110px);
+}
 </style>
\ No newline at end of file