Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

public/index.html

@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+    <script src="http://121.40.189.20:8899/web-apps/apps/api/documents/api.js"></script>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,

src/App.vue

@@ -2,6 +2,9 @@
   <div id="app">
     <router-view />
     <theme-picker />
+    <div class="onlyoffice">
+      <div id="placeholder"></div>
+    </div>
   </div>
 </template>
 
@@ -11,18 +14,94 @@ import ThemePicker from "@/components/ThemePicker";
 export default {
   name: "App",
   components: { ThemePicker },
-    metaInfo() {
-        return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-            titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-            }
-        }
+  data() {
+    return {
+      config: {},
+      flag: false
     }
+  },
+  mounted() {
+    console.log("app.vue");
+    this.config = {
+      "editorConfig": {
+        "mode": "edit",
+        "customization": {
+          "feedback": {
+            "visible": false
+          },
+          "help": false,
+          "goback": {
+            "blank": false
+          },
+          "macros": false,
+          "autosave": false,
+          "comments": false,
+          "review": {},
+          "hideRightMenu": true,
+          "anonymous": {
+            "request": false
+          },
+          "forcesave": true,
+          "logo": {},
+          "hideNotes": true
+        },
+        "plugins": {
+          "pluginsData": [],
+          "autostart": []
+        },
+        "callbackUrl": "http://121.40.189.20:9090/onlyOffice/save",
+        "lang": "zh-CN",
+        "user": {
+          "name": "OnlyOfficeUserName1",
+          "id": "1"
+        }
+      },
+      "docServiceApiUrl": "http://121.40.189.20:8899/web-apps/apps/api/documents/api.js",
+      "documentType": "word",
+      "document": {
+        "permissions": {
+          "edit": false,
+          "chat": false,
+          "review": false
+        },
+        "title": "调解申请书模板.docx",
+        "fileType": "docx",
+        "key": "6ae50056ac5e4e3ba09be430d444699c",
+        "url": "http://121.40.189.20:9090/download/6ae50056ac5e4e3ba09be430d444699c",
+        "info": {
+          "sharingSettings": [
+            {
+              "isLink": true,
+              "permissions": [
+                "Full Access"
+              ],
+              "user": "OnlyOfficeUserName1"
+            }
+          ],
+          "created": "2024-03-13 09:46:41"
+        }
+      },
+      "type": "desktop"
+    }
+    var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
+  },
+  metaInfo() {
+    return {
+      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+      titleTemplate: title => {
+        return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+      }
+    }
+  }
 };
 </script>
 <style scoped>
 #app .theme-picker {
   display: none;
 }
+
+.onlyoffice {
+  width: 0;
+  height: 0;
+}
 </style>

src/api/caseManagement/caseManagement.js

@@ -239,3 +239,18 @@ export function secretaryRoleByUserId(query) {
     params: query
   })
 }
+// 获取证件类型
+export function getIdType() {
+  return request({
+    url: '/system/dict/data/type/id_type',
+    method: 'get',
+  })
+}
+// 会议附件上传接口
+export function meetingUpload(data) {
+  return request({
+    url: '/video/upload',
+    method: 'post',
+    data: data
+  })
+}

src/api/deliveryRecord/deliveryRecord.js

@@ -18,3 +18,43 @@ export function smsList(data,params) {
         params:params
     })
 }
+//更新短信内容
+export function updateSendContent(data) {
+    return request({
+        url: 'shortMessage/updateSendContent',
+        method: 'post',
+        data: data,
+    })
+}
+// 分页查询短信
+export function recordList(data) {
+    return request({
+        url: '/shortMessage/recordList',
+        method: 'get',
+        params: data
+    })
+}
+// 重新发送短信
+export function reSendShortMessage(data) {
+    return request({
+        url: 'shortMessage/reSendShortMessage',
+        method: 'post',
+        data: data,
+    })
+}
+// 重新发送邮件
+export function reSendMailRecord(data) {
+    return request({
+        url: 'sendMailRecord/reSendMailRecord',
+        method: 'post',
+        data: data,
+    })
+}
+// 更新邮件发送记录
+export function update(data) {
+    return request({
+        url: 'sendMailRecord/update',
+        method: 'post',
+        data: data,
+    })
+}

src/api/login.js

@@ -65,6 +65,14 @@ export function sendCode(data) {
 		params:data
 	})
 }
+// 获取邮箱验证码
+export function sendEmailCode(data) {
+	return request({
+		url: '/weChatUser/sendEmailCode',
+		method: 'get',
+		params:data
+	})
+}
 // 注册方法
 export function wxregister(data) {
 	return request({
@@ -84,3 +92,25 @@ export function verifyUserName(data) {
 		params:data
 	})
 }
+// 获取证件类型
+export function getIdType() {
+  return request({
+    url: '/system/dict/data/type/skipToken/id_type',
+    method: 'get',
+  })
+}
+// 获取pc端的EIDtoken
+export function selectIdentityAuthenticaEIDtoken() {
+  return request({
+    url: '/identityAuthentication/selectIdentityAuthenticaEIDtoken',
+    method: 'post'
+  })
+} 
+// H5轮询获取E证通Token状态
+export function selectPCEIDtokenStatus(data) {
+  return request({
+    url: '/identityAuthentication/selectPCEIDtokenStatus',
+    method: 'get',
+    params:data
+  })
+}

src/api/onlyoffice/onlyoffice.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+// 获取onlyoffice配置文件
+export function getOnlyoffice(params) {
+  return request({
+    url: '/onlyOffice',
+    // headers: {
+    //   isToken: false
+    // },
+    method: 'get',
+    params: params
+  })
+}
+// 保存onlyoffice文档
+export function saveOnlyOfficeFile(data) {
+  return request({
+    url: '/caseApplication/saveOnlyOfficeFile',
+    method: 'post',
+    data: data
+  })
+}

src/layout/components/Navbar.vue

@@ -97,7 +97,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          this.$router.push({ path: '/Login' })
         })
       }).catch(() => {});
     }

src/main.js

@@ -4,7 +4,7 @@ import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
-
+import './assets/icons' // icon
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -13,11 +13,15 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-
+import { Message } from 'element-ui'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import { getToken } from '@/utils/auth'
+import { isRelogin } from '@/utils/request'
 import './assets/icons' // icon
 // 引入Iconfont 矢量图标库
 import './assets/icon/iconfont.css'
-import './permission' // permission control
+// import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
@@ -78,7 +82,61 @@ DictData.install()
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
  */
+NProgress.configure({ showSpinner: false })
 
+const whiteList = ['/login', '/register']
+
+router.beforeEach((to, from, next) => {
+  let path = to.fullPath
+  if(path.indexOf('token') != -1){
+    path = path.split('token=');
+    path = path[1];
+    Cookies.set("Admin-Token", path)
+  }
+  NProgress.start()
+  if (getToken()) {
+    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    /* has token*/
+    if (to.path === '/login') {
+      next({ path: '/' })
+      NProgress.done()
+    } else {
+      if (store.getters.roles.length === 0) {
+        isRelogin.show = true
+        // 判断当前用户是否已拉取完user_info信息
+        store.dispatch('GetInfo').then(() => {
+          isRelogin.show = false
+          store.dispatch('GenerateRoutes').then(accessRoutes => {
+            // 根据roles权限生成可访问的路由表
+            router.addRoutes(accessRoutes) // 动态添加可访问路由表
+            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+          })
+        }).catch(err => {
+            store.dispatch('LogOut').then(() => {
+              Message.error(err)
+              next({ path: '/' })
+            })
+          })
+      } else {
+        next()
+      }
+    }
+  } else {
+    // 没有token
+    if (whiteList.indexOf(to.path) !== -1) {
+      // 在免登录白名单，直接进入
+      next()
+    } else {
+      // next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
+      next(`/login`)
+      NProgress.done()
+    }
+  }
+})
+
+router.afterEach(() => {
+  NProgress.done()
+})
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
 })

src/permission.js

@@ -11,6 +11,7 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/register']
 
 router.beforeEach((to, from, next) => {
+  console.log("**************************************");
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
@@ -45,7 +46,8 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
+      // next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
+      next(`/login`)
       NProgress.done()
     }
   }

src/router/index.js

@@ -61,6 +61,16 @@ export const constantRoutes = [
     component: () => import('@/views/error/401'),
     hidden: true
   },
+  {
+    path: '/onlyoffice',
+    component: () => import('@/views/onlyoffice/onlyoffice'),
+    hidden: true
+  },
+  {
+    path: '/test',
+    component: () => import('@/views/test'),
+    hidden: true
+  },
   {
     path: '',
     component: Layout,

src/store/getters.js

@@ -15,5 +15,6 @@ const getters = {
   topbarRouters:state => state.permission.topbarRouters,
   defaultRoutes:state => state.permission.defaultRoutes,
   sidebarRouters:state => state.permission.sidebarRouters,
+  userId:state => state.user.userId,
 }
 export default getters

src/store/modules/user.js

@@ -6,11 +6,15 @@ const user = {
     token: getToken(),
     name: '',
     avatar: '',
+    userId:null,
     roles: [],
     permissions: []
   },
 
   mutations: {
+    SET_USERID:(state,userId) => {
+      state.userId = userId
+    },
     SET_TOKEN: (state, token) => {
       state.token = token
     },
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID',user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)
@@ -68,13 +73,14 @@ const user = {
     },
 
     // 退出系统
-    LogOut({ commit, state }) {
+    LogOut({ commit, state, dispatch }) {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           removeToken()
+          dispatch('tagsView/delAllViews', null, { root: true })
           resolve()
         }).catch(error => {
           reject(error)

src/utils/permission.js

@@ -48,3 +48,22 @@ export function checkRole(value) {
     return false
   }
 }
+
+/**
+ * 状态权限校验
+ * @param {Number} value 校验值
+ * @returns {Boolean}
+ */
+export function statusRole(value) {
+  let caseStatusStr = sessionStorage.getItem('caseStatus');
+  let caseStatus = [];
+  caseStatus = JSON.parse(caseStatusStr);
+  if (caseStatus.length == 0) {
+    return false
+  }
+  if (caseStatus.includes(value)) {
+    return true
+  } else {
+    return false
+  }
+}

src/views/caseManagement/caseList.vue

@@ -18,12 +18,12 @@
                     @keyup.enter.native="handleQuery" />
             </el-form-item> -->
             <el-form-item label="案件编号" prop="caseNum">
-                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable style="width: 240px"
-                    @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" :disabled='queryDisable' clearable
+                    style="width: 240px" @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="创建时间" prop="caseTime">
-                <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
+                <el-date-picker v-model="caseTime" type="datetimerange" align="right" unlink-panels range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" :default-time="['00:00:00', '23:59:59']"
                     @change="caseTimeChange">
                 </el-date-picker>
             </el-form-item>
@@ -76,15 +76,17 @@
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
                         v-hasPermi="['caseManagement:list:evidenceEdit']"
                         v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
+                    <el-button size="mini" v-if="scope.row.mediationFileFlag == 1"
+                        @click="mediationApplication(scope.row)" type="text" icon="el-icon-edit-outline">调解书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
             scope.row.caseFlowId == 16 ||
             scope.row.caseFlowId == 17
             " @click="caseFilingDetails(scope.row)">归档详情</el-button>
                     <div class="btnList" v-for="item in buttonList" :key="item.id">
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
-                            v-if="item.id == scope.row.caseFlowId &&
+                            v-if="(item.id == scope.row.caseFlowId &&
             checkPermi([item.buttonAuthFlag]) &&
-            scope.row.signButtonFlag != 1
+            scope.row.signButtonFlag != 1) && (scope.row.appOperatorFlag == 1 || scope.row.resOperatorFlag == 1 || scope.row.otherFlag == 1 || scope.row.agentFlag == 1 || scope.row.mediatorFlag == 1)
             ">{{ item.nodeName }}</el-button>
                     </div>
                 </template>
@@ -141,13 +143,17 @@
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
         <!-- 待调解     -->
         <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
-            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant">
+        </mediation>
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
         <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData"
             @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
         </caseFilingDetailsPage>
+        <!-- 调解申请书 -->
+        <mediationApplications :mediationAppVisable="mediationAppVisable" @cancelmediationApp="cancelmediationApp"
+            :mediationLise="mediationLise"></mediationApplications>
     </div>
 </template>
 
@@ -184,6 +190,7 @@ import timeConfirm from "./components/timeConfirm.vue";
 import mediation from "./components/mediation.vue";
 import confirmMediation from "./components/confirmMediation.vue";
 import caseFilingDetailsPage from "./components/caseFilingDetailsPage.vue";
+import mediationApplications from "./components/mediationApplications.vue"
 export default {
     name: "caseList",
     dicts: ["case_flow_node"],
@@ -204,6 +211,7 @@ export default {
         confirmMediation,
         caseFilingDetailsPage,
         respondentPay,
+        mediationApplications
     },
     data() {
         return {
@@ -211,6 +219,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
+            queryDisable: false,
             // 遮罩层
             loading: false,
             // 总条数
@@ -236,6 +245,8 @@ export default {
             detailform: {}, //缴费详情数据
             evidenceVisable: false, //证据修改弹窗
             mediationVisable: false, //待调解弹窗
+            mediationAppVisable: false,//调解申请书
+            mediationLise: {},
             mediationData: {},
             payTitle: "", //缴费标题
             resPayTitle: "", //被申请人缴费标题
@@ -274,9 +285,18 @@ export default {
             caseStausArr: [], //案件状态
             isapplicant: true, //判断角色申请人或非申请人
             caseFilingData: {},
+            applicant: ""
         };
     },
     created() {
+        // this.queryParams.caseNum = this.$route.query.caseNum;
+        this.$set(this.queryParams, "caseNum", this.$route.query.caseNum);
+        console.log(this.$route.query)
+        if (this.$route.query.token) {
+            this.queryDisable = true;
+        } else {
+            this.queryDisable = false;
+        }
         // this.getList(this.queryParams);
         this.listDeptFn();
         // this.getButtonList()
@@ -435,7 +455,6 @@ export default {
             //     })
             //     .catch(() => { });
             msCaseSignUrlApplyPC({ caseId: row.id }).then((res) => {
-                console.log(res, "PPPPPPPPPPPPPPPPPPPP");
                 window.open(res.data.sealUrl);
             });
         },
@@ -452,6 +471,7 @@ export default {
         mediationClick(val) {
             this.mediationVisable = true;
             this.mediationData = val;
+            this.applicant = val.applicationName;
         },
         /** 确认调解书 */
         confirmMediation(val) {
@@ -462,6 +482,12 @@ export default {
             caseApplicationSelectById(parms).then((res) => {
                 this.formPayDetail = res.data;
                 this.formPayDetailAffiliate = res.data.affiliate;
+                let applicantStr = '';
+                let resStr = '';
+                applicantStr = this.formPayDetailAffiliate.applicant.map(item => item.applicant.name).join(',');
+                resStr = this.formPayDetailAffiliate.res.map(item => item.res.name).join(',');
+                this.formPayDetailAffiliate.applicationName = applicantStr;
+                this.formPayDetailAffiliate.respondentName = resStr;
                 this.payForm.feePayable = res.data.feePayable;
                 this.payForm.caseId = res.data.id;
             });
@@ -470,6 +496,12 @@ export default {
             caseApplicationSelectById(parms).then((res) => {
                 this.formResPayDetail = res.data;
                 this.formResPay = res.data.affiliate;
+                let applicantStr = '';
+                let resStr = '';
+                applicantStr = this.formResPay.applicant.map(item => item.applicant.name).join(',');
+                resStr = this.formResPay.res.map(item => item.res.name).join(',');
+                this.formResPay.applicationName = applicantStr;
+                this.formResPay.respondentName = resStr;
                 this.resPayForm.feePayable = res.data.feePayable;
                 this.resPayForm.caseId = res.data.id;
             });
@@ -691,25 +723,25 @@ export default {
                 ids: [row.id],
             };
             this.$confirm("你确定要案件送达吗？", "提示", {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning',
-                    callback: () => { },
-                    beforeClose: (action, ctx, close) => {
-                        if (action !== 'confirm') {
-                            close();
-                            return;
-                        }
-                        ctx.confirmButtonLoading = true;
-                        msCaseFile(paramValues).then((res) => {
-                            this.$modal.msgSuccess("案件送达成功");
-                            close();
-                            this.getList(this.queryParams);
-                        }).finally(() => {
-                            ctx.confirmButtonLoading = false;
-                        })
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                callback: () => { },
+                beforeClose: (action, ctx, close) => {
+                    if (action !== 'confirm') {
+                        close();
+                        return;
                     }
-                }).finally(() => { })
+                    ctx.confirmButtonLoading = true;
+                    msCaseFile(paramValues).then((res) => {
+                        this.$modal.msgSuccess("案件送达成功");
+                        close();
+                        this.getList(this.queryParams);
+                    }).finally(() => {
+                        ctx.confirmButtonLoading = false;
+                    })
+                }
+            }).finally(() => { })
             // .then((res) => {
             //     msCaseFile(paramValues).then((res) => {
             //         this.$modal.msgSuccess("案件送达成功");
@@ -750,9 +782,22 @@ export default {
             this.caseFilingData = val;
             let vals = { id: val.id };
             caseApplicationSelectById(vals).then((res) => {
-                res.data.affiliate.respondentSex = Number(
-                    res.data.affiliate.respondentSex
-                );
+                res.data.affiliate.applicant.forEach(item => {
+                    if (!item.applicant) {
+                        item.applicant = {}
+                    }
+                    if (!item.applicantAgent) {
+                        item.applicantAgent = {}
+                    }
+                })
+                res.data.affiliate.res.forEach(item => {
+                    if (!item.res) {
+                        item.res = {}
+                    }
+                    if (!item.resAgent) {
+                        item.resAgent = {}
+                    }
+                })
                 this.detailsAwardNum = res.data;
                 console.log(this.detailsAwardNum);
                 this.flagLoadingS = false;
@@ -761,6 +806,14 @@ export default {
         cancelDetail() {
             this.showarchiveDetails = false;
         },
+        // 调解书
+        mediationApplication(row) {
+            this.mediationLise = row
+            this.mediationAppVisable = true
+        },
+        cancelmediationApp() {
+            this.mediationAppVisable = false
+        }
     },
 };
 </script>

src/views/caseManagement/components/confirmMediator.vue

@@ -92,7 +92,7 @@ export default {
             if (val) {
                 this.mediatorArr = [];
                 this.selectReservationFn({ id: this.confirmData.id })
-                listMediator().then(res => {
+                listMediator({caseAppliId:this.confirmData.id}).then(res => {
                     this.tableData = res.data;
                 })
             }

src/views/caseManagement/components/departmentMediator.vue

@@ -3,10 +3,12 @@
         <el-dialog title="部门长确认调解员" :visible="departmentVisable" v-if="departmentVisable" @close="cancel" center
             :distroy-on-close="true">
             <div>
-                <div v-if="tableDataFlag">
+                <!-- v-if="tableDataFlag" -->
+                <div>
                     <div style="margin-bottom: 20px;">选择调解员</div>
                 </div>
-                <el-table v-if="tableDataFlag" ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+                <!-- v-if="tableDataFlag" -->
+                <el-table  ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
                     @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55">
                     </el-table-column>
@@ -92,7 +94,7 @@ export default {
             if (val) {
                 this.mediatorArr = [];
                 this.selectReservationFn({ id: this.departmentData.id })
-                listMediator().then(res => {
+                listMediator({caseAppliId:this.departmentData.id}).then(res => {
                     this.tableData = res.data;
                 })
             }
@@ -124,6 +126,7 @@ export default {
         },
         /**提交选择结果*/
         async submitMediator() {
+            console.log(this.multipleSelection,this.tableDataNow)
             if (this.multipleSelection.length == 0 && this.tableDataNow.length > 0) {
                 this.verifyMediatorFn({
                     id: this.departmentData.id,
@@ -138,7 +141,15 @@ export default {
                     mediatorId: this.multipleSelection[0].mediatorId,
                     mediatorName: this.multipleSelection[0].mediatorName,
                 })
-            } else if (this.multipleSelection.length > 1 && this.tableDataNow.length == 0) {
+            }else if(this.multipleSelection.length == 1){
+                this.verifyMediatorFn({
+                    id: this.departmentData.id,
+                    caseFlowId: this.departmentData.caseFlowId,
+                    mediatorId: this.multipleSelection[0].mediatorId,
+                    mediatorName: this.multipleSelection[0].mediatorName,
+                })
+                // && this.tableDataNow.length == 0
+            }else if (this.multipleSelection.length > 1) {
                 Message.error('最多选择一名调解员');
                 return
             }

src/views/caseManagement/components/mediation.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-dialog :title="title" :visible="mediationVisable" @close="cancel" center :distroy-on-close="true" width="1000px">
+    <el-dialog :title="title" :visible="mediationVisable" @close="cancel" center :distroy-on-close="true"
+      width="1000px">
       <el-form ref="form" :model="formData" label-width="180px">
         <div class="caseInfo">案件信息：</div>
         <el-divider></el-divider>
@@ -11,8 +12,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请人：" prop="affiliate.applicationName">
-              <el-input v-model="formData.affiliate.applicationName" :disabled="true" />
+            <el-form-item label="申请人：">
+              <el-input v-model="applicant" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -21,15 +22,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="案件标的：" prop="caseSubjectAmount">
+            <!-- <el-form-item label="案件标的：" prop="caseSubjectAmount">
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" :disabled="true" />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="调解费用：" prop="feePayable">
               <el-input v-model="formData.feePayable" placeholder="请输入仲裁费用" :disabled="true" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="调解员：" prop="mediatorName">
               <el-input v-model="formData.mediatorName" placeholder="请输入" :disabled="true" />
@@ -40,13 +41,13 @@
           <el-form-item label="申请人案件证据：">
             <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
             <div v-for="(item, index) in applicateArr" :key="index" v-if="item.annexType == 2">
-              <a href="#" @click="toFile(item, index)" style="color: blue">{{ item.annexName }}</a>
+              <a href="#" @click="toFile2(item.annexPath)" style="color: blue">{{ item.annexName }}</a>
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="mediationType">
+        <el-col :span="24">
           <el-form-item label="调解结果:">
-            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
+            <el-radio-group v-model="formData.mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -55,14 +56,14 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="24">
-          <el-form-item label="是否和解" v-if="mediaResult==1">
-             <el-radio-group v-model="isReconci">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
+        <el-col :span="24">
+          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1 && mediationData.mediationMethod == '1'">
+            <el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <!-- <el-col :span="24">
           <el-form-item label="被申请人案件证据：">
             <div v-if="quiltArr.length == 0">被申请人暂未提供证据！</div>
@@ -81,7 +82,7 @@
         <el-col :span="24">
           <el-form-item label="调解书：" v-if="recordArrMediate.length > 0">
             <div v-for="(item, index) in recordArrMediate" :key="index" style="color: blue">
-              <a href="#" @click="toFileMediate(item.annexPath)">{{ item.annexName }}</a>
+              <a href="#" @click="toFileMediate(item.onlyOfficeFileId)">{{ item.annexName }}</a>
             </div>
           </el-form-item>
         </el-col>
@@ -98,20 +99,19 @@
         <!-- v-if="!mediationType" -->
         <el-col :span="24">
           <el-form-item label="上传调解书">
-            <el-upload class="upload-demo" accept=".png,.jpg,.doc,.docx,.txt,.pdf" ref="upload" :action="UploadUrl()"
-              :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="1"
+            <el-upload class="upload-demo" accept=".doc,.docx,.pdf" ref="upload" :action="UploadUrl()"
+              :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="2"
               :on-change="beforeUpload" :on-success="handlSuccess" :file-list="fileList">
               <el-button slot="trigger" size="small" :disabled="!isSecretaryRole" type="primary">选取文件</el-button>
               <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
-              <div slot="tip" class="el-upload__tip">只能上传.jpg，png，.doc，docx，.txt，.pdf文件</div>
+              <div slot="tip" class="el-upload__tip">只能上传.doc，docx，pdf文件</div>
             </el-upload>
           </el-form-item>
         </el-col>
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary" v-if="mediationType">{{ isSecretaryRole ? '发起会议' :
-        '进入会议' }}</el-button>
-      <!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" -->
+      '进入会议' }}</el-button>
       <el-button @click="openArbitrationresults" type="primary"
         v-if="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole">确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
@@ -119,8 +119,8 @@
           <span>取 消</span>
         </el-button>
         <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
-          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1"
-          type="primary" round>
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole"
+          class="endbutton1" type="primary" round>
           提 交
         </el-button>
       </div>
@@ -140,9 +140,10 @@ import { getUserProfile } from "@/api/system/user";
 import { reserveConferenceList } from "@/api/metting/metting.js";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["mediationVisable", "mediationData", "queryParams"],
+  props: ["mediationVisable", "mediationData", "queryParams", "applicant"],
   data() {
     return {
+      sealFlag: 1,
       loanStartDate: "",
       codes: null,
       title: "线上调解",
@@ -155,7 +156,9 @@ export default {
       mediaResult: 1,
       // isReconci:0,
       formData: {
-        affiliate: {}
+        affiliate: {},
+        mediaResult: 1,
+        sealFlag: 1,
       },
       user: "",
       userId: null,
@@ -166,17 +169,21 @@ export default {
       },
       filedata: {
         annexType: 7,
+        isMediaBook: 1,
+        caseId:null
       },
       fileList: [],
       attachList: [],
       isSecretaryRole: true,
       loadingSubmit: false,
-      selectRoido:true
+      selectRoido: true
     };
   },
   watch: {
     mediationVisable(val) {
-      this.mediaResult = 1;
+      this.attachList = [];
+      this.formData.mediaResult = 1;
+      this.formData.sealFlag = 1;
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
@@ -185,6 +192,7 @@ export default {
       } else if (this.mediationData.mediationMethod == "2") {
         this.title = "线下调解";
         this.mediationType = false;
+        this.selectRoido = true
       }
       if (val) {
         this.caseApplicationSelectByIdFn({
@@ -193,8 +201,8 @@ export default {
         this.getUser();
       }
     },
-    recordArrMediate(val){
-      if(val.length >= 1){
+    recordArrMediate(val) {
+      if (val.length >= 1) {
         this.selectRoido = false;
       }
     }
@@ -204,32 +212,49 @@ export default {
     // 根据用户id查询是否为调解员
     secretaryRoleByUserIdFn() {
       secretaryRoleByUserId({
-        userId: this.userId
+        userId: this.userId,
+        caseId: this.mediationData.id
       }).then(res => {
-         this.isSecretaryRole = res.data.isSecretaryRole;
+        this.isSecretaryRole = res.data.isSecretaryRole;
       })
     },
     /**上传地址*/
     UploadUrl() {
-      return window.location.origin + "/API/common/upload";
+      return window.location.origin + "/API/video/upload";
     },
     handlePreview(file) {
     },
     handleRemove(file, fileList) {
-
+      let updatedArray = this.attachList.filter(item => item.annexId != file.response.annexId);
+      this.attachList = updatedArray;
     },
     beforeUpload(flie, fileList) {
+      this.filedata.caseId =  this.mediationData.id
+  
       this.fileList = fileList;
     },
     handlSuccess(res, file) {
+      const fileSuccess = [{ annexId: res.annexId, annexType: res.annexType,annexName:res.newFileName,annexPath:res.fileName,onlyOfficeFileId:res.onlyOfficeFileId}]
       this.codes = res.code
-      this.attachList = [{ annexId: res.annexId }];
+      this.attachList.push({ annexId: res.annexId, annexType: res.annexType });
+      this.recordArrMediate = fileSuccess;
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
     /** 获取案件详情信息 */
     caseApplicationSelectByIdFn(data) {
       caseApplicationSelectById(data).then(res => {
-        this.formData = res.data;
+        if (res.data.mediaResult) {
+          this.formData = res.data;
+        } else {
+          this.formData = res.data;
+          this.formData.mediaResult = 1;
+        }
+        if (res.data.sealFlag == 1 || res.data.sealFlag == 0) {
+          this.formData = res.data;
+        } else {
+          this.formData = res.data;
+          this.formData.sealFlag = 1;
+        }
         this.applicateArr = res.data.caseAttachList;
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
@@ -238,6 +263,7 @@ export default {
             this.recordArrMediate.push(item);
           }
         });
+        
       });
     },
     /** 获取用户信息 */
@@ -250,9 +276,10 @@ export default {
     },
     /** 发起会议 */
     openmeeting() {
+      this.mediationVisable = false
       window.open(
-        // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie`
-        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie`
+        // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
       );
     },
     /**提交仲裁结果 */
@@ -271,7 +298,8 @@ export default {
         id: this.mediationData.id,
         caseFlowId: this.mediationData.caseFlowId,
         batchNumber: "",
-        mediaResult: this.mediaResult,
+        mediaResult: this.formData.mediaResult,
+        sealFlag: this.formData.sealFlag
       }).then(res => {
         caseApplicationSelectById({
           id: this.mediationData.id
@@ -289,8 +317,13 @@ export default {
     toFile2(annexPath) {
       window.open(window.location.origin + "/API" + annexPath, "_black");
     },
-    toFileMediate(annexPath) {
-      window.open(window.location.origin + "/API" + annexPath, "_black");
+    toFileMediate(val) {
+      if (this.checkPermi(['caseManagement:list:editOffice'])) {
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 1 } })
+      } else {
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+      }
+      // window.open(window.location.origin + "/API" + annexPath, "_black");
     },
     /** 生成调解书 */
     mediationFn(data) {
@@ -299,6 +332,8 @@ export default {
         this.$emit("cancelMediation");
         this.$emit("getList", this.queryParams);
         this.loadingSubmit = false;
+      }).catch(err => {
+        this.loadingSubmit = false;
       });
     },
     cancel() {
@@ -313,21 +348,30 @@ export default {
         this.loadingSubmit = true;
       }
       let mediationVal = {}
+
       if (this.codes == 200) {
+        if (this.formData.mediaResult != 1) {
+          this.sealFlag = 0
+        }
         mediationVal = {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
           attachList: this.attachList,
-          // isReconci:this.isReconci,
-          mediaResult: this.mediaResult,
+          mediaResult: this.formData.mediaResult,
         }
       } else {
+        if (this.formData.mediaResult != 1) {
+          this.sealFlag = 0
+        }
         mediationVal = {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
-          mediaResult: this.mediaResult,
+          sealFlag: this.sealFlag,
+          attachList: this.attachList,
+          mediaResult: this.formData.mediaResult,
         }
       }
+      console.log(mediationVal)
       this.mediationFn(mediationVal);
     },
     resultsMediation() {
@@ -342,4 +386,9 @@ export default {
   display: flex;
   flex-wrap: wrap;
 }
+
+::v-deep .el-input--medium .el-input__inner {
+  height: 40px;
+  line-height: 40px;
+}
 </style>

src/views/caseManagement/components/mediationApplications.vue

@@ -0,0 +1,131 @@
+<template>
+    <div>
+        <el-dialog title="调解书" :visible="mediationAppVisable" width="500px" @close="cancel" center
+            :distroy-on-close="true">
+            <div>
+                <div>
+                    <span style="font-weight: bold;">下载调解书</span>
+                </div>
+                <div style="margin-top: 10px;">
+                    <div style="color: blue; cursor: pointer" v-for="(item, index) in getFileListV"
+                        v-if="item.annexType == 7 || item.annexType == 13" @click="downloadApplic(item.annexPath)">{{
+            item.annexName }}</div>
+                </div>
+            </div>
+            <div style="margin-top: 30px;">
+                <div>
+                    <span style="font-weight: bold;">上传调解书</span>
+                </div>
+                <div style="margin-top: 10px;">
+                    <el-upload class="upload-demo" accept=".doc,.docx,.pdf" ref="upload" :action="UploadUrl()"
+                        :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove"
+                        :auto-upload="false" :limit="1" :on-change="beforeUpload" :on-success="handlSuccess"
+                        :file-list="fileList">
+                        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                        <div slot="tip" class="el-upload__tip">只能上传.doc，docx,pdf文件</div>
+                    </el-upload>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
+                <el-button @click="submitMediator" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getFileList, meetingUpload } from "@/api/caseManagement/caseManagement.js"
+import { createRoomId } from '@/api/metting/metting.js'
+import { getToken } from "@/utils/auth";
+import moment from "moment";
+export default {
+    props: ["mediationAppVisable", "mediationLise", "queryParams"],
+    data() {
+        return {
+            getFileListV: [],
+            fileURL: window.location.origin + "/API",
+            fileList: [],
+            headers: {
+                Authorization: "Bearer " + getToken(),
+            },
+            filedata: {
+                isMediaBook:1,
+                annexType: null,
+                caseId: null
+            },
+        };
+    },
+    watch: {
+        mediationAppVisable(val) {
+            this.fileList = []
+            if (val) {
+                let dataValue = {
+                    caseAppliId: this.mediationLise.id,
+                }
+                console.log(dataValue)
+                this.getFileListFn(dataValue)
+            }
+        },
+    },
+
+    methods: {
+        /**上传地址*/
+        UploadUrl() {
+            return window.location.origin + "/API/video/upload";
+        },
+        handlePreview(file) {
+        },
+        handleRemove(file, fileList) {
+
+        },
+        beforeUpload(flie, fileList) {
+            function getFileExtension(filename) {
+                const parts = filename.split('.');
+                return parts.length > 1 ? parts.pop() : '';
+            }
+            const extension = getFileExtension(flie.name);
+            if (extension == 'docx' || extension == 'doc') {
+                this.filedata.annexType = 7
+            } else if (extension == 'pdf') {
+                this.filedata.annexType = 7
+            }
+            this.filedata.caseId = this.mediationLise.id
+            this.fileList = fileList;
+            const isLt2M = flie.size / 1024 / 1024 < 50; // 小于50MB
+            if (!isLt2M) {
+                this.$message.error('上传的文件大小不能超过 50MB!');
+            }
+            return isLt2M;
+        },
+        handlSuccess(res, file) {
+            if (res.code == 200) {
+                this.$modal.msgSuccess("上传成功");
+                this.$emit("cancelmediationApp");
+            }
+        },
+        cancel() {
+            this.$emit("cancelmediationApp");
+        },
+        // 获取申请书附件
+        async getFileListFn(vals) {
+            await getFileList(vals).then(res => {
+                this.getFileListV = res.data
+            })
+        },
+        // 下载申请书
+        downloadApplic(val) {
+            window.open(this.fileURL + val);
+        },
+        /**提交选择结果*/
+        async submitMediator() {
+            this.$refs.upload.submit()
+
+
+        },
+    },
+
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/caseManagement/components/payDialog.vue

@@ -23,11 +23,11 @@
             {{ formPayDetail.caseStatusName }}
           </el-tag>
         </el-descriptions-item>
-        <el-descriptions-item label="驳回原因" v-if="formPayDetail.reason">
+        <!-- <el-descriptions-item label="驳回原因" v-if="formPayDetail.reason">
           <el-tag size="mini" type='danger' effect="dark">
             {{ formPayDetail.reason }}
           </el-tag>
-        </el-descriptions-item>
+        </el-descriptions-item> -->
       </el-descriptions>
       <div class="paySelectType">
         <el-radio-group v-model="paySelect" @input="changPayType">
@@ -56,6 +56,10 @@
         <div id="qrcodeImg"></div>
       </div>
       <div class="payTitle">{{ payMain }}</div>
+      <div v-if="formPayDetail.reason">
+        <span>驳回原因:</span>
+        <div style="width:95%;">{{ formPayDetail.reason }}</div>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="payCancel" round><span>取 消</span></el-button>
         <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
@@ -189,7 +193,7 @@ export default {
       this.submitForm.caseId = this.payId;
       }
     }
-  }
+  },
 };
 </script>
 

src/views/caseManagement/components/paymentdetailsDialog.vue

@@ -14,13 +14,13 @@
         <el-form-item label="缴费金额：" prop="feePayable">
           <el-input v-model="form.feePayable" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="申请人缴费凭证：" v-if="form.caseAttachList">
+        <el-form-item label="申请人缴费凭证：" v-if="form.caseAttachList&&form.caseAttachList.length>0 ">
           <div style="color: #104fad;cursor:pointer" v-for="(item, index) in form.caseAttachList" :key="index"
             @click="preview(item.annexPath)">
             {{ item.annexName }}
           </div>
         </el-form-item>
-        <el-form-item label="被申请人缴费凭证：" v-if="form.resCaseAttachList">
+        <el-form-item label="被申请人缴费凭证：" v-if="form.resCaseAttachList&&form.resCaseAttachList.length>0">
           <div style="color: #104fad;cursor:pointer" v-for="(item, index) in form.resCaseAttachList" :key="index"
             @click="preview(item.annexPath)">
             {{ item.annexName }}

src/views/caseManagement/components/timeConfirm.vue

@@ -87,10 +87,11 @@ export default {
             this.createRoomIdFn({
                 caseId: this.timeConfirmData.id
             })
-            if (this.formLabelAlign.name == '') {
+            if (!this.formLabelAlign.name) {
                 Message.error('请选择时间');
                 return
             }
+            console.log(this.formLabelAlign.name)
             this.formLabelAlign.name = moment(
                 this.formLabelAlign.name
             ).format("YYYY-MM-DD HH:mm:ss");

src/views/deliveryRecord/components/emailEdits.vue

@@ -0,0 +1,179 @@
+<template>
+  <div>
+    <el-dialog
+      title="邮件内容"
+      :visible="emailVidable"
+      @close="cancel"
+      center
+      :distroy-on-close="true"
+    >
+      <div>
+        <el-form>
+          <el-col :span="24">
+            <el-form-item label="邮件主题：" label-width="100px">
+              <div>{{ emailRow.mailSubject }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收件人：" label-width="100px">
+              <div>{{ emailRow.mailAddress }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发件人：" label-width="100px">
+              <div>{{ emailRow.mailFromAddress }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件附件：" label-width="100px">
+              <div
+                style="color: blue; cursor: pointer"
+                v-for="(item, index) in emailRow.caseAttachList"
+                :key="index"
+                @click="viewAttachments(item.annexPath)"
+              >
+                {{ item.annexName }}
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件上传：" label-width="100px">
+              <el-upload
+                class="upload-demo"
+                accept=".doc,.docx,.pdf"
+                ref="upload"
+                :action="UploadUrl()"
+                :headers="headers"
+                :data="filedata"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :limit="1"
+                :on-change="beforeUpload"
+                :on-success="handlSuccess"
+                :file-list="fileList"
+              >
+                <el-button
+                  slot="trigger"
+                  size="small"
+                  type="primary"
+                  >选取文件</el-button
+                >
+                <div slot="tip" class="el-upload__tip">
+                  只能上传.doc，docx，pdf文件
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件正文：" label-width="100px">
+              <el-input
+                type="textarea"
+                :rows="4"
+                placeholder="请输入内容"
+                v-model="sendData"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel" class="endbutton1" round
+          ><span>取 消</span></el-button
+        >
+        <el-button @click="submitSend" class="endbutton1" type="primary" round
+          ><span>确 认</span></el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  updateSendContent,
+  update,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+import { getToken } from "@/utils/auth";
+export default {
+  props: ["emailVidable", "emailRow", "queryParams"],
+  data() {
+    return {
+      sendData: "",
+      fileURL: window.location.origin + "/API",
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      filedata: {
+        annexType: 13,
+      },
+      fileList: [],
+      files:[],
+    };
+  },
+  watch: {
+    emailVidable(val) {
+      if (val) {
+        console.log(this.emailRow);
+        this.sendData = this.emailRow.mailContent;
+      }
+    },
+  },
+  methods: {
+    cancel() {
+      this.$emit("cancelEmail");
+    },
+    submitSend() {
+      console.log(this.emailRow.mailContent);
+      if(this.files.annexId){
+        this.updateSendContentFn({
+        id: this.emailRow.id,
+        mailContent: this.sendData,
+        caseAttachList:[{annexId:this.files.annexId}],
+        
+      });
+      }else{
+        this.updateSendContentFn({
+        id: this.emailRow.id,
+        mailContent: this.sendData,
+        caseAttachList:[],
+        
+      });
+      }
+      
+     
+    },
+    updateSendContentFn(data) {
+        console.log(data)
+      update(data).then((res) => {
+        
+        this.$message.success("更新成功");
+        this.$emit("cancelEmail");
+        this.$emit("getList", this.queryParams);
+         this.$refs.upload.clearFiles(); // 清除文件列表
+      });
+    },
+    // 查看附件下载附件
+    viewAttachments(val) {
+      window.open(this.fileURL + val);
+    },
+    /**上传地址*/
+    UploadUrl() {
+      return window.location.origin + "/API/common/upload";
+    },
+    handlePreview(file) {},
+    handleRemove(file, fileList) {},
+    beforeUpload(flie, fileList) {
+
+    },
+    handlSuccess(res, file) {
+        
+      const fileSuccess = [{ annexId: res.annexId, annexType: res.annexType,annexName:res.newFileName,annexPath:res.fileName,onlyOfficeFileId:res.onlyOfficeFileId}]
+      this.emailRow.caseAttachList = fileSuccess
+      this.files = res
+       console.log(res)
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/deliveryRecord/components/resend.vue

@@ -0,0 +1,69 @@
+<template>
+    <div>
+        <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
+            :distroy-on-close="true">
+            <div style="margin-bottom: 30px;"><span style="font-weight: bold;">发送内容:</span>{{ sendData }}</div>
+            <el-form label-width="100px">
+                <el-form-item v-for="(item,index) in rowData.templateParams" :label="item.paramName" :key="item.id"> 
+                    <el-input v-model="rowData.templateParams[index].paramValue" @input="changeContent"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
+                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    updateSendContent,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+export default {
+    props: ["resendVidable", "rowData","queryParams"],
+    data() {
+        return {
+            sendData:'',
+            param:"",
+            paramValue:""
+
+        };
+    },
+    watch: {
+        resendVidable(val){
+            if(val){
+                this.sendData = this.rowData.sendContent;
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelSend");
+        },
+        submitSend() {
+            console.log(this.rowData)
+            this.updateSendContentFn({
+                id:this.rowData.id,
+                templateParams:this.rowData.templateParams
+            })
+        },
+        updateSendContentFn(data){
+            updateSendContent(data).then(res=>{
+                this.$message.success('更新成功');
+                this.$emit("cancelSend");
+                this.$emit('getList',this.queryParams);
+            })
+        },
+        changeContent(){
+            let templateContent = this.rowData.templateContent
+            this.rowData.templateParams.forEach(item => {
+                templateContent = templateContent.replace(item.param,item.paramValue)
+            });
+           this.sendData = templateContent
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/deliveryRecord/emailRecord.vue

@@ -27,7 +27,14 @@
             <!-- 缴费人 -->
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
             <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
+            <el-table-column label="操作" align="center">
+                <template  slot-scope="scope">
+                    <el-button size="mini" type="text" @click="emailEditing(scope.row)" icon="el-icon-s-promotion">邮箱编辑</el-button>
+                    <el-button v-if="scope.row.sendStatus == '未发送'" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
+                </template>
+            </el-table-column>
         </el-table>
+        <emailEdits :emailVidable="emailVidable" @cancelEmail="cancelEmail"   @getList="getList" :queryParams="queryParams" :emailRow="emailRow"></emailEdits>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
             @pagination="getList(queryParams)" />
 
@@ -36,14 +43,14 @@
   
 <script>
 import {
-    emailList,
+    emailList,reSendMailRecord
 } from "@/api/deliveryRecord/deliveryRecord.js";
-
+import emailEdits from "./components/emailEdits.vue";
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: {},
+    components: {emailEdits},
     data() {
         return {
             queryParams: {
@@ -60,6 +67,9 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
+            emailVidable:false,
+            emailRow:{},
+            sendStatusMessage:false,
         };
     },
     created() {
@@ -89,14 +99,37 @@ export default {
                         item.sendStatus = "未发送"
                     } else if (item.sendStatus == 1) {
                         item.sendStatus = "已发送"
-                    } else {
-                        item.sendStatus = "未发送"
+
                     }
                 })
                 this.total = response.total;
                 this.loading = false;
             });
         },
+        // 邮箱编辑内容
+        emailEditing(data){
+            this.emailVidable = true
+            this.emailRow = data;
+            console.log(data)
+        },
+        // 关闭弹窗
+        cancelEmail(){
+            this.emailVidable = false
+        },
+        // 重新发送
+        resendCounts(row){
+           if(row.sendStatus=='未发送'){
+            row.sendStatus = 0
+           }else if(row.sendStatus=='已发送'){
+            row.sendStatus = 1
+           }
+            reSendMailRecord(row).then(res=>{
+                console.log(res)
+                this.$message.success('发送成功');
+                this.getList(this.queryParams);
+            })
+            
+        }
     },
 };
 </script>

src/views/deliveryRecord/smsRecord.vue

@@ -2,7 +2,8 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
             <el-form-item label="案件编号" prop="caseNum">
-                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable
+                    @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -13,32 +14,43 @@
             <el-table-column label="序号" type="index" align="center">
                 <template slot-scope="scope">
                     <span>{{
-                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-                    }}</span>
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+        }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
             <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
             <el-table-column label="发送时间" align="center" prop="sendTime" />
             <el-table-column label="发送状态" align="center" prop="sendStatus" />
-            <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true" />
+            <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true"/>
+            <el-table-column label="备注" align="center" prop="reason" :show-overflow-tooltip="true"/>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
+                        icon="el-icon-document-copy">复制内容</el-button>
+                    <el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
+                    <el-button v-if="scope.row.sendStatus == '发送失败'|| scope.row.sendStatus == '发送中'"  size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
+                </template>
+            </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList({caseNum:queryParams.caseNum},{pageNum:queryParams.pageNum,pageSize:queryParams.pageSize})" />
+        <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList({ caseNum: queryParams.caseNum,pageNum: queryParams.pageNum, pageSize: queryParams.pageSize})" />
 
     </div>
 </template>
 
 <script>
 import {
-    smsList,
+    recordList,reSendShortMessage
 } from "@/api/deliveryRecord/deliveryRecord.js";
-
+import resend from "./components/resend.vue";
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { },
+    components: {resend},
     data() {
         return {
             queryParams: {
@@ -55,18 +67,40 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
+            rowData:{},
+            resendVidable:false,
+            sendStatusMessage:false
         };
     },
     created() {
         getDicts("case_status").then(res => {
-            this.getList({caseNum:this.queryParams.caseNum},{pageNum:this.queryParams.pageNum,pageSize:this.queryParams.pageSize});
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize});
         })
     },
     methods: {
+        /** 复制内容 */
+        copyContent(row) {
+            const el = document.createElement('textarea');
+            el.value = row;
+            document.body.appendChild(el);
+            el.select();
+            document.execCommand('copy');
+            document.body.removeChild(el);
+            this.$message.success('复制成功');
+        },
+        /**重新发送 */
+        resend(row){
+            this.resendVidable = true;
+            this.rowData = row;
+        },
+        /**关闭弹窗 */
+        cancelSend(){
+            this.resendVidable = false;
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
-            this.getList({caseNum:this.queryParams.caseNum},{pageNum:this.queryParams.pageNum,pageSize:this.queryParams.pageSize});
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
         },
         /** 重置按钮操作 */
         resetQuery() {
@@ -74,18 +108,16 @@ export default {
             this.handleQuery();
         },
         // 查询列表数据
-        getList(data,params) {
+        getList(data) {
             this.loading = true;
-            smsList(data,params).then((response) => {
+            recordList(data).then((response) => {
                 this.dataList = response.rows;
-                this.dataList.forEach(item=>{
-                    if(item.sendStatus == 0){
-                        item.sendStatus = "发送失败"
-                    }else if(item.sendStatus == 1){
-                        item.sendStatus = "已送达"
-                    }else if(item.sendStatus == 2){
-                        item.sendStatus = "已读取"
-                    }else{
+                this.dataList.forEach(item => {
+                    if (item.sendStatus == 1) {
+                        item.sendStatus = "发送成功"
+                    } else if (item.sendStatus == 2) {
+                        item.sendStatus = "发送中"
+                    } else if(item.sendStatus == 3){
                         item.sendStatus = "发送失败"
                     }
                 })
@@ -93,6 +125,25 @@ export default {
                 this.loading = false;
             });
         },
+        // 重新发送
+        resendMessage(row){
+            console.log(row.sendStatus)
+            let valuesRow ={
+                id:row.id,
+                templateId:row.templateId,
+                phone:row.phone,
+                templateParams:row.templateParams
+            }
+            this.reSendShortMessageFn(valuesRow)
+            console.log(valuesRow)
+           
+        },
+        reSendShortMessageFn(valuesRow){
+            reSendShortMessage(valuesRow).then(res=>{
+                this.$message.success('发送成功');
+                this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+            })
+        }
     },
 };
 </script>

src/views/login.vue

@@ -10,110 +10,177 @@
     </div>
     <!-- 右侧 -->
     <div class="rightBox">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h2 class="title">用户登录</h2>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+      >
+        <h2 class="title">用户登录</h2>
+        <el-form-item prop="username">
+          <el-input
+            v-model="loginForm.username"
+            type="text"
+            auto-complete="off"
+            placeholder="账号"
+          >
+            <svg-icon
+              slot="prefix"
+              icon-class="user"
+              class="el-input__icon input-icon"
+            />
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input
+            v-model="loginForm.password"
+            type="password"
+            auto-complete="off"
+            placeholder="密码"
+            @keyup.enter.native="handleLogin"
+          >
+            <svg-icon
+              slot="prefix"
+              icon-class="password"
+              class="el-input__icon input-icon"
+            />
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="code" v-if="captchaEnabled">
+          <el-input
+            v-model="loginForm.code"
+            auto-complete="off"
+            placeholder="验证码"
+            style="width: 63%"
+            @keyup.enter.native="handleLogin"
+          >
+            <svg-icon
+              slot="prefix"
+              icon-class="validCode"
+              class="el-input__icon input-icon"
+            />
+          </el-input>
+          <div class="login-code">
+            <img :src="codeUrl" @click="getCode" class="login-code-img" />
+          </div>
+        </el-form-item>
+        <el-checkbox
+          v-model="loginForm.rememberMe"
+          style="margin: 0px 0px 25px 0px"
+          >记住密码</el-checkbox
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
+        <el-form-item style="width: 100%">
+          <el-button
+            :loading="loading"
+            size="medium"
+            type="primary"
+            style="width: 100%"
+            @click.native.prevent="handleLogin"
+          >
+            <span v-if="!loading">登 录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+          <div style="float: right" v-if="register">
+            <!-- <router-link class="link-type" :to="'/register'">立即注册</router-link> -->
+            <el-button
+              type="text"
+              v-if="buttonReg"
+              @click="registrationLink('/register')"
+              >立即注册</el-button
+            >
+          </div>
+          <div class="registerImg" v-show="closeImgs">
+            <div class="closeImg" @click="closeImg">
+              <img
+                style="width: 25px; height: 25px"
+                src="../assets/images/closed.png"
+                alt=""
+              />
+              <span style="padding-left: 100px">扫码人脸核验</span>
+            </div>
+            <div id="qrcodeImg" style="padding-left: 76px"></div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 注册时选择是否 -->
+    <div>
+      <el-dialog
+        title="是否需要人脸核实"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center
+      >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="facialVerification('/register')" type="primary"
+            >是</el-button
+          >
+          <el-button @click="noFacialVerification('/register')" type="primary"
+            >否</el-button
+          >
+        </span>
+      </el-dialog>
     </div>
     <!--  底部  -->
     <div class="el-login-footer">
       <div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
-      <div>Version：1.0.1</div>
+      <div>Version：1.1.4</div>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import {
+  getCodeImg,
+  selectIdentityAuthenticaEIDtoken,
+  selectPCEIDtokenStatus,
+} from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import QRCode from "qrcodejs2";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
 
 export default {
   name: "Login",
   data() {
     return {
       codeUrl: "",
+      closeImgs: false,
+      centerDialogVisible: false,
+      buttonReg: true,
+      eidTokens: {},
+      timer: null,
+      pathVal: "",
       loginForm: {
         username: "admin",
         password: "admin123",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
       // 验证码开关
       captchaEnabled: true,
       // 注册开关
       register: true,
-      redirect: undefined
+      redirect: undefined,
     };
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
     this.getCode();
@@ -121,8 +188,9 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.img;
           this.loginForm.uuid = res.uuid;
@@ -132,38 +200,110 @@ export default {
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const rememberMe = Cookies.get("rememberMe");
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
       };
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove("rememberMe");
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
+    },
+    // 生成二维码
+    qrcode(url) {
+      // 前端根据 URL 生成微信支付二维码
+      document.getElementById("qrcodeImg").innerHTML = "";
+      return new QRCode("qrcodeImg", {
+        width: 200,
+        height: 200,
+        text: url,
+        colorDark: "#000",
+        colorLight: "#fff",
+      });
+    },
+    registrationLink(path) {
+      this.centerDialogVisible = true;
+    },
+    // 是人脸核实
+    facialVerification(path) {
+      this.centerDialogVisible = false;
+      this.pathVal = path;
+      // clearInterval(this.timer);
+      selectIdentityAuthenticaEIDtoken().then((res) => {
+        this.closeImgs = true;
+        this.buttonReg = false;
+        let url = res.data.Url;
+        this.eidTokens = {
+          eidToken: res.data.EidToken,
+        };
+        this.timer = setInterval(() => {
+          this.getSelectPCEIDtokenStatus(this.eidTokens);
+        }, 10000);
+        this.qrcode(url);
+      });
+    },
+    // 不用人脸核实
+    noFacialVerification(path) {
+      this.$router.push(path);
+    },
+    // H5轮询获取E证通Token状态
+    getSelectPCEIDtokenStatus(data) {
+      selectPCEIDtokenStatus(data).then((res) => {
+        if (res.data.certificationStatus == 0) {
+          // this.$router.push(this.pathVal);
+          this.$router.push({
+            path:this.pathVal,
+            query:{
+              identityNo:res.data.identityNo,
+              name:res.data.name
+            }
+          })
+        }
+      });
+    },
+    // 关闭弹框
+    closeImg() {
+      clearInterval(this.timer);
+      this.closeImgs = false;
+      this.buttonReg = true;
+    },
+  },
+  beforeDestroy() {
+    // 清除计时器
+    if (this.timer) {
+      clearInterval(this.timer);
     }
-  }
+  },
 };
 </script>
 
@@ -173,23 +313,28 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
+
   .leftBox {
     width: 50%;
     height: 90%;
+
     .leftIcon {
       height: 20%;
       width: 100%;
       margin: 0% 10% 1% 15%;
+
       .Icon {
         width: 100px;
         height: 105px;
         background-image: url("../assets/images/logos.png");
         background-size: cover;
       }
+
       div {
         font-size: 18px;
       }
     }
+
     .leftImage {
       width: 100%;
       height: 90%;
@@ -208,6 +353,7 @@ export default {
     align-items: center;
   }
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -220,32 +366,39 @@ export default {
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 38px;
+
     input {
       height: 38px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 2px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   background-color: rgb(126, 131, 135);
   height: 55px;
@@ -258,10 +411,17 @@ export default {
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;
+
   div {
     height: 30%;
   }
 }
+
+.registerImg {
+  border: 1px solid #c0c0c0;
+  width: 350px;
+  height: 250px;
+}
 .login-code-img {
   height: 38px;
 }

src/views/onlyoffice/onlyoffice.vue

@@ -0,0 +1,110 @@
+<template>
+  <div style="width: 100%; height: 100%">
+    <div id="placeholder"></div>
+  </div>
+</template>
+
+<script>
+import { getOnlyoffice, saveOnlyOfficeFile } from "@/api/onlyoffice/onlyoffice";
+import { setToken } from "@/utils/auth";
+import store from "@/store";
+import axios from "axios";
+export default {
+  props: [],
+  data() {
+    return {
+      config: {},
+      flag: 0,
+      userId: store.getters.userId,
+      websock: null,
+    };
+  },
+  destroyed() {
+    //页面销毁时关闭ws连接
+    if (this.websock) {
+      this.websock.close(); // 关闭websocket
+    }
+  },
+  methods: {
+    getConfig(id) {
+      let edit = "edit";
+      if (this.flag == 0) {
+        edit = "view";
+      } else {
+        edit = "edit";
+      }
+      axios
+        .get(
+          `http://121.40.189.20:9090/onlyOfficeConfig/${edit}/${id}/${this.userId}/desktop/true/tiaojieprod`
+        )
+        .then((res) => {
+          this.config = res.data;
+          this.config.editorConfig.callbackUrl = this.config.editorConfig.callbackUrl + "/" + id;
+          console.log(this.config,"OOOOOOOOOOOOOOOOOOOOOOOOOOO");
+
+          // this.config.callbackUrl = this.config.callbackUrl + `/${this.userId}`;
+          var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
+        });
+    },
+    //初始化weosocket
+    initWebSocket() {
+      if (typeof WebSocket === "undefined") {
+        alert("您的浏览器不支持WebSocket");
+        return false;
+      }
+      const wsuri = `ws://121.40.189.20:9090/api/websocket/${this.userId}`; // websocket地址
+      this.websock = new WebSocket(wsuri);
+      this.websock.onopen = this.websocketonopen;
+      this.websock.onmessage = this.websocketonmessage;
+      this.websock.onerror = this.websocketonerror;
+      this.websock.onclose = this.websocketclose;
+    },
+    //连接成功
+    websocketonopen() {
+      console.log("WebSocket连接成功");
+    },
+    //接收后端返回的数据
+    websocketonmessage(e) {
+      let dataJson = e.data;
+      if (dataJson != "conn_success") {
+        dataJson = JSON.parse(dataJson);
+      }
+      if (dataJson.caseId) {
+        saveOnlyOfficeFile({
+          caseAppliId: Number(dataJson.caseId),
+          annexName: dataJson.fileName,
+          annexPath: dataJson.filePath,
+          onlyOfficeFileId: dataJson.fileId,
+        }).then((res) => {
+          this.websock.send();
+        });
+      }
+      // 在这里使用后端返回的数据，对数据进行处理渲染
+    },
+    //连接建立失败重连
+    websocketonerror(e) {
+      console.log(`连接失败的信息：`, e);
+      this.initWebSocket(); // 连接失败后尝试重新连接
+    },
+    //关闭连接
+    websocketclose(e) {
+      console.log("断开连接", e);
+    },
+    /**是否从视频会议跳转，是处理token */
+    async getToken() {
+      setToken(this.$route.query.token);
+    },
+  },
+  async mounted() {
+    if (this.$route.query.token) {
+      await this.getToken();
+    }
+    let id = this.$route.query.id;
+    this.flag = this.$route.query.flag;
+    this.getConfig(id);
+    this.initWebSocket();
+  },
+  watch: {},
+};
+</script>
+<style lang="scss" scoped></style>

src/views/register.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="register">
+      <div class="leftIcon">
+        <div class="Icon"></div>
+        <div>智慧调解系统</div>
+      </div>
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">智慧调解系统注册</h3>
       <el-form-item prop="userName">
@@ -30,13 +34,13 @@
       <el-form-item prop="idType">
         <el-select v-model="registerForm.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-          <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
+          <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel" :value="Number(item.dictValue)">
 
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="identityNo" v-if="registerForm.idType === 0">
-        <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="身份证号码">
+      <el-form-item prop="identityNo">
+        <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="证件号码">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -46,9 +50,18 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="email">
-        <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
+        <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱" style="width:63%;">
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
         </el-input>
+        <div class="register-code">
+          <el-button type="primary" :disabled="emailDisabled"  @click="getEmailNumber(registerForm.email)">{{ emailText
+          }}</el-button>
+        </div>
+      </el-form-item>
+      <el-form-item prop="emailVerifyCode">
+        <el-input v-model="registerForm.emailVerifyCode" type="text" auto-complete="off" placeholder="邮箱验证码">
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
       </el-form-item>
       <el-form-item prop="name">
         <el-input v-model="registerForm.name" type="text" auto-complete="off" placeholder="用户名">
@@ -105,7 +118,7 @@
 </template>
 
 <script>
-import { getCodeImg, register, sendCode, wxregister,verifyUserName } from "@/api/login";
+import { getCodeImg, register, sendCode, wxregister,verifyUserName,getIdType,sendEmailCode } from "@/api/login";
 import { listRoleNotoken } from "@/api/system/role.js"
 export default {
   name: "Register",
@@ -119,7 +132,9 @@ export default {
     };
     return {
       codeText: "发送验证码",
+      emailText:"发送验证码",
       codeDisabled: false,
+      emailDisabled:false,
       codeUrl: "",
       registerForm: {
         userName: "",
@@ -129,7 +144,9 @@ export default {
         code: "",
         uuid: "",
         nationality:0,
-        idType:0
+        idType:0,
+        identityNo:"",
+        name:""
       },
       registerRules: {
         userName: [
@@ -154,7 +171,7 @@ export default {
         identityNo: [
           {
             required: true,
-            message: '被申请人身份证号不能为空',
+            message: '证件号码不能为空',
             trigger: 'blur',
           },
           // {
@@ -165,7 +182,7 @@ export default {
           // },
         ],
         email: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
+          { required: true, trigger: "blur", message: "请输入您的邮箱" },
           {
             pattern:
               /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -192,7 +209,10 @@ export default {
           },
         ],
         verifyCode: [
-          { required: true, trigger: "blur", message: "请输入验证码" },
+          { required: true, trigger: "blur", message: "请输入短信验证码" },
+        ],
+        emailVerifyCode:[
+        { required: true, trigger: "blur", message: "请输入邮箱验证码" },
         ],
         idType: [
           { required: true, trigger: "blur", message: "请选择证件类型" },
@@ -206,34 +226,37 @@ export default {
       roleList: [],
       nationalityList:[
         {
-          value:'国内',
+          value:'境内',
           id:0
         },
         {
-          value:'国外',
+          value:'境外',
           id:1
         }
       ],
       idTypeList:[
-      {
-          value:'身份证',
-          id:0
-        },
-        {
-          value:'护照',
-          id:1
-        }
+      
       ]
     };
   },
   created() {
     this.getCode();
     this.getListRole();
+    this.getIdTypeFn();
+    this.registerForm.identityNo = this.$route.query.identityNo;
+    this.registerForm.name = this.$route.query.name;
+    console.log(this.$route.query.identityNo)
   },
   methods: {
     changeInput(){
       verifyUserName({userName:this.registerForm.userName})
     },
+    /** 获取证件类型 */
+    getIdTypeFn(){
+      getIdType().then(res=>{
+        this.idTypeList = res.data;
+      })
+    },
     /**获取角色 */
     getListRole() {
       listRoleNotoken().then(res => {
@@ -295,6 +318,28 @@ export default {
 
       })
     },
+    // 获取邮箱验证码
+    getEmailNumber(emailValue){
+      sendEmailCode({email:emailValue}).then(res=>{
+        if(res.code != 200){
+          this.$modal.msgError(res.msg);
+          return
+        }else{
+          this.$modal.msgSuccess('发送成功');
+          let time = 60;
+          let timer = setInterval(() => {
+            time--;
+            this.emailDisabled = true;
+            this.emailText = time + 's重试'
+            if (time == 0) {
+              clearInterval(timer)
+              this.emailText = '发送验证码'
+              this.emailDisabled = false;
+            }
+          }, 1000)
+        }
+      })
+    }
   }
 };
 </script>
@@ -304,9 +349,25 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  //height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  // height: 100%;
+  // background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login.svg");
   background-size: cover;
+  .leftIcon {
+      position: relative;
+      width: 200px;
+      height: 155px;
+      top:-300px;
+      left: -300px;
+
+      .Icon {
+        width: 100px;
+        height: 105px;
+        background-image: url("../assets/images/logos.png");
+        background-size: cover;
+      }
+    }
+  
 }
 
 .title {

src/views/system/user/index.vue

@@ -189,6 +189,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item  label="证件号码" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入证件号码"  maxlength="18"  />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">

src/views/test.vue

@@ -0,0 +1,79 @@
+<template>
+    <div>
+        <el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
+            <el-form-item prop="email" label="邮箱" :rules="[
+            { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+            { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
+        ]">
+                <el-input v-model="dynamicValidateForm.email"></el-input>
+            </el-form-item>
+            <div v-for="(item, index) in dynamicValidateForm.domains" :key="item.key">
+                <el-form-item :label="'域名' + index" :prop="'domains.' + index + '.value.name'" :rules="{
+            required: true, message: '域名不能为空', trigger: 'blur'
+        }">
+                    <el-input v-model="item.value.name"></el-input>
+                </el-form-item>
+                <el-form-item :label="'链接' + index" :prop="'domains.' + index + '.value.url'" :rules="{
+            required: true, message: '链接不能为空', trigger: 'blur'
+        }">
+                    <el-input v-model="item.value.url"></el-input>
+                </el-form-item>
+                <el-button @click.prevent="removeDomain(item)">删除</el-button>
+            </div>
+            <el-form-item>
+                <el-button type="primary" @click="submitForm('dynamicValidateForm')">提交</el-button>
+                <el-button @click="addDomain">新增域名</el-button>
+                <el-button @click="resetForm('dynamicValidateForm')">重置</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            dynamicValidateForm: {
+                domains: [{
+                    value: {
+                        name: "",
+                        url: ""
+                    }
+                }],
+                email: ''
+            },
+            data: { "applicant": { "id": 123, "caseAppliId": 5453163805296176, "userId": null, "applicantDeptId": null, "code": null, "compLegalPerson": null, "roleType": 1, "groupOrder": 2, "operatorFlag": 0, "phone": "17691225077", "email": "1129801211@qq.com", "name": "白贵勇", "home": "西安", "address": "西安", "idCard": "612429198708193335", "idType": null, "nationality": null, "birth": null, "sex": null, "resName": null }, "applicantAgent": null, "res": { "id": 124, "caseAppliId": 5453163805296176, "userId": null, "applicantDeptId": null, "code": null, "compLegalPerson": null, "roleType": 3, "groupOrder": 2, "operatorFlag": 0, "phone": "18792927508", "email": "1322446236@qq.com", "name": "王琼", "home": "西安", "address": "西安", "idCard": "14050219970814622X", "idType": null, "nationality": null, "birth": null, "sex": null, "resName": null }, "resAgent": null }
+        };
+    },
+    methods: {
+        submitForm(formName) {
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    alert('submit!');
+                    console.log(this.dynamicValidateForm);
+
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        resetForm(formName) {
+            this.$refs[formName].resetFields();
+        },
+        removeDomain(item) {
+            var index = this.dynamicValidateForm.domains.indexOf(item)
+            if (index !== -1) {
+                this.dynamicValidateForm.domains.splice(index, 1)
+            }
+        },
+        addDomain() {
+            this.dynamicValidateForm.domains.push({
+                value: {
+                    name: "",
+                    key: Date.now()
+                },
+            });
+        }
+    }
+}
+</script>