修改调查

src/views/reaplceMusicPlayer/modals/addUrl.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="form" label-width="120px" ref="form">
+    <el-form :model="form" label-width="80px" ref="form">
       <el-form-item
         label="分部"
         prop="organId"
@@ -42,6 +42,22 @@
         </el-select>
       </el-form-item>
       <el-form-item
+        label="选择问卷"
+      >
+        <el-select
+          v-model.trim="form.showQuestion"
+          filterable
+          clearable
+        >
+          <el-option v-for="item in topicList" :key="item.id" :label="item.title" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-alert
+        title="若不选择问卷，则直接跳转乐器选购页面"
+        :closable="false"
+        type="error">
+      </el-alert>
+      <!-- <el-form-item
         label="是否参与调查"
         prop="showQuestion"
         :rules="[{ required: true, message: '请选择是否参与调查' }]"
@@ -54,13 +70,14 @@
           <el-option label="是" :value="1"></el-option>
           <el-option label="否" :value="0"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
   </div>
 </template>
 <script>
 import { queryByOrganId } from "@/api/systemManage";
 import { addReplacement } from "../api"
+import { questionnaireTopicQueryPage } from '../../setQuestions/api'
 export default {
   data() {
     return {
@@ -70,8 +87,18 @@ export default {
         showQuestion: 1,
       },
       cooperationList: [],
+      topicList: []
     };
   },
+  async mounted() {
+    try {
+      let res = await questionnaireTopicQueryPage({ page: 1, rows: 999 })
+      console.log(res)
+      this.topicList = res.data.rows
+    } catch {
+      //
+    }
+  },
   methods: {
     changeSection(val) {
       this.form.school = "";
@@ -100,4 +127,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/.el-select {
+  width: 100% !important;
+}
 </style>

src/views/setQuestions/api.js

@@ -22,4 +22,11 @@ export const questionnaireTopicUpdate = data => request2({
     url: '/api-web/questionnaireTopic/update',
     data,
     method: 'post'
+})
+
+export const questionnaireTopicUpdateStatus = data => request2({
+    url: '/api-web/questionnaireTopic/updateStatus',
+    data,
+    method: 'post',
+    requestType: 'form'
 })

src/views/setQuestions/components/questionList.vue

@@ -3,16 +3,16 @@
     <el-row>
         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <el-form-item label="题目类型" prop="type" :rules="[{ required: true, message: '请选择题目类型', trigger: 'change' }]">
-                    <el-select v-model="form.type" placeholder="请选择题目类型">
-                        <el-option label="单选" value="radio"></el-option>
-                        <el-option label="多选" value="checkbox"></el-option>
-                        <el-option label="问答" value="textarea"></el-option>
-                    </el-select>
-                </el-form-item>
+                <el-select v-model="form.type" placeholder="请选择题目类型" :disabled="disabled">
+                    <el-option label="单选" value="radio"></el-option>
+                    <el-option label="多选" value="checkbox"></el-option>
+                    <el-option label="问答" value="textarea"></el-option>
+                </el-select>
+            </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <el-form-item label="是否必填" prop="isRequire" :rules="[{ required: true, message: '请选择是否必填', trigger: 'change' }]">
-                <el-select v-model="form.isRequire" placeholder="请选择是否必填">
+                <el-select v-model="form.isRequire" placeholder="请选择是否必填" :disabled="disabled">
                     <el-option label="是" :value="1"></el-option>
                     <el-option label="否" :value="0"></el-option>
                 </el-select>
@@ -20,7 +20,7 @@
         </el-col>
     </el-row>
     <el-form-item label="题目" prop="content" :rules="[{ required: true, message: '请输入题目', trigger: 'blur' }]">
-        <el-input type="textarea" placeholder="请输入题目" v-model="form.content" show-word-limit maxlength="200" :autosize="{ minRows: 2, maxRows: 4}"></el-input>
+        <el-input type="textarea" placeholder="请输入题目" :disabled="disabled" v-model="form.content" show-word-limit maxlength="200" :autosize="{ minRows: 2, maxRows: 4}"></el-input>
     </el-form-item>
 
     <template v-if="form.type != 'textarea'">
@@ -29,39 +29,39 @@
                 style="display: inline-block;"
                 :prop="'questionnaireQuestionItemList.' + index + '.answerValue'"
                 :rules="[{ required: true, message: '请输入选项内容', trigger: 'change' }]">
-                <el-input type="text" placeholder="请输入选项内容" v-model="questionnaireQuestionItemList.answerValue"></el-input>
+                <el-input type="text" placeholder="请输入选项内容" :disabled="disabled" v-model="questionnaireQuestionItemList.answerValue"></el-input>
             </el-form-item>
             <el-form-item label="是否终止答题"
                 style="display: inline-block;"
                 label-width="120px"
                 :prop="'questionnaireQuestionItemList.' + index + '.isOver'"
                 :rules="[{ required: true, message: '请选择是否终止答题', trigger: 'change' }]">
-                <el-radio-group v-model="questionnaireQuestionItemList.isOver" style="margin-right: 20px">
+                <el-radio-group v-model="questionnaireQuestionItemList.isOver" :disabled="disabled" style="margin-right: 20px">
                     <el-radio :label="1">是</el-radio>
                     <el-radio :label="0">否</el-radio>
                 </el-radio-group>
             </el-form-item>
             <div style="display: inline-block;">
                 <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
-                    <el-button icon="el-icon-top" circle size="small" @click="moveDown(form.questionnaireQuestionItemList, index)" :disabled="index == 0"></el-button>
+                    <el-button icon="el-icon-top" circle size="small" @click="moveDown(form.questionnaireQuestionItemList, index)" :disabled="index == 0 || disabled"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
-                    <el-button icon="el-icon-bottom" circle size="small" @click="moveUp(form.questionnaireQuestionItemList, index)" :disabled="form.questionnaireQuestionItemList.length <= 1 || form.questionnaireQuestionItemList.length == (index + 1)"></el-button>
+                    <el-button icon="el-icon-bottom" circle size="small" @click="moveUp(form.questionnaireQuestionItemList, index)" :disabled="form.questionnaireQuestionItemList.length <= 1 || form.questionnaireQuestionItemList.length == (index + 1) || disabled"></el-button>
                 </el-tooltip>
                 <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                    <el-button icon="el-icon-delete" circle size="small" @click="onDelete(form.questionnaireQuestionItemList, index)" :disabled="form.questionnaireQuestionItemList.length <= 1"></el-button>
+                    <el-button icon="el-icon-delete" circle size="small" @click="onDelete(form.questionnaireQuestionItemList, index)" :disabled="form.questionnaireQuestionItemList.length <= 1 || disabled"></el-button>
                 </el-tooltip>
             </div>
         </div>
         <el-form-item>
-            <el-button style="width: 200px" type="default" icon="el-icon-plus" :disabled="form.questionnaireQuestionItemList.length >= 10" @click="addQuestionItem(form.questionnaireQuestionItemList)">新增选项</el-button>
+            <el-button style="width: 200px" type="default" icon="el-icon-plus" :disabled="form.questionnaireQuestionItemList.length >= 10 || disabled" @click="addQuestionItem(form.questionnaireQuestionItemList)">新增选项</el-button>
         </el-form-item>
     </template>
 </el-form>
 </template>
 <script>
 export default {
-    props: ['form'],
+    props: ['form', 'type', 'disabled'],
     data () {
         return {
         }
@@ -84,6 +84,13 @@ export default {
         },
         // 删除选项
         onDelete(arr, index) {
+            if(this.type == 'update') {
+                if(this.form.delQuestionnaireQuestionItemIdList) {
+                    this.form.delQuestionnaireQuestionItemIdList.push(arr[index].id)
+                } else {
+                    this.form.delQuestionnaireQuestionItemIdList = [arr[index].id]
+                }
+            }
             arr.splice(index, 1)
         }
     }

src/views/setQuestions/index.vue

@@ -64,13 +64,13 @@
           <el-table-column align='center'
                            label="操作">
             <template slot-scope="scope">
+              <el-button @click="onQuestionOperation('look', scope.row)"
+                         type="text">详情</el-button>
               <el-button @click="onOperation(scope.row)"
                          type="text">{{ scope.row.status ? '停用' : '启用' }}</el-button>
               <el-button @click="onQuestionOperation('update', scope.row)"
                          v-permission="'organization/update'"
                          type="text">修改</el-button>
-              <el-button @click="onOperation(scope.row, 'del')"
-                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -86,7 +86,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { questionnaireTopicQueryPage, questionnaireTopicUpdate } from './api'
+import { questionnaireTopicQueryPage, questionnaireTopicUpdateStatus } from './api'
 export default {
   name: 'branchSetting',
   components: { pagination },
@@ -125,11 +125,17 @@ export default {
     },
     onQuestionOperation(type, row) {
         let str = '问卷'
-        str = (type == 'create' ? '添加' : '修改') + str
+        if(type == 'create') {
+          str = '添加' + str
+        } else if(type == 'update') {
+          str = '修改' + str
+        } else if(type == 'look') {
+          str = '查看' + str
+        }
         let params = {
           type
         }
-        if(type == 'update') {
+        if(type == 'update' || type == 'look') {
           params.id = row.id
         }
         this.$router.push({
@@ -141,21 +147,14 @@ export default {
     },
     async onOperation(row, type) {
       let str = row.status ? '停用' : '启用'
-      if(type == 'del') {
-        str = '删除'
-      }
       this.$confirm(`是否${str}该问卷？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(async () => {
         try {
-            if(type == 'del') {
-              await questionnaireTopicUpdate({ id: row.id, delFlag: 1 })
-            } else {
-              let status = row.status
-              await questionnaireTopicUpdate({ id: row.id, status: !status })
-            }
+            let status = row.status ? 0 : 1
+            await questionnaireTopicUpdateStatus({ topicId: row.id, status: status })
             this.$message.success(str + '成功')
             this.getList()
         } catch {

src/views/setQuestions/operation.vue

@@ -1,48 +1,72 @@
 <template>
 <div class='m-container'>
     <h2>
-      <el-page-header @back="onCancel" :content="type == 'create' ? '添加问卷' : '修改问卷'"></el-page-header>
+      <el-page-header @back="onCancel" :content="titleName"></el-page-header>
     </h2>
     <div class="m-core">
         <el-row>
             <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
                 <el-form ref="form" :model="form" label-width="80px">
                     <el-form-item label="问卷名称" prop="title" :rules="[{ required: true, message: '请输入问卷名称', trigger: 'blur' }]">
-                        <el-input v-model="form.title" placeholder="请输入问卷名称"></el-input>
+                        <el-input v-model="form.title" placeholder="请输入问卷名称" :disabled="disabled"></el-input>
                     </el-form-item>
                 </el-form>
             </el-col>
         </el-row>
         <el-row>
-            <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18" v-for="(item, index) in form.questionnaireQuestionList" :key="index" style="padding: 22px; background-color: #eef4f9; margin-bottom: 10px;">
-                <el-row type="flex" align="middle" style="padding-bottom: 15px;">
+            <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18" v-for="(item, index) in form.questionnaireQuestionList" :key="index" style="padding: 15px 22px; background-color: #eef4f9; margin-bottom: 10px;">
+                <el-row type="flex" align="middle" style="flex: 1 auto; padding-bottom: 15px;">
                     <el-col :span="12">
-                        <span style="width: 80px; text-align: right;display: inline-block;">问题{{ index + 1 }}</span>
+                        <span style="font-size: 18px;width: 80px; text-align: right;display: inline-block;">问题{{ index + 1 }}</span>
                     </el-col>
                     <el-col :span="12" style="text-align: right; padding-right: 15px;">
                         <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
-                            <el-button icon="el-icon-top" circle size="small" @click="moveDown(form.questionnaireQuestionList, index)" :disabled="index == 0"></el-button>
+                            <el-button icon="el-icon-top" circle size="small" @click.stop="moveDown(form.questionnaireQuestionList, index)" :disabled="index == 0 || disabled"></el-button>
                         </el-tooltip>
                         <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
-                            <el-button icon="el-icon-bottom" circle size="small" @click="moveUp(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1 || form.questionnaireQuestionList.length == (index + 1)"></el-button>
+                            <el-button icon="el-icon-bottom" circle size="small" @click.stop="moveUp(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1 || form.questionnaireQuestionList.length == (index + 1) || disabled"></el-button>
                         </el-tooltip>
                         <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                            <el-button icon="el-icon-delete" circle size="small" @click="onDelete(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1"></el-button>
+                            <el-button icon="el-icon-delete" circle size="small" @click.stop="onDelete(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1 || disabled"></el-button>
                         </el-tooltip>
                     </el-col>
                 </el-row>
-                <question-list ref="questions" :form="item" />
+                <question-list ref="questions" :type="type" :form="item" :disabled="disabled" />
             </el-col>
+            <!-- <el-collapse v-model="activeName">
+                <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18" v-for="(item, index) in form.questionnaireQuestionList" :key="index" style="padding: 15px 22px; background-color: #eef4f9; margin-bottom: 10px;">
+                <el-collapse-item style="background-color: #eef4f9;" :name="index">
+                    <template slot="title">
+                        <el-row type="flex" align="middle" style="flex: 1 auto;">
+                            <el-col :span="12">
+                                <span style="font-size: 18px;width: 80px; text-align: right;display: inline-block;">问题{{ index + 1 }}</span>
+                            </el-col>
+                            <el-col :span="12" style="text-align: right; padding-right: 15px;">
+                                <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
+                                    <el-button icon="el-icon-top" circle size="small" @click.stop="moveDown(form.questionnaireQuestionList, index)" :disabled="index == 0"></el-button>
+                                </el-tooltip>
+                                <el-tooltip class="item" effect="dark" content="向下移动" placement="top">
+                                    <el-button icon="el-icon-bottom" circle size="small" @click.stop="moveUp(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1 || form.questionnaireQuestionList.length == (index + 1)"></el-button>
+                                </el-tooltip>
+                                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                                    <el-button icon="el-icon-delete" circle size="small" @click.stop="onDelete(form.questionnaireQuestionList, index)" :disabled="form.questionnaireQuestionList.length <= 1"></el-button>
+                                </el-tooltip>
+                            </el-col>
+                        </el-row>
+                    </template>
+                    <question-list ref="questions" :type="type" :form="item" />
+                </el-collapse-item>
+                </el-col>
+            </el-collapse> -->
         </el-row>
         <el-row style="padding-bottom: 15px;">
             <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18" style="text-align: center;">
-                <el-button style="width: 100%" type="default" @click="addQuestionItem(form.questionnaireQuestionList)" icon="el-icon-plus">新增问题</el-button>
+                <el-button style="width: 100%" type="default" :disabled="disabled" @click="addQuestionItem(form.questionnaireQuestionList)" icon="el-icon-plus">新增问题</el-button>
             </el-col>
         </el-row>
-        <el-button type="primary" @click="onSubmit">提交问卷</el-button>
-        <el-button @click="onReset">重置</el-button>
+        <el-button type="primary" :disabled="disabled" @click="onSubmit">{{ type == 'create' ? '提交问卷' : '修改问卷' }}</el-button>
+        <el-button @click="onReset" :disabled="disabled">重置</el-button>
     </div>
-
 </div>
 </template>
 <script>
@@ -53,21 +77,37 @@ export default {
     components: { questionList },
     data () {
         let query = this.$route.query
+        let titleName = '问卷'
+        if(query.type == 'create') {
+          titleName = '添加' + titleName
+        } else if(query.type == 'update') {
+          titleName = '修改' + titleName
+        } else if(query.type == 'look') {
+          titleName = '查看' + titleName
+        }
         return {
             type: query.type,
+            titleName: titleName,
             id: query.id,
+            questionList: [],
+            activeName: [],
             form: {
                 title: null,
                 questionnaireQuestionList: [{questionnaireQuestionItemList: [{ }]}],
-            }
+            },
+            disabled: query.type == 'look' ? true : false
         }
     },
     async mounted () {
-        if(this.type == 'update') {
+        if(this.type == 'update' || this.type == 'look') {
             try {
                 let res = await questionnaireTopicGetDetail({ id: this.id })
-                console.log(res)
                 this.form = res.data
+                this.questionList = res.data
+                // let list = res.data.questionnaireQuestionList || []
+                // list.forEach((item, index) => {
+                //     this.activeName.push(index)
+                // })
             } catch {
                 //
             }
@@ -102,7 +142,6 @@ export default {
                 console.log(validateResult)
                 if(validateResult) {
                     this.setResultSort()
-                    console.log(this.form)
                     try {
                         if(this.type == 'create') {
                             await questionnaireTopicAdd(this.form)
@@ -155,6 +194,13 @@ export default {
         },
         // 删除选项
         onDelete(arr, index) {
+            if(this.type == 'update') {
+                if(this.form.delQuestionnaireQuestionIdList) {
+                    this.form.delQuestionnaireQuestionIdList.push(arr[index].id)
+                } else {
+                    this.form.delQuestionnaireQuestionIdList = [arr[index].id]
+                }
+            }
             arr.splice(index, 1)
         },
         onCancel () {
@@ -183,4 +229,10 @@ export default {
 /deep/.el-select {
   width: 98% !important;
 }
+/deep/.el-collapse {
+    border: 0;
+}
+/deep/.el-collapse-item__wrap, /deep/.el-collapse-item__header {
+    background-color: #eef4f9;
+}
 </style>

vue.config.js

@@ -18,9 +18,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.139:8000' // 箭河
-// let target = 'http://192.168.3.38:8000' //邹璇
+let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
@@ -66,8 +66,8 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        // target: 'https://test.dayaedu.com',
-        target : target,
+        target: 'http://192.168.3.148:8000',
+        // target : target,
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''