Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppAskForm/components/FormSetting.vue

@@ -45,7 +45,7 @@
           </u-radio-group>
         </div>
       </div>
-      <div class="setting-item">
+      <!-- <div class="setting-item">
         <div class="setting-item__left">
           <span>行为通知</span>
           <image :src="`${$cdn}askform/bz.png`" @click="tips = '当客户点击或者发布表单时，发送表单的员工将会受到消息提醒' , isShowModal = true" />
@@ -62,7 +62,7 @@
         <div class="setting-item__right">
           <u-switch v-model="dynamicNotice" active-value="1" :size="40" active-color="#1088F9"></u-switch>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="add-form__footer">
       <div @click="back">
@@ -108,8 +108,8 @@ export default {
       this.type = this.type
     } else if (this.formConfig) {
       const res = this.formConfig
-      this.periodValidityType = res.periodValidityType
-      this.commitType = res.commitType
+      this.periodValidityType = res.periodValidityType || '0'
+      this.commitType = res.commitType || '1'
       this.actionNotice = res.actionNotice === '1'
       this.dynamicNotice = res.dynamicNotice === '1'