Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Funds/Fxtfcm/views/Cnfp.vue

@@ -106,12 +106,12 @@
             </c-col>
             <c-col :span="24">
                 <c-form-item label="备注" prop="fxdgrp.blk.remark">
-                  <c-input type="textarea" v-model="model.fxdgrp.blk.remark" maxlength="140" :rows="4" style="width:100%" placeholder="请输入备注">
+                  <c-input  type="textarea" v-model="model.fxdgrp.blk.remark" maxlength="140" :rows="4" style="width:100%" placeholder="请输入备注">
                   </c-input>
                 </c-form-item>
             </c-col>
             <c-col :span="24">
-	            <c-checkbox v-model="model.swtflg">发送MT300</c-checkbox>
+	            <c-checkbox true-label="X"  v-model="model.swtflg">发送MT300</c-checkbox>
             </c-col>
         </c-col>
         <!-- ==================右边================ -->

src/page/Funds/Fxtfcm/views/Ovwp.vue

 <template>
   <div class="eibs-tab">
     <c-collapse v-model="activeNames">
-      <el-collapse-item title="平盘确认信息" name="cnfp">
+      <el-collapse-item title="平盘确认信息" name="cnfp" >
         <m-cnfp :model="model" :codes="codes" />
       </el-collapse-item>
-      <el-collapse-item title="Mt300报文信息" name="mt300">
-        <m-mt300 :model="model" :codes="codes" ref="mt300" />
+      <el-collapse-item title="Mt300报文信息" name="mt300" v-if="model.swtflg=='X'">
+        <m-mt300 :model="model" :codes="codes" ref="mt300"    />
       </el-collapse-item>
       
     </c-collapse>