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

src/model/Sptsel/Default.js

@@ -43,7 +43,7 @@ async function defaultDflg() {
     let rtnmsg = await Api.post("sptsel/default/dflg", Utils.flatObject(this.model))
     if (rtnmsg.respCode == "AAAAAA") {
         //TODO 处理数据逻辑
-        this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
+        //this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
     }
     else {
         this.$notify.error({ title: '错误', message: '服务请求失败！' });
@@ -53,7 +53,7 @@ async function defaultYptinf() {
     let rtnmsg = await Api.post("sptsel/default/yptinf", Utils.flatObject(this.model))
     if (rtnmsg.respCode == "AAAAAA") {
         //TODO 处理数据逻辑
-        this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
+        //this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
     }
     else {
         this.$notify.error({ title: '错误', message: '服务请求失败！' });
@@ -65,7 +65,7 @@ async function defaultCheckbox() {
     let rtnmsg = await Api.post("sptsel/default/sptstm", Utils.flatObject(this.model))
     if (rtnmsg.respCode == "AAAAAA") {
         //TODO 处理数据逻辑
-        //this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
+        this.model.stmData.data = rtnmsg.data.sptstm.rows;
     }
     else {
         this.$notify.error({ title: '错误', message: '服务请求失败！' });

src/views/Business/Ditopn/Ovwp.vue

@@ -177,6 +177,9 @@
        <el-col :span="7">
         <el-form-item label="信用证最大金额">
             <c-select v-model="model.didgrp.cbs.max.cur" style="width:100%" placeholder="请选择Currency">
+                <el-option v-for="item in codes.cur" :key="item.value" :label="item.label"
+                        :value="item.value">
+                </el-option>
             </c-select>
         </el-form-item>
        </el-col>

src/views/Business/Ditopn/Tk.vue

@@ -7,7 +7,7 @@
     -->          
        <el-col :span="24">
         <el-form-item label="货物描述">
-            <c-input type="textarea" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input>
+            <c-input type="textarea" v-model="model.didgrp.blk.lcrgod" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入Description of Goods" ></c-input>
         <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrgodButtxmsel">
             ...
         </c-button>
@@ -16,7 +16,7 @@
                   
        <el-col :span="24">
         <el-form-item label="单据要求">
-            <c-input type="textarea" v-model="model.didgrp.blk.lcrdoc" maxlength="65" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
+            <c-input type="textarea" v-model="model.didgrp.blk.lcrdoc" maxlength="1950" style="width:70%;margin-right:20px;" show-word-limit placeholder="请输入单据要求" ></c-input>
         <c-button size="small" type="primary" icon="el-icon-search" @click="onLcrdocButtxmsel">
             ...
         </c-button>
@@ -25,7 +25,7 @@
                                                     
        <el-col :span="24">
         <el-form-item label="附加条款">
-            <c-input type="textarea" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="65" show-word-limit placeholder="请输入附加条款" ></c-input>
+            <c-input type="textarea" v-model="model.didgrp.blk.adlcnd" style="width:70%;margin-right:20px;" maxlength="390" show-word-limit placeholder="请输入附加条款" ></c-input>
             <c-button size="small" type="primary" icon="el-icon-search" @click="onAdlcndButtxmsel">
                 ...
             </c-button>
@@ -34,7 +34,7 @@
                                                     
        <el-col :span="24">
         <el-form-item label="给付款、承兑、议付行的指示">
-            <c-input type="textarea" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="65" show-word-limit placeholder="请输入付行的指示" ></c-input>
+            <c-input type="textarea" v-model="model.didgrp.blk.insbnk" style="width:70%;margin-right:20px;" maxlength="1430" show-word-limit placeholder="请输入付行的指示" ></c-input>
             <c-button size="small" type="primary" icon="el-icon-search" @click="onInsbnkButtxmsel">
                 ...
             </c-button>

src/views/Business/Sptsel/Menu.vue

@@ -70,7 +70,6 @@
 
         </el-col>
 
-                                   
         <el-col :span="12">
             <el-form-item label="Between">
                 <el-date-picker type="date" v-model="model.inidatfro" style="width:45%" placeholder="请选择Date of entry of Transaction"></el-date-picker>
@@ -79,8 +78,6 @@
             </el-form-item>
         </el-col>
 
-
-                  
         <el-col :span="12">
             <el-form-item label="国内国际证标志">
                 <c-select v-model="model.dflg" style="width:100%" placeholder="请选择国内国际标志">
@@ -145,7 +142,7 @@
         </el-form-item>
        </el-col>
        -->
-       <p>{{model.sptstm}}</p>
+        <!-- <p>{{model.sptstm}}</p> -->
 
         <el-col :span="24">
             <el-col :span="12">
@@ -154,7 +151,6 @@
                 </el-form-item>
             </el-col>
 
-                        
             <el-col :span="12" style="text-align:center">
                 <c-button size="small" type="primary" disabled="disabled" @click="onButypt">
                     退回云平台
@@ -171,6 +167,7 @@
             </el-col>
         </el-col>
 
+        <c-istream-table :list="stmData.data" :columns="stmData.columns"></c-istream-table>
     </div>
 </template>
 <script>
@@ -184,8 +181,12 @@ export default {
     // mixins: [CommonProcess],
     data(){
         return {
-            declareParams:{"fileName":"sptsel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/sptsel/sptstm"},
-
+            stmData: {
+                columns: [
+                ],
+                data: [
+                ]
+            }
         }
     },
     methods:{...Event},
@@ -195,5 +196,4 @@ export default {
 }
 </script>
 <style>
-
 </style>

src/views/Business/Sptsel/index.vue

@@ -3,7 +3,7 @@
         <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
             <el-tabs ref="elment" type="border-card" @tab-click="tabClick">
                 <el-tab-pane label="经办夹查询">
-                    <m-menu :model="model" :codes="codes" />
+                    <m-menu :model="model" :codes="codes" ref="Menu"/>
                 </el-tab-pane>
             </el-tabs>
         </el-form>
@@ -50,7 +50,7 @@ export default {
         {
            //TODO 处理数据逻辑
             this.model = Utils.copyValueFromVO(this.model, rtnmsg.data)
-            //console.log(this.model)
+            this.$refs.Menu.stmData.columns = rtnmsg.data.sptstm.rows;
         }
         else
         {