1

src/components/education/questionnaireList.vue

@@ -13,7 +13,7 @@
         <div class="block">
           <div class="searchInput" style="width:250px">
             <el-input style="display:inline-block;width:225px;height:30px"
-                      placeholder="请输入活动名称搜索"
+                      placeholder="请输入问卷调查名称搜索"
                       v-model="msg.Title"
                       size="small"
                       @clear="getList"
@@ -72,6 +72,21 @@
           </template>
 
         </el-table-column>
+        <el-table-column
+          prop="FormTypeStr"
+          label="问卷类型">
+
+        </el-table-column>
+        <el-table-column
+          prop="IsRequired"
+          label="是否必填">
+          <template slot-scope="scope">
+            <div v-if="scope.row.IsRequired == 0">不必填</div>
+            <div v-if="scope.row.IsRequired == 1">必填</div>
+
+          </template>
+
+        </el-table-column>
 
 
 
@@ -139,6 +154,12 @@
             <el-radio label="1" >否</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否必填" size="small" class="is-required" label-width="80px">
+          <el-radio-group v-model="addMsg.IsRequired">
+            <el-radio label="0" >不必填</el-radio>
+            <el-radio label="1" >必填</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="排序" prop="Sort" class="is-required" size="small" label-width="80px">
           <el-input v-model="addMsg.Sort" placeholder="请输入排序" class="w400"/>
         </el-form-item>
@@ -196,6 +217,7 @@
           FormType:'1',
           ActivitySurveyId:0,
           SurveyOptionsList:[],
+          IsRequired:'0'
         },
         addloading:false,
         addstoragerules: {
@@ -264,6 +286,7 @@
           this.addMsg.Title = '';
           this.addMsg.Sort = 0;
           this.addMsg.IsShow = '0';
+          this.addMsg.IsRequired = '0';
           this.addMsg.FormType = '0';
           this.addMsg.SurveyOptionsList = [];
         if(this.addMsg.SurveyType==2 || this.addMsg.SurveyType==3){
@@ -284,6 +307,7 @@
             this.addMsg = res.data.data;
             this.addMsg.SurveyType = this.addMsg.SurveyType.toString()
             this.addMsg.IsShow = this.addMsg.IsShow.toString()
+            this.addMsg.IsRequired = this.addMsg.IsRequired.toString()
             this.addMsg.FormType = this.addMsg.FormType.toString()
             if(this.addMsg.SurveyType==2 || this.addMsg.SurveyType==3){
               this.showoption=true;