Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web

src/views/COUNSELINGMESSAGE/edit.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="cmain">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="form.title" placeholder="请输入标题"></el-input>
+      </el-form-item>
+      <el-form-item label="图片上传">
+        <cropper v-model="form.fileUrl"></cropper>
+      </el-form-item>
+      <el-form-item label="内容" prop="content">
+        <editor v-model="form.content" />
+      </el-form-item>
+
+<!--      <el-form-item label="图片上传">-->
+<!--        <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload" :file-list="fileList">-->
+<!--          <i slot="default" class="el-icon-plus"></i>-->
+<!--          <div slot="file" slot-scope="{ file }">-->
+<!--            <img class="el-upload-list__item-thumbnail" :src="file.url" />-->
+<!--            <span class="el-upload-list__item-actions">-->
+<!--                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">-->
+<!--                  <i class="el-icon-zoom-in"></i>-->
+<!--                </span>-->
+<!--                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">-->
+<!--                  <i class="el-icon-delete"></i>-->
+<!--                </span>-->
+<!--              </span>-->
+<!--          </div>-->
+<!--        </el-upload>-->
+<!--      </el-form-item>-->
+    </el-form>
+
+    <div slot="footer" class="mfooter">
+      <el-button type="info" @click="submitzc">暂 存</el-button>
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="$layer.close(layerid)">取 消</el-button>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" fullscreen append-to-body @close="dialogVisible = false">
+      <img width="100%" :src="form.fileUrl" alt="" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCOUNSELINGMESSAGE, getCOUNSELINGMESSAGE, delCOUNSELINGMESSAGE, addCOUNSELINGMESSAGE, updateCOUNSELINGMESSAGE, upload, newCommit } from '@/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE';
+
+export default {
+  name: 'edit.vue',
+  data(){
+    return{
+      baseUrl: process.env.VUE_APP_BASE_API,
+      dialogVisible:false,
+      disabled: false,
+      fileList: [],
+      // 表单参数
+      form: {content:''},
+      // 表单校验
+      rules: {
+        title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+        content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
+        fileUrl: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
+        picture: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
+      }
+    }
+  },
+  mounted() {
+    if (this.param.id) {
+      getCOUNSELINGMESSAGE(this.param.id).then(response => {
+        this.form = response.data;
+        // if (this.form.fileUrl != null){
+        //   this.fileList.push({ name: 'xxx', url: this.form.fileUrl });
+        // }
+        this.form.content = response.data.content.replace(new RegExp('/profile/upload/', 'g'), this.baseUrl + '/profile/upload/');
+      });
+    }
+  },
+  props: {
+    param: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    layerid: {
+      type: String
+    }
+  },
+  methods:{
+    //旧的图片上传
+    httprequest() {},
+    /** 上传附件 */
+    beforeupload(file) {
+      let formData = new FormData();
+      formData.append('file', file);
+      upload(formData).then(res => {
+        this.form.fileUrl = res.url;
+      });
+    },
+    //放大预览
+    handlePictureCardPreview(file) {
+      this.form.fileUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleRemove(file) {
+      this.form.fileUrl = '';
+      this.fileList = [];
+    },
+    /** 暂存按钮 */
+    submitzc() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id == null) {
+            this.form.status = '0';
+            addCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess('暂存成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          } else if (this.form.status == 0 || this.form.status == 2 || this.form.status == 3 || this.form.status == 5) {
+            updateCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          } else {
+            addCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          }
+        }
+      });
+    },
+    // // 取消按钮
+    // cancel() {
+    //   this.open = false;
+    //   this.reset();
+    // },
+    // // 表单重置
+    // reset() {
+    //   this.form = {
+    //     id: null,
+    //     delFlag: null,
+    //     deptId: null,
+    //     title: null,
+    //     content: null,
+    //     fileUrl: null,
+    //     picture: null,
+    //     status: '0',
+    //     auditTime: null,
+    //     reportDate: null,
+    //     releaseDate: null
+    //   };
+    //   this.resetForm('form');
+    //   this.fileList = [];
+    // },
+  },
+  created() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/COUNSELINGMESSAGE/index.vue

@@ -46,11 +46,13 @@
       </el-table-column>
       <el-table-column label="信息状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0"><el-tag type="info">草稿</el-tag></span>
+          <span v-if="scope.row.status == 0"><el-tag>草稿</el-tag></span>
           <span v-if="scope.row.status == 1"><el-tag type="warning">审核中</el-tag></span>
-          <span v-if="scope.row.status == 2"><el-tag type="danger">已审核</el-tag></span>
-          <span v-if="scope.row.status == 3"><el-tag type="success">已上报</el-tag></span>
-          <span v-if="scope.row.status == 4"><el-tag >已发布</el-tag></span>
+          <span v-if="scope.row.status == 2"><el-tag type="danger">审核驳回</el-tag></span>
+          <span v-if="scope.row.status == 3"><el-tag type="success">已审核</el-tag></span>
+          <span v-if="scope.row.status == 4"><el-tag type="success">已上报</el-tag></span>
+          <span v-if="scope.row.status == 5"><el-tag type="info">已发布</el-tag></span>
+          <span v-if="scope.row.status == 6"><el-tag>已下架</el-tag></span>
         </template>
       </el-table-column>
 
@@ -67,66 +69,24 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改咨询信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题"></el-input>
-        </el-form-item>
-        <el-form-item label="内容" prop="content">
-          <editor v-model="form.content" :min-height="192" />
-        </el-form-item>
-<!--        <el-form-item label="附件上传" prop="fileUrl">-->
-<!--          <el-upload class="upload-demo" drag action="#" :limit="1" :before-upload="beforeupload" :auto-upload="true" :http-request="httprequest">-->
-<!--            <i class="el-icon-upload"></i>-->
-<!--            <div class="el-upload__text">-->
-<!--              将文件拖到此处，或-->
-<!--              <em>点击上传</em>-->
-<!--            </div>-->
-<!--            <div class="el-upload__tip" slot="tip">只能上传不超过200MB的文件</div>-->
-<!--          </el-upload>-->
-<!--        </el-form-item>-->
-        <!-- <el-form-item label="图片上传">
-          <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload" :file-list="fileList">
-            <i slot="default" class="el-icon-plus"></i>
-            <div slot="file" slot-scope="{ file }">
-              <img class="el-upload-list__item-thumbnail" :src="file.url" />
-              <span class="el-upload-list__item-actions">
-                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                  <i class="el-icon-zoom-in"></i>
-                </span>
-                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                  <i class="el-icon-delete"></i>
-                </span>
-              </span>
-            </div>
-          </el-upload>
-        </el-form-item> -->
-      </el-form>
+<!--    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body >-->
+<!--     -->
+<!--    </el-dialog>-->
 
-      <div slot="footer" class="dialog-footer">
-        <el-button type="info" @click="submitzc">暂 存</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
 
-    <el-dialog :visible.sync="dialogVisible" fullscreen append-to-body @close="dialogVisible = false">
-      <img width="100%" :src="form.picture" alt="" />
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listCOUNSELINGMESSAGE, getCOUNSELINGMESSAGE, delCOUNSELINGMESSAGE, addCOUNSELINGMESSAGE, updateCOUNSELINGMESSAGE, upload, newCommit } from '@/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE';
+import edit from './edit.vue'
 
 export default {
   name: 'COUNSELINGMESSAGE',
   data() {
     return {
-      disabled: false,
       //预览
       dialogVisible: false,
-      fileList: [],
       statusOptionList: [
         { label: '草稿', value: 0 },
         { label: '审核中', value: 1 },
@@ -175,28 +135,14 @@ export default {
         reportDate: null,
         releaseDate: null
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
-        delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
-        title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
-        content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
-        fileUrl: [{ required: true, message: '附件不能为空', trigger: 'blur' }],
-        picture: [{ required: true, message: '图片不能为空', trigger: 'blur' }],
-        status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-        auditTime: [{ required: true, message: '审核时间不能为空', trigger: 'blur' }],
-        reportDate: [{ required: true, message: '提交时间不能为空', trigger: 'blur' }],
-        releaseDate: [{ required: true, message: '发布时间不能为空', trigger: 'blur' }]
-      }
+
     };
   },
   created() {
     this.getList();
   },
   methods: {
+
     /** 查询咨询信息列表 */
     getList() {
       this.loading = true;
@@ -206,29 +152,8 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        delFlag: null,
-        deptId: null,
-        title: null,
-        content: null,
-        fileUrl: null,
-        picture: null,
-        status: '0',
-        auditTime: null,
-        reportDate: null,
-        releaseDate: null
-      };
-      this.resetForm('form');
-      this.fileList = [];
-    },
+
+
     /** 发布 */
     handleDownOrUp(row) {
       //修改发布、下架状态
@@ -240,7 +165,6 @@ export default {
           this.$modal.msgSuccess('下架成功');
           this.open = false;
           this.getList();
-          this.reset();
         });
       } else if (row.status == '5') {
         //已下架
@@ -249,7 +173,6 @@ export default {
           this.$modal.msgSuccess('发布成功');
           this.open = false;
           this.getList();
-          this.reset();
         });
       }
     },
@@ -279,84 +202,27 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = '添加咨询信息';
+      this.iframe({ obj: edit, param: {}, title: '添加资讯', width: '1050px', height: '750px' });
+      // this.open = true;
+      // this.title = '添加咨询信息';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids;
-      getCOUNSELINGMESSAGE(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = '修改咨询信息';
-        if (this.form.fileUrl != null){
-          this.fileList.push({ name: 'xxx', url: this.form.fileUrl });
-        }
-      });
-    },
-    //放大预览
-    handlePictureCardPreview(file) {
-      this.form.picture = file.url;
-      this.dialogVisible = true;
-    },
-    httprequest() {},
-    /** 上传附件 */
-    beforeupload(file) {
-      let formData = new FormData();
-      formData.append('file', file);
-      upload(formData).then(res => {
-        this.form.fileUrl = res.url;
-      });
-    },
-    handleRemove(file) {
-      this.form.picture = '';
-      this.fileList = [];
-    },
-    /** 暂存按钮 */
-    submitzc() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.id == null) {
-            this.form.status = '0';
-            addCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess('暂存成功');
-              this.open = false;
-              this.getList();
-              this.reset();
-            });
-          } else if (this.form.status == 0 || this.form.status == 2 || this.form.status == 3 || this.form.status == 5) {
-            updateCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功');
-              this.open = false;
-              this.getList();
-              this.reset();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功');
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCOUNSELINGMESSAGE(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功');
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
+      this.iframe({ obj: edit, param: { id: id }, title: '修改资讯', width: '1050px', height: '750px' });
+    },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   const id = row.id || this.ids;
+    //   getCOUNSELINGMESSAGE(id).then(response => {
+    //     this.form = response.data;
+    //     this.open = true;
+    //     this.title = '修改咨询信息';
+    //     if (this.form.fileUrl != null){
+    //       this.fileList.push({ name: 'xxx', url: this.form.fileUrl });
+    //     }
+    //   });
+    // },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;