Merge branch 'bochk-poc-1113' of http://192.168.0.110:11080/fukai/vue-gjjs into bochk-poc-1113

src/business/inflid/views/Infsea.vue

@@ -243,6 +243,13 @@
         <el-table
             :data="stmData.data"
             :columns="stmData.columns"
+            :showButtonFlg="true"
+            :header-cell-style="{
+            background: 'rgb(235, 235, 235)',
+            color: 'rgb(51, 51, 51)',
+          }" 
+          style="width:100%"
+         :highlight-current-row="true"
         >
           <el-table-column
               v-for="(item, key) in stmData.columns"
@@ -250,6 +257,9 @@
               :label="item.label"
               :prop="item.prop"
               :formatter="item.rounding" 
+              :width="item.width" 
+                show-overflow-tooltip="true"
+                sortable  
           ></el-table-column>
           <el-table-column fixed="right" prop="op" label="操作" width="140px">
             <template slot="header">
@@ -282,6 +292,7 @@
                       :key="key"
                       :label="item.label"
                       :prop="item.prop"
+                      :formatter="item.rounding" 
                   >
                     <template slot-scope="scope">
                       <div>{{ scope.row[item.prop] }}</div>
@@ -393,50 +404,60 @@ export default {
         columns: [
           {
             label: '信用证编号',
-            prop: 'seaownref'
+            prop: 'seaownref',
+            width: '120px'
           },
           {
             label: '客户经理',
-            prop: 'ownusr'
+            prop: 'ownusr',
+            width: '100px'
           },
           {
             label: '币种',
-            prop: 'seacur'
+            prop: 'seacur',
+            width: '100px'
           },
 
           {
             label: '金额',
             prop: 'maxamt',
-            rounding:this.rounding
+            rounding:this.rounding,
+            width: '100px'
           },
           {
             label: '余额',
-            prop: 'opnamt'
+            prop: 'opnamt',
+            width: '100px'
           },
           {
             label: '开立日期',
-            prop: 'opndat'
+            prop: 'opndat',
+            width: '100px'
           },
           {
             label: '申请人编号',
             prop: 'aplextkey',
-
+            width: '120px'
           },
           {
             label: '申请人名称',
-            prop: 'aplnam'
+            prop: 'aplnam',
+            width: '120px'
           },
           {
             label: '通知银行BIC编码',
-            prop: 'seapty'
+            prop: 'seapty',
+            width: '150px'
           },
           {
             label: '受益人名称',
-            prop: 'benefi'
+            prop: 'benefi',
+            width: '120px'
           },
           {
             label: '远离期限',
-            prop: 'tenmaxday'
+            prop: 'tenmaxday',
+            width: '100px'
           },
         ],
         data: [],
@@ -474,8 +495,9 @@ export default {
             prop: 'reloricur'
           },
           {
-            label: '相关金额',
-            prop: 'reloriamt'
+            label: '相关金额1',
+            prop: 'reloriamt',
+            rounding:this.rounding
           },
           {
             label: '标识',

src/business/sptsel/views/Menu.vue

@@ -89,23 +89,17 @@
       <div style="border-bottom: 10px solid rgb(232, 232, 232)"></div>
     </c-col>
     <c-col :span="24">
-      <el-table
+       <c-paging-table 
         :data="stmData.data"
         :columns="stmData.columns"
-          :showButtonFlg="true"
+        :pageNumber="pagination.pageNum"
+        :pageSize="pagination.pageSize"
+        :total="pagination.total"
+        v-on:queryFunc="queryFunc"
       >
-        <el-table-column
-          v-for="(item, key) in stmData.columns"
-          :key="key"
-          :label="item.label"
-          :prop="item.prop"
-        ></el-table-column>
-        <el-table-column fixed="right" prop="op" label="操作" width="250px" >
-          <template slot="header">
-            <c-col :span="11" style="text-align:center"><span>操作</span></c-col>
-          </template>
-          <template slot-scope="scope">
-            <c-button style="margin-left: 0" size="small" @click="onDetails(scope.$index, scope.row)">详情
+       <c-table-column fixed="right" prop="op" label="操作" width="250px" >
+          <template slot-scope="{ scope }">
+            <c-button style="margin-left: 0" size="small" @click="onDetails(scope.row)">详情
             </c-button>
             <c-button style="margin-left: 5px" size="small" type="primary" @click="continueEdit(scope.row)">处理
             </c-button>
@@ -125,20 +119,8 @@
               <a slot="reference" href="javascript:void(0)" style="margin-left: 5px"><i class="el-icon-more"></i></a>
             </el-popover>
           </template>
-        </el-table-column>
-      </el-table>
-      <div class="pagination-box">
-        <el-pagination
-          style="margin-right: 30px;"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pagination.pageIndex"
-          :page-sizes="[10, 20, 50, 100, 500]"
-          :page-size="pagination.pageSize"
-          layout="sizes, prev, pager, next"
-          :total="pagination.total">
-        </el-pagination>
-      </div>
+        </c-table-column>
+       </c-paging-table>
     </c-col>
     <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns"></div>
@@ -242,6 +224,9 @@ export default {
       let datetime = new Date();
       datetime = datetime.setDate(datetime.getDate() - 10);
       this.model.inidatfro = new Date(datetime);
+    },
+    handleCurrentChange(val) {
+        this.currentRow = val;
     }
   },
   created: function () {
@@ -250,6 +235,13 @@ export default {
 };
 </script>
 <style scoped>
+.tableClass .cell{   
+    padding: 0!important;
+    height: 40px;
+    line-height: 30px!important;
+    text-align: center;
+  }
+ 
 .table-button-item-list {
   padding: 0;
   margin: 0;

src/business/trnrel/views/Inftrnps.vue

@@ -98,14 +98,27 @@
       </c-col>
   
       <el-row>
-        <c-col :span="24" style="">
-          <el-table :data="stmData.data" :columns="stmData.columns" style="width:100%">
+        <c-col :span="24" style="margin-top:20px;">
+          <el-table 
+          :data="stmData.data"  
+          :header-cell-style="{
+            background: 'rgb(235, 235, 235)',
+            color: 'rgb(51, 51, 51)',
+          }" 
+          style="width:100%"
+         :highlight-current-row="true"
+        >
             <el-table-column
                 v-for="(item, key) in stmData.columns"
                 :key="key"
                 :label="item.label"
                 :prop="item.prop"
                 :formatter="item.rounding"
+                :header-align="item.headerAlign"
+                :align="item.align"
+                :width="item.width" 
+                show-overflow-tooltip="true"
+                sortable                              
             >
 
             </el-table-column>
@@ -163,17 +176,17 @@
         },
         stmData: {
           columns: [
-            { label: "交易代码", prop: "inifrm" },
-            { label: "业务编号", prop: "ownref" },
-            { label: "摘要信息", prop: "addtxt" },
-            { label: "币种", prop: "reloricur" },
-            { label: "金额", prop: "reloriamt",rounding:this.rounding },
-            { label: "创建时间", prop: "inidattim" },
-            { label: "签名要求", prop: "relreq" },
-            { label: "签名状态", prop: "relres" },
-            { label: "经办柜员", prop: "iniusr" },
-            { label: "业务状态", prop: "relflg" },
-            { label: "业务机构", prop: "bchname" },
+            { label: "交易代码", prop: "inifrm", width: "100px" },
+            { label: "业务编号", prop: "ownref" , width: "100px"},
+            { label: "摘要信息", prop: "addtxt" , width: "200px"},
+            { label: "币种", prop: "reloricur", width: "70px"  },
+            { label: "金额1", prop: "reloriamt",rounding:this.rounding,headerAlign:"right",align:"right", width: "70px" },
+            { label: "创建时间", prop: "inidattim", width: "100px" },
+            { label: "签名要求", prop: "relreq", width: "100px" },
+            { label: "签名状态", prop: "relres", width: "100px" },
+            { label: "经办柜员", prop: "iniusr", width: "100px" },
+            { label: "业务状态", prop: "relflg" , width: "100px"},
+            { label: "业务机构", prop: "bchname", width: "100px" },
           ],
           data: [],
         },
@@ -223,6 +236,21 @@
     }
   };
   </script>
-  <style>
-  </style>
+ <style scoped>
+  .el-scrollbar_warp{
+    overflow-y: auto;
+  }
+  .el-table >>> th.is-left div{
+    text-align:left;
+  }
+  .el-table >>> th.is-right div{
+    text-align:right;
+  }
+  .el-table >>> td.is-left div{
+    text-align:left;
+  }
+  .el-table >>> td.is-right div{
+    text-align:right;
+  } 
+</style>
   
\ No newline at end of file

src/components/DatePicker.vue

@@ -127,24 +127,30 @@ export default {
 <style  lang="less" scoped>
 .greenClass /deep/ .el-input__inner {
   border-color: green;
+  border-width: medium;
 }
 
 .greenClass /deep/ .el-textarea__inner {
   border-color: green;
+  border-width: medium;
 }
 
 .yellowClass /deep/ .el-input__inner {
   border-color: blue;
+  border-width: medium;
 }
 
 .yellowClass /deep/ .el-textarea__inner {
   border-color: blue;
+  border-width: medium;
 }
 
 .redClass /deep/ .el-input__inner {
   border-color: red;
+  border-width: medium;
 }
 
 .redClass /deep/ .el-textarea__inner {
   border-color: red;
+  border-width: medium;
 }</style>
\ No newline at end of file

src/components/Input.vue

@@ -143,26 +143,32 @@ export default {
 <style lang="less" scoped>
 .greenClass /deep/ .el-input__inner {
   border-color: green;
+  border-width: medium;
 }
 
 .greenClass /deep/ .el-textarea__inner {
   border-color: green;
+  border-width: medium;
 }
 
 .yellowClass /deep/ .el-input__inner {
   border-color: blue;
+  border-width: medium;
 }
 
 .yellowClass /deep/ .el-textarea__inner {
   border-color: blue;
+  border-width: medium;
 }
 
 .redClass /deep/ .el-input__inner {
   border-color: red;
+  border-width: medium;
 }
 
 .redClass /deep/ .el-textarea__inner {
   border-color: red;
+  border-width: medium;
 }
 
 /*

src/components/PagingTable.vue

@@ -21,6 +21,7 @@
         :width="item.width"
         :formatter="item.rounding"
         sortable
+        :show-overflow-tooltip="true"
       >
         <template v-slot="{ scope }">
           <span>{{ scope.row[item.prop] }}</span>

src/components/Select.vue

@@ -220,23 +220,29 @@ export default {
 <style lang="less" scoped>
 .greenClass /deep/ .el-input__inner {
   border-color: green;
+  border-width: medium;
 }
 
 .greenClass /deep/ .el-textarea__inner {
   border-color: green;
+  border-width: medium;
 }
 .yellowClass /deep/ .el-input__inner {
   border-color: blue;
+  border-width: medium;
 }
 
 .yellowClass /deep/ .el-textarea__inner {
   border-color: blue;
+  border-width: medium;
 }
 .redClass /deep/ .el-input__inner {
   border-color: red;
+  border-width: medium;
 }
 
 .redClass /deep/ .el-textarea__inner {
   border-color: red;
+  border-width: medium;
 }
 </style>

src/views/Business/Bopsel/index.vue

 <template>
   <div class="eContainer">
-    <c-page title="申报">
+    <c-page style="margin-top:20px;" title="申报">
       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" >
         <el-tab-pane label="申报信息" name="selp">
                 <c-content>