Merge branch '0601Action' into 11/24SAAS

src/views/couponManager/couponUpdate.vue

@@ -395,7 +395,11 @@ export default {
     this.$store.dispatch("setBranchs");
     if (this.$route.query.row) {
       this.activeRow = JSON.parse(this.$route.query.row);
-      let organIdStr = JSON.parse(this.activeRow.useCondition).organId;
+       let organIdStr =''
+      if( this.activeRow.useCondition&&JSON.parse(this.activeRow.useCondition)&&JSON.parse(this.activeRow.useCondition).organId){
+          organIdStr = JSON.parse(this.activeRow.useCondition).organId;
+      }
+
       let organId = [];
       if (organIdStr) {
         organId =