Ver código fonte

内外部问卷分开

xjc 4 anos atrás
pai
commit
89d558968d

+ 2 - 2
src/router.js

@@ -51,7 +51,7 @@ export default new Router({
         component: () => import('./views/message/InnerSurvey.vue'),
         name: '内部问卷'
       }, {
-        path: '/message/message/analyse',
+        path: '/message/innerSurvey/analyse',
         component: () => import('./views/message/MessageAnalyse.vue'),
         name: '问卷统计'
       }]
@@ -68,7 +68,7 @@ export default new Router({
         component: () => import('./views/message/OutSurvey.vue'),
         name: '外部问卷'
       }, {
-        path: '/message/message/analyse',
+        path: '/message/outSurvey/analyse',
         component: () => import('./views/message/MessageAnalyse.vue'),
         name: '问卷统计'
       }]

+ 1 - 1
src/views/message/InnerSurvey.vue

@@ -519,7 +519,7 @@ export default {
   computed() {},
   methods: {
     showMessageAnalyse(){
-          this.$router.push({path:'/message/message/analyse'})
+          this.$router.push({path:'/message/innerSurvey/analyse'})
     },
     downloadExcel(){
       this.$api.downloadSurveyResult({message_id:this.cur_message_id,type:this.cur_post_type}).then((res)=>{

+ 2 - 0
src/views/message/Message.vue

@@ -420,9 +420,11 @@ a {
 </template>
 <script>
 import Page from "../../components/Page";
+import fuEditor from '../../components/fuEditor'
 export default {
   components: {
     Page,
+    fuEditor
   },
   data() {
     return {

+ 12 - 68
src/views/message/Notice.vue

@@ -184,15 +184,7 @@ a {
         <el-form-item label="标题" prop="name">
           <el-input v-model="form1.name" placeholder="请输入标题"></el-input>
         </el-form-item>
-        <el-form-item label="接收人">
-          <!-- <el-select placeholder="请选择接收人" v-model="form1.receiver_id" multiple>
-                        <el-option
-                            v-for="(item, index) in userList"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select> -->
+        <el-form-item label="接收人" prop="receiver_id">
           <el-cascader
             v-model="form1.receiver_id"
             :options="options"
@@ -206,8 +198,8 @@ a {
             </template>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="消息内容">
-          <el-input></el-input>
+        <el-form-item label="消息内容" prop="content">
+          <fuEditor v-model="form1.content" :isClear="false" @change="changeEditor"></fuEditor>
         </el-form-item>
         <el-form-item label="附件">
           <input @change="upload('fileurl')" id="fileurl" type="file" />
@@ -303,9 +295,11 @@ a {
 </template>
 <script>
 import Page from "../../components/Page";
+import fuEditor from '../../components/fuEditor'
 export default {
   components: {
     Page,
+    fuEditor
   },
   data() {
     return {
@@ -338,69 +332,18 @@ export default {
       checkList: [],
       rules: {
         name: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        receiver_id:[{ required: true, message: "请选择接收人", trigger: "change" }],
+        content:[{ required: true, message: "请输入消息内容", trigger: "change" }]
       },
       props: { multiple: true },
-      options: [
-        {
-          value: 1,
-          label: "东南",
-          children: [
-            {
-              value: 2,
-              label: "上海",
-              children: [
-                { value: 3, label: "普陀" },
-                { value: 4, label: "黄埔" },
-                { value: 5, label: "徐汇" },
-              ],
-            },
-            {
-              value: 7,
-              label: "江苏",
-              children: [
-                { value: 8, label: "南京" },
-                { value: 9, label: "苏州" },
-                { value: 10, label: "无锡" },
-              ],
-            },
-            {
-              value: 12,
-              label: "浙江",
-              children: [
-                { value: 13, label: "杭州" },
-                { value: 14, label: "宁波" },
-                { value: 15, label: "嘉兴" },
-              ],
-            },
-          ],
-        },
-        {
-          value: 17,
-          label: "西北",
-          children: [
-            {
-              value: 18,
-              label: "陕西",
-              children: [
-                { value: 19, label: "西安" },
-                { value: 20, label: "延安" },
-              ],
-            },
-            {
-              value: 21,
-              label: "新疆维吾尔族自治区",
-              children: [
-                { value: 22, label: "乌鲁木齐" },
-                { value: 23, label: "克拉玛依" },
-              ],
-            },
-          ],
-        },
-      ],
+      options: [],
     };
   },
   computed() {},
   methods: {
+    changeEditor(val) {
+      this.form1.content = val;
+    },
     showMessageAnalyse(){
           this.$router.push({path:'/message/message/analyse'})
     },
@@ -559,6 +502,7 @@ export default {
         });
     },
     save() {
+      console.log(this.$refs["editor"],22222222222222)
       this.$refs["form1"].validate((valid) => {
         if (valid) {
           let parm = this.form1;

+ 1 - 1
src/views/message/OutSurvey.vue

@@ -483,7 +483,7 @@ export default {
   computed() {},
   methods: {
     showMessageAnalyse(){
-          this.$router.push({path:'/message/message/analyse'})
+          this.$router.push({path:'/message/outSurvey/analyse'})
     },
     downloadExcel(){
       this.$api.downloadSurveyResult({message_id:this.cur_message_id,type:this.cur_post_type}).then((res)=>{