Merge branch 'dev-circle-nine-20201231' of...

Merge branch 'dev-circle-nine-20201231' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-nine-20201231

src/utils/filter.js

@@ -494,6 +494,17 @@ const vueFilter = {
       return '已通过'
     }
   },
+    auditApplyStatus: (value) => {
+        if (value == 0) {
+            return '-'
+        } else if (value == 1) {
+            return '待审核'
+        } else if (value == 2) {
+            return '已通过'
+        } else if (value == 3) {
+            return '已拒绝'
+        }
+    },
     // 圈子状态 0:暂存 10:待发布（已保存） 20:已发布（已提交待审核、审核被拒绝） 30:已上架（审核通过）40：下架 50：解散
     rangeStatus: (value) => {
         if (value == 0) {

src/views/activitymanagement/range-apply.vue

@@ -42,11 +42,11 @@
         <el-table-column prop="townName" label="所属街道" min-width="100" align="center"></el-table-column>
         <el-table-column prop="auditStatus" label="审核状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.auditStatus | circleApplyStatus }}</span>
+            <span>{{ scope.row.auditStatus | auditApplyStatus }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="200" align="center">
-          <template slot-scope="scope"> <!-- 1待审核 2已通过 3已拒绝 -->
+          <template slot-scope="scope"> <!-- 0全部 1待审核 2已通过 3已拒绝 -->
             <div>
               <el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">通过</el-button>
               <el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">拒绝</el-button>
@@ -88,7 +88,7 @@
           doctorName: '',
           titleManager: '',
           // endTime: '',
-          auditStatus: 1,
+          auditStatus: 0,
           pageNo: 1,
           pageSize: 10,
         },
@@ -100,6 +100,10 @@
           settingData: []
         },
         statusList: [
+          {
+            value: 0,
+            label: "全部"
+          },
           {
             value: 1,
             label: "待审核"
@@ -195,7 +199,7 @@
       resetForm() {
         this.searchForm.doctorName = "";
         this.searchForm.titleManager = "";
-        this.searchForm.auditStatus = 1;
+        this.searchForm.auditStatus = 0;
         console.log('重置')
         this.search();
       },
@@ -234,7 +238,7 @@
       //拒绝
       reject(row) {
         let params = {
-          "accept": true,
+          "accept": false,
           "auditRecordId": row.auditRecordId,
         };
         this.$confirm(`拒绝后"${row.doctorName}"将无法访问"${row.activityName}"`, `确认拒绝`, {

src/views/plaza/plaza-list.vue

@@ -13,15 +13,16 @@
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
           <el-col :span="9">
             <el-form-item label="专区名称">
-              <el-input v-model="searchForm.squareName" size="small" placeholder="请输入专区名称"></el-input>
+              <el-input v-model="searchForm.squareName" size="small" placeholder="请输入专区名称" style="margin-left:20px;height: 32px;line-height: 32px;"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="9" style="padding-left: 0px;">
             <el-form-item label="疾病标签">
               <el-select multiple :multiple-limit="5"
                 v-model="searchForm.diseaseIdList"
                 id="statusSelector"
                 placeholder="请选择疾病标签"
+                filterable
                 clearable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
@@ -43,6 +44,7 @@
                 id="statusSelector"
                 placeholder="请选择科室标签"
                 clearable
+                filterable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
                 <el-option
@@ -60,6 +62,7 @@
                 v-model="searchForm.subjectIdList"
                 id="statusSelector"
                 placeholder="请选择学科标签"
+                filterable
                 clearable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
@@ -139,17 +142,18 @@
         center
       >
 
-        <el-form ref="plazaForm" :model="plazaForm">
+        <el-form ref="plazaForm" :model="plazaForm" :rules="rules" label-suffix=":">
 
 
-              <el-form-item label="专区名称">
+              <el-form-item label="专区名称"  class="required-label" prop="businessId">
                 <el-col :span="20">
                 <el-select
                   v-model="plazaForm.businessId"
                   id="statusSelector"
-                  placeholder="请选择发布状态"
+                  placeholder="请选择专区名称"
+                  filterable
                   clearable
-                  style="margin-left:20px;height: 32px;line-height: 32px;"
+                  style="margin-left:20px;height: 32px;line-height: 32px;width: 450px;"
                   :disabled="editFlag"
                 >
                   <el-option
@@ -164,14 +168,15 @@
 
 
 
-              <el-form-item label="疾病标签">
+              <el-form-item label="疾病标签" class="required-label">
                 <el-col :span="20">
                 <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.diseaseIdList"
                   id="statusSelector"
-                  placeholder="请选择发布状态"
+                  placeholder="请选择疾病标签"
+                  filterable
                   clearable
-                  style="margin-left:20px;height: 32px;line-height: 32px;"
+                  style="margin-left:20px;height: 32px;line-height: 32px;width: 450px;"
                 >
                   <el-option
                     v-for="item in diseaseList"
@@ -185,14 +190,15 @@
 
 
 
-              <el-form-item label="科室标签">
+              <el-form-item label="科室标签" class="required-label">
                 <el-col :span="20">
                 <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.deptIdList"
                   id="statusSelector"
-                  placeholder="请选择发布状态"
+                  placeholder="请选择科室标签"
+                  filterable
                   clearable
-                  style="margin-left:20px;height: 32px;line-height: 32px;"
+                  style="margin-left:20px;height: 32px;line-height: 32px;width: 450px;"
                 >
                   <el-option
                     v-for="item in deptList"
@@ -205,14 +211,15 @@
               </el-form-item>
 
 
-              <el-form-item label="学科标签">
+              <el-form-item label="学科标签" class="required-label">
                 <el-col :span="25">
                 <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.subjectIdList"
                   id="statusSelector"
-                  placeholder="请选择发布状态"
+                  placeholder="请选择学科标签"
+                  filterable
                   clearable
-                  style="margin-left:20px;height: 32px;line-height: 32px;"
+                  style="margin-left:20px;height: 32px;line-height: 32px;width: 450px;"
                 >
                   <el-option
                     v-for="item in subjectList"
@@ -326,27 +333,17 @@
         dialogVisible: false,
         isSign: 0, // 是否签到
 
-        statusList: [
-          {
-            value: "1",
-            label: "预告"
-          },
-          {
-            value: "2",
-            label: "直播中"
-          },
-          {
-            value: "4",
-            label: "已结束"
-          }
-        ],
-
         diseaseList: [],
         deptList: [],
         subjectList: [],
         selectPlazaList: [],
         editFlag: false,
         title: "",
+        rules: {
+          businessId: [
+            {required: true, message: "请输入专区名称", trigger: "blur"}
+          ],
+        }
       };
     },
     props:{
@@ -426,10 +423,15 @@
         vm.dialogVisible = true;
         vm.title = "添加专区";
         vm.editFlag = false;
+        vm.plazaForm = {
+            id:'',
+            businessId: "",
+            diseaseTagIds: [],
+            deptTagIds: [],
+            subjectTagIds: []
+        },
         vm.getSelectPlazaList(0);
       },
-
-
       //弹出直播链接弹窗
       liveLink(row) {
         this.dialogLivelinkVisible = true;
@@ -1033,4 +1035,12 @@
     height: 32px;
     line-height: 32px;
   }
+  /*.el-select__tags {*/
+    /*margin-top: 15px;*/
+  /*}*/
+  .required-label .el-form-item__label::before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+  }
 </style>