Merge remote-tracking branch 'origin/master'

src/model/Sptsel/Event.js

@@ -75,4 +75,13 @@ export default {
 
     },
 
+    async continueEdit(row){
+        let rtnmsg = await Api.post("sptsel/getPendingData",{params:{'selsptinr':row[0]}})
+        if (rtnmsg.respCode == "AAAAAA") {
+            var cacheFileName = rtnmsg.data.cacheFileName;
+            let viewurl ="/business/ditopn?cacheFileName="+cacheFileName;
+            this.$router.push(viewurl);
+        }
+    }
+
 }
\ No newline at end of file

src/model/Trnrel/Event.js

@@ -178,10 +178,13 @@ export default {
         })
     },
     onRejrow() {
+        console.log(this.getSelectedData())
+
+        this.model.trncorco.selinr['rows'] = this.getSelectedData();
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("trnrel/rejrow", Utils.flatObject(this.model))
+            // if (!valid)
+            //     return;
+            let rtnmsg = await Api.post("trnrel/executeRule/rejrow", Utils.flatObject(this.model))
             if (rtnmsg.respCode == "AAAAAA") {
                 //TODO 处理数据逻辑
 

src/model/Trnrel/Pattern.js

@@ -93,11 +93,6 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "recpan.atp.cod":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 6,message:"长度不能超过6"}
-    ],
-
     "trn.reloricur":[
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}

src/model/Trnrel/index.js

@@ -9,7 +9,7 @@ export default class Trnrel{
 							inidattil:"",			//  Date of entry of Transaction until		.trncorco.inidattil
 							trnstm:"",			//  List of transaction sfor display		.trncorco.trnstm
 							dflg:"",			//  国内证标志		.trncorco.dflg
-							selinr: ""
+							selinr: {},
 						},
 						atp:{
 							cod:"",			//  Transaction Type 		.atp.cod

src/views/Business/Ditopn/Detp1.vue

@@ -24,7 +24,8 @@
 
         <el-col :span="12">
             <el-form-item label="开证行联行行号" prop="didgrp.adv.pts.bankno">
-                <c-input v-model="model.didgrp.adv.pts.bankno" maxlength="20"  :readonly="true" placeholder="请输入Number of bank"></c-input>
+                <!-- <c-input v-model="model.didgrp.adv.pts.bankno" maxlength="20"  :readonly="true" placeholder="请输入Number of bank"></c-input> -->
+                <c-input v-model="model.didgrp.adv.pts.bankno" maxlength="20" placeholder="请输入Number of bank"></c-input>
             </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/Business/Ditopn/index.vue

@@ -213,7 +213,7 @@ export default {
     },
     mounted:async function(){
         console.log("进入ditopn交易");
-        let rtnmsg = await this.init()
+        let rtnmsg = await this.init(this.$route.query)
         // let rtnmsg = {respCode: ''}
         if(rtnmsg.respCode == SUCCESS)
         {

src/views/Business/Sptsel/Menu.vue

@@ -203,7 +203,16 @@
             </el-col>
         </el-col>
 
-        <c-istream-table :list="stmData.data" :columns="stmData.columns"></c-istream-table>
+        <c-istream-table :list="stmData.data" :columns="stmData.columns">
+           <el-table-column
+              prop="op"
+              label="OP"
+              width="100">
+            <template slot-scope="scope">
+              <a href="javascript:void(0)" @click="continueEdit(scope.row)">继续编辑</a>
+            </template>
+         </el-table-column>
+        </c-istream-table>
     </div>
 </template>
 <script>

src/views/Business/Trnrel/Inftrnps.vue

@@ -119,7 +119,7 @@
             <c-button size="small" type="primary" disabled="disabled" @click="onReprow">
                 Repair
             </c-button>
-            <c-button size="small" type="primary" disabled="disabled" @click="onRejrow">
+            <c-button size="small" type="primary"  :disabled="relrowDisabled" @click="onRejrow">
                 Reject
             </c-button>
             <c-button size="small" type="primary" @click="onExi">
@@ -283,6 +283,9 @@ export default {
             this.relrowDisabled = !(val.length > 0);
             this.multipleSelection = val;
         },
+        getSelectedData() {
+          return this.multipleSelection.map(idx => this.stmData.data[idx])
+        },
         ...Event
     },
     created:function(){