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

src/components/IStreamTable.vue

@@ -327,6 +327,22 @@ export default {
         return value
       }
       return em.label
+    },
+    timeFormat(item,scope){
+      let value = scope.row[item.prop];
+      if(!value){
+        return ""
+      }
+      let idx = value.indexOf(".");
+      return value.substring(0,idx);
+    },
+    dateFormat(item,scope){
+      let value = scope.row[item.prop];
+      if(!value){
+        return ""
+      }
+      let idx = value.indexOf(" ");
+      return value.substring(0,idx);
     }
   }
 };

src/model/Bdtset/Pattern.js

@@ -295,11 +295,11 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "skr":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 40,message:"长度不能超过40"}
     ],
     "skzh":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 40,message:"长度不能超过40"}
     ],
     "bddgrp.rec.skhmc":[

src/model/Public/Setmod/index.js

@@ -22,7 +22,9 @@ export default class Setmod {
             },
             glemod: {
                 gleshwstm: {}
-            }
+            },
+            setamt:"",			//  扣费后付款金额		.setmod.setamt
+			redamt:"",			//  扣减金额		.setmod.redamt
         }
     }
 }
\ No newline at end of file