Merge remote-tracking branch 'origin/development-202206' into development-202206

src/components/IStreamTable.vue

@@ -4,7 +4,7 @@
       <c-button
         icon="el-icon-s-tools"
         @click="clounmSetting"
-        style=""
+        style="margin-right: 28px;margin-top: 10px;"
       ></c-button>
     </div>
     <el-table
@@ -419,6 +419,7 @@ export default {
   text-align: left;
   display: inline-block;
   margin: 0;
+  margin-top: -3px;
   position: absolute;
   z-index: 999;
   right: 5px;

src/model/Sptsel/index.js

@@ -29,7 +29,7 @@ export default class Sptsel {
 			yptinf: "",			//  退回原因		.yptinf
 			chkypt: "",			//  云平台		.chkypt
 			inidatfro: "",			//  Date of entry of Transaction		.inidatfro
-			inidattil: "",			//  Date of entry of Transaction until		.inidattil
+			inidattil: new Date(),			//  Date of entry of Transaction until		.inidattil
 			routxt: "",			//  已转报		.routxt
 			dflg: "",			//  国内国际标志		.dflg
 			chktco: "",			//  网银		.chktco

src/model/Trnrel/index.js

@@ -6,7 +6,7 @@ export default class Trnrel {
 				ownref: "",			//  Reference		.trncorco.ownref
 				relflg: "",			//  Status		.trncorco.relflg
 				inidatfro: "",			//  Date of entry of Transaction		.trncorco.inidatfro
-				inidattil: "",			//  Date of entry of Transaction until		.trncorco.inidattil
+				inidattil: new Date(),			//  Date of entry of Transaction until		.trncorco.inidattil
 				trnstm: "",			//  List of transaction sfor display		.trncorco.trnstm
 				dflg: "",			//  国内证标志		.trncorco.dflg
 				selinr: {},

src/views/Business/Cltset/Sel.vue

@@ -3,14 +3,13 @@
         <c-col :span="24">
             <c-col :span="11">
                 <el-form-item label="包号" prop="cldgrp.rec.ownref">
-                    <c-input v-model="model.cldgrp.rec.ownref" maxlength="16" placeholder="请输入Batch No." disabled>
+                    <c-input v-model="model.cldgrp.rec.ownref" maxlength="16" placeholder="请输入包号" disabled>
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="11" :offset="1">
                 <el-form-item label="汇票类型" prop="cldgrp.rec.chktyp">
-                    <c-select v-model="model.cldgrp.rec.chktyp" style="width: 100%" placeholder="请输入汇票类型"
-                        disabled>
+                    <c-select v-model="model.cldgrp.rec.chktyp" style="width: 100%" placeholder="请输入汇票类型" disabled>
                         <el-option v-for="item in codes.chktyp" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
@@ -22,22 +21,20 @@
             <c-col :span="11">
                 <c-col :span="12">
                     <el-form-item label="托收币种金额" prop="cldgrp.cbs.max.cur">
-                        <c-input v-model="model.cldgrp.cbs.max.cur" style="width:100%" placeholder="请选择托收币种金额"
-                            disabled>
+                        <c-input v-model="model.cldgrp.cbs.max.cur" style="width:100%" placeholder="请选择托收币种金额" disabled>
                         </c-input>
                     </el-form-item>
                 </c-col>
                 <c-col :span="11" :offset="1">
                     <el-form-item label="" label-width="0" prop="cldgrp.cbs.max.amt" style="width:100%">
-                        <c-input v-model.number="model.cldgrp.cbs.max.amt" style="width:100%"
-                            placeholder="请输入托收余额" disabled></c-input>
+                        <c-input v-model.number="model.cldgrp.cbs.max.amt" style="width:100%" placeholder="请输入托收余额"
+                            disabled></c-input>
                     </el-form-item>
                 </c-col>
             </c-col>
             <c-col :span="11" :offset="1">
                 <el-form-item label="票据类型" prop="cldgrp.rec.colflg">
-                    <c-select v-model="model.cldgrp.rec.colflg" style="width: 100%" placeholder="请输入票据类型"
-                        disabled>
+                    <c-select v-model="model.cldgrp.rec.colflg" style="width: 100%" placeholder="请输入票据类型" disabled>
                         <el-option v-for="item in codes.colflg" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
@@ -50,8 +47,7 @@
             <c-col :span="11">
                 <c-col :span="12">
                     <el-form-item label="托收余额" prop="cldgrp.cbs.opn1.cur">
-                        <c-input v-model="model.cldgrp.cbs.opn1.cur" style="width:100%" placeholder="请选择托收余额"
-                            disabled>
+                        <c-input v-model="model.cldgrp.cbs.opn1.cur" style="width:100%" placeholder="请选择托收余额" disabled>
                         </c-input>
                     </el-form-item>
                 </c-col>
@@ -77,8 +73,7 @@
         <c-col :span="24">
             <c-col :span="11">
                 <el-form-item label="代收行名称" prop="cldgrp.rec.colptynam">
-                    <c-input v-model="model.cldgrp.rec.colptynam" maxlength="40" placeholder="请输入代收行名称"
-                        disabled>
+                    <c-input v-model="model.cldgrp.rec.colptynam" maxlength="40" placeholder="请输入代收行名称" disabled>
                     </c-input>
                 </el-form-item>
             </c-col>
@@ -182,5 +177,4 @@ export default {
 }
 </script>
 <style>
-
 </style>

src/views/Business/Infcld/Infsea.vue

@@ -140,7 +140,10 @@
 
         <c-col :span="24">
             <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
-                <el-table-column fixed="right" prop="op" label="操作" width="150px">
+                <el-table-column fixed="right" prop="op" label="操作" width="140px">
+                    <template slot="header">
+                        <c-col :span="11" style="text-align: center"><span>操作</span></c-col>
+                    </template>
                     <template slot-scope="scope">
                         <el-popover placement="top-start" title="历史信息" width="800" trigger="click"
                             :ref="'popover_' + scope.row.IDX">

src/views/Business/Sptsel/index.vue

 <template>
   <div class="eContainer-search">
-    <el-form
-      :model="model"
-      :rules="rules"
-      ref="modelForm"
-      tokenKey="modelForm"
-      label-width="120px"
-      size="small"
-      :validate-on-rule-change="false"
-    >
+    <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="120px" size="small"
+      :validate-on-rule-change="false">
       <!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
       <!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
-      <!-- <c-content> -->
-      <m-menu :model="model" :codes="codes" ref="菜单" />
-      <!-- </c-content> -->
+      <c-content>
+        <m-menu :model="model" :codes="codes" ref="菜单" />
+      </c-content>
       <!-- </el-tab-pane> -->
       <!-- </c-tabs> -->
     </el-form>
@@ -74,4 +67,5 @@ export default {
 };
 </script>
 <style>
+
 </style>