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

src/components/Table.vue

@@ -180,4 +180,7 @@ export default {
 .el-table .success-row {
   background: #f0f9eb;
 }
+.eContainer-table thead tr th.is-leaf{
+  border-bottom: transparent;
+}
 </style>
\ No newline at end of file

src/config/CodeTable/index.js

@@ -5778,7 +5778,18 @@ const CodeTable = {
 	payee: [
 		{ label: "OWN Ourselves", value: "OWN" },
 		{ label: "ISS issuing Bank", value: "ISS" }
-	]
+	],
+	acccur:[
+		{ label: `CNY-人民币`, value: `CNY` },
+		{ label: `USD-美元`, value: `USD` },
+		{ label: `HKD-港币`, value: `HKD` },
+		{ label: `GBP-英镑`, value: `GBP` },
+		{ label: `EUR-欧元`, value: `EUR` },
+		{ label: `CAD-加元`, value: `CAD` },
+		{ label: `JPY-日元`, value: `JPY` },
+		{ label: `AUD-澳元`, value: `AUD` },
+		{ label: `CHF-瑞朗`, value: `CHF` },
+		],
 
 }
 export default CodeTable;
\ No newline at end of file

src/model/Ditopn/Check.js

@@ -959,6 +959,7 @@ function checkDidgrpRecTenmaxdayN1000(rule, value, callback) {
     const that = this;
     that.exeuteCheck("didgrp.rec.tenmaxday").then(res => {
         //TODO
+        Utils.copyValueFromVO(this.model, res.data)
         callback()
     })
 }

src/model/Ditopn/Default.js

@@ -347,7 +347,7 @@ function defaultDidgrpRecTenmaxday(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.blk.defdet").then(res => {
         //TODO
-        that.model.didgrp.blk.defdet = res.data.didgrp_blk_defdet;
+        Utils.copyValueFromVO(this.model, res.data)
         callback()
     })
 }

src/model/Ditopn/Pattern.js

@@ -284,8 +284,8 @@ export default {
 
 
     "didgrp.rec.tenmaxday": [
-        { type: "string", required: true, message: "必输项", trigger: "blur" },
-        { max: 3, message: "长度不能超过3", trigger: "blur" }
+        {  type: 'number', required: true, message: "必输项", trigger: "blur" },
+        // { max: 3, message: "长度不能超过3", trigger: "blur" },
     ],
 
 

src/views/Business/Ditopn/Detp.vue

@@ -11,7 +11,7 @@
             </el-form-item>
 
             <el-form-item label="付款期限" prop="didgrp.rec.tenmaxday" @keyup.enter.native="recTenmaxdayEvent">
-                <c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:15%"></c-input>
+                <c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:15%" maxlength="3"></c-input>
             </el-form-item>
 
             <el-form-item label="远期付款指示" prop="didgrp.blk.defdet">

src/views/Business/Ditopn/Setpan.vue

@@ -310,9 +310,9 @@
                 </el-table-column>
                 <el-table-column label="in" prop="acccur" width="auto">
                     <template slot-scope="scope">
-                        <el-select v-model="scope.acccur">
+                        <el-select v-model="scope.row.acccur">
                             <el-option
-                                v-for="item in scope.acccur"
+                                v-for="item in codes.acccur"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value"
@@ -342,7 +342,7 @@
                 </el-table-column>
                 <el-table-column label="Account" prop="act" width="auto">
                     <template slot-scope="scope">
-                        <el-select v-model="scope.act">
+                        <el-select v-model="scope.row.act">
                             <el-option
                                 v-for="item in scope.act"
                                 :key="item.value"

src/views/Docpan/Show.vue

@@ -16,7 +16,7 @@
                     </el-col>
                     <el-col :span="12">
                         {{ item[1] }}
-                    </el-col> <el-divider></el-divider>
+                    </el-col>
                 </el-col>
                
             </el-row>