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/views/Business/Gitame/Ameps20.vue

@@ -733,6 +733,7 @@
                 v-if="model.gitp.swiftflg == 'N'"
                 v-model="model.trnmod.swiadd.newexpflg"
                 @change="newexpflgChange"
+                class="checkbox-left"
                 >是否无效期限制</c-checkbox
               >
             </c-col>
@@ -741,6 +742,7 @@
                 v-if="model.gitp.swiftflg == 'N'"
                 disabled
                 v-model="model.trnmod.swiadd.newliaflg"
+                class="checkbox-left"
                 >是否无效期限制</c-checkbox
               >
             </c-col>
@@ -751,6 +753,7 @@
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'N'"
                 v-model="model.gitamep.cre767flg"
+                class="checkbox-left"
                 >是否生成通知报文</c-checkbox
               >
             </c-col>
@@ -758,6 +761,7 @@
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'N'"
                 v-model="model.gitamep.prtflg"
+                class="checkbox-left"
                 >是否选择输入保函全部内容</c-checkbox
               >
             </c-col>
@@ -769,6 +773,7 @@
                 disabled
                 v-if="model.gitp.swiftflg == 'N'"
                 v-model="model.gitamep.clsclmflg"
+                class="checkbox-left"
                 >关闭索赔</c-checkbox
               >
             </c-col>
@@ -778,6 +783,7 @@
                 v-if="model.gitp.swiftflg == 'N'"
                 v-model="model.gitamep.plateflg"
                 @change="plateflgChange"
+                class="checkbox-left"
                 >保函修改面函模板</c-checkbox
               >
             </c-col>
@@ -823,6 +829,7 @@
                 v-if="model.gitp.swiftflg == 'Y'"
                 style="margin: 0 0 0 10px"
                 v-model="model.gitamep.amebut.chkast"
+                class="checkbox-left"
                 >Allow</c-checkbox
               >
               <c-button
@@ -894,53 +901,59 @@
           </c-col>
 
           <c-col :span="24">
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="5">
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.trnmod.swiadd.reqcan"
                 @change="reqcanChange"
+                class="checkbox-left"
                 >撤销请求</c-checkbox
               >
             </c-col>
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="7">
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.trnmod.swiadd.amemsgdonflg"
+                class="checkbox-left"
                 >是否生成通知报文</c-checkbox
               >
             </c-col>
           </c-col>
           <c-col :span="24">
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="5">
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitamep.prtflg"
+                class="checkbox-left"
                 >是否选择输入保函全部内容</c-checkbox
               >
             </c-col>
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="7">
               <c-checkbox
                 disabled
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitamep.clsclmflg"
+                class="checkbox-left"
                 >关闭索赔</c-checkbox
               >
             </c-col>
           </c-col>
           <c-col :span="24">
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="5">
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.trnmod.swiadd.addamtflg"
                 @change="addamtflgChange"
+                class="checkbox-left"
                 >附加金额</c-checkbox
               >
             </c-col>
-            <c-col :span="6" :offset="6">
+            <c-col :span="6" :offset="7">
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 :disabled="model.trnmod.swiadd.amemsgdonflg == ''"
                 v-model="model.gitamep.ametxtflg"
+                class="checkbox-left"
                 >是否修改修改内容</c-checkbox
               >
             </c-col>

src/views/Business/Gitame/Detp.vue

@@ -101,6 +101,7 @@
               <el-form-item
                 label="合同标的"
                 prop="gidgrp.blk.covgodsrv"
+                style="width:510px"
               >
                 <c-input
                   :disabled="
@@ -120,13 +121,15 @@
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitp.covgodsrvmodflg"
-                style="margin: 0 0 0 10px"
+                style="margin: 0 0 0 5px"
+                class="checkbox-left"
                 >修改文本</c-checkbox
               >
               <c-checkbox
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitp.covgod.chkast"
-                style="margin: 0 0 0 10px"
+                style="margin: 0 0 0 5px"
+                class="checkbox-left"
                 >允许</c-checkbox
               >
               <c-button
@@ -134,7 +137,7 @@
                 v-if="model.gitp.swiftflg == 'Y'"
                 size="small"
                 type="primary"
-                style="margin: 5px 0 0 10px"
+                style="margin: 5px 0 0 5px;width: 100px;"
                 @click="onGitpButdifcovgodsrv"
               >
                 查看系统文本
@@ -144,7 +147,7 @@
                 v-if="model.gitp.swiftflg == 'Y'"
                 size="small"
                 type="primary"
-                style="margin: 5px 0 0 10px"
+                style="margin: 5px 0 0 5px;width: 100px;"
                 @click="onGitpButdifhiscovgodsrv"
               >
                 查看历史文本

src/views/Business/Gitcrq/Gitsetp1.vue

@@ -346,7 +346,6 @@
 
     <!-- 中间 -->
     <c-col :span="24" style="height: 0px">
-      <el-divider></el-divider>
     </c-col>
 
     <c-col :span="11" style="margin-top: 15px">

src/views/Business/Infgcd/Infsea.vue

 <template>
-  <div class="eibs">
+  <div class="eibs-tab">
     <c-list-search @form-reset="handleReset" @form-search="handleSearch">
       <!-- 持续展示区 -->
       <template v-slot="searchSlot">
-        <el-form class="m-table-search-form" ref="paramsForm" :inline="true" label-position="right" label-width="110px"
-          size="small">
+        <el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px" size="small">
           <c-row>
-            <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="保函编号" prop="infcon.seaownref" style="width: 100%">
                 <c-input v-model="model.infcon.seaownref" maxlength="16" placeholder="请输入保函编号"></c-input>
@@ -16,8 +14,8 @@
             <c-col :span="8">
               <el-form-item label="开立日期" prop="infcon.opndatfrom" style="width: 100%">
                 <c-col :span="11">
-                    <c-date-picker type="date" v-model="model.infcon.opndatfrom" style="width: 100%"
-                      placeholder="请选择起始日期" value-format="yyyy-MM-dd"></c-date-picker>
+                  <c-date-picker type="date" v-model="model.infcon.opndatfrom" style="width: 100%" placeholder="请选择起始日期"
+                    value-format="yyyy-MM-dd"></c-date-picker>
                 </c-col>
                 <c-col :span="2" style="text-align: center">
                   <label style="display: inline-block; width: 100%">-</label>
@@ -35,12 +33,10 @@
                 </c-select>
               </el-form-item>
             </c-col>
-            </c-col>
           </c-row>
 
           <!-- 可控展示区 -->
           <c-row v-show="searchSlot.searchToggle">
-            <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="业务简略信息" prop="infcon.nam" style="width: 100%">
                 <c-input v-model="model.infcon.nam" maxlength="40" placeholder="请输入业务简略信息"></c-input>
@@ -56,9 +52,7 @@
                 <c-input v-model="model.infcon.seapty" maxlength="24" placeholder="请输入当事人BIC编码"></c-input>
               </el-form-item>
             </c-col>
-            </c-col>
 
-            <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="当事人名称" prop="infcon.pty.nam" style="width: 100%">
                 <c-input v-model="model.infcon.pty.nam" maxlength="40" placeholder="请输入当事人名称"></c-input>
@@ -77,9 +71,7 @@
                 <c-input v-model="model.infcon.usr.extkey" maxlength="24" placeholder="请输入客户经理"></c-input>
               </el-form-item>
             </c-col>
-            </c-col>
 
-            <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="业务状态" prop="infcon.seasta" style="width: 100%">
                 <c-select v-model="model.infcon.seasta" style="width: 100%" placeholder="请选择业务状态">
@@ -109,8 +101,7 @@
                 </c-col>
               </el-form-item>
             </c-col>
-            </c-col>
-            <c-col :span="24">
+
             <c-col :span="8">
               <el-form-item label="当事人参考号" prop="infcon.searef" style="width: 100%">
                 <c-input v-model="model.infcon.searef" maxlength="16" placeholder="请输入当事人参考号"></c-input>
@@ -123,27 +114,22 @@
                 </c-select>
               </el-form-item>
             </c-col>
-            </c-col>
           </c-row>
         </el-form>
       </template>
     </c-list-search>
-
-    <el-row>
+    <div style="height:90%">
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
           <el-table-column fixed="right" prop="op" label="操作" width="140px">
             <template slot="header">
-              <c-col :span="11" style="text-align: center">
-                <span>操作</span>
-              </c-col>
+              <c-col :span="11" style="text-align: center"><span>操作</span></c-col>
               <!-- <c-col :span="12" style="text-align: right">
                     <c-button icon="el-icon-s-tools"></c-button>
                   </c-col> -->
             </template>
             <template slot-scope="scope">
-              <el-popover placement="top-start" title="历史信息" width="800" trigger="click"
-                :ref="'popover_' + scope.row.IDX">
+              <el-popover placement="top-start" title="历史信息" width="800" trigger="click" :ref="'popover_' + scope.row.IDX">
                 <div style="
                         text-align: right;
                         margin-top: -30px;
@@ -159,8 +145,8 @@
                     </template>
                   </el-table-column>
                 </c-istream-table>
-                <c-button style="margin-left: 0" size="small" @click="getTrnInfo(scope.$index, scope.row)"
-                  slot="reference">详情</c-button>
+                <c-button style="margin-left: 0" size="small" @click="getTrnInfo(scope.$index, scope.row)" slot="reference">
+                  详情</c-button>
               </el-popover>
               <c-button style="margin-left: 5px" size="small" type="primary" @click="getButtons(scope.row['保函编号'])">
                 处理</c-button>
@@ -168,7 +154,7 @@
           </el-table-column>
         </c-istream-table>
       </c-col>
-    </el-row>
+    </div>
 
     <div v-if="dialogFlag" class="m-list-btns">
       <m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gcdgrp" :model="gitselModel" tabIndex="3"

src/views/Business/Infgid/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"
-    >
+  <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-infsea :model="model" :codes="codes" ref="infsea" />
       </c-content>
     </el-form>
-  </c-page>
   </div>
 </template>
 <script>
@@ -71,4 +62,5 @@ export default {
 };
 </script>
 <style>
+
 </style>

src/views/Business/Infled/index.vue

@@ -73,6 +73,6 @@ export default {
     }
 }
 </script>
-<style>
+<style scoped>
 
 </style>