Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Cltsel/index.js

@@ -32,6 +32,7 @@ export default class Cltsel{
 								chktyp:"",			//  Type of Draft		.cldgrp.rec.chktyp
 								colflg:"",			//  Payemnt Disposition		.cldgrp.rec.colflg
 								inr:"",
+								opndat:"",
 							},
 							cbs:{
 								max:{

src/model/Cltset/Pattern.js

@@ -40,7 +40,7 @@ export default {
     ],
     "cldgrp.rec.count":[
         {type: "number", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        // {max: 3,message:"长度不能超过3"}
     ],
     "setmod.ref":[
         {type: "string", required: false, message: "必输项"},

src/model/Clttra/Pattern.js

@@ -39,7 +39,7 @@ export default {
         // {type: "date", required: false, message: "输入正确的日期"}
     ],
     "cldgrp.rec.count":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {type: "number", required: false, message: "必输项"},
+        // {max: 3,message:"长度不能超过3"}
     ],
 }
\ No newline at end of file

src/views/Business/Bctset/Cips2.vue

@@ -25,7 +25,9 @@
                   
        <c-col :span="12">
         <el-form-item label="业务种类" prop="trnmod.bustyp">
-            <c-select v-model="model.trnmod.bustyp" style="width:100%" :placeholder="$t('other.please_enter')+'业务种类'">
+            <c-select v-model="model.trnmod.bustyp" 
+            :code="codes.bustyp"
+            style="width:100%" :placeholder="$t('other.please_enter')+'业务种类'">
               </c-select>
         </el-form-item>
        </c-col>

src/views/Business/Bctset/Dftcrep.vue

@@ -45,7 +45,7 @@
                   style="width: 100%"
                   disabled
                   placeholder="请选择单据金额："
-                  :code="codes.cur"
+                  :code="codes.curtxt1"
                 >
                 </c-select>
               </el-form-item>
@@ -67,7 +67,7 @@
                   v-model="model.dftcre.dfdgrp.cbs.max.cur"
                   style="width: 100%"
                   placeholder="请选择代付金额："
-                  :code="codes.cur"
+                  :code="codes.curtxt1"
                 >
                 </c-select>
               </el-form-item>
@@ -486,6 +486,7 @@
                 v-model="model.dftcre.dfdgrp.dff.pts.adrblk"
                 maxlength="35"
                  :rows="5"
+                 disabled
                 show-word-limit
                 placeholder="请输入地址"
               ></c-input>

src/views/Business/Bctset/index.vue

@@ -122,11 +122,11 @@
             <m-cfactlp :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="Cips" name="cips">
+          <el-tab-pane label="Cips" name="cips" v-if="model.trnmod.cmtflg=='P'">
             <m-cips :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="Cips要素" name="cips2">
+          <el-tab-pane label="Cips要素" name="cips2" v-if="model.trnmod.cmtflg=='P'">
             <m-cips2 :model="model" :codes="codes" />
           </el-tab-pane>
 

src/views/Business/Infcld/BusNavbar.vue

@@ -54,7 +54,15 @@
       amt: {
         required: false,
         default: 0,
-      }
+      },
+      inr: {
+        required: false,
+        default: '',
+      },
+      opndat: {
+        required: false,
+        default: 0.000,
+      },
     },
     components: {},
     mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
@@ -100,6 +108,9 @@
       this.$nextTick(function () {
         this.$on("childmethods", async function () {
           this.model.cldgrp.cbs.opn1.amt = this.amt;
+          this.model.cldgrp.rec.inr = this.inr;
+          this.model.cldgrp.rec.ownref = this.ownref;
+          this.model.cldgrp.rec.opndat = this.opndat;
           let res = await this.executeRule(`cfgfil.hotreg${this.tabIndex}`);
           if (res.respCode == SUCCESS) {
             this.updateModel(res.data);

src/views/Business/Infcld/Infsea.vue

@@ -165,14 +165,14 @@
                                 slot="reference">详情</c-button>
                         </el-popover>
                         <c-button style="margin-left: 0" size="small" type="primary"
-                            @click="getButtons(scope.row['Reference'],scope.row['Open Amount'])">处理
+                            @click="getButtons(scope.row['Reference'],scope.row['Open Amount'], scope.row['INR'],scope.row['Opened'])">处理
                         </c-button>
                     </template>
                 </el-table-column>
             </c-istream-table>
         </c-col>
 
-        <m-busbtn ref="childs" :ownref="ownref" :amt="amt" :model="CltselModel" ownrefPath="cldgrp" trnCode="cltsel"
+        <m-busbtn ref="childs" :ownref="ownref" :amt="amt" :model="CltselModel" ownrefPath="cldgrp" trnCode="cltsel" :inr="inr" :opndat="opndat"
             @onChoose="onChoose">11</m-busbtn>
 
 
@@ -197,6 +197,8 @@ export default {
     data() {
         return {
             amt: '',
+            inr: '',
+            opndat: '',
             CltselModel: new CltselModel().data,
             ownref: "",
             initdialog: false,
@@ -241,13 +243,13 @@ export default {
     },
     methods: {
         ...Event,
-        async getButtons(ownref,amt) {
+        async getButtons(ownref,amt,inr,opndat) {
             this.$refs.childs.initdialog = true
-            this.executeDefault('executeNotify');
             this.ownref = ownref
             this.amt = amt;
+            this.inr = inr;
+            this.opndat = opndat;
             console.log("ownref:" + ownref);
-            console.log(amt);
         },
         async onChoose(code) {
             //跳转交易

src/views/Layout/SideMenu.vue

@@ -114,9 +114,9 @@ export default {
         { inifrm: "infbtd", ininam: "转让信用证单据查询", pntmiu: "7" },
         { inifrm: "8", ininam: "打包托收", pntmiu: "" },
         { inifrm: "infcld", ininam: "打包托收查询", pntmiu: "8" },
-        { inifrm: "cltdav", ininam: "打包托收开立", pntmiu: "8" },
-        { inifrm: "clttra", ininam: "打包托收催收", pntmiu: "8" },
-        { inifrm: "cltset", ininam: "打包托收解包", pntmiu: "8" },
+        // { inifrm: "cltdav", ininam: "打包托收开立", pntmiu: "8" },
+        // { inifrm: "clttra", ininam: "打包托收催收", pntmiu: "8" },
+        // { inifrm: "cltset", ininam: "打包托收解包", pntmiu: "8" },
         { inifrm: "9", ininam: "光票托收", pntmiu: "" },
         { inifrm: "infccd", ininam: "光票托收查询", pntmiu: "9" },
         // { inifrm: "ccttra", ininam: "光票托收催收", pntmiu: "9" },