提交联调

src/business/gitopn/model/index.js

@@ -5,45 +5,11 @@ export default class Gitopn {
 	constructor() {
 		this.data = {
 			addbcb: {
-				addbcbl1blk:"",
-        name:"",			//  �'�物简称及税号		.addbcb.name
-        godnam:"",			//  �'�物简称		.addbcb.godnam
-        pwtyp1:"",			//  进口许可证		.addbcb.pwtyp1
-        pwtyp2:"",			//  机电产品进口许可证		.addbcb.pwtyp2
-        pwtyp3:"",			//  一般商品进口配额证明		.addbcb.pwtyp3
-        pwtyp4:"",			//  特定商品进口登记证明		.addbcb.pwtyp4
-        pwtyp5:"",			//  重要工业品自动进口许可证		.addbcb.pwtyp5
-        pwtyp6:"",			//  凭保开证，批文后补		.addbcb.pwtyp6
-        pwtyp7:"",			//  不需要		.addbcb.pwtyp7
-        pwtyp8:"",			//  其他		.addbcb.pwtyp8
-        pwtyp9:"",			//  批文类型填写文本框		.addbcb.pwtyp9
-        bcbtyp1:"",			//  不在名录		.addbcb.bcbtyp1
-        bcbtyp2:"",			//  异地付汇		.addbcb.bcbtyp2
-        bcbtyp3:"",			//  转口�'�易		.addbcb.bcbtyp3
-        bcbtyp4:"",			//  90天以上信用证		.addbcb.bcbtyp4
-        bcbtyp5:"",			//  不需要		.addbcb.bcbtyp5
-        bcbtyp6:"",			//  其它		.addbcb.bcbtyp6
-        bcbtyp7:"",			//  备查表类型填写文本框		.addbcb.bcbtyp7
         label1:"",			//  国际部意见		.addbcb.label1
         label2:"",			//  国际部意见		.addbcb.label2
         label3:"",			//  国际部意见		.addbcb.label3
-        label6:"",			//  国际部意见		.addbcb.label6
         label4:"",			//  国际部意见		.addbcb.label4
         label5:"",			//  国际部意见		.addbcb.label5
-        pwdat:"",			//  批文效期		.addbcb.pwdat
-        bcbdat:"",			//  备案表效期		.addbcb.bcbdat
-        gitamecho:"",			//  GITAMECHO		.addbcb.gitamecho
-        gitamermk:"",			//  GITAMERMK		.addbcb.gitamermk
-        bgftktyp:"",			//  不规范条款类型		.addbcb.bgftktyp
-        modtyp:"",			//  修改信用证类型		.addbcb.modtyp 
-        litameadv:"",			//  特殊规定		.addbcb.litameadv
-        ameadvrmk:"",			//  特殊规定条件		.addbcb.ameadvrmk
-        bccls1:"",			//  效期是否敞口		.addbcb.bccls1
-        bccls3:"",			//  保函期限超过三年，已经总行贸易金融部批准办理		.addbcb.bccls3
-        preexpdat:"",			//  预计效期为		.addbcb.preexpdat
-        expdat:"",			//  效期为		.addbcb.expdat
-        bccls2:"",			//  合同尚未签订或生效		.addbcb.bccls2
-        bccls4:"",			//  以下两个选项二选一		.addbcb.bccls4
 			},
 			gitp: {
 				swiftflg: '', // 是否SWIFT格式		.gitp.swiftflg
@@ -125,7 +91,7 @@ export default class Gitopn {
 					orcdat: '', // Date from Original Contract		.gidgrp.rec.orcdat
 					tenclsdat: '', // Closing Date		.gidgrp.rec.tenclsdat
 					orccur: '', // Contract Amount 		.gidgrp.rec.orccur
-					orcamt: '', // Contract Amount 		.gidgrp.rec.orcamt
+					orcamt: '0.00', // Contract Amount 		.gidgrp.rec.orcamt
 					acc: '', // A/c for Adv. Paym. Guar.		.gidgrp.rec.acc
 					jurlaws20: '', // Governing Law		.gidgrp.rec.jurlaws20
 					jurlaw: '', // Law of Jurisdiction		.gidgrp.rec.jurlaw
@@ -136,12 +102,12 @@ export default class Gitopn {
 					bngcod: '', // 企业海关编码		.gidgrp.rec.bngcod
 					juscod: '', // 组织机构代码		.gidgrp.rec.juscod
 					cunqii: '', // 流动资金贷款利率档次		.gidgrp.rec.cunqii
-					bilvvv: '', // 上浮比率		.gidgrp.rec.bilvvv
+					bilvvv: 0, // 上浮比率		.gidgrp.rec.bilvvv
 					jurplc: '', // Place of Jurisdiction		.gidgrp.rec.jurplc
 					reccnfdet: '', // Confirm. Instr.		.gidgrp.rec.reccnfdet
 					cnfdet: '',
 					cnfsta: '', // Confirmation Status 		.gidgrp.rec.cnfsta
-					partcon: '', // Partial Confirmation		.gidgrp.rec.partcon
+					partcon: 0, // Partial Confirmation		.gidgrp.rec.partcon
 					cnfdat: '', // Confirmation Date		.gidgrp.rec.cnfdat
 					opndatc: '', // Requested Issue Date		.gidgrp.rec.opndatc
 					gartypc: '', // Undertaking Type 		.gidgrp.rec.gartypc
@@ -383,12 +349,6 @@ export default class Gitopn {
 			liaall: new Pub().data.Liaall,
 			liaccv: new Pub().data.Liaccv,
 			docpan: new Pub().data.Docpan,
-			pageId: '',
-			sysmod: {
-				wrkbch: {
-					bchref: '',
-				},
-			},
 		};
 	}
 }

src/business/gitopn/views/Addbcb.vue

 <template>
   <div class="eibs-tab" >
-    <el-collapse v-model="activeNames" @change="handleChange">
+    <el-collapse v-model="activeNames">
       <el-collapse-item title="备查表" name="addbcb1">
         <m-addbcb1 :model="model" :codes="codes" />
       </el-collapse-item>
@@ -27,21 +27,7 @@ export default {
       activeNames: ["addbcb1"],
     };
   },
-  methods: {
-    handleChange(names){
-      if (this.isInDisplay) {
-        return
-      }
-      const arr = []
-      for (let i = 0; i < names.length; i++) {
-        const n = names[i];
-        const path = tabNameToRulePathMapping[n]//取出激活/展开面板name对应的rulePath
-        if (path) {
-          arr.push(path)
-        }
-      }
-    },
-  },
+  methods: {},
   created: function () {},
 };
 </script>

src/business/gitopn/views/Ovwp1.vue

@@ -268,9 +268,7 @@
                 v-model="model.gidgrp.rec.giduil"
                 style="width: 100%"
                 placeholder="请选择保函文本语言种类"
-
-              :code="codes.uiltxt1"
-              @change="executeRule('gidgrp.rec.giduil')"
+                :code="codes.uiltxt1"
               >
               </c-select>
             </el-form-item>

src/mixin/operationFunc.js

 // 此文件存放交易流转的一些公共方法
 import Api from '~/service/Api';
 export default {
+  data () {
+    return {
+      validEdRules: []
+    }
+  },
   methods: {
     // 提交
-    handleSubmit() {
+    async handleSubmit() {
       console.log('提交', this.model);
+      let params = {
+        ...this.model,
+        gidgrp: {
+          ...this.model.gidgrp,
+          ...this.model.gitp
+        },
+        transName: this.trnName,
+        userId: window.sessionStorage.userId || 'ZL',
+      }
+      delete params.gitp
+      const res = await Api.post(`/service/${this.trnName}/save`, params);
+      if (res.respCode === SUCCESS) {
+        this.$notify({
+          title: '成功',
+          message: '校验成功',
+          type: 'success',
+        });
+        this.$router.push('/taskList')
+        this.$store.commit("setTaskListTabVal", 'trnrel');
+      }
     },
     // 检核
     async handleCheck() {
       const loading = this.loading('正在校验数据');
-      const rtnmsg = await Api.post('/service/gitopn/checkAll', {
+      const rtnmsg = await Api.post(`/service/${this.trnName}/checkAll`, {
         ...this.model,
         transName: this.trnName,
         userId: window.sessionStorage.userId || 'ZL',
       });
       if (rtnmsg.respCode === SUCCESS) {
         let errorRules = rtnmsg.data;
-        Object.keys(errorRules).map((ruleKey) => {
-          // 此处判断是为了区分，如果在前端做了校验后端也校验了就不采用自定义校验规则
-          if (!this.rules[ruleKey]) {
-            this.rules[ruleKey] = [
-              {
-                validator: (rule, value, callback) => {
+        let keysList = Object.keys(errorRules)
+        let validSuccess = []
+        console.log('this.validEdRules', this.validEdRules)
+        if (this.validEdRules.length) {
+          this.validEdRules.map((item) => {
+            if (!keysList.includes(item)) {
+              validSuccess.push(item)
+            }
+          })
+        }
+        console.log('validSuccess', validSuccess)
+        this.validEdRules = Object.keys(errorRules)
+        keysList.map((ruleKey) => {
+          this.rules[ruleKey] = [
+            {
+              validator: (rule, value, callback) => {
+                if (errorRules[ruleKey]) {
                   callback(new Error(errorRules[ruleKey]));
-                },
-                trigger: ['change', 'blur'],
-              },
-            ];
-          }
+                }
+              }
+            },
+          ];
         });
+        validSuccess.map((item) => {
+          this.rules[item] = [{
+            validator: (rule, value, callback) => {
+              callback()
+            }
+          }]
+        })
         console.log('rules', this.rules);
         this.$refs['modelForm'].validate((valid) => {
           console.log('valid', valid);
+          if (valid) {
+            this.$notify({
+              title: '成功',
+              message: '校验成功',
+              type: 'success',
+            });
+          }
         });
       }
-      // this.$notify({
-      //   title: '成功',
-      //   message: '校验成功',
-      //   type: 'success',
-      // });
       loading.close();
     },
     // 暂存
@@ -57,7 +101,7 @@ export default {
         gidgrp: this.model.gidgrp,
         gitp: this.model.gitp,
       }
-      const res = await Api.post('/service/gitopn/txnHold', params);
+      const res = await Api.post(`/service/${this.trnName}/txnHold`, params);
       if (res.respCode === SUCCESS) {
         this.$notify({
           title: '成功',