Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/letcan/model/check.js

@@ -138,14 +138,14 @@ export default {
     { max: 16, message: '长度不能超过16' },
   ],
 
-  'setmod.docamt': [
-    { type: 'number', required: false, message: '必输项' },
-    { max: 18, message: '整数位不能超过14位' },
-    {
-      pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/,
-      message: '小数位不能超过3位',
-    },
-  ],
+  // 'setmod.docamt': [
+  //   { type: 'number', required: false, message: '必输项' },
+  //   { max: 18, message: '整数位不能超过14位' },
+  //   {
+  //     pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/,
+  //     message: '小数位不能超过3位',
+  //   },
+  // ],
 
   'setmod.zmqacc': [
     { type: 'string', required: false, message: '必输项' },

src/business/litopn/event/index.js

@@ -26,10 +26,6 @@ export default {
           trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
         }
       }
-      if ( typeof(this.$route.query.inr) == 'string' ){
-        params.spt = null
-        params.trnmod.trn =null
-      }
       const res = await Api.post('/service/litopn/init', {
         ...params,
         transName: this.trnName,

src/business/trnrel/event/index.js

@@ -157,7 +157,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
-         // 提交复核之后给该交易码的flag设置为false，用来判断此交易码没有当前页面
+         // 提交复核之后给移除该交易码的flag，用来判断此交易码没有当前页面
         localStorage.removeItem('flag_'+this.$route.query.newFlag)
         let params = {
           transName: 'trnrel',
@@ -222,8 +222,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
-         // 退回复核之后给该交易码的flag设置为false，用来判断此交易码没有当前页面
-        // localStorage.removeItem('flag_'+this.$route.query.newFlag)
+         // 退回复核之后移除该交易码的flag，用来判断此交易码没有当前页面
+        localStorage.removeItem('flag_'+this.$route.query.newFlag)
         let params = {
           trninr: this.$route.query.trn,
           transName: 'trnrel',