20220120 wujia 信用证info

src/model/Infdid/index.js

@@ -111,6 +111,7 @@ export default class Infdid{
 								fenctg:"",			//  是否可议付		.didgrp.rec.fenctg
 								bdflg:"",			//  是否可保兑		.didgrp.rec.bdflg
 								lcrtyp:"",			//  Form of Documentary Credit		.didgrp.rec.lcrtyp
+								inr:"",
 							},
 							cbs:{
 								nom1:{

src/views/Business/Infdid/Coninfp.vue

@@ -29,6 +29,7 @@
             v-model="model.mtabut.coninf.oitinf.oit.inflev"
             disabled
             placeholder="请选择Infotext Level"
+            style="width: 100%"
             :code="inflev"
           >
           </c-select>
@@ -58,6 +59,7 @@
         >
           <c-select
             v-model="model.mtabut.coninf.oitset.oit.inflev"
+            style="width: 100%"
             disabled
             placeholder="请选择Infotext Level"
             :code="inflev"
@@ -66,18 +68,18 @@
         </el-form-item>
       </c-col>
     </c-col>
-    <c-col :span="11">
+    <c-col :span="15">
       <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
         <c-date-picker
           type="date"
           v-model="model.mtabut.coninf.conexedat"
-          style="width: 50%"
+          style="width: 100%"
           placeholder="请选择执行日期"
           disabled
         ></c-date-picker>
       </el-form-item>
     </c-col>
-    <c-col :span="7" :offset="5">
+    <c-col :span="7" :offset="1">
       <el-form-item label="Send for Release to" prop="mtabut.coninf.usr.extkey">
         <c-input
           v-model="model.mtabut.coninf.usr.extkey"

src/views/Business/Infdid/Detp.vue

@@ -11,7 +11,7 @@
             </el-form-item>
 
             <el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" >
-                <c-input disabled v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:17%" maxlength="3"></c-input>
+                <c-input disabled v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3"></c-input>
             </el-form-item>
 
             <el-form-item label="远期付款指示" prop="didgrp.blk.defdet">
@@ -39,8 +39,8 @@
             </el-form-item>
 
             <el-form-item label="货物运输/交货/服务方式" prop="didgrp.rec.tratyp">
-            <c-col :span="10">
-                <c-select v-model="model.didgrp.rec.tratyp" style="width:90%" placeholder="请选择" @change="recTratypChange" disabled>
+            <c-col :span="24">
+                <c-select v-model="model.didgrp.rec.tratyp" style="width:100%" placeholder="请选择" @change="recTratypChange" disabled>
                     <el-option v-for="item in codes.tratyp" :key="item.value" :label="item.label"
                         :value="item.value">
                     </el-option>
@@ -78,14 +78,14 @@
         <!-- ========================= Right ========================= -->
         <c-col :span="11" :offset="1">
             <el-form-item label="分批装运货物" prop="didgrp.rec.shppar">
-                <c-select v-model="model.didgrp.rec.shppar" style="width:50%" placeholder="请选择" disabled>
+                <c-select v-model="model.didgrp.rec.shppar" style="width:100%" placeholder="请选择" disabled>
                     <el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-select>
             </el-form-item>
 
             <el-form-item label="分期装运/提供服务" prop="didgrp.rec.fqzytgfw">
-                <c-select v-model="model.didgrp.rec.fqzytgfw" placeholder="请选择" disabled style="width:50%">
+                <c-select v-model="model.didgrp.rec.fqzytgfw" placeholder="请选择" disabled style="width:100%">
                     <el-option v-for="item in codes.shppar" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-select>
@@ -96,7 +96,7 @@
             </el-form-item>
 
             <el-form-item label="转运" prop="didgrp.rec.shptrs">
-                <c-select v-model="model.didgrp.rec.shptrs" style="width:50%" placeholder="请选择" disabled>
+                <c-select v-model="model.didgrp.rec.shptrs" style="width:100%" placeholder="请选择" disabled>
                   <el-option label="不允许" value="禁止"></el-option>
                   <el-option label="允许" value="允许"></el-option>
                 </c-select>

src/views/Business/Infdid/Detp1.vue

@@ -56,6 +56,7 @@
       </el-form-item> -->
       <c-ptapdome
         :disabledJigomc="true"
+        :disabledBankno="true"
         :disabledDizhii="true"
         :model="model"
         :argadr="{
@@ -157,9 +158,9 @@
         ></c-input>
       </el-form-item> -->
       <c-ptapdome
-        :disabledBankno="model.didgrp.rec.fenctg != 'Y'"
         :disabledJigomc="true"
-        :disabledDizhii="model.didgrp.rec.fenctg != 'Y'"
+        :disabledBankno="true"
+        :disabledDizhii="true"
         :model="model"
         :argadr="{
           title: '议付行',
@@ -216,9 +217,9 @@
         ></c-input>
       </el-form-item> -->
       <c-ptapdome
-        :disabledBankno="model.didgrp.rec.lcrtyp != 'IT'"
         :disabledJigomc="true"
-        :disabledDizhii="model.didgrp.rec.lcrtyp != 'IT'"
+        :disabledBankno="true"
+        :disabledDizhii="true"
         :model="model"
         :argadr="{
           title: '转让行',
@@ -270,8 +271,8 @@
                 ></c-input>
             </el-form-item> -->
       <c-ptapdome
-        :disabledBankno="true"
         :disabledJigomc="true"
+        :disabledBankno="true"
         :disabledDizhii="true"
         :model="model"
         :argadr="{
@@ -356,9 +357,9 @@
         ></c-input>
       </el-form-item> -->
         <c-ptapdome
-          :disabledBankno="model.didgrp.rec.bdflg != 'Y'"
           :disabledJigomc="true"
-          :disabledDizhii="model.didgrp.rec.bdflg != 'Y'"
+          :disabledBankno="true"
+          :disabledDizhii="true"
           :model="model"
           :argadr="{
             title: '保兑行',
@@ -396,6 +397,8 @@
       </el-form-item> -->
       <c-ptapdome
         :disabledJigomc="true"
+        :disabledBankno="true"
+        :disabledDizhii="true"
         :model="model"
         :argadr="{
           title: '申请行',
@@ -441,7 +444,7 @@ import Api from "~/service/Api";
 import CommonProcess from "~/mixin/CommonProcess";
 import Event from "~/model/Ditopn/Event";
 import Utils from "~/utils";
-import PtapDome from "./PtapDome";
+import PtapDome from "~/views/Public/PtapDome";
 
 export default {
   components: { "c-ptapdome": PtapDome },

src/views/Business/Infdid/Infsea.vue

@@ -302,7 +302,7 @@
     <!-- <el-row> -->
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns">
-          <el-table-column fixed="right" prop="op" label="操作" width="150px">
+          <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
@@ -371,14 +371,14 @@
                 处理
               </c-button>
 
-              <!-- <c-button
+              <c-button
                 style="margin-left: 0"
                 size="small"
                 type="primary"
                 @click="getDitSelInfo(scope.$index, scope.row)"
               >
                 info
-              </c-button> -->
+              </c-button>
             </template>
           </el-table-column>
         </c-istream-table>
@@ -651,31 +651,27 @@ export default {
           this.initdialog = false                    
         } ,
         async getDitSelInfo(idx,row){
+          //TD中选中行触发
           var params = {selDst:"infbut.dspstm",selIds:[idx+1]}
           let rtnmsg = await this.executeRule("infbut.dspstm", params);  
-          console.log(rtnmsg);
           if(rtnmsg.respCode = SUCCESS){
             this.updateModel(rtnmsg.data);
             // Utils.copyValueFromVO(this.model, rtnmsg.data);
+            //TD中点击display时触发
             params = {selDst:"infbut.dsp",selIds:[idx+1]}
             let rtnmsgNew = await this.executeRule("infbut.dsp", params); 
 
             if(rtnmsgNew.respCode = SUCCESS){
+              console.log(rtnmsgNew);
               this.updateModel(rtnmsgNew.data);
-              // Utils.copyValueFromVO(this.model, rtnmsgNew.data);
-              params = {selDst:"infcon.dsp",selIds:[idx+1]}
-              let rtnmsgObjinr = await this.executeDefault("infcon.objinr",params); 
 
-               if(rtnmsgObjinr.respCode = SUCCESS){
-                 this.updateModel(rtnmsgObjinr.data);
-                //  Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
-              //   // let rtnmsgOitset = await this.executeDefault("mtabut.coninf.oitset.oit",params); 
+              let rtnmsgOitset = await this.executeDefault("mtabut.coninf.oitset.oit"); 
 
-              //   // if(rtnmsgOitset.respCode = SUCCESS){
-              //   //   Utils.copyValueFromVO(this.model, rtnmsgOitset.data);
+                if(rtnmsgOitset.respCode = SUCCESS){
+                  Utils.copyValueFromVO(this.model, rtnmsgOitset.data);
 
-              //   // }
                 }
+               
             }
           }
           //触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏

src/views/Business/Infdid/Ovwp.vue

 <template>
+<div class="eibs-tab">
   <c-row>
     <!-- =================顶部====================== -->
     <c-col :span="24">
       <c-col :span="11">
-        <c-col :span="20">
           <el-form-item
             label="信用证号码"
             prop="didgrp.rec.ownref"
             style="width: 100%"
           >
+            <c-fullbox>
               <c-input
                   v-model="model.didgrp.rec.ownref"
                   maxlength="16"
                   placeholder="请输入Reference"
-              style="width: 95%"
                   disabled
               ></c-input>
-          </el-form-item>
-        </c-col>
-        <!-- <c-col :span="1" style="text-align: right"> -->
-          <c-col :span="1">
-            <!-- <el-form-item label="" label-width="5px"> -->
+              <template slot="footer">
                 <c-button
-               style="margin:0 10px 0 0;padding: 0 12px;"
+                style="margin:0px 10px 0 10;padding: 0 12px;"
                   size="small"
                   type="primary"
                   @click="onSeainf"
                   disabled
                 >
-              <span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
+                <span style="font-family:'宋体';font-weight:bold">i</span>
                 </c-button>
-            <!-- </el-form-item> -->
-          </c-col>
-          <c-col :span="3" style="text-align: right">
-            <!-- <el-form-item label="" label-width="5px"> -->
                 <c-button
                 style="margin:0 0"
                   size="small"
@@ -43,9 +35,9 @@
                 >
                   获取
                 </c-button>
-            <!-- </el-form-item> -->
-          </c-col>
-        <!-- </c-col> -->
+              </template>
+           </c-fullbox>
+          </el-form-item>
       </c-col>
       <c-col :span="11" :offset="1">
         <el-form-item label="摘要" prop="didgrp.rec.nam">
@@ -61,35 +53,34 @@
     </c-col>
     <!-- ====================左边======================= -->
     <c-col :span="11">
-      <c-col :span="20">
+      <c-col :span="24">
         <el-form-item
           label="所属客户经理"
           prop="recpan.usr.extkey"
           style="width: 100%"
         >
+        <c-fullbox>
             <c-input
-            style="width: 95%"
               v-model="model.recpan.usr.extkey"
               maxlength="8"
               placeholder="请输入User ID"
               disabled
             ></c-input>
-        </el-form-item>
-      </c-col>
-
-      <c-col :span="1">
-        <!-- <el-form-item label="" label-width="17px"> -->
+            <template slot="footer">
               <c-button
-            style="margin:0 10px 0 0;padding: 0 10px;"
+                style="margin-left:10px;padding: 0 10px;"
                 size="small"
                 icon="el-icon-search"
                 type="primary"
                 @click="onExtkey"
                 disabled
               ></c-button>
-        <!-- </el-form-item> -->
+            </template>  
+          </c-fullbox>
+        </el-form-item>
       </c-col>
 
+
       <!-- <c-col>
                 &nbsp;
             </c-col> -->
@@ -140,23 +131,27 @@
       </c-col>
       <c-col :span="24">
         <c-col :span="13">
-        <el-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
+          <c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
               <c-input
                   v-model="model.didgrp.rec.nomtop"
                   maxlength="9"
-            style="width: 48%"
+                  style="width: 100%"
                   placeholder="请输入Amount Tolerance - Positive"
                   disabled
               ></c-input>
+          </c-form-item>
+        </c-col>
+        <c-col :span="1" style="text-align:center">
           <label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
+        </c-col>
+        <c-col :span="10">
           <c-input
               v-model="model.didgrp.rec.nomton"
               maxlength="9"
-            style="width: 48%"
+              style="width: 100%"
               placeholder="请输入Amount Tolerance - Negative"
               disabled
           ></c-input>
-        </el-form-item>
         </c-col>
       </c-col>
       <!-- <c-col :span="12" style="text-align: left">
@@ -242,21 +237,18 @@
       </c-col>
 
       <c-col :span="24">
-      <c-col :span="13">
         <el-form-item label="开证日期" prop="didgrp.rec.opndat">
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.opndat"
             value-format="yyyy-MM-dd"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择Date"
             disabled
           ></c-date-picker>
         </el-form-item>
       </c-col>
-      </c-col>
        <c-col :span="24">
-      <c-col :span="13">
         <el-form-item
           v-if="model.didgrp.rec.mytype == 'H'"
           label="最迟货物装运日"
@@ -266,7 +258,7 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择Date"
             disabled
           ></c-date-picker>
@@ -280,7 +272,7 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择Date"
             disabled
           ></c-date-picker>
@@ -294,27 +286,24 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择"
             disabled
           ></c-date-picker>
         </el-form-item>
       </c-col>
-      </c-col>
       <c-col :span="24">
-      <c-col :span="13">
         <el-form-item label="有效日期" prop="didgrp.rec.expdat">
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.expdat"
             value-format="yyyy-MM-dd"
-            style="width: 95%"
+            style="width: 100%"
             placeholder="请选择Date"
             disabled
           ></c-date-picker>
         </el-form-item>
       </c-col>
-      </c-col>
       <c-col :span="24">
         <el-form-item label="有效地点" prop="didgrp.rec.expplc">
           <c-input
@@ -348,6 +337,7 @@
         <el-form-item label="报文类型" label-width="80px">
           <c-select v-model="model.recpan.msgtyp" placeholder="请选择报文类型"
            :code="getValues('recpan.msgtyp')"
+           style="width: 100%"
            disabled />
         </el-form-item>
       </c-col>
@@ -787,6 +777,7 @@
       </c-col>
     </c-col>
   </c-row>
+  </div>
 </template>
 <script>
 import Api from "~/service/Api";
@@ -827,15 +818,15 @@ export default {
     },
   },
   created: function () {
-    console.log(this.root);
+    // console.log(this.root);
   },
   computed: {
-    flag() {
-      return this.model.didgrp.apl.pts.extkey == "";
-    },
+    // flag() {
+    //   return this.model.didgrp.apl.pts.extkey == "";
+    // },
   },
   watch: {
-    declareParams() {},
+    // declareParams() {},
   },
 };
 </script>

src/views/Business/Infdid/Ptap.vue

 <template>
-  <div class="eibs-tab">
+  <div>
     <c-col v-if="!noRef" :span="24">
-      <el-form-item
+      <c-form-item
         :label="`${argadr.title}参考号`"
         :prop="`${argadr.grp}.${argadr.rol}.pts.ref`"
       >
@@ -10,33 +10,28 @@
           :placeholder="'请输入' + argadr.title + '参考号'"
           disabled
         ></c-input>
-      </el-form-item>
+      </c-form-item>
     </c-col>
 
-    <c-col :span="20">
+    <c-col :span="24">
       <el-form-item
         :label="`${argadr.title}ID`"
         :prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
         style="width: 100%"
       >
+        <c-fullbox>
           <c-input
-          style="width: 95%"
             v-model="model[argadr.grp][argadr.rol].pts.extkey"
             :placeholder="'请输入' + argadr.title + 'Extkey'"
             @keyup.enter.native="
               showGridPromptDialog(`${argadr.grp}.${argadr.rol}.pts.extkey`)
             "
-          @change="valueChange"
             disabled
+            @change="valueChange"
           ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="1">
-      <!-- <el-form-item label="" label-width="5px"> -->
+          <template slot="footer">
             <c-button
-        style="margin:0 10px 0 0;padding: 0 10px;"
-        class="searchButton"
+              style="margin:0 10px 0 10;padding: 0 12px;"
               size="small"
               type="primary"
               icon="el-icon-search"
@@ -44,19 +39,18 @@
               @click="onSeainf(`${argadr.grp}.${argadr.rol}.pts.extkey`)"
             >
             </c-button>
-    </c-col>
-    <c-col :span="3" style="text-align: right">
             <c-button
               style="margin:0 0"
-        class="detailsButton"
               size="small"
               type="primary"
-        disabled
               @click="onAplpDet"
+              disabled
             >
               {{ $t('buttons.details') }}
             </c-button>
-      <!-- </el-form-item> -->
+          </template>
+        </c-fullbox>
+      </el-form-item>
     </c-col>
 
     <template v-if="!onlySearch">
@@ -72,7 +66,7 @@
             maxlength="35"
             show-word-limit
             placeholder="请输入名称地址"
-            :disabled="disabled"
+            disabled
           ></c-input>
         </el-form-item>
       </c-col>
@@ -86,7 +80,7 @@
               type="textarea"
               v-model="model[argadr.grp][argadr.rol].namelc"
               :placeholder="'请输入' + argadr.title + '名称'"
-              :disabled="disabled"
+              disabled
               :rows="2"
               maxlength="35"
               show-word-limit
@@ -104,7 +98,7 @@
               :rows="2"
               v-model="model[argadr.grp][argadr.rol].adrelc"
               :placeholder="'请输入' + argadr.title + '地址'"
-              :disabled="disabled"
+              disabled
               maxlength="35"
               show-word-limit
             ></c-input>
@@ -186,14 +180,4 @@ export default {
 };
 </script>
 <style>
-.searchButton {
-  text-align: center;
-  /* margin: 0 10px; */
-  margin-right: 10px;
-  padding: 0 10px;
-}
-.detailsButton {
-  margin-left: 10px;
-  
-}
 </style>

src/views/Business/Infdid/Stament.vue

@@ -21,7 +21,6 @@
           show-word-limit
           placeholder="请输入声明"
           :rows="15"
-          disabled
         ></c-input>
       </el-form-item>
     </c-col>

src/views/Business/Infdid/index.vue

 <template>
-  <div class="eContainer">
+  <div class="eContainer" style="height:90%">
      <div style="padding:0 15px">
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="110px" label-position="right" size="small" :validate-on-rule-change="false">
+    <el-form 
+     :model="model" 
+     :rules="rules" 
+     ref="modelForm" 
+     label-width="110px" 
+     label-position="right" 
+     size="small" 
+     :validate-on-rule-change="false">
        
         
             <!--PD000006 -->
@@ -14,12 +21,16 @@
           <c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card" @tab-click="tabClick">
             <!--PD000001 -->
            <el-tab-pane label="基本信息" name="ovwp">
+                <c-content>
                 <m-ovwp :model="model" :codes="codes"/>
+                </c-content>
            </el-tab-pane>
 
            <!--PD000452 -->
            <el-tab-pane label="其他当事人" name="detp1">
+                <c-content>
                 <m-detp1 :model="model" :codes="codes"/>
+                </c-content>
            </el-tab-pane>
  
             <!--PD000077 -->
@@ -98,9 +109,19 @@
            <el-tab-pane label="声明" name="stament">
                 <m-stament :model="model" :codes="codes"/>
            </el-tab-pane> 
+           
+           
        </c-tabs>
     </el-form>
     </div>
+     <c-button
+          v-show="showPanel"
+          style="margin-left: 75%;bottom: 10%;position:sticky"
+          size="small"
+          @click="goBack()">
+     <!-- @click="getDitSelInfo(scope.$index, scope.row)" -->
+          返回
+     </c-button>
   </div>
 </template>
 <script>
@@ -208,7 +229,10 @@ export default {
         async updateShowPanel(value) {
             this.showPanel = value;
             this.initPanel(value);
-        }
+        },
+        goBack(){
+          this.showPanel = false;
+        },
 
     },
     created:async function(){