Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/education/resultPageList.vue

@@ -25,9 +25,7 @@
 
         </div>
       </div>
-      <el-dialog title="用户问卷调查详情" :visible.sync="dialogVisible" width="600px">
 
-      </el-dialog>
     </div>
 
 
@@ -90,6 +88,52 @@
                      :total="count">
       </el-pagination>
     </div>
+    <el-dialog title="用户问卷调查详情" :visible.sync="dialogVisible" width="600px">
+      <div class="wjstyle" v-if="xqdata!=null">
+        <div class="row" style="font-size: 16px;margin-bottom: 10px">
+          <img :src="xqdata.obj.Photo" alt="" style="width: 50px;height: 50px;margin-right: 10px">
+          {{xqdata.obj.Name}}
+        </div>
+        <div>创建时间：{{xqdata.obj.CreateDateStr}}</div>
+        <div style="font-size: 16px;margin: 10px 0 ;font-weight: bold">用户调查表</div>
+        <div v-for="(item,index) in xqdata.surverList" :key="index">
+            <div >{{index+1}}、{{item.Title}}</div>
+            <div v-if="item.SurveyType==4" style="margin: 10px 0;">
+              <el-input
+                v-if="item.FormType==2"
+                type="textarea"
+                placeholder="请输入内容"
+                v-model="item.TextContent"
+                :rows="3"
+                size="small"
+                :disabled="true">
+              </el-input>
+              <el-input
+                v-if="item.FormType==1"
+                type="text"
+                placeholder="请输入内容"
+                v-model="item.TextContent"
+                size="small"
+                :disabled="true">
+              </el-input>
+            </div>
+<!--          单选-->
+          <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
+            <el-checkbox v-model="x.IsCheck==0?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y" >{{x.OptionsName}}</el-checkbox>
+
+          </div>
+          <div v-if="item.SurveyType==1" style="margin: 10px 0;">
+            <el-rate
+              v-model="item.ScoreNum"
+              disabled
+              show-score
+              text-color="#ff9900"
+              score-template="{value}分">
+            </el-rate>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -110,7 +154,7 @@
         loading:false,
         dateList:[],
         dialogVisible:false,
-        xqdata:{},
+        xqdata:null,
       }
     },
     created(){
@@ -150,7 +194,7 @@
         this.apipost("/api/Survey/GetGuestSurveyDetails", {SurveyID:row.ID}, res => {
           if(res.data.resultCode==1){
             this.xqdata = res.data.data;
-
+            this.dialogVisible =true
           }else {
             this.Info(res.data.message);
           }
@@ -204,4 +248,9 @@
     float: left;
     margin-right: 8px;
   }
+  .resultPageList .wjstyle{
+    width: 100%;
+
+  ;
+  }
 </style>

src/components/sallCenter/addAutoreleaseCoupon.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="el-card__body" style="background-color: white; padding: 15px 50% 15px 0 ;margin-top: 20px">
       <el-form :model="msg" style="padding:0 20px;" :rules="rules" ref="msg" label-width="160px"  size="small">
-        <el-form-item label="触发事件" class="is-required" style="width: 50%">
+        <el-form-item label="触发事件" class="is-required" >
           <el-select v-model="msg.TriggerType" placeholder="请选择">
             <el-option
               v-for="item in options"
@@ -20,7 +20,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="发放的优惠券" class="is-required" style="width: 50%">
+        <el-form-item label="发放的优惠券" class="is-required" >
           <el-select v-model="msg.DiscountCouponId" placeholder="请选择">
             <el-option
               v-for="item in options2"
@@ -30,13 +30,22 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="口令" class="is-required"   v-if="msg.TriggerType==5" style="width: 61%;">
+          <el-input v-model="msg.KeyWord" class="el-input--small"  />
+        </el-form-item>
+        <el-form-item label="开始时间" >
+          <el-date-picker size="small"  v-model="msg.RegisterDate" type="date"
+                          value-format="yyyy-MM-dd" placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+
 
         <el-form-item label="发放次数" prop="GrantNum" class="is-required">
           <el-tooltip class="item" effect="dark" content="每个用户可发放次数；如不限制发放次数，请填写0" placement="top"
                       style="position: absolute;left: -10px;top:10px">
             <i class="el-tooltip el-icon-info"></i>
           </el-tooltip>
-          <el-input v-model="msg.GrantNum" class="el-input--small" :disabled="checked" step="1"  min="0" onkeyup="this.value= this.value.match(/\d+(\d{0,2})?/) ? this.value.match(/\d+(\d{0,2})?/)[0] : ''" style="width: 30%;"/>
+          <el-input v-model="msg.GrantNum" class="el-input--small" :disabled="checked" step="1"  min="0" onkeyup="this.value= this.value.match(/\d+(\d{0,2})?/) ? this.value.match(/\d+(\d{0,2})?/)[0] : ''" style="width: 50%;"/>
           <el-checkbox v-model="checked" @change="checked==true? msg.GrantNum=0:msg.GrantNum=1" style="margin-left: 10px">无限制</el-checkbox>
         </el-form-item>
 
@@ -124,7 +133,9 @@
                 DiscountCouponId:0,
                 GrantNum:1,
                 IsAll:0,
-                UserList:[]
+                UserList:[],
+                RegisterDate:'',
+                KeyWord:'',
               },
             rules:{
               GrantNum:[
@@ -254,6 +265,13 @@
                 UList.push({'UserId':this.UserList[i].Id})
               }
               this.msg.UserList= UList
+              if(this.msg.RegisterDate==null){
+                this.msg.RegisterDate=''
+              }
+              if(this.msg.TriggerType==5 && this.msg.KeyWord==''){
+                this.Error('请填写口令')
+                return false
+              }
               this.loading2 = true;
               this.apipost("/api/Coupon/AddOrUpdateSelfMotion",this.msg, res => {
                 this.loading2 = false;