Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/assets/css/common.css

@@ -400,12 +400,7 @@
 .el-table__fixed,
 .el-table__fixed-right {
   height: 100% !important;
-  bottom: 16px;
-  z-index: 1;
-}
-
-.el-table__body-wrapper,.is-scrolling-left{
-  z-index: 2;
+  bottom: 17px;
 }
 
 /* medium_button_change_small */

src/views/Business/Brtlat/index.vue

@@ -235,7 +235,7 @@ export default {
   mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
   data() {
     return {
-      tabVal: "utlp",
+      tabVal: "utlp,ovwp,docpre,shpdet",
       trnName: "brtlat",
       model: new Brtlat().data,
       checkRules: Check,

src/views/Business/Cnysel/Selp.vue

@@ -85,18 +85,18 @@
                     <c-input  v-model="model.cnystm"  placeholder="请输入Selection"></c-input>
                 </el-form-item>
             </c-col> -->
-      <c-istream-table
+      <c-istream-table-noOperate
         :list="stmData.data"
         :columns="stmData.columns"
         :showButtonFlg="true"
       >
-        <el-table-column fixed="right" prop="op" label="操作" width="200px">
-          <!-- <template slot="header">
-            <c-col :span="11" style="text-align: left"><span>操作</span></c-col>  -->
+        <el-table-column fixed="right" prop="op" width="auto">
+          <template slot="header">
+            <!-- <c-col :span="11" style="text-align: center"></c-col>  -->
             <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
-          <!-- </template>-->
+          </template>
         </el-table-column> 
-      </c-istream-table>
+      </c-istream-table-noOperate>
     </c-col>
 
   </div>
@@ -109,10 +109,15 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Cnysel/Event";
 
+import IStreamTableNoOperate from "./IStreamTable.vue";
+
 export default {
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],
+  components: {
+    "c-istream-table-noOperate": IStreamTableNoOperate
+  },
   data() {
     return {
       ownextkey:[
@@ -122,7 +127,7 @@ export default {
       ],
       stmData: {
         columns: [
-          '0 1 "业务编号" 110',
+          '0 1 "业务编号" 120',
           '1 2 "币种" 110',
           '2 3 "金额" 120 2 8:1 2 5',
           '3 4 "收款人名称" 250',

src/views/Business/Cnysel/index.vue

@@ -18,7 +18,9 @@
         >
           <!--PD000001 -->
           <el-tab-pane label="接口信息选择" name="selp">
+            <content>
               <m-selp :model="model" :codes="codes" />
+            </content>
           </el-tab-pane>
         </c-tabs>
       </el-form>