广西进出口数据

src/views/GXZZQ/index.vue

@@ -62,22 +62,6 @@
 
     <el-table :data="GXZZQList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="主键" align="center" prop="id">
-        
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-    
-      </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy">
-       
-      </el-table-column>
-      <el-table-column label="修改时间" align="center" prop="updateTime">
-       
-      </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updateBy">
-        
-      </el-table-column>
-      -->
       <el-table-column label="年份" align="center" prop="year">
       </el-table-column>
       <el-table-column label="月份" align="center" prop="month">
@@ -167,6 +151,8 @@ import {
   addGXZZQ,
   updateGXZZQ,
 } from "@/api/portal/GXZZQ/GXZZQ";
+import { checkPermi } from "@/utils/permission.js";
+
 
 export default {
   name: "GXZZQ",

src/views/JOINTCONFERENCE/add.vue

@@ -16,7 +16,7 @@
           v-model="form.conferenceContent"
         ></el-input>
       </el-form-item>
-
+      <p style="display: none" v-html="form.conferenceContent" ref="test"></p>
       <el-form-item label="协作单位">
         <!-- <el-select
           v-model="deptId"
@@ -57,7 +57,7 @@
           <el-radio v-model="form.type" label="3">限期</el-radio>
         </template>
       </el-form-item>
-      <el-form-item style="padding-bottom: 20px;" label="限期日期" prop="date" >
+      <el-form-item style="padding-bottom: 20px" label="限期日期" prop="date">
         <el-date-picker
           v-model="form.date"
           type="date"
@@ -128,16 +128,14 @@ export default {
         conferenceContent: [
           { required: true, message: "会议内容不能为空", trigger: "blur" },
         ],
-     
-        type: [
-          { required: true, message: "状态不能为空", trigger: "blur" },
-        ],
+
+        type: [{ required: true, message: "状态不能为空", trigger: "blur" }],
         collaborativeContent: [
           { required: true, message: "协作要求不能为空", trigger: "blur" },
         ],
-        date:[
-        { required: true, message: "限期时间不能为空", trigger: "blur" },
-        ]
+        date: [
+          { required: true, message: "限期时间不能为空", trigger: "blur" },
+        ],
       },
 
       deptListSele: [],
@@ -170,7 +168,10 @@ export default {
       this.deptList = res.data;
     });
   },
-  mounted() {},
+  updated() {
+    // console.log(this.$refs.test.innerText);
+    this.form.conferenceContent = this.$refs["test"].innerText;
+  },
 
   methods: {
     handleTrees(data, id, parentId, children) {
@@ -226,7 +227,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if(this.seleValue.length == 0){
+      if (this.seleValue.length == 0) {
         this.$message.error("请选择协作单位");
         return;
       }

src/views/JOINTCONFERENCE/detail.vue

@@ -21,18 +21,30 @@
       <div class="title">会议标题：</div>
       <p>{{ form.conference.conferenceTitle }}</p>
     </div> -->
-    <el-form v-model="form" >
-      <!-- <div class="detail_item" style="align-items: start"> -->
-      <el-form-item style="margin-top: 10px;" label="会议内容" width="120px">
-        <el-input
-          :disabled="true"
-          type="textarea"
-          rows="4"
-          placeholder="请输入协作要求"
-          v-model="form.conference.conferenceContent"
-        ></el-input>
-      </el-form-item>
-      <!-- </div> -->
+    <el-form v-model="form">
+      <div >
+        <div
+          style="
+            font-size: 14px;
+            color: #606266;
+            font-weight: 600;
+            line-height: 40px;
+            "
+        >
+          会议内容
+        </div>
+        <div
+          class="test"
+          style="
+            background-color: #f5f7fa;
+            border: 1px solid #dfe4ed;
+            color: #c0c4cc;
+            padding: 10px;
+            min-height: 150px;
+          "
+          v-html="form.conference.conferenceContent"
+        ></div>
+      </div>
       <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
           :disabled="true"
@@ -182,7 +194,7 @@ export default {
 .wire {
 }
 .detail_item .title {
-  width: 100px;
+  // width: 100px;
   margin: 0;
   font-size: 14px;
   font-weight: 600;