Merge remote-tracking branch 'origin/develop' into develop

src/page/Funds/Inffxd/event/index.js

@@ -42,6 +42,9 @@ export default {
                 else if(this.activeTab==="dhpp"){
                   this.stmDataDh.data = rtnmsg.data.list;
                 }
+                else if(this.activeTab==="jshpp"){
+                    this.stmDatajshpp.data = rtnmsg.data.list;
+                }
                 
                 this.pagination.total = rtnmsg.data.total;
               

src/page/Funds/Inffxd/views/Infsea.vue

@@ -229,6 +229,80 @@
               </div>
             </el-tab-pane>
 
+            <el-tab-pane label="结售汇平盘查询" name="jshpp">
+              <el-table
+                  :data="stmDatajshpp.data"
+                  :columns="stmDatajshpp.columns"
+                  v-loading="load"
+                  style="width: 100%"
+                  size="small"
+                  :border="true"
+                  height="calc(100vh - 480px)"
+                  :highlight-current-row="true"
+              >
+                <el-table-column
+                    v-for="(item, key) in stmDatajshpp.columns"
+                    :key="key"
+                    :label="item.label"
+                    :prop="item.prop"
+                    :min-width="item.width"
+                >
+                </el-table-column>
+
+                <el-table-column fixed="right" prop="op" label="操作" width="180px">
+                  <template slot="header">
+                    <c-col :span="11" style="text-align: center">
+                      <span>操作</span>
+                    </c-col>
+                  </template>
+                  <template slot-scope="scope">
+                    <c-button style="margin-right: 5px" size="small" type="text" @click="handler(scope.row)">处理
+                    </c-button>
+                    <span> </span>
+                    <el-popover
+                        trigger="manual"
+                        v-clickOutside="closeDisplayDialog" placement="top-end" title="历史信息" width="1200" :ref="'popover_' + scope.row.inr">
+                      <div style="text-align: right;margin-top: -30px;margin-right: 5px;font-size: 16px;">
+                        <span class="el-icon-close" style="cursor: pointer" @click="closeDetailsDialog('popover_' + scope.row.inr)"></span>
+                      </div>
+                      <el-table :data="trnData.data" :columns="trnData.columns" :showButtonFlg="true">
+                        <el-table-column v-for="(item, key) in trnData.columns" :key="key" :label="item.label" :prop="item.prop" :width="item.width">
+                          <template slot-scope="scope">
+                            <div>{{ scope.row[item.prop] }}</div>
+                          </template>
+                        </el-table-column>
+                        <el-table-column fixed="right" prop="op" label="操作" width="100px">
+                          <template slot-scope="scope">
+                            <c-button style="margin-left: 0" size="small" @click="display(scope.row)">快照
+                            </c-button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="details(scope.row)">
+                        快照
+                      </c-button>
+                      <c-button style="margin-left: 0" type="text" size="small" slot="reference" @click="toInfo(scope.row,'FXD')">
+                        Info
+                      </c-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+
+              </el-table>
+              <div class="pagination-box"
+                   style="display:block">
+                <el-pagination
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="pagination.total"
+                    :page-size="pagination.pageSize"
+                    :current-page.sync="pagination.pageNumber"
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                >
+                </el-pagination>
+              </div>
+            </el-tab-pane>
+
             <el-tab-pane label="外币兑换平盘查询" name="dhpp">
               <el-table
                 :data="stmDataDh.data"
@@ -508,6 +582,168 @@ export default {
       },
 
 
+      stmDatajshpp: {
+        columns: [
+          {
+            label: "业务编号",
+            prop: "ownref",
+            width: "180px",
+          },
+          {
+            label: "业务名称",
+            prop: "nam",
+            width: "180px",
+          },
+          {
+            label: "客户名称",
+            prop: "ownusr",
+            width: "120px",
+          },
+          {
+            label: "资金部经办人",
+            prop: "usr",
+            width: "120px",
+          },
+          {
+            label: "外汇交易类型",
+            prop: "fxtyp",
+            width: "120px",
+          },
+          {
+            label: "成交日期",
+            prop: "opndat",
+            width: "120px",
+          },
+          {
+            label: "起息日",
+            prop: "valdat",
+            width: "120px",
+          },
+          {
+            label: "平盘牌价",
+            prop: "rat",
+            width: "120px",
+          },
+          {
+            label: "中间价",
+            prop: "midrat",
+            width: "120px",
+          },
+          {
+            label: "询价编号",
+            prop: "quoref",
+            width: "120px",
+          },
+          {
+            label: "资金部编号",
+            prop: "fudref",
+            width: "120px",
+          },
+          {
+            label: "平盘日期",
+            prop: "setdat",
+            width: "120px",
+          },
+          {
+            label: "择期交割起始日",
+            prop: "setdatfrm",
+            width: "160px",
+          },
+          {
+            label: "择期交割截止日",
+            prop: "setdatto",
+            width: "160px",
+          },
+          {
+            label: "结算日期",
+            prop: "clsdat",
+            width: "120px",
+          },
+          {
+            label: "版本",
+            prop: "ver",
+            width: "120px",
+          },
+          {
+            label: "分支机构编号",
+            prop: "branchinr",
+            width: "120px",
+          },
+          {
+            label: "分支机构关键编号",
+            prop: "bchkeyinr",
+            width: "160px",
+          },
+          {
+            label: "交易主体",
+            prop: "trnman",
+            width: "120px",
+          },
+          {
+            label: "交易内部编号",
+            prop: "trdint",
+            width: "120px",
+          },
+          {
+            label: "交易外部编号",
+            prop: "trdout",
+            width: "120px",
+          },
+
+          {
+            label: "外币结算账号",
+            prop: "acc",
+            width: "120px",
+          },
+          {
+            label: "本币结算账号",
+            prop: "acc2",
+            width: "120px",
+          },
+          {
+            label: "处置1",
+            prop: "dsp",
+            width: "120px",
+          },
+          {
+            label: "处置2",
+            prop: "dsp2",
+            width: "120px",
+          },
+          {
+            label: "现金覆盖率",
+            prop: "cshpct",
+            width: "120px",
+          },
+          {
+            label: "账户经理",
+            prop: "accmng",
+            width: "120px",
+          },
+          {
+            label: "汇率",
+            prop: "rat1",
+            width: "120px",
+          },
+          {
+            label: "账户经理部门",
+            prop: "hdbch",
+            width: "120px",
+          },
+          {
+            label: "实体外部键",
+            prop: "etyextkey",
+            width: "120px",
+          },
+
+
+
+
+        ],
+        data: [],
+      },
+
+
       stmDataDh: {
         columns: [
           {