Merge remote-tracking branch 'origin/development-202206' into development-202206

src/views/Business/Bptopn/Cfap.vue

 <template>
   <div class="eibs-tab">
-    <c-row>
-      <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
+      <c-col :span="24">
         <el-form-item label="数据采集标志" prop="cfabpt.cfaflg">
           <c-select
             @change="selectOrCheckboxRule('cfabpt.cfaflg')"
@@ -20,18 +20,6 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="3">
-        <el-form-item label="" prop=""> </el-form-item>
-      </c-col>
-      <c-col :span="5">
-        <c-checkbox disabled v-model="model.cfabpt.basflg">签约信息</c-checkbox>
-      </c-col>
-
-      <c-col :span="4">
-        <c-checkbox disabled v-model="model.cfabpt.dclflg">变动信息</c-checkbox>
-      </c-col>
-    </c-row>
-
       <c-col :span="24">
         <el-form-item label="地区机构号" prop="cfabpt.ownextkey">
           <c-select
@@ -44,6 +32,46 @@
       </c-col>
 
       <c-col :span="24">
+        <el-form-item
+          label="中资企业境外担保项下境内贷款额度币种"
+          prop="cfabpt.cda.cfeogudcurr"
+        >
+          <c-select
+            :disabled="model.cfabpt.cdaflg == 'N' || model.cfabpt.cdaflg == ''"
+            v-model="model.cfabpt.cda.cfeogudcurr"
+            style="width: 100%"
+            placeholder="请选择中资企业境外担保项下境内贷款额度币种"
+          >
+            <el-option
+              v-for="item in codes.cur"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </c-select>
+        </el-form-item>
+      </c-col>
+
+    </c-col>
+
+
+    <!-- <c-col :span="3">
+      <el-form-item label="" prop=""> </el-form-item>
+    </c-col> -->
+    <c-col :span="12" style="padding-left: 20px;margin-bottom: 20px;">
+      <c-col :span="12">
+        <c-checkbox disabled v-model="model.cfabpt.basflg">签约信息</c-checkbox>
+      </c-col>
+
+      <c-col :span="12">
+        <c-checkbox disabled v-model="model.cfabpt.dclflg">变动信息</c-checkbox>
+      </c-col>
+    </c-col>
+
+
+    <c-col :span="12" style="padding-left: 20px">
+      <c-col :span="12">
         <el-form-item label="是否外保内贷" prop="cfabpt.cdaflg">
           <c-select
             v-model="model.cfabpt.cdaflg"
@@ -61,7 +89,7 @@
         </el-form-item>
       </c-col>
 
-    <c-col :span="24">
+      <c-col :span="12">
         <el-form-item label="资金用途" prop="cfabpt.cda.useofunds">
             <c-select
               :disabled="model.cfabpt.cdaflg == 'N' || model.cfabpt.cdaflg == ''"
@@ -73,31 +101,11 @@
             </c-select>
         </el-form-item>
       </c-col>
-    <br /><br /><br /><br /><br />
-
-    <c-col :span="24">
-      <el-form-item
-        label="中资企业境外担保项下境内贷款额度币种"
-        prop="cfabpt.cda.cfeogudcurr"
-      >
-        <c-select
-          :disabled="model.cfabpt.cdaflg == 'N' || model.cfabpt.cdaflg == ''"
-          v-model="model.cfabpt.cda.cfeogudcurr"
-          style="width: 100%"
-          placeholder="请选择中资企业境外担保项下境内贷款额度币种"
-        >
-          <el-option
-            v-for="item in codes.cur"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </c-select>
-      </el-form-item>
     </c-col>
-    <br /><br /><br /><br /><br />
-    <c-col :span="24">
+
+    
+    
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item
         label="中资企业境外担保项下境内贷款额度金额"
         prop="cfabpt.cda.cfeogudamount"
@@ -110,7 +118,7 @@
         </c-input>
       </el-form-item>
     </c-col>
-    <br /><br /><br /><br /><br />
+
     <c-col :span="24">
       <el-form-item
         label="中资企业境外担保项下贷款业务批准文件号"

src/views/Business/Bptopn/Conp.vue

 <template>
   <div class="eibs-tab">
-    <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item
         label="国内外汇贷款编号"
         prop="cfabpt.recgrp.bas.dofoexlocode"
@@ -14,7 +14,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
         <el-form-item label="删除原因" prop="cfabpt.recgrp.bas.actiondesc">
           <c-input
             :disabled="
@@ -37,6 +37,9 @@
         </el-form-item>
     </c-col>
 
+    
+
+    <c-col :span="12" style="padding-right: 20px">
       <c-col :span="12">
         <el-form-item label="操作类型" prop="cfabpt.recgrp.bas.actiontype">
           <c-select
@@ -57,6 +60,30 @@
       </c-col>
 
       <c-col :span="12">
+        <el-form-item
+          label="国内外汇贷款类型"
+          prop="cfabpt.recgrp.bas.dofoexlotype"
+        >
+          <c-select
+            v-model="model.cfabpt.recgrp.bas.dofoexlotype"
+            style="width: 100%"
+            placeholder="请选择国内外汇贷款类型"
+          >
+            <el-option
+              v-for="item in codes.dofoexlotype"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </c-select>
+        </el-form-item>
+      </c-col>
+
+    </c-col>
+
+    <c-col :span="12" style="padding-left: 20px">
+      <c-col :span="12">
         <el-form-item label="债权人代码" prop="cfabpt.recgrp.bas.creditorcode">
           <c-input
             disabled
@@ -68,6 +95,13 @@
       </c-col>
 
       <c-col :span="12">
+        <c-checkbox disabled v-model="model.cfabpt.recp.pubp.acp"
+          >确认</c-checkbox
+        >
+      </c-col>
+    </c-col>
+
+    <!-- <c-col :span="12" style="padding-right: 20px">
       <el-form-item
         label="国内外汇贷款类型"
         prop="cfabpt.recgrp.bas.dofoexlotype"
@@ -86,15 +120,11 @@
           </el-option>
         </c-select>
       </el-form-item>
-    </c-col>
+    </c-col> -->
 
-    <c-col :span="12">
-      <c-checkbox disabled v-model="model.cfabpt.recp.pubp.acp"
-        >确认</c-checkbox
-      >
-    </c-col>
     
-    <c-col :span="12">
+
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item label="贷款币种" prop="cfabpt.recgrp.bas.currence">
         <c-select
           disabled
@@ -106,7 +136,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item label="签约金额" prop="cfabpt.recgrp.bas.contractamount">
         <c-input
           disabled
@@ -116,7 +146,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item label="年化利率值" prop="cfabpt.recgrp.bas.anninrate">
         <c-input
           disabled
@@ -126,7 +156,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item label="起息日" prop="cfabpt.recgrp.bas.valuedate">
         <c-date-picker
           type="date"
@@ -138,7 +168,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item label="到期日" prop="cfabpt.recgrp.bas.maturity">
         <c-date-picker
           type="date"
@@ -150,7 +180,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item label="债务人代码" prop="cfabpt.recgrp.bas.debtorcode">
         <c-input
           v-model="model.cfabpt.recgrp.bas.debtorcode"
@@ -160,7 +190,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item label="债务人中文名称" prop="cfabpt.recgrp.bas.debtorname">
         <c-input
           v-model="model.cfabpt.recgrp.bas.debtorname"
@@ -170,7 +200,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item label="转贷项目名称" prop="cfabpt.recgrp.bas.lenproname">
         <c-input
           v-model="model.cfabpt.recgrp.bas.lenproname"
@@ -180,7 +210,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-right: 20px">
       <el-form-item label="转贷协议号" prop="cfabpt.recgrp.bas.lenagree">
         <c-input
           v-model="model.cfabpt.recgrp.bas.lenagree"
@@ -190,7 +220,7 @@
       </el-form-item>
     </c-col>
 
-    <c-col :span="12">
+    <c-col :span="12" style="padding-left: 20px">
       <el-form-item label="备注" prop="cfabpt.recgrp.bas.remark">
         <c-input
           type="textarea"

src/views/Business/Bptopn/Dclpp.vue

@@ -152,8 +152,8 @@
         </c-col>
       </c-col>
 
-      <c-col :span="24"><el-form-item label=""></el-form-item></c-col>
-      <c-col :span="24"><el-form-item label=""></el-form-item></c-col>
+      <!-- <c-col :span="24"><el-form-item label=""></el-form-item></c-col>
+      <c-col :span="24"><el-form-item label=""></el-form-item></c-col> -->
       
       <c-col :span="24">
         <el-form-item label="期末余额" prop="cfabpt.recp.dclp.loanopenbalan">

src/views/Business/Bptopn/Docpan1.vue

 <template>
   <div class="eibs-tab">
     <!-- left -->
-    <c-col :span="11">
+    <c-col :span="12" style="padding-right: 20px">
       <c-col :span="24">
         <el-form-item
           label="验证证书编号"
@@ -29,7 +29,7 @@
     </c-col>
 
     <!-- right -->
-    <c-col :span="11" :offset="1">
+    <c-col :span="12" style="padding-left: 20px">
       <c-col :span="24">
         <el-form-item label="ACT" prop="lendoc.account">
           <c-fullbox>

src/views/Business/BusRouter.js

@@ -314,9 +314,9 @@ const BusRouter = [
     { path: 'betrcl', component: Betrcl, name: 'Betrcl', meta: { title: '出口信用证单据索汇' } },
     { path: 'betrcl', component: Betrcl, name: 'Betrcl', meta: { title: '出口信用证单据出口单据索汇' } },
     { path: 'betset', component: Betset, name: 'Betset', meta: { title: '出口信用证单据出口收汇' } },
-    { path: 'sptrel', component: Sptrel, name: 'Sptrel', meta: { title: 'Sptrel' } },
-    { path: 'sptneg', component: Sptneg, name: 'Sptneg', meta: { title: 'Sptneg' } },
-    { path: 'sptrou', component: Sptrou, name: 'Sptrou', meta: { title: 'Sptrou' } },
+    { path: 'sptrel', component: Sptrel, name: 'Sptrel', meta: { title: '待审批列表' } },
+    { path: 'sptneg', component: Sptneg, name: 'Sptneg', meta: { title: '订单分配列表' } },
+    { path: 'sptrou', component: Sptrou, name: 'Sptrou', meta: { title: '待经办任务分配' } },
     { path: 'bddsel', component: Bddsel, name: 'Bddsel', meta: { title: 'Bddsel' } },
     { path: 'infbdd', component: Infbdd, name: 'Infbdd', meta: { title: '买方信用证单据查询' } },
     { path: 'infbrd', component: Infbrd, name: 'Infbrd', meta: { title: '进口信用证单据查询' } },

src/views/Business/Ordrel/Menu.vue

@@ -9,16 +9,16 @@
       >
       <c-col :span="24">
         <!---------左边------------>
-          <c-col :span="11">
+          <c-col :span="12" style="padding-right: 20px">
                <c-col :span="24">
-                   <c-col :span="21">
+                   <c-col :span="19">
                     <el-form-item :label="$t('ordrel.filter')" prop="usfmod.flt">
                         <c-select v-model="model.usfmod.flt" style="width:100%" :placeholder="$t('other.please_enter')+ $t('ordrel.filter')" :code="codes.flt_ordrel">
                           </c-select>
                     </el-form-item>
                    </c-col>
-                   <c-col :span="3">
-                    <c-button size="small" type="primary"  @click="onUsfmodShwflt">
+                   <c-col :span="5">
+                    <c-button style="float:right" size="small" type="primary"  @click="onUsfmodShwflt">
                          {{$t('usfmod.CF000033')}}
                     </c-button>
                    </c-col>
@@ -58,7 +58,7 @@
 
           </c-col>
          <!---------右边------------>
-          <c-col :span="11" :offset="1">
+          <c-col :span="12" style="padding-left: 20px">
                  <!-- SF000050 : Reference -->
 
                    <c-col :span="24">
@@ -238,11 +238,11 @@ export default {
              initdialog:false,
              stmData: {
                  columns: [
-                     "1 1 \"交易代码\" 200",
-                     "2 2  \"交易名称\" 150",
+                     "1 1 \"交易代码\" 100",
+                     "2 2  \"交易名称\" ",
                       {index:3,position:3,width:160,pattern:'code',label:'交易状态',code:'sptDetSta'},
                      "4 4 \"创建时间\" 200",
-                     "5 5 \"对于用户\" 200",
+                     "5 5 \"对于用户\" 100",
                      "6 6 \"工作用户\" 200",
                  ],
                  data: []

src/views/Business/Ordrel/Ordpwfm.vue

@@ -65,14 +65,14 @@ export default {
         return {
            stmData: {
                  columns: [
-                     "1 1 \"ID\" 200",
-                     "2 2  \"Service\" 200",
+                     "1 1 \"ID\" 100",
+                     "2 2  \"Service\" ",
                       {index:3,position:3,width:160,pattern:'code',label:'交易状态',code:'sptDetSta'},
                      "4 4 \"Last Update\" 200",
-                     "5 5 \"Retries\" 200",
-                     "6 6 \"Text\" 200",
-                     "7 7 \"Contrary Text\" 200",
-                     "8 8 \"Target Time\" 200",
+                     "5 5 \"Retries\" 100",
+                     "6 6 \"Text\" 100",
+                     "7 7 \"Contrary Text\" 150",
+                     "8 8 \"Target Time\" 150",
                  ],
                  data: []
              }

src/views/Business/Ordrel/index.vue

 <template>
-  <div class="eContainer">
+  <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-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
                    <!--ordrel PD000042 Menu -->

src/views/Business/Sptrel/Menu.vue

@@ -5,12 +5,13 @@
                 label-position="right"
                 label-width="110px"
                 size="small"
+                class="m-table-search-form"
             >
         <!-- <c-col :span="12">
           <span  v-text="model.usfmod.usftxt"   data-path=".usfmod.usftxt" > </span>
         </c-col> -->
         <!-- ============左========= -->
-          <c-col :span="11">
+          <c-col :span="12" style="padding-right: 20px">
             <c-col :span="24">
               <el-form-item label="用户选择" prop="usfmod.flt">
                 <c-select
@@ -98,7 +99,7 @@
           </c-col>
 
         <!-- ============右========= -->
-          <c-col :span="12" :offset="1">
+          <c-col :span="12" style="padding-left: 20px">
               <c-col :span="24">
                 <el-form-item label="业务编号" prop="selobj">
                   <c-input

src/views/Business/Sptrel/index.vue

 <template>
-  <div class="eContainer">
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" size="small" :validate-on-rule-change="false">
-       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
-        
+  <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">
             <!--PD000042 -->
            <c-content label="菜单" name="menu">
                 <m-menu :model="model" :codes="codes"/>
            </c-content>
-       </c-tabs>
     </el-form>
   </div>
 </template>
@@ -67,5 +64,7 @@ export default {
 }
 </script>
 <style>
-
+/* .el-tabs--card>.el-tabs__header {
+    border-bottom: 0px solid var(--themecolor);
+} */
 </style>