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/litame/model/index.js

@@ -144,7 +144,8 @@ export default class Litame {
 					porloa: '',
 					apprultxt: '',
 					branchinr:'',
-					inr:''
+					inr:'',
+					shppars18:'',
 				},
 				adv: {
 					pts: new Pts().data,

src/business/litdav/views/Mt750p.vue

@@ -60,8 +60,8 @@
                   
        <c-col :span="5">
         <el-form-item label="待支付金额" prop="brdgrp.rec.totamt">
-            <c-input  v-model="model.brdgrp.rec.totamt"  placeholder="请输入金额"></c-input>
-        </el-form-item>
+            <c-input  v-model="totamt"  placeholder="请输入金额"></c-input>
+          </el-form-item>
        </c-col>
     </c-col>
 
@@ -134,27 +134,56 @@ export default {
   },
   methods: {},
   created: function() {},
-
-  watch:{
-    "model.brdgrp.cbs.max.amt":{
-        handler(val,oldVal){
-            this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max2.amt)
-            if(isNaN(this.model.brdgrp.rec.totamt)){
-                this.model.brdgrp.rec.totamt=0
-            }
-        }
-    },
-    "model.brdgrp.cbs.max2.amt":{
-        handler(val,oldVal){
-            this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max.amt)
-            if(isNaN(this.model.brdgrp.rec.totamt)){
-                this.model.brdgrp.rec.totamt=0
-            }
-        }
-    }
-  }
-  
-};
+  computed: {
+    totamt(){
+      const maxAmt = this.model.brdgrp.cbs.max.amt
+      const max2Amt = this.model.brdgrp.cbs.max2.amt
+      this.model.brdgrp.rec.totamt = 
+      parseFloat(isNaN(maxAmt) || !maxAmt ? 0 : maxAmt) + 
+      parseFloat(isNaN(max2Amt) || !max2Amt ? 0 : max2Amt)
+      return this.model.brdgrp.rec.totamt
+    } 
+    // totamt(){
+    //   this.model.brdgrp.rec.totamt = 0
+    //   if(!isNaN(this.model.brdgrp.cbs.max.amt)){
+    //     this.model.brdgrp.rec.totamt += parseFloat(this.model.brdgrp.cbs.max.amt)
+    //   }else{
+    //     this.model.brdgrp.cbs.max.amt = 0
+    //   }
+    //   if(!isNaN(this.model.brdgrp.cbs.max2.amt)){
+    //     this.model.brdgrp.rec.totamt += parseFloat(this.model.brdgrp.cbs.max2.amt)
+    //   }
+    //   // this.model.brdgrp.rec.totamt = 
+    //   // parseFloat(isNaN(this.model.brdgrp.cbs.max.amt) ? 0 : this.model.brdgrp.cbs.max.amt) + 
+    //   // parseFloat(isNaN(this.model.brdgrp.cbs.max2.amt) ? 0 : this.model.brdgrp.cbs.max2.amt)
+    //   return this.model.brdgrp.rec.totamt
+    // } 
+  },
+  // watch:{
+    // "model.brdgrp.cbs.max.amt":{
+    //     handler(val,oldVal){
+    //         this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max2.amt)
+    //         if(isNaN(this.model.brdgrp.rec.totamt)){
+    //             this.model.brdgrp.rec.totamt=0
+    //         }
+    //     }
+    // },
+  //   "model.brdgrp.cbs.max2.amt":{
+  //       handler(val,oldVal){
+  //           this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max.amt)
+  //           if(isNaN(this.model.brdgrp.rec.totamt)){
+  //               this.model.brdgrp.rec.totamt=0
+  //           }
+  //       }
+  //   }
+  // "model.brdgrp.cbs":{
+  //   handler(val,oldVal){
+  //     isNaN(this.model.brdgrp.cbs.max.amt) ? 0 : this.model.brdgrp.cbs.max.amt
+  //     isNaN(this.model.brdgrp.cbs.max2.amt) ? 0 : this.model.brdgrp.cbs.max2.amt
+  //   }
+  //   }
+  // }
+ };
 </script>
 <style>
 </style>

src/business/litdck/model/check.js

@@ -394,7 +394,7 @@ let checkObj = {
   'brdgrp.srm.djudat': [{ type: 'string', required: false }],
   'brdgrp.srm.djuref': [{ type: 'string', required: false }],
   invtyp: [{ type: 'string', required: true, message: '必输项' }],
-  // 'outlen.szflg': [{ type: 'string', required: true, message: '必输项' }],
+  'szflg': [{ type: 'string', required: true, message: '必输项' }],
   'outlen.acttyp': [{ type: 'string', required: false, message: '必输项' }],
   'brdgrp.srm.djutyp': [{ type: 'string', required: true, message: '必输项' }],
 };

src/business/litopn/views/Ovwp1.vue

@@ -657,13 +657,8 @@ export default {
        }
      }
    },
-   "model.lidgrp.rec.nomspc":{
-     immediate: true,
-     handler(val,oldval){
-       if(this.model.lidgrp.rec.nomspc==""){}
-        this.model.lidgrp.rec.nomspc="X";
-     }
-   }
+ 
+   
   },
   computed: {
     flag1() {