src/components/feedBack/index.vue

@@ -1,115 +1,109 @@
 <template>
-  <!--FEEDBACK-->
+  <!--MFA-->
-  <div v-if="visible" @click.stop="()=>false">
+  <el-dialog
-    <el-dialog
+    v-if="visible"
-      :visible.sync="visible"
+    :visible.sync="visible"
-      v-dialogDrag
+    v-dialogDrag
-      width="540px"
+    width="540px"
-      :close-on-click-modal="false"
+    :close-on-click-modal="false"
-      @close="cancel"
+    append-to-body
-    >
+    @close="cancel"
-      <div slot="title">
+  >
-        {{ title }}
+    <div slot="title">
-      </div>
+      {{ title }}
-      <!-- 项目详情 -->
+    </div>
-      <div class="trialsBox">
+    <!-- 项目详情 -->
-        <el-form
+    <div class="trialsBox">
-          label-position="right"
-          :model="form"
-          :inline="true"
-          class="trialsForm"
-        >
-          <el-form-item :label="$t('feedBack:trials:code')">
-            <span>2024-06-28 15:00</span>
-          </el-form-item>
-          <el-form-item :label="$t('feedBack:trials:name')">
-            <span>2024-06-28 15:00</span>
-          </el-form-item>
-          <el-form-item :label="$t('feedBack:trials:siteCode')">
-            <span>2024-06-28 15:00</span>
-          </el-form-item>
-          <el-form-item :label="$t('feedBack:trials:visit')">
-            <span>2024-06-28 15:00</span>
-          </el-form-item>
-        </el-form>
-      </div>
       <el-form
-        ref="mfaForm"
         label-position="right"
         :model="form"
-        :rules="rules"
+        :inline="true"
-        label-width="100px"
+        class="trialsForm"
       >
-        <!-- 影像异常tip -->
+        <el-form-item :label="$t('feedBack:trials:code')">
-        <p class="tip">
-          <i
-            class="el-icon-warning-outline"
-            style="color: #f56c6c; font-size: 24px"
-          ></i>
-          <span> 影像异常导致无法阅片</span>
-        </p>
-        <!-- 问题反馈 -->
-        <el-form-item :label="$t('feedBack:form:feedBack')" prop="feedBack">
-          <el-select v-model="form.value" style="width: 100%">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          <span>影像异常导致无法阅片</span>
-        </el-form-item>
-        <!-- 问题描述 -->
-        <el-form-item
-          :label="$t('feedBack:form:description')"
-          prop="description"
-        >
-          <el-input v-model="form.Code" type="textarea" :rows="4" />
-        </el-form-item>
-        <!-- 截图 -->
-        <el-form-item :label="$t('feedBack:form:screenshot')" prop="screenshot">
-          <uploadImage
-            :path.sync="form.HospitalLogoPath"
-            :disabled="disabled"
-          />
-        </el-form-item>
-        <!-- 反馈时间 -->
-        <el-form-item :label="$t('feedBack:form:time')" prop="screenshot">
           <span>2024-06-28 15:00</span>
         </el-form-item>
-        <!-- 状态 -->
+        <el-form-item :label="$t('feedBack:trials:name')">
-        <el-form-item :label="$t('feedBack:form:status')" prop="screenshot">
+          <span>2024-06-28 15:00</span>
-          <el-switch
+        </el-form-item>
-            v-model="form.status"
+        <el-form-item :label="$t('feedBack:trials:siteCode')">
-            active-color="#13ce66"
+          <span>2024-06-28 15:00</span>
-            inactive-color="#ff4949"
+        </el-form-item>
-            :active-value="true"
+        <el-form-item :label="$t('feedBack:trials:visit')">
-            :inactive-value="false"
+          <span>2024-06-28 15:00</span>
-            :active-text="$fd('FeedBackStatus', true)"
-            :inactive-text="$fd('FeedBackStatus', false)"
-          >
-          </el-switch>
         </el-form-item>
       </el-form>
-      <div slot="footer">
+    </div>
-        <!-- 取消 -->
+    <el-form
-        <el-button size="small" @click.stop="cancel">
+      ref="mfaForm"
-          {{ $t("feedBack:button:cancel") }}
+      label-position="right"
-        </el-button>
+      :model="form"
-        <!-- 保存 -->
+      :rules="rules"
-        <el-button
+      label-width="100px"
-          type="primary"
+    >
-          size="small"
+      <!-- 影像异常tip -->
-          @click.stop="save"
+      <p class="tip">
-          :loading="loading"
+        <i
+          class="el-icon-warning-outline"
+          style="color: #f56c6c; font-size: 24px"
+        ></i>
+        <span> 影像异常导致无法阅片</span>
+      </p>
+      <!-- 问题反馈 -->
+      <el-form-item :label="$t('feedBack:form:feedBack')" prop="feedBack">
+        <el-select v-model="form.value" style="width: 100%">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <span>影像异常导致无法阅片</span>
+      </el-form-item>
+      <!-- 问题描述 -->
+      <el-form-item :label="$t('feedBack:form:description')" prop="description">
+        <el-input v-model="form.Code" type="textarea" :rows="4" />
+      </el-form-item>
+      <!-- 截图 -->
+      <el-form-item :label="$t('feedBack:form:screenshot')" prop="screenshot">
+        <uploadImage :path.sync="form.HospitalLogoPath" :disabled="disabled" />
+      </el-form-item>
+      <!-- 反馈时间 -->
+      <el-form-item :label="$t('feedBack:form:time')" prop="screenshot">
+        <span>2024-06-28 15:00</span>
+      </el-form-item>
+      <!-- 状态 -->
+      <el-form-item :label="$t('feedBack:form:status')" prop="screenshot">
+        <el-switch
+          v-model="form.status"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          :active-value="true"
+          :inactive-value="false"
+          :active-text="$fd('FeedBackStatus', true)"
+          :inactive-text="$fd('FeedBackStatus', false)"
         >
-          {{ $t("feedBack:button:save") }}
+        </el-switch>
-        </el-button>
+      </el-form-item>
-      </div>
+    </el-form>
-    </el-dialog>
+    <div slot="footer">
-  </div>
+      <!-- 取消 -->
+      <el-button size="small" @click.stop="cancel">
+        {{ $t("feedBack:button:cancel") }}
+      </el-button>
+      <!-- 保存 -->
+      <el-button
+        type="primary"
+        size="small"
+        @click.stop="save"
+        :loading="loading"
+      >
+        {{ $t("feedBack:button:save") }}
+      </el-button>
+    </div>
+  </el-dialog>
 </template>
 <script>
 import uploadImage from "./uploadImage.vue";

src/components/feedBackTable/fun.js

@@ -1,23 +0,0 @@
-import Vue from "vue";
-import FEEDBACKCOMP from "./index.vue";
-const FBConstructor = Vue.extend(FEEDBACKCOMP);
-
-const FBT = options => {
-    // const { cancelBack } = options;
-    // if (!UserId) throw `UserId is requred.but ${UserId}`
-    const id = `FB${new Date().getTime()}`;
-    const instance = new FBConstructor();
-    instance.id = id;
-    instance.vm = instance.$mount();
-    if (instance.vm.visible) return;
-    document.body.appendChild(instance.vm.$el);
-    instance.vm.open();
-    instance.vm.$on("success", (Id) => {
-    });
-    instance.vm.$on("closed", () => {
-        document.body.removeChild(instance.vm.$el);
-        instance.vm.$destroy();
-    });
-    return instance.vm;
-}
-export default FBT;

src/components/feedBackTable/index.js

@@ -1,7 +0,0 @@
-import FEEDBACKCOMP from "./index.vue";
-import FBT from "./fun";
-
-export default Vue => {
-    Vue.component(FEEDBACKCOMP.name, FEEDBACKCOMP);
-    Vue.prototype.$FBT = FBT;
-};

src/components/feedBackTable/index.vue

@@ -1,48 +0,0 @@
-<template>
-  <div v-if="visible" @click.stop="()=>false">
-    <el-dialog
-      :visible.sync="visible"
-      v-dialogDrag
-      width="1200px"
-      :close-on-click-modal="false"
-      @close="cancel"
-    >
-      <div slot="title">
-        {{ title }}
-      </div>
-      <feedBackTable />
-    </el-dialog>
-  </div>
-</template>
-<script>
-import feedBackTable from "@/views/feedBack/index.vue";
-export default {
-  name: "FBT",
-  components: { feedBackTable },
-  data() {
-    return {
-      title: null,
-      visible: false,
-    };
-  },
-  computed: {
-    disabled() {
-      return false;
-    },
-  },
-  methods: {
-    open(data) {
-      this.visible = true;
-    },
-    cancel() {
-      this.visible = false;
-      this.$emit("closed");
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-bottom: 0;
-}
-</style>

src/main.js

@@ -62,8 +62,6 @@ import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
 Vue.use(FB)
-import FBT from '@/components/feedBackTable/index'
-Vue.use(FBT)
 import adaptive from '@/directive/adaptive/index'
 // 表格自适应指令
 Vue.use(adaptive)

src/views/feedBack/index.vue

@@ -3,39 +3,16 @@
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
         <!--项目编号/实验名称-->
-        <el-form-item :label="$t('feedBack:search:trials')" v-if="level > 8">
+        <el-form-item :label="$t('feedBack:search:trials')">
-          <el-input
+          <el-input v-model="searchData.a" clearable></el-input>
-            v-model="searchData.a"
-            clearable
-            style="width: 150px"
-          ></el-input>
-        </el-form-item>
-        <!--中心-->
-        <el-form-item :label="$t('feedBack:search:site')" v-if="level > 7">
-          <el-input
-            v-model="searchData.a"
-            clearable
-            style="width: 150px"
-          ></el-input>
         </el-form-item>
         <!--受试者访视-->
-        <el-form-item
+        <el-form-item :label="$t('feedBack:search:subjectVisit')">
-          :label="$t('feedBack:search:subjectVisit')"
+          <el-input v-model="searchData.a" clearable></el-input>
-          v-if="level > 7"
-        >
-          <el-input
-            v-model="searchData.a"
-            clearable
-            style="width: 150px"
-          ></el-input>
         </el-form-item>
         <!--角色-->
-        <el-form-item :label="$t('feedBack:search:role')" v-if="level > 7">
+        <el-form-item :label="$t('feedBack:search:role')">
-          <el-select
+          <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
-            v-model="searchData.NoticeTypeEnum"
-            clearable
-            style="width: 150px"
-          >
             <el-option
               v-for="item of $d.NoteType"
               :key="item.value"
@@ -45,20 +22,12 @@
           </el-select>
         </el-form-item>
         <!--反馈人-->
-        <el-form-item :label="$t('feedBack:search:user')" v-if="level > 7">
+        <el-form-item :label="$t('feedBack:search:user')">
-          <el-input
+          <el-input v-model="searchData.a" clearable></el-input>
-            v-model="searchData.a"
-            clearable
-            style="width: 150px"
-          ></el-input>
         </el-form-item>
         <!--问题类型-->
         <el-form-item :label="$t('feedBack:search:questionType')">
-          <el-select
+          <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
-            v-model="searchData.NoticeTypeEnum"
-            clearable
-            style="width: 150px"
-          >
             <el-option
               v-for="item of $d.NoteType"
               :key="item.value"
@@ -69,19 +38,11 @@
         </el-form-item>
         <!--问题描述-->
         <el-form-item :label="$t('feedBack:search:description')">
-          <el-input
+          <el-input v-model="searchData.a" clearable></el-input>
-            v-model="searchData.a"
-            clearable
-            style="width: 150px"
-          ></el-input>
         </el-form-item>
         <!--状态-->
-        <el-form-item :label="$t('feedBack:search:status')" v-if="level > 7">
+        <el-form-item :label="$t('feedBack:search:status')">
-          <el-select
+          <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
-            v-model="searchData.NoticeTypeEnum"
-            clearable
-            style="width: 150px"
-          >
             <el-option
               v-for="item of $d.NoteType"
               :key="item.value"
@@ -90,7 +51,7 @@
             />
           </el-select>
         </el-form-item>
-        <!--反馈日期-->
+        <!--最新接受日期-->
         <el-form-item :label="$t('feedBack:search:time')">
           <el-date-picker
             v-model="datetimerange"
@@ -100,7 +61,6 @@
             :end-placeholder="$t('feedBack:search:endTime')"
             value-format="yyyy-MM-dd HH:mm:ss"
             @change="handleDatetimeChange"
-            style="width: 250px"
           />
         </el-form-item>
         <el-form-item>
@@ -120,12 +80,7 @@
           >
             {{ $t("common:button:reset") }}
           </el-button>
-          <el-button
+          <el-button type="primary" size="mini" @click="report">
-            type="primary"
-            size="mini"
-            @click="report"
-            v-if="level > 7"
-          >
             {{ $t("common:button:export") }}
           </el-button>
         </el-form-item>
@@ -134,7 +89,6 @@
           size="mini"
           @click="resolve"
           style="float: right"
-          v-if="level > 7"
         >
           {{ $t("feedBack:button:resolve") }}
         </el-button>
@@ -149,20 +103,13 @@
         @sort-change="handleSortByColumn"
         :default-sort="{ prop: 'StudyTime', order: 'descending' }"
       >
-        <el-table-column
+        <el-table-column type="selection" align="center" width="45" />
-          type="selection"
-          align="center"
-          width="45"
-          v-if="level > 7"
-        />
-        <el-table-column type="index" width="50" />
         <el-table-column
           :label="$t('feedBack:form:trialCode')"
           prop="NoticeLevelEnum"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 8"
         />
         <el-table-column
           :label="$t('feedBack:form:study')"
@@ -170,7 +117,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 8"
         />
         <el-table-column
           :label="$t('feedBack:form:siteCode')"
@@ -178,7 +124,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('feedBack:form:subjectVisit')"
@@ -186,7 +131,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('feedBack:form:role')"
@@ -194,7 +138,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('feedBack:form:user')"
@@ -202,7 +145,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('feedBack:form:questionType')"
@@ -231,7 +173,6 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('feedBack:form:uploadTime')"
@@ -239,17 +180,16 @@
           min-width="100"
           show-overflow-tooltip
           sortable="custom"
-          v-if="level > 7"
         />
         <el-table-column
           :label="$t('common:action:action')"
           fixed="right"
           prop="UserTypeShortName"
-          width="80"
+          min-width="200"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="getDetail(scope.row)">
+            <el-button size="mini" type="text" @click="handleEdit(scope.row)">
               {{ $t("common:button:view") }}
             </el-button>
           </template>
@@ -267,6 +207,11 @@
   </div>
 </template>
 <script>
+import {
+  getSystemNoticeList,
+  addOrUpdateSystemNotice,
+} from "@/api/system/notice";
+import { getUserTypeRoleList } from "@/api/admin";
 import Pagination from "@/components/Pagination";
 const searchDataDefault = () => {
   return {
@@ -303,20 +248,6 @@ export default {
       tableSelectData: [],
     };
   },
-  computed: {
-    level() {
-      if (this.hasPermi(["role:dev", "role:admin"])) {
-        return 9;
-      }
-      if (this.hasPermi(["role:pm"])) {
-        return 8;
-      }
-      if (this.hasPermi(["role:ir", "role:crc"])) {
-        return 7;
-      }
-      return 0;
-    },
-  },
   mounted() {},
   methods: {
     getList() {},
@@ -356,10 +287,6 @@ export default {
       this.searchData.PageIndex = 1;
       this.getList();
     },
-    // 获取详情
-    getDetail() {
-      this.$FB();
-    },
   },
 };
 </script>

src/views/trials/trials-layout/components/feedBack.vue

@@ -6,17 +6,14 @@
       'feedBack-out': show === false,
     }"
     @click.stop="open"
-    v-if="isShow"
   >
     <i class="el-icon-chat-dot-square icon"></i>
     <transition name="fade">
-      <div class="checkBox" v-show="visible" @click.stop="()=>false">
+      <div class="checkBox" v-show="visible" @click.stop="false">
         <span @click.stop="openFeedBack">{{
           $t("triials:feedBack:botton:opinion")
         }}</span>
-        <span @click.stop="openFeedBackTable">{{
+        <span>{{ $t("triials:feedBack:botton:mine") }}</span>
-          $t("triials:feedBack:botton:mine")
-        }}</span>
       </div>
     </transition>
   </div>
@@ -40,14 +37,6 @@ export default {
       }
     });
   },
-  computed: {
-    isShow() {
-      if (this.hasPermi(["role:ir", "role:crc"])) {
-        return true;
-      }
-      return false;
-    },
-  },
   methods: {
     open() {
       if (this.show) {
@@ -64,10 +53,6 @@ export default {
         },
       });
     },
-    // 打开反馈列表
-    openFeedBackTable() {
-      this.$FBT();
-    },
   },
 };
 </script>

src/views/trials/trials-layout/index.vue

@@ -6,7 +6,7 @@
       </div>
       <trialsMain />
     </div>
-    <feedBack />
+    <!-- <feedBack /> -->
   </div>
 </template>