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

src/page/Frontend/Oftdtl/event/index.js

 import Api from "~/service/Api";
-import moment from "moment";
-
+import Oftdtl from "../model"
 export default {
   methods: {
-
+    async handleSearch() {
+      
+    },
+    async handleReset() {
+      this.model = new Oftdtl().data;
+    },
+    // pageSize改变
+    handleSizeChange(val) {
+      this.pagination.pageNum = 1;
+      this.pagination.pageSize = val;
+      this.handleSearch();
+    },
+    // 页码改变
+    handleCurrentChange(val) {
+      this.pagination.pageNum = val;
+      this.handleSearch();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    }
   },
 };

src/page/Frontend/Oftdtl/views/index.vue

 <template>
-  <div class="eContainer">
-    <c-page title="报文详情展示">
-      <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
-        :validate-on-rule-change="false">
-        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
-          <!--fmsp PD000000 展示 -->
-          <el-tab-pane :label="$t('fmsp.展示')" name="oftdtl">
-            <m-oftdtl :model="model" :codes="codes" />
-          </el-tab-pane>
-        </c-tabs>
-      </el-form>
-    </c-page>
+  <div class="eContainer-search">
+    <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
+      :validate-on-rule-change="false">
+      <c-content>
+        <m-oftdtl :model="model" :codes="codes" />
+      </c-content>
+    </el-form>
   </div>
 </template>
 <script>
@@ -37,7 +32,6 @@ export default {
   mixins: [operationFunc, commonDepend, event, buildFn],
   data() {
     return {
-      tabVal: "oftdtl",
       trnName: "oftdtl",
       model: new Oftdtl().data,
       rules: Check,
@@ -50,9 +44,7 @@ export default {
     }
   },
   methods: {
-    myTabClick(tab) {
-      this.tabClick(tab)
-    }
+    
   },
   created: async function () {
     console.log("进入oftdtl交易");

src/page/Frontend/Rcvsel/views/Schpnl.vue

@@ -151,29 +151,25 @@
 
 
     <el-col :span="24" style="margin-top: 10px">
-      <div style="height: 90%">
+      <div>
         <c-col :span="24">
-          <el-tabs v-model="activeTab" class="y-tabs">
-            <el-tab-pane label="发报查询" name="sb">
-              <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
-                @selection-change="handleSelectionChange"
-                @row-dblclick="dbClickRow"
-                size="small" :border="true" height="calc(100vh - 420px)" :highlight-current-row="true">
-                <el-table-column  type="selection" width="55">
-                </el-table-column>
-                <el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" :min-width="item.width">
-                  <template slot-scope="scope">
-                    <c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
-                    <span v-else>{{ scope.row[item.prop] }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
-                :page-size="pagination.pageSize" :current-page.sync="pagination.pageNum" @size-change="handleSizeChange"
-                @current-change="handleCurrentChange">
-              </el-pagination>
-            </el-tab-pane>
-          </el-tabs>
+          <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
+            @selection-change="handleSelectionChange"
+            @row-dblclick="dbClickRow"
+            size="small" :border="true" height="calc(100vh - 320px)" :highlight-current-row="true">
+            <el-table-column  type="selection" width="55">
+            </el-table-column>
+            <el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop" :min-width="item.width">
+              <template slot-scope="scope">
+                <c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
+                <span v-else>{{ scope.row[item.prop] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
+            :page-size="pagination.pageSize" :current-page.sync="pagination.pageNum" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
         </c-col>
       </div>
     </el-col>
@@ -188,7 +184,6 @@ export default {
   mixins: [event],
   data() {
     return {
-      activeTab: 'sb',
       load: false,
       subtypCodes: [],
       // isFoldDisable: true,