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

@@ -521,12 +521,17 @@
   }
 }
 
-
+/* checkbox右对齐 */
 .el-checkbox{
   float: right;
   text-align: center;
 }
 
+/* checkbox左对齐 */
+.checkbox-left{
+  float: left;
+  text-align: center;
+}
 /* .el-checkbox:last-of-type{
   margin-right:30px;
 } */

src/model/Cptato/Pattern.js

@@ -19,7 +19,7 @@ export default {
 
 
     "cpdgrp.cbs.nom1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -151,7 +151,7 @@ export default {
     ],
     "cpdgrp.orc.pts.adrblk":[
         {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {max: 235,message:"长度不能超过235"}
     ],
     "cpdgrp.orc.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},

src/views/Business/Brtudp/Ovwp.vue

+<template>
+  <div class="eibs-tab">
+    <el-collapse v-model="activeNames">
+      <el-collapse-item title="承兑信息" name="payp">
+        <m-payp :model="model" :codes="codes" />
+      </el-collapse-item>
+      <el-collapse-item title="反馈 Feedback" name="2">
+        <div>
+          控制反馈：通过界面样式和交互动效让用户可以清晰的感知自己的操作；
+        </div>
+      </el-collapse-item>
+      <el-collapse-item title="效率 Efficiency" name="3">
+        <div>简化流程：设计简洁直观的操作流程；</div>
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+
+<script>
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Brtudp/Event";
+import Payp from "./Payp";
+import Ptap1 from "~/views/Public/Ptap1";
+import Ptsmsg from "~/views/Public/Ptsmsg";
+import Fullbox from "../../../components/Fullbox.vue";
+
+export default {
+  components: {
+    "m-payp": Payp,
+    "c-ptap1": Ptap1,
+    // "c-ptap": Ptap,
+    "c-ptsmsg": Ptsmsg,
+  },
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [commonProcess],
+  data() {
+    return {
+        activeNames: ['payp']
+    };
+  },
+  methods: {
+    ...Event,
+  },
+  created: function () {},
+};
+</script>
+
+<style>
+</style>

src/views/Business/Brtudp/index.vue

 <template>
-  <c-page title="进口信用证单据承兑">
-    <div class="eContainer">
+  <div class="eContainer">
+    <c-page title="进口信用证单据承兑">
+      <div class="fast-button">
+        <el-button size="small">备忘录</el-button>
+        <el-button size="small" @click="setDraggableContent('cms', '影像信息')"
+          >影像信息</el-button
+        >
+        <!-- <el-button size="small">保存模板</el-button> -->
+        <!-- <el-button size="small">使用模板</el-button> -->
+        <el-button size="small">制裁信息</el-button>
+        <!-- <el-button size="small">拆分报文</el-button> -->
+        <el-button size="small">智能提示</el-button>
+      </div>
       <el-form
         :model="model"
         :rules="rules"
@@ -16,12 +27,17 @@
           type="card"
           @tab-click="myTabClick"
         >
+        <el-tab-pane label="业务信息" name="ovwp">
+            <c-content>
+              <m-ovwp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
           <!--PD000032 -->
-          <el-tab-pane label="承兑信息" name="payp">
+          <!-- <el-tab-pane label="承兑信息" name="payp">
             <c-content>
               <m-payp :model="model" :codes="codes" />
             </c-content>
-          </el-tab-pane>
+          </el-tab-pane> -->
 
           <!--PD000062 -->
           <el-tab-pane
@@ -172,21 +188,11 @@
         </c-tabs>
       </el-form>
 
-      <!-- <c-bus-button :$pntvm="this"></c-bus-button>   按钮 -->
       <c-function-btn
         :handleSubmit="handleSubmit"
         :handleCheck="handleCheck"
         :handleStash="handleStash"
       >
-        <el-button size="small">备忘录</el-button>
-        <el-button size="small" @click="setDraggableContent('cms', '影像信息')"
-          >影像信息</el-button
-        >
-        <!-- <el-button size="small">保存模板</el-button> -->
-        <!-- <el-button size="small">使用模板</el-button> -->
-        <el-button size="small">制裁信息</el-button>
-        <!-- <el-button size="small">拆分报文</el-button> -->
-        <el-button size="small">智能提示</el-button>
       </c-function-btn>
 
       <c-grid-ety-prompt-dialog
@@ -201,8 +207,8 @@
         @select-ety="selectMsg"
       >
       </c-grid-ety-prompt-dialog>
-    </div>
-  </c-page>
+    </c-page>
+  </div>
 </template>
 <script>
 import Api from "~/service/Api";

src/views/Business/Cptato/Opnp1.vue

@@ -20,6 +20,7 @@
                 style="margin: 0 10px 0 10px; padding: 0 12px"
                 size="small"
                 type="primary"
+                @click="onSeainf"
               >
                 <span style="font-family: '宋体'; font-weight: bold">i</span>
               </c-button>
@@ -28,6 +29,7 @@
                 size="small"
                 type="primary"
                 :disabled="this.flag"
+                @click="onAttpGetref"
               >
                 获取
               </c-button>

src/views/Business/Litame/Addbcb.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="备查表" name="addbcb">
-        <el-form-item label="备查表类型">
+        <el-form-item label="备查表类型" class="checkbox-left">
           <c-checkbox v-model="model.bcbtyp1">不在名录</c-checkbox>
 
           <c-checkbox v-model="model.bcbtyp2">异地付汇</c-checkbox>
@@ -13,7 +13,7 @@
 
           <c-checkbox v-model="model.bcbtyp5">不需要</c-checkbox>
 
-          <c-checkbox v-model="model.bcbtyp6">其它</c-checkbox>
+          <c-checkbox v-model="model.bcbtyp6" style="margin-right:30px;">其它</c-checkbox>
         </el-form-item>
 
         <c-col :span="12" v-if="model.bcbtyp6">
@@ -62,7 +62,9 @@
         </c-col>
 
         <c-col :span="11" :offset="0">
-          <c-checkbox v-model="model.modtyp">修改信用证类型</c-checkbox>
+          <el-form-item label=" " prop="modtyp">
+          <c-checkbox v-model="model.modtyp" class="checkbox-left">修改信用证类型</c-checkbox>
+          </el-form-item>
         </c-col>
 
         <c-col :span="24">
@@ -99,7 +101,9 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+      activeNames: ['addbcb']
+    };
   },
   methods: { ...Event },
   created: function () {},

src/views/Business/Litame/Inspame.vue

 <template>
   <div class="eibs">
                                                                 
-       <c-col :span="20">
+       <c-col :span="24">
         <el-form-item label="指示信息" prop="lidgrp.blk.insbnk">
             <c-input 
             type="textarea" 

src/views/Business/Litame/Ovwp1.vue

@@ -120,7 +120,7 @@
        </c-col>
                   
        <c-col :span="12">
-	    <c-checkbox disabled v-model="model.lidgrp.rec.dkflg" style="margin-left:20px;padding: 0 10px;">是否代开信用证</c-checkbox>
+	    <c-checkbox disabled v-model="model.lidgrp.rec.dkflg">是否代开信用证</c-checkbox>
        </c-col>
 
         <c-col :span="24">
@@ -322,7 +322,9 @@
        
                   
        <c-col :span="12">
-	    <c-checkbox disabled v-model="model.lidgrp.rec.rmbflg">偿付行信息</c-checkbox>
+        <el-form-item label=" " prop="lidgrp.rec.rmbflg">
+	    <c-checkbox disabled v-model="model.lidgrp.rec.rmbflg" class="checkbox-left">偿付行信息</c-checkbox>
+      </el-form-item>
        </c-col>
        <c-col :span="12">
 	    <c-checkbox disabled v-model="model.lidgrp.rec.revflg">循环信用证</c-checkbox>

src/views/Business/Litame/Ptyp.vue

@@ -285,7 +285,7 @@
                   sortable
                   width="300">
                 </c-table-column>
-                <el-table-column label="" prop="det" width="80px" fixed="right">
+                <el-table-column label="" prop="det" width="100px" fixed="right">
                     <template slot-scope="scope" slot="header">
                         <el-button
                             circle

src/views/Business/Litame/index.vue

 <template>
   <div class="eContainer">
     <c-page title="进口信用证修改">
+      <div class="fast-button">
+        <el-button size="small">备忘录</el-button>
+        <el-button size="small" @click="setDraggableContent('cms', '影像信息')"
+          >影像信息</el-button
+        >
+        <!-- <el-button size="small">保存模板</el-button> -->
+        <!-- <el-button size="small">使用模板</el-button> -->
+        <el-button size="small">制裁信息</el-button>
+        <!-- <el-button size="small">拆分报文</el-button> -->
+        <el-button size="small">智能提示</el-button>
+      </div>
       <el-form
         :model="model"
         :rules="rules"

src/views/Public/Ccvpan.vue

@@ -147,7 +147,7 @@
           prop="liaall.liaccv.gleflg"
         >
           <c-col :span="7" class="">
-            <el-form-item label=" " prop="liaall.liaccv.gleflg" label-width="120px" style=" float:left;">
+            <el-form-item label="" prop="liaall.liaccv.gleflg" class="checkbox-left" label-width="0px">
               <c-checkbox v-model="model.liaall.liaccv.gleflg">过账</c-checkbox>
             </el-form-item>
           </c-col>