src/api/trials.js

@@ -4243,14 +4243,6 @@ export function getAuditRecordList(data) {
     data
   })
 }
-// 稽查管理-列表(EA)
-export function getAuditRecordSelectList(data) {
-  return request({
-    url: `/AuditDocument/getAuditRecordSelectList`,
-    method: 'post',
-    data
-  })
-}
 // 稽查管理-列表新增修改
 export function addOrUpdateAuditRecord(data) {
   return request({
@@ -4266,19 +4258,4 @@ export function setAuditRecordPermission(data) {
     method: 'post',
     data
   })
-}
-// 稽查管理-人员管理
-export function addOrDeleteAuditRecordUser(data) {
-  return request({
-    url: `/AuditDocument/addOrDeleteAuditRecordUser`,
-    method: 'put',
-    data
-  })
-}
-// 稽查管理-删除
-export function deleteAuditRecord(auditRecordId) {
-  return request({
-    url: `/AuditDocument/deleteAuditRecord/${auditRecordId}`,
-    method: 'delete'
-  })
 }

src/views/login/index.vue

@@ -7,13 +7,20 @@
       <div class="login-l">
         <div class="login-logo">
           <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img v-else-if="NODE_ENV === 'usa'" src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
+          <img
+            v-else-if="NODE_ENV === 'usa'"
+            src="@/assets/zzlogo-usa.png"
+            alt=""
+            class="usa-logo"
+          />
           <img v-else src="@/assets/zzlogo4.png" alt="" />
         </div>
-        <div :class="{
+        <div
-          'login-image': true,
+          :class="{
-          'login-image-usa': true,
+            'login-image': true,
-        }">
+            'login-image-usa': true,
+          }"
+        >
           <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
           <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
@@ -22,43 +29,77 @@
         <div class="title-container">
           <!-- IRC Management System -->
           <div v-if="NODE_ENV === 'usa'">
-            <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
+            <svg-icon
+              icon-class="login-logo"
+              style="width: 300px; height: 94px"
+            />
           </div>
           <div class="title" v-else>{{ $t('login:title:system') }}</div>
         </div>
-        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
+        <el-form
-          label-position="left">
+          ref="loginForm"
-          <el-form-item prop="username" :rules="[
+          :model="loginForm"
-            {
+          :rules="loginRules"
-              required: true,
+          class="login-form"
-              message: this.$t('login:formRule:userName'),
+          auto-complete="on"
-              trigger: 'blur',
+          label-position="left"
-            },
+        >
-          ]">
+          <el-form-item
+            prop="username"
+            :rules="[
+              {
+                required: true,
+                message: this.$t('login:formRule:userName'),
+                trigger: 'blur',
+              },
+            ]"
+          >
             <span class="svg-container">
               <svg-icon icon-class="user" />
             </span>
             <!-- User Name -->
-            <el-input ref="username" v-model="loginForm.username" size="small" :placeholder="$t('login:form:userName')"
+            <el-input
-              name="username" type="text" tabindex="1" />
+              ref="username"
+              v-model="loginForm.username"
+              size="small"
+              :placeholder="$t('login:form:userName')"
+              name="username"
+              type="text"
+              tabindex="1"
+            />
           </el-form-item>
 
-          <el-form-item prop="password" :rules="[
+          <el-form-item
-            {
+            prop="password"
-              required: true,
+            :rules="[
-              message: this.$t('login:formRule:password'),
+              {
-              trigger: 'blur',
+                required: true,
-            },
+                message: this.$t('login:formRule:password'),
-          ]">
+                trigger: 'blur',
+              },
+            ]"
+          >
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
             <!-- password -->
-            <el-input :key="passwordType" ref="password" v-model="loginForm.password" size="small" :type="passwordType"
+            <el-input
-              :placeholder="$t('login:form:password')" name="password" auto-complete="new-password"
+              :key="passwordType"
-              autocomplete="new-password" tabindex="2" @keyup.enter.native="handleLogin" />
+              ref="password"
+              v-model="loginForm.password"
+              size="small"
+              :type="passwordType"
+              :placeholder="$t('login:form:password')"
+              name="password"
+              auto-complete="new-password"
+              autocomplete="new-password"
+              tabindex="2"
+              @keyup.enter.native="handleLogin"
+            />
             <span class="show-pwd" @click="showPwd">
-              <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+              <svg-icon
+                :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+              />
             </span>
             <!-- <el-input
               :key="passwordType"
@@ -77,20 +118,33 @@
             </span> -->
           </el-form-item>
           <!-- Login -->
-          <el-button :loading="loading" type="primary" style="
+          <el-button
+            :loading="loading"
+            type="primary"
+            style="
               width: 100%;
               margin-bottom: 10px;
               background-color: rgb(0, 147, 221);
-            " size="medium" @click.native.prevent="handleLogin">
+            "
+            size="medium"
+            @click.native.prevent="handleLogin"
+          >
             {{ $t('login:button:login') }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="
+            <TopLang
-              VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+              v-if="
-              NODE_ENV !== 'usa'
+                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
-            " />
+                NODE_ENV !== 'usa'
+              "
+            />
             <!-- Forget password? -->
-            <el-button type="text" size="medium" @click.native.prevent="handleResetPwd" style="color: rgb(0, 147, 221)">
+            <el-button
+              type="text"
+              size="medium"
+              @click.native.prevent="handleResetPwd"
+              style="color: rgb(0, 147, 221)"
+            >
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
@@ -98,14 +152,19 @@
       </div>
     </div>
     <div v-if="language === 'zh'" class="login-footer">
-      <span>Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+      <span
-        版权所有</span>
+        >Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+        版权所有</span
+      >
       <span> | </span>
       <a target="_blank" href="https://beian.miit.gov.cn/">
         <span> 沪ICP备2021037850-2 </span>
       </a>
       <span> | </span>
-      <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
+      <a
+        target="_blank"
+        href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
+      >
         <img src="@/assets/filing.png" />
         <span>沪公网安备 31011002005859号</span>
       </a>
@@ -121,23 +180,43 @@
         <span style="color: #428bca">About</span>
       </a>
     </div>
-    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :success-text="$t('login:button:successText')"
+    <Vcode
-      :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
+      :show="isShow"
-    <el-dialog v-if="aboutVisible" :visible.sync="aboutVisible" width="680px" style="margin-top: 0"
+      :fail-text="$t('login:button:failText')"
-      :close-on-click-modal="false" size="small">
+      :success-text="$t('login:button:successText')"
-      <div style="
+      :slider-text="$t('login:button:sliderText')"
+      :imgs="[Img1]"
+      @success="onSuccess"
+    />
+    <el-dialog
+      v-if="aboutVisible"
+      :visible.sync="aboutVisible"
+      width="680px"
+      style="margin-top: 0"
+      :close-on-click-modal="false"
+      size="small"
+    >
+      <div
+        style="
           margin: 0 auto;
           width: 600px;
           line-height: 28px;
           text-align: center;
-        ">
+        "
-        <h1 style="text-align: center; margin-bottom: 30px" v-if="NODE_ENV === 'usa'">
+      >
+        <h1
+          style="text-align: center; margin-bottom: 30px"
+          v-if="NODE_ENV === 'usa'"
+        >
           About
         </h1>
         <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
         <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
           <!-- {{ $t('login:title:system_title_about') }} -->
-          <svg-icon icon-class="login-logo" style="width: 250px; height: 71px" />
+          <svg-icon
+            icon-class="login-logo"
+            style="width: 250px; height: 71px"
+          />
         </p>
         <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
         <p style="margin-bottom: 20px; margin-top: 0">
@@ -168,8 +247,13 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
-    <toggleRole v-if="toggleRoleVisible" :visible.sync="toggleRoleVisible" :loading="toggleRoleLoading"
+    <toggleRole
-      @save="loginByRole" @cancel="cancel" />
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
@@ -255,14 +339,7 @@ export default {
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
     localStorage.setItem('location', this.location)
-    // zh-CN navigator.language
+    if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
-    console.log(navigator.language, 'navigator.language')
-    if (navigator.language !== 'zh-CN' && navigator.language !== 'zh-TW') {
-      this.$i18n.locale = 'en'
-      this.setLanguage('en')
-      this.$updateDictionary()
-    }
-    else if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
       this.$i18n.locale = 'en'
       this.setLanguage('en')
       this.$updateDictionary()
@@ -439,7 +516,7 @@ export default {
         Array.isArray(this.$store.state.user.roles) &&
         this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
           .length ===
-        this.$store.state.user.roles.length - 1
+          this.$store.state.user.roles.length - 1
       ) {
         let role = this.$store.state.user.roles.find(
           (item) => !item.IsUserRoleDisabled
@@ -563,7 +640,6 @@ $cursor: #fff;
       // }
     }
   }
-
   .login-r {
     .el-form-item {
       border: 1px solid rgba(255, 255, 255, 0.1);
@@ -579,28 +655,23 @@ $cursor: #fff;
 $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #606266;
-
 .login-container {
   position: relative;
   width: 100%;
   height: 100%;
   overflow: auto;
   background: rgb(249, 249, 249);
-
   ::v-deep .el-input__inner::placeholder {
     color: $dark_gray;
   }
-
   .login-header {
     margin: 10px 0px 20px 10px;
     height: 3rem;
     width: 720px;
-
     .login-logo {
       height: 100%;
     }
   }
-
   .login-body {
     position: absolute;
     left: 50%;
@@ -614,39 +685,32 @@ $light_gray: #606266;
     box-sizing: border-box;
     background: rgb(255, 255, 255);
     border-radius: 10px 0px 0px 10px;
-
     .login-l {
       position: relative;
       float: left;
       width: 50%;
       height: 100%;
-
       .login-logo {
         position: absolute;
         top: 35px;
         left: 50px;
-
         img {
           height: 40px;
         }
-
         .usa-logo {
           height: 60px;
         }
       }
-
       .login-image {
         position: absolute;
         top: 10px;
         left: 0px;
         // transform: translateY(-50%);
         height: 100%;
-
         img {
           height: 100%;
         }
       }
-
       .login-image-usa {
         width: 100%;
         display: flex;
@@ -654,7 +718,6 @@ $light_gray: #606266;
         justify-content: flex-end;
       }
     }
-
     .login-r {
       position: relative;
       float: left;
@@ -672,19 +735,16 @@ $light_gray: #606266;
         margin: 0 auto;
         overflow: hidden;
       }
-
       .title-container {
         // margin-bottom: 50px;
         text-align: center;
         margin-top: 20%;
-
         .title {
           font-size: 35px;
           color: $light_gray;
           text-align: center;
           font-weight: bold;
         }
-
         .title-logo-message {
           font-size: 26px;
           color: $light_gray;
@@ -724,7 +784,6 @@ $light_gray: #606266;
       }
     }
   }
-
   .login-footer {
     position: absolute;
     bottom: 50px;
@@ -738,7 +797,6 @@ $light_gray: #606266;
     align-items: center;
     // color: rgb(180, 190, 199);
     color: #909399;
-
     a {
       display: inline-block;
       text-decoration: none;
@@ -747,16 +805,13 @@ $light_gray: #606266;
       display: flex;
       justify-content: center;
     }
-
     span {
       margin: 0 2px;
     }
-
     img {
       height: 20px;
       line-height: 20px;
     }
-
     // p{
     //   display: inline-block;
     //   height:20px;

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -60,7 +60,7 @@
           <el-input v-model="searchData.userName" clearable style="width: 120px" />
         </el-form-item>
         <!-- 用户类型 -->
-        <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc && !isEASystem">
+        <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc">
           <el-select v-model="searchData.UserTypeId" clearable filterable style="width: 120px">
             <el-option v-for="item of userTypeOptions"
               v-show="isSystem || (item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27)" :key="item.Id"
@@ -69,7 +69,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:isSign')" v-if="(!isDoc || !viewStatus) && !isEASystem">
+        <el-form-item :label="$t('trials:signRecords:table:isSign')" v-if="!isDoc || !viewStatus">
           <el-select v-model="searchData.IsConfirmed" clearable style="width: 120px">
             <el-option v-for="i of $d.TrainingStatusEnum" :key="'IsConfirmed' + i.label" :value="i.value"
               :label="i.label" />
@@ -78,12 +78,12 @@
         <el-form-item :label="isDoc
           ? $t('trials:signRecords:table:isDeletedFile')
           : $t('trials:signRecords:table:isDeleted')
-          " v-if="!isEASystem">
+          ">
           <el-select v-model="searchData.IsDeleted" clearable style="width: 120px">
             <el-option v-for="i of $d.TrainingStatus" :key="'IsDeleted' + i.label" :value="i.value" :label="i.label" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:username')" v-if="isDoc && !isEASystem">
+        <el-form-item :label="$t('trials:signRecords:table:username')" v-if="isDoc">
           <el-input v-model="searchData.UserName" style="width: 120px" />
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:confirmTime')" v-if="isDoc || isSystem">
@@ -91,7 +91,7 @@
             :default-time="['00:00:00', '23:59:59']" type="datetimerange">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:uploadTime')" v-if="isSystem && !isEASystem">
+        <el-form-item :label="$t('trials:signRecords:table:uploadTime')" v-if="isSystem">
           <el-date-picker v-model="timeListC" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange" :default-time="['00:00:00', '23:59:59']" @change="changeTimeListC" />
         </el-form-item>
@@ -305,11 +305,6 @@ export default {
       },
     }
   },
-  computed: {
-    isEASystem() {
-      return this.isSystem && this.hasPermi(['role:ea'])
-    }
-  },
   mounted() {
     this.getTypeOptions()
     this.getUserSelect()
@@ -365,14 +360,6 @@ export default {
     },
     // 获取系统文件数据
     getList() {
-      if (this.isEASystem) {
-        this.searchData.IsConfirmed = true
-        if (!this.searchData.FileTypeId && !this.searchData.Name && !this.searchData.UserId && !this.searchData.userName && (!Array.isArray(this.timeList) || this.timeList.length < 2)) {
-          this.list = []
-          this.total = 0
-          return false
-        }
-      }
       this.loading = true
       if (this.viewStatus) {
         this.searchData.IsConfirmed = true
@@ -411,7 +398,6 @@ export default {
     getTypeOptions() {
       if (this.isSystem) {
         this.typeOptions = this.$d.Sys_Document
-        if (this.isEASystem) this.typeOptions = this.typeOptions.filter(item => item.raw.ChildGroup !== "Trial")
       } else {
         getTrialDocAndSystemDocType(this.trialId).then((res) => {
           this.typeOptions = res.Result

src/views/trials/trials-workbench/components/auditDocument/index.vue

@@ -417,11 +417,7 @@ export default {
                     this.searchData.IsAuthorization = null
                 }
                 if (this.AuditRecordId) this.searchData.AuditRecordId = this.AuditRecordId
-                if (!this.isAudit) {
+                if (!this.isAudit) this.searchData.IsCurrentAuditRecordAuthorization = true
-                    this.searchData.IsCurrentAuditRecordAuthorization = true
-                } else {
-                    this.searchData.IsCurrentAuditRecordAuthorization = null
-                }
                 let res = await getAuditDocumentData(this.searchData)
                 this.loading = false
                 if (res.IsSuccess) {

src/views/trials/trials-workbench/components/auditDocument/view.vue

@@ -1,43 +0,0 @@
-<template>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane v-for="item in tabs" :key="item.Id"
-            :label="`${item.AuditTime} ${item.AuditContent} (${item.CompanyName})`" :name="item.Id">
-            <auditDocument v-if="activeName === item.Id" :isManage="false" :AuditRecordId="item.Id" />
-        </el-tab-pane>
-    </el-tabs>
-
-</template>
-<script>
-import { getAuditRecordSelectList } from '@/api/trials'
-import auditDocument from "@/views/trials/trials-workbench/components/auditDocument"
-export default {
-    name: "auditDocumentView",
-    components: { auditDocument },
-    data() {
-        return {
-            activeName: '',
-            tabs: []
-        }
-    },
-    created() {
-        this.getTabs()
-    },
-    methods: {
-        handleClick(row) {
-            this.activeName = row.name
-        },
-        async getTabs() {
-            try {
-                let res = await getAuditRecordSelectList({})
-                if (res.IsSuccess) {
-                    this.tabs = res.Result
-                    this.activeName = res.Result[0].Id
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        }
-    }
-}
-</script>
-<style lang="scss" scoped></style>

src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog v-if="visible" :visible.sync="visible" :close-on-click-modal="false"
         :title="$t(`trials:trials-workbench:inspectionManagement:dialogTitle:${state}`)" width="600px"
-        custom-class="base-dialog-wrapper" v-dialogDrag :before-close="handleCancle">
+        custom-class="base-dialog-wrapper" v-dialogDrag>
         <el-form :model="from" size="mini" :rules="rules" ref="dataForm" label-width="120px">
             <div class="base-dialog-body">
                 <!-- 公司名称 -->
@@ -23,7 +23,7 @@
                     </el-select>
                 </el-form-item>
                 <!-- 稽查人员 -->
-                <!-- <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:IdnetityUserName')"
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:IdnetityUserName')"
                     prop="IdnetityUserName">
                     <div style="display: flex;align-items: center;justify-content: space-around;">
                         <p :title="from.IdnetityUserName"
@@ -34,7 +34,7 @@
                             $t('trials:trials-workbench:inspectionManagement:button:select')
                             }}</el-button>
                     </div>
-                </el-form-item> -->
+                </el-form-item>
                 <!-- 稽查日期 -->
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditTime')"
                     prop="AuditTime">
@@ -44,8 +44,7 @@
                 </el-form-item>
                 <!-- 文档查看时间 -->
                 <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:ViewTime')" prop="ViewTime">
-                    <el-date-picker v-model="from.ViewTime" type="datetimerange"
+                    <el-date-picker v-model="from.ViewTime" type="datetimerange" range-separator="-"
-                        :default-time="['00:00:00', '23:59:59']" range-separator="-"
                         :start-placeholder="$t('curriculumVitae:daterange:startTime')"
                         :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
                         format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
@@ -56,7 +55,7 @@
                     prop="AuditState" v-if="state === 'edit'">
                     <el-radio-group v-model="from.AuditState">
                         <el-radio v-for="item in $d.AuditState" :key="item.id" :label="item.value">{{ item.label
-                        }}</el-radio>
+                            }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </div>
@@ -73,11 +72,17 @@
                 </el-form-item>
             </div>
         </el-form>
+        <base-model :config="config">
+            <template slot="dialog-body">
+                <userList @add="addUser" v-if="config.visible" />
+            </template>
+        </base-model>
     </el-dialog>
 </template>
 <script>
 import { addOrUpdateAuditRecord } from '@/api/trials'
-
+import userList from './userList'
+import baseModel from '@/components/BaseModel'
 export default {
     props: {
         visible: {
@@ -95,12 +100,13 @@ export default {
             }
         }
     },
+    components: { userList, baseModel },
     watch: {
         state: {
             handler() {
                 if (this.state === 'edit') {
                     Object.keys(this.from).forEach(key => {
-                        if (this.rowData[key] || this.rowData[key] == 0) {
+                        if (this.rowData[key]) {
                             this.from[key] = this.rowData[key]
                         }
                     })
@@ -108,7 +114,9 @@ export default {
                     this.from.ViewTime = [this.from.BeginTime, this.from.EndTime]
                 } else {
                     Object.keys(this.from).forEach(key => {
-                        this.from[key] = ''
+                        if (this.rowData[key]) {
+                            this.from[key] = ''
+                        }
                     })
                     this.from.ViewTime = []
                     this.from.IdnetityUserIdList = []
@@ -207,6 +215,12 @@ export default {
                     },
                 ],
             },
+            config: {
+                visible: false,
+                title: this.$t('trials:trials-workbench:inspectionManagement:dialogTitle:selectUser'),
+                width: '1200px',
+                appendToBody: true
+            },
         }
     },
     methods: {

src/views/trials/trials-workbench/components/inspectionManagement/document.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-if="visible" :visible.sync="visible" :close-on-click-modal="false" :fullscreen="true"
-        :before-close="close" :title="$t(`trials:trials-workbench:inspectionManagement:dialogTitle:${isAudit}`)"
+        :title="$t(`trials:trials-workbench:inspectionManagement:dialogTitle:${isAudit}`)"
         custom-class="base-dialog-wrapper">
         <auditDocument :isManage="false" :AuditRecordId="AuditRecordId" :isAudit="isAudit" />
     </el-dialog>
@@ -23,16 +23,6 @@ export default {
         }
     },
     components: { auditDocument },
-    methods: {
-        close(done) {
-            this.$emit("update:visible", false)
-            // done()
-        }
-    }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-::v-deep .el-dialog__body {
-    margin-top: 0;
-}
-</style>

src/views/trials/trials-workbench/components/inspectionManagement/index.vue

@@ -1,159 +1,133 @@
 <template>
-
+    <div class="inspectionManagement">
-    <BaseContainer class="inspectionManagement">
+        <el-row>
-        <template slot="title-container">
+            <el-col :span="12">
-            <el-row>
+                <h3>{{ $t('trials:tab:inspectionManagement') }}</h3>
-                <el-col :span="12">
+            </el-col>
-                    <h3>{{ $t('trials:tab:inspectionManagement') }}</h3>
+            <el-col :span="12" style="text-align:right;">
-                </el-col>
+                <h3>
-                <el-col :span="12" style="text-align:right;">
+                    <Pagination class="page" :total="total" :page.sync="searchData.pageIndex"
-                    <h3>
+                        :limit.sync="searchData.pageSize" layout="total, sizes, prev, pager, next" :background="false"
-                        <Pagination class="page" :total="total" :page.sync="searchData.pageIndex"
+                        style="display: inline-block;" @pagination="getList" />
-                            :limit.sync="searchData.pageSize" layout="total, sizes, prev, pager, next"
+                    <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')"
-                            :background="false" style="display: inline-block;" @pagination="getList" />
+                        @click="handleReset" />
-                        <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')"
+                </h3>
-                            @click="handleReset" />
+            </el-col>
-                    </h3>
+        </el-row>
-                </el-col>
+        <el-form :inline="true" class="base-search-form">
-            </el-row>
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')">
-        </template>
+                <el-input v-model="searchData.CompanyName" clearable placeholder=""></el-input>
-        <template slot="search-container">
+            </el-form-item>
-            <el-form :inline="true">
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')">
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')">
+                <el-input v-model="searchData.AuditContent" clearable placeholder=""></el-input>
-                    <el-input v-model="searchData.CompanyName" clearable placeholder=""></el-input>
+            </el-form-item>
-                </el-form-item>
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')">
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')">
+                <el-select v-model="searchData.AuditType" placeholder="" clearable>
-                    <el-input v-model="searchData.AuditContent" clearable placeholder=""></el-input>
+                    <el-option v-for="item in $d.AuditType" :key="item.id" :label="item.label" :value="item.value">
-                </el-form-item>
+                    </el-option>
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')">
+                </el-select>
-                    <el-select v-model="searchData.AuditType" placeholder="" clearable>
+            </el-form-item>
-                        <el-option v-for="item in $d.AuditType" :key="item.id" :label="item.label" :value="item.value">
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
-                        </el-option>
+                <el-input v-model="searchData.IdentityUserName" clearable placeholder=""></el-input>
-                    </el-select>
+            </el-form-item>
-                </el-form-item>
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')">
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
+                <el-date-picker v-model="auditTime" type="daterange" range-separator="-"
-                    <el-input v-model="searchData.IdentityUserName" clearable placeholder=""></el-input>
+                    :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
-                </el-form-item>
+                    :end-placeholder="$t('imageInspect:daterange:endPlaceholder')" value-format="yyyy-MM-dd"
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')">
+                    format="yyyy-MM-dd" clearable>
-                    <el-date-picker v-model="auditTime" type="daterange" range-separator="-"
+                </el-date-picker>
-                        :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
+            </el-form-item>
-                        :end-placeholder="$t('imageInspect:daterange:endPlaceholder')" value-format="yyyy-MM-dd"
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
-                        format="yyyy-MM-dd" clearable>
+                <el-date-picker v-model="viewTime" type="datetimerange" range-separator="-"
-                    </el-date-picker>
+                    :start-placeholder="$t('curriculumVitae:daterange:startTime')"
-                </el-form-item>
+                    :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
+                    format="yyyy-MM-dd HH:mm:ss" clearable>
-                    <el-date-picker v-model="viewTime" type="datetimerange" range-separator="-"
+                </el-date-picker>
-                        :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+            </el-form-item>
-                        :default-time="['00:00:00', '23:59:59']"
+            <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')">
-                        :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+                <el-date-picker v-model="createTime" type="daterange" range-separator="-"
-                        format="yyyy-MM-dd HH:mm:ss" clearable>
+                    :start-placeholder="$t('curriculumVitae:daterange:startTime')"
-                    </el-date-picker>
+                    :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd"
-                </el-form-item>
+                    format="yyyy-MM-dd" clearable>
-                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')">
+                </el-date-picker>
-                    <el-date-picker v-model="createTime" type="daterange" range-separator="-"
+            </el-form-item>
-                        :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+            <el-form-item>
-                        :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd"
+                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-                        format="yyyy-MM-dd" clearable>
+                    {{ $t('common:button:search') }}
-                    </el-date-picker>
+                </el-button>
-                </el-form-item>
+                <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-                <el-form-item>
+                    {{ $t('common:button:reset') }}
-                    <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                </el-button>
-                        {{ $t('common:button:search') }}
+                <el-button type="primary" @click="openForm('add', {})">
-                    </el-button>
+                    {{ $t('common:button:new') }}
-                    <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+                </el-button>
-                        {{ $t('common:button:reset') }}
+            </el-form-item>
-                    </el-button>
+        </el-form>
-                    <el-button type="primary" @click="openForm('add', {})">
+        <el-table id="auditDocumentTable" ref="auditDocumentTable" :data="tableData" style="width: 99%" row-key="Id"
-                        {{ $t('common:button:new') }}
+            :loading="loading" v-adaptive="{ bottomOffset: 75 }" height="100" @sort-change="handleSortChange">
-                    </el-button>
+            <el-table-column prop="CompanyName" show-overflow-tooltip
-                </el-form-item>
+                :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')" sortable="custom">
-            </el-form>
+            </el-table-column>
-        </template>
+            <el-table-column prop="AuditContent" show-overflow-tooltip
-        <template slot="main-container">
+                :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')" sortable="custom">
-            <el-table id="auditDocumentTable" ref="auditDocumentTable" :data="tableData" style="width: 99%" row-key="Id"
+            </el-table-column>
-                :loading="loading" v-adaptive="{ bottomOffset: 75 }" height="100" @sort-change="handleSortChange">
+            <el-table-column prop="AuditType" show-overflow-tooltip
-                <el-table-column type="index" width="50" />
+                :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')" sortable="custom">
-                <el-table-column prop="CompanyName" show-overflow-tooltip
+                <template slot-scope="scope">
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')" sortable="custom">
+                    <span>{{ $fd('AuditType', scope.row.AuditType) }}</span>
-                </el-table-column>
+                </template>
-                <el-table-column prop="AuditContent" show-overflow-tooltip
+            </el-table-column>
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')" sortable="custom">
+            <el-table-column prop="identityUserList" show-overflow-tooltip
-                </el-table-column>
+                :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
-                <el-table-column prop="AuditType" show-overflow-tooltip
+                <template slot-scope="scope">
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')" sortable="custom">
+                    <span>
-                    <template slot-scope="scope">
-                        <span>{{ $fd('AuditType', scope.row.AuditType) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="identityUserList" show-overflow-tooltip
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
-                    <template slot-scope="scope">
-                        <el-button v-if="Array.isArray(scope.row.IdentityUserList)" type="text"
-                            @click="openUserList(true, scope.row)">
-                            {{scope.row.IdentityUserList.map(item => item.FullName).join(", ")}}
-                        </el-button>
-                        <!-- <span>
                         {{Array.isArray(scope.row.IdentityUserList) ?
                             scope.row.IdentityUserList.map(item => item.FullName).join(", ") :
                             ''}}
-                    </span> -->
+                    </span>
-                    </template>
+                </template>
-                </el-table-column>
+            </el-table-column>
-                <el-table-column prop="AuditTime" show-overflow-tooltip
+            <el-table-column prop="AuditTime" show-overflow-tooltip
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')" sortable="custom">
+                :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')" sortable="custom">
-                </el-table-column>
+            </el-table-column>
-                <el-table-column prop="BeginTime" show-overflow-tooltip
+            <el-table-column prop="BeginTime" show-overflow-tooltip
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
+                :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
-                    <template slot-scope="scope">
+                <template slot-scope="scope">
-                        <span>{{ `${scope.row.BeginTime} - ${scope.row.EndTime}` }}</span>
+                    <span>{{ `${scope.row.BeginTime} - ${scope.row.EndTime}` }}</span>
-                    </template>
+                </template>
-                </el-table-column>
+            </el-table-column>
-                <el-table-column prop="AuditState" show-overflow-tooltip
+            <el-table-column prop="AuditState" show-overflow-tooltip
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditState')" sortable="custom">
+                :label="$t('trials:trials-workbench:inspectionManagement:table:AuditState')" sortable="custom">
-                    <template slot-scope="scope">
+                <template slot-scope="scope">
-                        <span>{{ $fd('AuditState', scope.row.AuditState) }}</span>
+                    <span>{{ $fd('AuditState', scope.row.AuditState) }}</span>
-                    </template>
+                </template>
-                </el-table-column>
+            </el-table-column>
-                <el-table-column prop="CreateTime" show-overflow-tooltip
+            <el-table-column prop="CreateTime" show-overflow-tooltip
-                    :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')" sortable="custom">
+                :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')" sortable="custom">
-                </el-table-column>
+            </el-table-column>
-                <el-table-column :label="$t('common:action:action')" width="260" align="left" fixed="right">
+            <el-table-column :label="$t('common:action:action')" width="260" align="left" fixed="right">
-                    <template slot-scope="scope">
+                <template slot-scope="scope">
-                        <el-button circle icon="el-icon-view"
+                    <el-button type="text" @click="openDoc(false, scope.row)">
-                            :title="$t('trials:trials-workbench:inspectionManagement:button:viewDocument')"
+                        {{ $t('trials:trials-workbench:inspectionManagement:button:viewDocument') }}
-                            @click="openDoc(false, scope.row)" />
+                    </el-button>
-                        <el-button circle icon="el-icon-edit-outline"
+                    <el-button type="text" @click="openDoc(true, scope.row)">
-                            :title="$t('trials:trials-workbench:inspectionManagement:button:editDocument')"
+                        {{ $t('trials:trials-workbench:inspectionManagement:button:editDocument') }}
-                            @click="openDoc(true, scope.row)" />
+                    </el-button>
-                        <el-button circle icon="el-icon-user"
+                    <el-button type="text" @click="openForm('edit', scope.row)">
-                            :title="$t('trials:trials-workbench:inspectionManagement:button:user')"
+                        {{ $t('common:button:edit') }}
-                            @click="openUserList(false, scope.row)" />
+                    </el-button>
-                        <el-button circle icon="el-icon-edit" :title="$t('common:button:edit')"
+                </template>
-                            @click="openForm('edit', scope.row)" />
+            </el-table-column>
-                        <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')"
+        </el-table>
-                            :disabled="scope.row.AuditState > 0" @click="del(scope.row)" />
-                    </template>
-                </el-table-column>
-            </el-table>
-        </template>
         <dataForm v-if="fromVisible" :visible.sync="fromVisible" :rowData="rowData" :state="state" @getList="getList" />
         <document v-if="docVisible" :visible.sync="docVisible" :isAudit="isAudit" :AuditRecordId="AuditRecordId" />
-        <base-model :config="config">
+    </div>
-            <template slot="dialog-body">
-                <userList v-if="config.visible" :AuditRecordId="AuditRecordId" :isView="isView" @close="close"
-                    @getList="getList" />
-            </template>
-        </base-model>
-    </BaseContainer>
 </template>
 <script>
 import Pagination from '@/components/Pagination'
-import { getAuditRecordList, deleteAuditRecord } from '@/api/trials'
+import { getAuditRecordList } from '@/api/trials'
 import dataForm from "./dataForm.vue"
 import document from "./document.vue"
-import userList from './userList'
-import baseModel from '@/components/BaseModel'
-import BaseContainer from '@/components/BaseContainer'
 const searchDataDefault = () => {
     return {
         CompanyName: '',
@@ -174,7 +148,7 @@ const searchDataDefault = () => {
 }
 export default {
     name: "inspectionManagement",
-    components: { Pagination, dataForm, document, userList, baseModel, BaseContainer },
+    components: { Pagination, dataForm, document },
     data() {
         return {
             searchData: searchDataDefault(),
@@ -194,14 +168,7 @@ export default {
 
             docVisible: false,
             isAudit: false,
-            AuditRecordId: null,
+            AuditRecordId: null
-
-            config: {
-                visible: false,
-                title: this.$t('trials:trials-workbench:inspectionManagement:dialogTitle:selectUser'),
-                width: '1200px',
-            },
-            isView: false,
 
         }
     },
@@ -209,30 +176,6 @@ export default {
         this.getList()
     },
     methods: {
-        async del(row) {
-            try {
-                let confirm = await this.$confirm(this.$t("trials:trials-workbench:inspectionManagement:confirm:del"))
-                if (!confirm) return false
-                this.loading = true
-                let res = await deleteAuditRecord(row.Id)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getList()
-                    this.$message.success(this.$t("common:message:deletedSuccessfully"))
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        close() {
-            this.config.visible = false
-        },
-        openUserList(isView = false, row) {
-            this.isView = isView
-            this.AuditRecordId = row.Id
-            this.config.visible = true
-        },
         openDoc(isAudit = false, row) {
             this.AuditRecordId = row.Id
             this.isAudit = isAudit

src/views/trials/trials-workbench/components/inspectionManagement/userList.vue

@@ -11,14 +11,6 @@
         <!-- 单位 -->
         <span>{{ $t('trials:staff:table:organization') }}:</span>
         <el-input v-model="listQuery.OrganizationName" size="mini" class="mr" clearable />
-        <!-- 是否加入 -->
-        <template v-if="!isView">
-          <span>{{ $t('trials:staff:table:Join') }}:</span>
-          <el-select v-model="listQuery.IsAuditRecordUserSelect" placeholder="" size="mini" class="mr" clearable>
-            <el-option v-for="item in $d.IsJoin" :key="item.id" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </template>
         <!-- 用户类型 -->
         <!-- <span>{{ $t('trials:staff:table:userType') }}:</span>
         <el-select v-model="listQuery.UserTypeEnum" size="mini" clearable class="mr">
@@ -36,17 +28,17 @@
           {{ $t('common:button:reset') }}
         </el-button>
 
-        <!-- <el-button type="primary" size="mini" style="margin-left: auto" :disabled="selectArr.length === 0"
+        <el-button type="primary" size="mini" style="margin-left: auto" :disabled="selectArr.length === 0"
           :loading="assignLoadStatus" icon="el-icon-plus" @click="handleAssign">
           {{ $t('common:button:add') }}
-        </el-button> -->
+        </el-button>
       </div>
     </el-header>
     <el-main>
       <div class="data-table">
         <el-table :data="list" stripe height="400px" class="participant-table-list"
           @selection-change="handleSelectChange" @sort-change="handleSortByColumn">
-          <!-- <el-table-column type="selection" width="50" /> -->
+          <el-table-column type="selection" width="50" />
           <el-table-column type="index" width="50" />
           <!-- 姓名 -->
           <el-table-column prop="FullName" :label="$t('trials:staff:table:name')" show-overflow-tooltip
@@ -66,22 +58,6 @@
           <!-- 用户类型 -->
           <!-- <el-table-column prop="UserTypeShortName" :label="$t('trials:staff:table:userType')" show-overflow-tooltip
             sortable="custom" min-width="100" /> -->
-          <el-table-column prop="IsAuditRecordUserSelect" :label="$t('trials:staff:table:Join')" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{ $fd('IsJoin', scope.row.IsAuditRecordUserSelect) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('common:action:action')" width="120" align="left" fixed="right">
-            <template slot-scope="scope">
-              <el-button type="text" @click="changeUser(true, scope.row)" :disabled="scope.row.IsAuditRecordUserSelect">
-                {{ $t('trials:trials-workbench:inspectionManagement:button:join') }}
-              </el-button>
-              <el-button type="text" @click="changeUser(false, scope.row)"
-                :disabled="!scope.row.IsAuditRecordUserSelect">
-                {{ $t('trials:trials-workbench:inspectionManagement:button:Exit') }}
-              </el-button>
-            </template>
-          </el-table-column>
         </el-table>
       </div>
     </el-main>
@@ -93,14 +69,12 @@
 </template>
 <script>
 import { getUserList } from '@/api/admin'
-import { addOrDeleteAuditRecordUser } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 const getListQueryDefault = () => {
   return {
     RealName: '',
     UserName: '',
     OrganizationName: '',
-    IsAuditRecordUserSelect: null,
     UserTypeEnum: '16',
     PageIndex: 1,
     PageSize: 20,
@@ -108,16 +82,6 @@ const getListQueryDefault = () => {
 }
 export default {
   components: { Pagination },
-  props: {
-    AuditRecordId: {
-      type: String,
-      default: ''
-    },
-    isView: {
-      type: Boolean,
-      default: false
-    }
-  },
   data() {
     return {
       list: [],
@@ -134,22 +98,6 @@ export default {
     this.getList()
   },
   methods: {
-    async changeUser(IsAdd = true, row) {
-      try {
-        let data = {
-          AuditRecordId: this.AuditRecordId,
-          IsAdd,
-          identityUserIdList: [row.Id]
-        }
-        let res = await addOrDeleteAuditRecordUser(data)
-        if (res.IsSuccess) {
-          this.getList()
-          this.$emit("getList")
-        }
-      } catch (err) {
-        console.log(err)
-      }
-    },
     getList() {
       const loading = this.$loading({
         target: document.querySelector('.participant-table-list'),
@@ -157,8 +105,6 @@ export default {
         lock: true,
       })
       this.listQuery.UserState = 1
-      this.listQuery.AuditRecordId = this.AuditRecordId
-      if (this.isView) this.listQuery.IsAuditRecordUserSelect = true
       getUserList(this.listQuery)
         .then((res) => {
           loading.close()
@@ -178,7 +124,6 @@ export default {
     },
     handleReset() {
       this.listQuery = getListQueryDefault()
-      if (this.isView) this.listQuery.IsAuditRecordUserSelect = true
       this.getList()
     },
     handleSelectChange(val) {

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

@@ -452,7 +452,7 @@
         <!--通用培训记录-->
         <generalTraining v-if="selected === 'viewGeneralTraining'" :isManage="false" />
         <!--稽查文档-->
-        <auditDocumentView v-if="selected === 'viewAuditDocument'" :isManage="false" />
+        <auditDocument v-if="selected === 'viewAuditDocument'" :isManage="false" />
         <!--培训课程管理-->
         <generalTraining v-if="selected === 'updateGeneralTraining'" :isManage="true" />
         <!--稽查文档管理-->
@@ -581,7 +581,6 @@ import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
 import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
 import auditDocument from "./components/auditDocument"
-import auditDocumentView from "./components/auditDocument/view"
 import generalTraining from "./components/generalTraining"
 import ReuploadAudit from "./components/ReuploadAudit"
 import inspectionManagement from "./components/inspectionManagement"
@@ -596,7 +595,6 @@ export default {
   name: 'WorkBench',
   components: {
     auditDocument,
-    auditDocumentView,
     generalTraining,
     inspectionManagement,
     clinicalDataConfirm,