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

src/model/Sptsel/Event.js

@@ -107,10 +107,9 @@ export default {
                     this.model[s.value] = 't';
                   })
             }
-            this.executeDefault("sptstm").then(res => {
-                //TODO 处理数据逻辑
-                this.stmData.data = res.data.sptstm.rows;
-            })
+           const res = await this.executeDefault("sptstm")
+           //TODO 处理数据逻辑
+           this.stmData.data = res.data.sptstm.rows;
         },
 
         async sptfndHandleReset() {

src/views/Business/Bctame/Amep.vue

@@ -50,7 +50,7 @@
 
             <c-col :span="6">
                 <el-form-item label="" style="text-align: left" label-width="20px" prop="oldbcdgrp.cbs.max.amt">
-                    <c-input disabled v-model="model.oldbcdgrp.cbs.max.amt" placeholder="Original Amount"></c-input>
+                    <c-input-currency  v-model="model.oldbcdgrp.cbs.max.amt" placeholder="Original Amount" disabled></c-input-currency>
                 </el-form-item>
             </c-col>
         </c-col>
@@ -68,7 +68,7 @@
 
             <c-col :span="6">
                 <el-form-item label="" style="text-align: left" label-width="20px" prop="trnmod.swiadd.ameamt">
-                    <c-input v-model="model.trnmod.swiadd.ameamt" placeholder="Amended Amount"></c-input>
+                    <c-input-currency v-model="model.trnmod.swiadd.ameamt" placeholder="Amended Amount"></c-input-currency>
                 </el-form-item>
             </c-col>
 
@@ -86,7 +86,7 @@
 
             <c-col :span="6">
                 <el-form-item label="" style="text-align: left" label-width="20px" prop="trnmod.swiadd.newamt">
-                    <c-input v-model="model.trnmod.swiadd.newamt" placeholder="New amount"></c-input>
+                    <c-input-currency v-model="model.trnmod.swiadd.newamt" placeholder="New amount"></c-input-currency>
                 </el-form-item>
             </c-col>
         </c-col>
@@ -103,7 +103,7 @@
         <c-col :span="24">
             <c-col :span="5">
                 <el-form-item label="Tenor Data" prop="oldbcdgrp.rec.matpercnt">
-                    <c-input disabled v-model="model.oldbcdgrp.rec.matpercnt" placeholder="Tenor Data"></c-input>
+                    <c-input-currency disabled v-model="model.oldbcdgrp.rec.matpercnt" placeholder="Tenor Data"></c-input-currency>
                 </el-form-item>
             </c-col>
 

src/views/Business/Bctame/Detp.vue

 <template>
     <div class="eibs-tab">
-
+      <c-row>
         <!-- ====================左边======================= -->
         <c-col :span="12">
             <c-col :span="24">
@@ -65,7 +65,7 @@
         </c-col>
 
         <!-- ====================右边======================= -->
-        <c-col :span="12">
+        <c-col :span="11" :offset="1">
 
             <c-col :span="24">
                 <el-form-item label="Charges Condition" prop="bcdgrp.rec.chato">
@@ -131,7 +131,7 @@
             </c-col>
 
         </c-col>
-
+       </c-row>
     </div>
 </template>
 <script>

src/views/Business/Bctame/Ovwp.vue

@@ -48,7 +48,7 @@
 
                 <c-col :span="12">
                     <el-form-item label="" style="text-align: left" label-width="20px" prop="bcdgrp.cbs.max.amt">
-                        <c-input v-model="model.bcdgrp.cbs.max.amt" placeholder="请输入Document Amount"></c-input>
+                        <c-input-currency v-model="model.bcdgrp.cbs.max.amt" placeholder="请输入Document Amount"></c-input-currency>
                     </el-form-item>
                 </c-col>
             </c-col>
@@ -64,7 +64,7 @@
 
                 <c-col :span="12">
                     <el-form-item label="" style="text-align: left" label-width="20px" prop="bcdgrp.cbs.opn1.amt">
-                        <c-input disabled v-model="model.bcdgrp.cbs.opn1.amt" placeholder="请输入Open Amount"></c-input>
+                        <c-input-currency disabled v-model="model.bcdgrp.cbs.opn1.amt" placeholder="请输入Open Amount"></c-input-currency>
                     </el-form-item>
                 </c-col>
             </c-col>

src/views/Business/BusRouter.js

@@ -119,7 +119,7 @@ const BusRouter = [
   { path: 'switsk', component: Switsk, name: 'Switsk', meta: { title: 'Switsk' } },
   { path: 'infusr', component: Infusr, name: 'Infusr', meta: { title: '用户信息' } },
   { path: 'infcpd', component: Infcpd, name: 'Infcpd', meta: { title: '汇款查询' } },
-  { path: 'bctdav', component: Bctdav, name: 'Bctdav', meta: { title: '进口代收' } },
+  { path: 'bctdav', component: Bctdav, name: 'Bctdav', meta: { title: '进口代收到单通知' } },
   { path: 'bctacc', component: Bctacc, name: 'Bctacc', meta: { title: '进口代收承兑' } },
   { path: 'bctrad', component: Bctrad, name: 'Bctrad', meta: { title: '进口代收二次收单' } },
   { path: 'bctdor', component: Bctdor, name: 'Bctdor', meta: { title: '进口代收拒付' } },
@@ -157,7 +157,7 @@ const BusRouter = [
   { path: 'inffec', component: Botset, name: 'Inffec', meta: { title: '费用条件查询' } },
   { path: 'inffee', component: Inffee, name: 'Inffee', meta: { title: '费用管理' } },
   { path: 'infptm', component: Botset, name: 'Infptm', meta: { title: '客户BIC查询' } },
-  {path:'infbcd',component:Infbcd, name: 'Infbcd', meta: { title: '进口代收查询' } },
+  {path:  'infbcd', component: Infbcd, name: 'Infbcd', meta: { title: '进口代收查询' } },
   { path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
   { path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
   { path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },

src/views/Business/Sptsel/Menu.vue

@@ -411,7 +411,7 @@ export default {
       },
     };
   },
-  mounted() {
+  async mounted() {
 
       this.sourceData = [
         { label: "Incoming", value: "chkinc" },
@@ -424,6 +424,8 @@ export default {
         { label: "归档", value: "chkcan" },
         { label: "云平台", value: "chkypt" },
       ];
+      await this.handleSearch()
+      this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length})
   },
   methods: {
     sourceChangeEvent(val) {

src/views/Business/Sptsel/index.vue

@@ -56,7 +56,6 @@ export default {
     mounted:async function(){
         console.log("进入sptsel交易");
         const that = this;
-        this.$store.commit("setTaskList", {key: "sptsel", val: 20})
         that.init(that.model).then(res => {
             //TODO 处理数据逻辑
              that.model = Utils.copyValueFromVO(that.model, res.data)

src/views/Layout/SideMenu.vue

@@ -72,13 +72,14 @@ export default {
         { inifrm: "infbpd", ininam: "进口单据查询", pntmiu: "4" },
         { inifrm: "inftxm", ininam: "条式语句查询", pntmiu: "4" },
         { inifrm: "5", ininam: "进口代收", pntmiu: "" },
-        { inifrm: "bctdav", ininam: "进口代收", pntmiu: "5" },
+        { inifrm: "bctdav", ininam: "进口代收到单通知", pntmiu: "5" },
         { inifrm: "bctame", ininam: "进口代收修改", pntmiu: "5" },
         { inifrm: "bctacc", ininam: "进口代收承兑", pntmiu: "5" },
         { inifrm: "bctrad", ininam: "进口代收二次收单", pntmiu: "5" },
         { inifrm: "bctdor", ininam: "进口代收拒付", pntmiu: "5" },
         { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" },
         { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" },
+        { inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" },
 		    { inifrm: "6", ininam: "出口托收", pntmiu: "" },
         { inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" },
         { inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" },

src/views/TaskList/index.vue

@@ -5,7 +5,7 @@
         <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
         <span slot="label">
           待经办列表
-          <el-badge :value="$store.state.Status.taskList.sptsel" :max="99"/>
+          <el-badge v-if="$store.state.Status.taskList.sptsel" :value="$store.state.Status.taskList.sptsel" :max="99"/>
         </span>
         <t-sptsel />
       </el-tab-pane>