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/model/Bctacc/index.js

@@ -53,6 +53,7 @@ export default class Bctacc{
 								dbfadrblkcn:"",			//  Chinese address		.bcdgrp.drr.dbfadrblkcn
 							},
 							blk:{
+								docpre:"",
 								colins:"",			//  Collection Instructions		.bcdgrp.blk.colins
 								dftins:"",			//  Draft Instructions		.bcdgrp.blk.dftins
 								othins:"",			//  Other Instructions		.bcdgrp.blk.othins
@@ -76,6 +77,7 @@ export default class Bctacc{
 								mattxtlab:"",			//  Label for MATTXT		.bctp.matp.mattxtlab
 							},
 							docgrdm:{
+								docgrd:[],
 								docdsclab:"",			//  Label of document description		.bctp.docgrdm.docdsclab
 							},
 							drep:{

src/model/Bctame/index.js

@@ -41,6 +41,7 @@ export default class Bctame{
 								},
 							},
 							blk:{
+								docpre:"",
 								bcgdet:"",			//  Maturity Text		.bcdgrp.blk.bcgdet
 								bcgdetflg:"",			//  BC Tenor Details modified		.bcdgrp.blk.bcgdetflg
 								colins:"",			//  Collection Instructions		.bcdgrp.blk.colins
@@ -89,6 +90,7 @@ export default class Bctame{
 								extkey:"",			//  Responsible User		.bctp.usr.extkey
 							},
 							docgrdm:{
+								docgrd:[],
 								docdsclab:"",			//  Label of document description		.bctp.docgrdm.docdsclab
 							},
 							drep:{

src/model/Bctdav/index.js

@@ -50,6 +50,7 @@ export default class Bctdav{
 								},
 							},
 							blk:{
+								docpre:"",
 								bcgdet:"",			//  Maturity Text		.bcdgrp.blk.bcgdet
 								bcgdetflg:"",			//  BC Tenor Details modified		.bcdgrp.blk.bcgdetflg
 								colins:"",			//  Collection Instructions		.bcdgrp.blk.colins
@@ -93,6 +94,8 @@ export default class Bctdav{
 							},
 							docgrdm:{
 								docdsclab:"",			//  Label of document description		.bctp.docgrdm.docdsclab
+								docgrd:[],	
+							
 							},
 							drep:{
 								ptsget:{

src/model/Bctdor/index.js

@@ -66,6 +66,7 @@ export default class Bctdor{
 								dbfadrblkcn:"",			//  Chinese address		.bcdgrp.drr.dbfadrblkcn
 							},
 							blk:{
+								docpre:"",
 								resrej:"",			//  Reason 		.bcdgrp.blk.resrej
 								colins:"",			//  Collection Instructions		.bcdgrp.blk.colins
 								dftins:"",			//  Draft Instructions		.bcdgrp.blk.dftins
@@ -106,6 +107,10 @@ export default class Bctdor{
 							},
 						},
 						bctp:{
+							docgrdm:{
+								docdsclab:"",			//  Label of document description		.bctp.docgrdm.docdsclab
+								docgrd:[],				
+							},
 							recget:{
 								sdamod:{
 									seainf:"",			//  		.bctp.recget.sdamod.seainf

src/model/Bctrad/index.js

@@ -51,6 +51,7 @@ export default class Bctrad{
 								dbfadrblkcn:"",			//  Chinese address		.bcdgrp.drr.dbfadrblkcn
 							},
 							blk:{
+								docpre:"",
 								colinssnm:"",			//  Instructions for Second Mail		.bcdgrp.blk.colinssnm
 								colins:"",			//  Collection Instructions		.bcdgrp.blk.colins
 								dftins:"",			//  Draft Instructions		.bcdgrp.blk.dftins
@@ -75,6 +76,7 @@ export default class Bctrad{
 								mattxtlab:"",			//  Label for MATTXT		.bctp.matp.mattxtlab
 							},
 							docgrdm:{
+								docgrd:[],
 								docdsclab:"",			//  Label of document description		.bctp.docgrdm.docdsclab
 							},
 							co2p:{

src/views/Business/Bctame/Ovwp.vue

@@ -299,8 +299,13 @@
           >BC Tenor Details modified</c-checkbox
         > -->
       </c-col>
-
-      <c-edit-table :model="model" v-bind="ptsaddg"> </c-edit-table>
+      <c-docpre 
+      :model="model" 
+      :argadr="{
+        path:'bcdgrp.blk.docpre',
+        grp: 'bctp',
+        code:'docpre'
+      }"></c-docpre>
     </c-col>
     <!-- ====================右边======================= -->
     <c-col :span="11" :offset="1">
@@ -390,9 +395,13 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Bctame/Event";
 import Ptap from "~/views/Public/Ptap";
+import Docpre from "~/views/Public/Docpre";
 
 export default {
-  components: { "c-ptap": Ptap },
+  components: { 
+    "c-ptap": Ptap,
+    "c-docpre": Docpre,
+    },
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],

src/views/Business/Bctdav/Ovwp.vue

@@ -239,10 +239,17 @@
             >
             </c-istream-table>
 			-->
-		  <c-edit-table :model="model" v-bind="docgrd">
+		  <!-- <c-edit-table :model="model" v-bind="docgrd">
           </c-edit-table>
+       </c-col> -->
+      <c-docpre
+          :model="model"
+          :argadr="{
+            path: 'bcdgrp.blk.docpre',
+            grp: 'bctp',
+            rol: 'blk',
+          }"></c-docpre>
     </c-col>
-
     </c-col>
 
     <!-- ========================右边======================= -->
@@ -508,9 +515,13 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Bctdav/Event"
 import Ptap from "~/views/Public/Ptap";
+import Docpre from "~/views/Public/Docpre";
 
 export default {
-    components: { "c-ptap": Ptap },
+    components: { 
+      "c-ptap": Ptap ,
+      "c-docpre" : Docpre
+      },
     inject: ['root'],
     props:["model","codes"],
     mixins: [commonProcess],

src/views/Business/Bctrad/Bctret.vue

@@ -89,8 +89,15 @@
                 </c-button>
             </c-col>
             <c-col :span="24">
-                <c-edit-table :model="model" v-bind="docgrd">
-                </c-edit-table>
+                <!-- <c-edit-table :model="model" v-bind="docgrd">
+                </c-edit-table> -->
+                <c-docpre
+                :model="model"
+                :argadr="{
+                path: 'bcdgrp.blk.docpre',
+                grp: 'bctp',
+                rol: 'blk',
+          }"></c-docpre>
             </c-col>
         </c-col>
         <!-- ====================右边======================= -->
@@ -203,10 +210,12 @@
     import CodeTable from "~/config/CodeTable"
     import Event from "~/model/Bctrad/Event"
     import Ptap from "~/views/Public/Ptap";
+    import Docpre from "~/views/Public/Docpre";
 
     export default {
         components: {
-            "c-ptap": Ptap
+            "c-ptap": Ptap,
+            "c-docpre" : Docpre
         },
         inject: ['root'],
         props: ["model", "codes"],

src/views/Business/Bctset/Bctsus.vue

@@ -139,7 +139,7 @@
         >
         </c-istream-table>
       </c-col>
-      
+    <c-col :span="24">
         <c-docpre
           :model="model"
           :argadr="{
@@ -147,8 +147,9 @@
             grp: 'bctp',
             rol: 'blk',
           }"></c-docpre>
-     
     </c-col>
+    </c-col>
+    
 
     <!-- ========================右边======================= -->
     <c-col :span="11" :offset="1">

src/views/Public/Docpre.vue

@@ -26,7 +26,7 @@
                             </c-input>
                         </template>
                     </el-table-column>
-                    <el-table-column label="Document" prop="docnam" width="auto">
+                    <el-table-column label="Document" width="180px" prop="docnam" >
                         <template slot-scope="scope">
                             <!-- {{scope.row.docnam}} -->
                             <c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam"
@@ -37,10 +37,10 @@
                             </c-select>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" width="170px" fixed="right">
-                        <template slot-scope="scope">
-                            <div v-if="ifShowDelete">
-                                <c-button @click="deleteTable(scope.$index)" type="primary">删除</c-button>
+                    <el-table-column label="操作" width="70px"  fixed="right">
+                        <template slot-scope="scope" >
+                            <div v-if="ifShowDelete" >
+                                <c-button style="margin-left:-5px" @click="deleteTable(scope.$index)" type="primary">删除</c-button>
                             </div>
                         </template>
                     </el-table-column>