Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/course-form.vue

@@ -124,6 +124,12 @@
           <q-input filled stack-label v-model="objOption.ScrollMaxNum" ref="ScrollMaxNum" class="col-6 q-pr-lg q-pb-lg"
             label="最大上课人数" :rules="[val => !!val || '请填写最大上课人数']" />
         </div>
+        <div class="row">
+          <q-input filled stack-label v-model="objOption.FreeCoffeeNum" ref="FreeCoffeeNum" class="col-6 q-pr-lg q-pb-lg"
+            label="赠送咖啡杯数" :rules="[val => val >=0 || '请填写赠送咖啡杯数']" />
+          <q-input filled stack-label v-model="objOption.AddHoursMoney" ref="AddHoursMoney" class="col-6 q-pr-lg q-pb-lg"
+            label="课程增加课时费" :rules="[val => val >=0 || '请填写课程增加课时费']" />
+        </div>
         <div class="row wrap">
           <div class="col-6">
             <q-select filled stack-label option-value="Id" option-label="Name" v-model="CourseEmphasis" multiple
@@ -258,6 +264,8 @@
           IsScrollClass: 0, // 是否开启滚动开班  1是  0否（默认）
           ScrollMinNum: 0, //   最小上课人数
           ScrollMaxNum: 0, //   最大上课人数
+          FreeCoffeeNum: 0, //  赠送咖啡
+          AddHoursMoney: 0, //  课程增加课时费
           CourseTimeId: 0, //   关联上课时段
           ContractInfo: "",//合同补充协议
           OpenBankLevelList: []
@@ -498,6 +506,8 @@
             this.objOption.IsScrollClass = res.Data.IsScrollClass;
             this.objOption.ScrollMinNum = res.Data.ScrollMinNum;
             this.objOption.ScrollMaxNum = res.Data.ScrollMaxNum;
+            this.objOption.FreeCoffeeNum = res.Data.FreeCoffeeNum;
+            this.objOption.AddHoursMoney = res.Data.AddHoursMoney;
             this.objOption.CourseTimeId = res.Data.CourseTimeId;
             this.objOption.OpenBankLevelList = res.Data.OpenBankLevelList;
             this.CourseEmphasis = [];
@@ -556,6 +566,8 @@
           this.objOption.IsScrollClass = 0;
           this.objOption.ScrollMinNum = 0;
           this.objOption.ScrollMaxNum = 0;
+          this.objOption.FreeCoffeeNum = 0;
+          this.objOption.AddHoursMoney = 0;
           this.objOption.CourseTimeId = 0;
           this.objOption.OpenBankLevelList = [];
         }
@@ -570,10 +582,14 @@
         this.$refs.CourseName.validate();
         this.$refs.ClassHours.validate();
         this.$refs.CateId.validate();
+        this.$refs.FreeCoffeeNum.validate();
+        this.$refs.AddHoursMoney.validate();
         if (
           !this.$refs.CourseName.hasError &&
           !this.$refs.ClassHours.hasError &&
-          !this.$refs.CateId.hasError
+          !this.$refs.CateId.hasError &&
+          !this.$refs.FreeCoffeeNum.hasError &&
+          !this.$refs.AddHoursMoney.hasError
         ) {
           this.saveCourseLoading = true;
           var Teacher_Ids = "";

src/pages/activity/questionnaireList.vue

@@ -7,7 +7,7 @@
             label="问卷调查名称" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable filled stack-label option-value="Id" option-label="Name"
+          <q-select @input="resetSearch" filled stack-label option-value="Id" option-label="Name"
             v-model="msg.SurveyType" ref="SurveyType" :options="platList" emit-value map-options label="类型"
             :dense="false" />
         </div>
@@ -53,7 +53,7 @@
           </q-td>
         </template>
       </q-table>
-      <wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
+      <wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
     </div>
   </div>
 </template>
@@ -145,6 +145,9 @@
     created() {
     },
     mounted() {
+      if(this.$route.query&&this.$route.query.ID){
+        this.msg.ActivitySurveyId = this.$route.query.ID;
+      }
       this.getPlat();
       this.getList();
     },
@@ -179,12 +182,53 @@
           }
         })
       },
-      addObj(){
-
+      addObj(obj) {
+        if (obj) {
+          this.objOption = obj
+        } else {
+          this.objOption = null
+        }
+        this.isShowWenjuan = true;
       },
       //删除问卷
-      delQuestion(){
-
+      delQuestion(row){
+        let that = this;
+        this.$q.dialog({
+          title: "提示",
+          message: '是否删除该活动信息？',
+          cancel: {
+            label: "取消",
+            flat: true
+          },
+          ok: {
+            label: "确认",
+            flat: true,
+            focus: true
+          }
+        }).onOk(() => {
+          that.apipostDS(
+            "/api/Survey/DelSurvey",
+            {SurveyID:row.ID},
+            res => {
+              if (res.data.resultCode == 1) {
+                that.$q.notify({
+                  icon: 'iconfont icon-chenggong',
+                  color: 'accent',
+                  timeout: 2000,
+                  message: '数据删除成功！',
+                  position: 'top'
+                })
+                that.getList();
+              } else {
+                that.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: res.data.message
+                })
+              }
+            },
+          );
+        });
       },
       closeSaveForm(){
         this.isShowWenjuan=false;