Merge branch '03/03Lebao' into test

src/views/reaplceMusicPlayer/answerList.vue

@@ -49,7 +49,7 @@
                 <el-collapse-item title="查看答案" name="1">
                   <div v-for="(o, index) in item.questionnaireResultDtoList" :key="index" class="text item">
                     <el-alert :title="o.content" type="info" :closable="false"></el-alert>
-                    <div style="padding: 8px 20px; font-size: 14px;">{{ o.answerValue }}</div>
+                    <div style="padding: 8px 20px; font-size: 14px;">{{ o.answerValue ? o.answerValue : o.additionalValue }}</div>
                   </div>
                 </el-collapse-item>
               </el-collapse>
@@ -80,7 +80,7 @@ export default {
     components: { pagination },
     data () {
         let query = this.$route.query
-        let titleName = '答案详情'
+        let titleName = '问答详情'
         return {
             titleName: titleName,
             id: query.id,

src/views/reaplceMusicPlayer/index.vue

@@ -134,7 +134,7 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text" @click="lookDetail(scope.row)" v-if="permission('replacementInstrumentActivity/queryPage')">问卷详情</el-button>
-                <el-button type="text" @click="lookDetail(scope.row, 'answer')">答题详情</el-button>
+                <el-button type="text" @click="lookDetail(scope.row, 'answer')" v-if="permission('/reaplceMusicPlayer/answer')">问答详情</el-button>
                 <el-button
                   type="text"
                   @click="onCreateQRCode(scope.row, '调查链接')"