Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/model/Ditdck/Pattern.js

@@ -17,7 +17,7 @@ export default {
     ],
 
     "didgrp.cbs.nom1.amt":[
-        {required: true, message: "必输项", trigger: 'blur'},
+        {required: false, message: "必输项", trigger: 'blur'},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -30,7 +30,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "didgrp.cbs.opn1.amt":[
-        {required: true, message: "必输项", trigger: 'blur'},
+        {required: false, message: "必输项", trigger: 'blur'},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -58,15 +58,15 @@ export default {
     "didgrp.rec.opndat":[
         {type: "date", required: false, message: "输入正确的日期"}
     ],
-    "bddgrp.prb.pts.ref":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 16,message:"长度不能超过16"}
-    ],
+    // "bddgrp.prb.pts.ref":[
+    //     {type: "string", required: false, message: "必输项"},
+    //     {max: 16,message:"长度不能超过16"}
+    // ],
     "didgrp.rec.expdat":[
         {type: "date", required: false, message: "输入正确的日期"}
     ],
     "didgrp.rec.expplc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "bddgrp.prb.pts.nam":[
@@ -99,8 +99,12 @@ export default {
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
+    "bddgrp.rec.docprbrol": [
+        { type: "string", required: true, message: "必输项" },
+        { max: 60, message: "长度不能超过60" }
+    ],
     "bddgrp.prb.pts.ref":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "trnmod.swiadd.oriinstgagt":[
@@ -112,21 +116,21 @@ export default {
         // {max: 3,message:"长度不能超过3"}
     ],
     "bddgrp.prb.pts.extkey":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
     ],
     "bddgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "date", required: true, message: "输入正确的日期"}
     ],
     "bddgrp.rec.predat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "date", required: true, message: "输入正确的日期"}
     ],
     "bddgrp.prb.pts.bankno":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
     "bddgrp.rec.orddat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "date", required: true, message: "输入正确的日期"}
     ],
 
     "bddgrp.rec.shpdat":[
@@ -160,7 +164,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bddgrp.skh.pts.jigomc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "bddgrp.rec.docsta":[
@@ -183,9 +187,9 @@ export default {
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
-    "bddgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
-    ],
+    // "bddgrp.rec.rcvdat":[
+    //     {type: "date", required: false, message: "输入正确的日期"}
+    // ],
     "bddgrp.rec.stadat":[
         {type: "date", required: false, message: "输入正确的日期"}
     ],

src/model/Ditopn/Pattern.js

@@ -175,7 +175,7 @@ export default {
     ],
 
     "didgrp.beb.pts.bankno": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { pattern: (/^[\u4E00-\u9FA5]{3,}|^[0-9A-Za-z]{6,}/), message: "至少输入3个字或6位行号" },
         { max: 20, message: "长度不能超过20" }
     ],

src/views/Business/Ditdck/Litdckp.vue

@@ -291,7 +291,7 @@
         </c-col>
     </c-col>
 
-    <c-col :span="24" style="height: 20px">
+    <c-col :span="23" style="height: 20px;margin-left:20px">
           <el-divider></el-divider>
         </c-col>
 
@@ -416,7 +416,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="到单日期">
+        <el-form-item label="到单日期" prop="bddgrp.rec.rcvdat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.rcvdat"
@@ -428,7 +428,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="交单日期">
+        <el-form-item label="交单日期" prop="bddgrp.rec.predat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.predat"
@@ -440,7 +440,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="通知日期">
+        <el-form-item label="通知日期" prop="bddgrp.rec.orddat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.orddat"
@@ -560,7 +560,7 @@
     <!-- =================右边====================== -->
     <c-col :span="11" :offset="1">
       <c-col :span="24">
-        <el-form-item label="交单行">
+        <el-form-item label="交单行" prop="bddgrp.rec.docprbrol">
           <c-select
             v-model="model.bddgrp.rec.docprbrol"
             :code="getValues('bddgrp.rec.docprbrol')"

src/views/Business/Infbdd/BusNavbar.vue

@@ -48,6 +48,7 @@ export default {
               //将model中的数据映射成数组
               return this.navcode.map(item=>{
                   let entireItem = {...item}
+                  this.navcode = [];
                   //TODO 根据数据判断当前的code，是否可以继续
                //    entireItem.enable = item.isDis
                   return entireItem
@@ -100,9 +101,15 @@ export default {
                                    //添加到navcode数组中
                                    this.navcode.splice(i,0,newList)
                               }
+                          }else{
+                              this.navcode = [] 
+                              this.$notify.error({ title: "错误", message: "服务请求失败！" });
                           }
                               
                         
+                         }else{
+                              this.navcode = [] 
+                              this.$notify.error({ title: "错误", message: "服务请求失败！" });
                          }
                         
                     })

src/views/Business/Infdid/BusNavbar.vue

@@ -48,6 +48,7 @@ export default {
               //将model中的数据映射成数组
               return this.navcode.map(item=>{
                   let entireItem = {...item}
+                  this.navcode = [];
                   //TODO 根据数据判断当前的code，是否可以继续
                //    entireItem.enable = item.isDis
                   return entireItem
@@ -107,6 +108,9 @@ export default {
                                }
 
                         
+                         }else{
+                              this.navcode = [] 
+                              this.$notify.error({ title: "错误", message: "服务请求失败！" });
                          }
                         
                     })

src/views/Public/Engp.vue

@@ -10,7 +10,9 @@
         <el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
         <el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
         <el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
+        <!--
         <el-table-column prop="nam" label="Name" width="300"> </el-table-column>
+        -->
         <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
         <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
         <el-table-column prop="oldamt" label="Old Amount" width="150px">