单位指派筛选

src/views/AttendMeeting/index.vue

@@ -132,7 +132,7 @@
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-if="scope.row.condition !=1 && checkPermi(['business:JOINTCONFERENCE:edit'])"
+            v-if="scope.row.condition !=1 && scope.row.status !=3   && checkPermi(['business:JOINTCONFERENCE:edit'])"
             >单位指派</el-button
           >
           <el-button
@@ -415,3 +415,9 @@ export default {
   },
 };
 </script>
+
+<style scoped lang="scss">
+p{
+  margin: 0;
+}
+</style>

src/views/JOINTCONFERENCE/add.vue

@@ -24,13 +24,13 @@
           v-model="seleValue"
           placeholder="请选择协作单位"
           @change="handleChange"
-          >
+        >
           <!-- style="width: 100%" -->
           <el-option
             v-for="item in deptList"
             :key="item.deptId"
             :label="item.deptName"
-            :value="item.deptId+''"
+            :value="item.deptId"
           >
           </el-option>
         </el-select>
@@ -86,7 +86,7 @@
 <script>
 import { getDept } from "@/api/portal/CONFERENCEREPLY/CONFERENCEREPLY.js";
 import { listDept } from "@/api/system/dept";
-import { getUserInfo } from "@/api/portal/ARTICLE/ARTICLE";
+import { getInfo } from "@/api/login";
 
 import {
   addJOINTCONFERENCE,
@@ -114,6 +114,7 @@ export default {
       }
     };
     return {
+      user: null,
       // 状态选择
       status: null,
       // 限期日期
@@ -163,8 +164,7 @@ export default {
         this.form = response.data;
         this.seleValue = this.form.deptIds;
         let arr = eval("(" + this.form.deptIds + ")");
-        this.seleValue = arr.toString();
-        console.log(this.seleValue);
+        this.seleValue = arr[0];
         this.deptId = JSON.parse(this.form.deptIds);
       });
     }
@@ -180,10 +180,54 @@ export default {
       });
     });
 
+    getInfo().then((res) => {
+      if (res.user.dept.type == 1 && res.user.userId == 1) {
+        getDept(2).then((res) => {
+          this.deptList = res.data;
+        });
+      } else if(res.user.dept.type == 2) {
+        this.deptList = [
+          {
+            searchValue: null,
+            createBy: "admin",
+            createTime: "2023-07-20 14:40:52",
+            updateBy: "admin",
+            updateTime: "2023-09-18 18:46:44",
+            params: {},
+            deptId: 100,
+            parentId: 0,
+            ancestors: "0",
+            deptName: "广西壮族自治区北部湾办公室",
+            type: 1,
+            orderNum: 0,
+            leader: "XXX",
+            phone: "15888888888",
+            biaoCang: "23",
+            email: "ry@qq.com",
+            status: "0",
+            delFlag: "0",
+            parentName: null,
+            industryOrientation: null,
+            planningArea: null,
+            acceptanceArea: null,
+            useArea: null,
+            usageRate: null,
+            warehouse: null,
+            oilDepot: null,
+            refrigeratory: null,
+            workshop: null,
+            approvalTime: null,
+            children: [],
+            createBy_dictText: "管理员",
+          },
+        ];
+      }
+    });
+
     // if (this.user.type == 1) {
-      getDept(2).then((res) => {
-        this.deptList = res.data;
-      });
+    getDept(2).then((res) => {
+      this.deptList = res.data;
+    });
     // }else{
     //   getDept(1).then((res) => {
     //     this.deptList = res.data;
@@ -242,14 +286,12 @@ export default {
       return tree;
     },
     selectChange(val) {
-      // console.log(val);
     },
     handleChange(val) {
       this.form.cooperativeUnitId = this.seleValue;
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (this.seleValue.length == 0) {
           this.$message.error("请选择协作单位");
@@ -296,4 +338,8 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+p{
+  margin: 0;
+}
+</style>

src/views/JOINTCONFERENCE/callback.vue

@@ -1,24 +1,55 @@
 <template>
   <div class="cmain">
-    <div class="detail_item">
-      <div class="title">标题：</div>
-      <p>{{ form.conference.conferenceTitle }}</p>
-    </div>
-    <div class="detail_item content">
-      <div class="title">内容：</div>
-      <span v-html="form.conference.conferenceContent"></span>
+
+
+    <el-descriptions border :labelStyle="{ width: '120px' }">
+      <el-descriptions-item label="标题">
+        <span v-text="form.conference.conferenceTitle"></span>
+      </el-descriptions-item>
+    </el-descriptions>
+
+
+
+    <div>
+      <div
+        class="call_title"
+      >
+        内 容
+      </div>
+      <div
+        class="test"
+        style="
+          background-color: #f5f7fa;
+          border: 1px solid #dfe4ed;
+          color: #c0c4cc;
+          padding: 10px;
+          min-height: 150px;
+          margin-bottom: 20px;
+        "
+        v-html="form.conference.conferenceContent"
+      ></div>
     </div>
 
-    <div class="detail_item">
-      <div class="title">回 复：</div>
+    <div class="detail_item_reply">
+      <div class="call_title">回 复</div>
       <textarea
+      class="textarea"
         v-model="queryData.reply"
-        style="width: 60%; height: 200px"
       ></textarea>
     </div>
 
     <div class="detail_item">
-      <div class="title">附 件：</div>
+      <div
+        class="call_title"
+        style="
+          font-size: 14px;
+          color: #606266;
+          font-weight: 600;
+          line-height: 40px;
+        "
+      >
+        附 件：
+      </div>
       <el-upload
         class="upload-demo"
         ref="upload"
@@ -173,6 +204,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep p {
+  margin: 0 !important;
+}
+
 .cmain .detail_item {
   display: flex;
   align-items: flex-start;
@@ -181,18 +216,32 @@ export default {
   color: #333333;
   font-size: 16px;
 }
-.content{
+.content {
   align-items: center;
 }
-.detail_item .title {
+.call_title {
+  margin-top: 10px;
   width: 100px;
-  margin: 0;
+  font-size: 14px;
+  font-weight: 600;
+  color: #606266;
+}
+.textarea{
+  padding: 4px;
+  width: 100%;
+  min-height: 200px;
+  border-color: #c7cad1;
+  border-radius: 4px;
 }
+
 .cmain .detail_item p {
   margin: 0;
 }
+.detail_item_reply{
+  margin-bottom: 20px;
+}
 
-textarea:focus{
-   outline: none;
- }
+textarea:focus {
+  outline: none;
+}
 </style>

src/views/JOINTCONFERENCE/detail.vue

@@ -187,6 +187,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+p{
+  margin: 0;
+}
 .cmain {
   color: #333333;
   font-size: 16px;

src/views/JOINTCONFERENCE/index.vue

@@ -128,12 +128,12 @@
             v-hasPermi="['business:ARTICLE:query']"
             >会议详情</el-button
           >
-          <!-- v-hasPermi="['business:JOINTCONFERENCE:edit']" -->
+
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-if="scope.row.condition !=1 && checkPermi(['business:JOINTCONFERENCE:edit'])"
+            v-if="scope.row.condition !=1 && scope.row.status != 3 && checkPermi(['business:JOINTCONFERENCE:edit'])"
             >单位指派</el-button
           >
         </template>
@@ -168,6 +168,7 @@ export default {
   name: "JOINTCONFERENCE",
   data() {
     return {
+
       statusList: [
         { label: "未指派", value: 1 },
         { label: "进行中", value: 2 },
@@ -250,7 +251,6 @@ export default {
   },
   created() {
     getInfo().then((res) => {
-      console.log(res.user);
       this.queryParams.createBy = res.user.userName;
       this.getList();
     });