'上传多个缴费凭证后，删除一个提交接口报错修复'

README.md

@@ -1,3 +1,30 @@
-# Mediation-Frontend
+## 开发
 
-调解系统PC端服务
+```bash
+# 克隆项目
+git clone https://gitee.com/y_project/RuoYi-Vue
+
+# 进入项目目录
+cd ruoyi-ui
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npmmirror.com
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:80
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.6",
-  "description": "智慧仲裁管理系统",
+  "description": "调解系统",
   "author": "智慧仲裁",
   "license": "MIT",
   "scripts": {
@@ -48,8 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
-    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "qrcodejs2": "0.0.2",
     "quill": "1.3.7",

src/api/login.js

@@ -76,3 +76,11 @@ export function wxregister(data) {
 		data: data
 	})
 }
+// 检测用户名是否已经存在
+export function verifyUserName(data) {
+	return request({
+		url: '/weChatUser/verifyUserName',
+		method: 'get',
+		params:data
+	})
+}

src/api/system/homepage.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询首页待办
+export function todoCount(data) {
+    return request({
+        url: '/caseApplication/todoCount',
+        method: 'get',
+        params: data
+    })
+}

src/components/ImageUpload/index.vue

@@ -51,12 +51,12 @@ export default {
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 1,
     },
     // 大小限制(MB)
     fileSize: {
        type: Number,
-      default: 5,
+      // default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

src/components/RuoYi/Doc/index.vue

@@ -9,7 +9,8 @@ export default {
   name: 'RuoYiDoc',
   data() {
     return {
-      url: 'http://doc.ruoyi.vip/ruoyi-vue'
+      // url: 'http://doc.ruoyi.vip/ruoyi-vue'
+      url: '#'
     }
   },
   methods: {

src/layout/components/Navbar.vue

@@ -7,15 +7,10 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <!-- <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

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'
@@ -14,6 +14,8 @@ import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 
+import './assets/icons' // icon
+// 引入Iconfont 矢量图标库
 import './assets/icon/iconfont.css'
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
@@ -37,8 +39,9 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+//画布组件
+import vueEsign from 'vue-esign'
 import {checkPermi} from '@/utils/permission'
-import { statusRole } from '@/utils/permission'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -51,7 +54,6 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.checkPermi = checkPermi
-Vue.prototype.statusRole = statusRole
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
@@ -65,6 +67,7 @@ Vue.component('ImagePreview', ImagePreview)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(vueEsign)
 DictData.install()
 
 /**

src/router/index.js

@@ -100,7 +100,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
+        // component: () => import('@/views/system/user/authRole'),
+        component: (resolve) => require(['@/views/system/user/authRole'],resolve),
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user' }
       }
@@ -114,7 +115,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
+        // component: () => import('@/views/system/role/authUser'),
+        component: (resolve) => require(['@/views/system/role/authUser'],resolve),
         name: 'AuthUser',
         meta: { title: '分配用户', activeMenu: '/system/role' }
       }

src/store/modules/permission.js

@@ -126,6 +126,7 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
+    // return () => import(`@/views/${view}`)
     return (resolve) => require([`@/views/${view}`], resolve)
   }
 }

src/store/modules/user.js

@@ -50,7 +50,6 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          sessionStorage.setItem('caseStatus', JSON.stringify(res.caseStatus))
           const user = res.user
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组

src/utils/permission.js

@@ -24,7 +24,6 @@ export function checkPermi(value) {
     return false
   }
 }
-
 /**
  * 角色权限校验
  * @param {Array} value 校验值
@@ -49,42 +48,3 @@ 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)) {
-  //   // caseStatus.forEach(item => {
-  //   //   if (item == value) {
-  //   //     return true
-  //   //   }
-  //   // });
-  //   for(let i = 0;i < caseStatus.length;i++){
-  //     if(caseStatus[i] == value){
-  //       return true
-  //     }
-  //   }
-  // } else {
-  //   return false
-  // }
-  let flag = null;
-  for (let i = 0; i < caseStatus.length; i++) {
-    if (caseStatus[i] == value) {
-      flag = caseStatus[i]
-    }
-  }
-  if (flag == value) {
-    return true
-  } else {
-    return false
-  }
-}

src/utils/request.js

@@ -17,7 +17,8 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  // timeout: 10000
+  timeout: 15000
 })
 
 // request拦截器
@@ -36,10 +37,6 @@ service.interceptors.request.use(config => {
     config.params = {};
     config.url = url;
   }
-  if (config.url === '/caseApplication/mediation') {
-    // 调解时对于特定的请求设置超时时间为20秒
-    config.timeout = 20000; // 20秒
-  }
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     const requestObj = {
       url: config.url,

src/views/caseManagement/caseList.vue

@@ -3,8 +3,8 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
             <el-form-item label="案件状态" prop="caseFlowId">
                 <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
-                    <el-option v-for="dict in caseStausArr" :key="dict.id" :label="dict.caseStatusName"
+                    <el-option v-for="dict in caseStausArr" :key="dict.id" :label="dict.caseStatusName" :value="dict.id"
-                        :value="dict.id" @keyup.enter.native="handleQuery"></el-option>
+                        @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="申请机构" prop="applicationOrganId">
@@ -23,7 +23,8 @@
             </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" @change="caseTimeChange">
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
+                    @change="caseTimeChange">
                 </el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -33,7 +34,8 @@
         </el-form>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus"  v-hasPermi="['caseManagement:list:add']" size="mini" @click="addCase()">新增案件</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" v-hasPermi="['caseManagement:list:add']" size="mini"
+                    @click="addCase()">新增案件</el-button>
             </el-col>
             <!-- TODO 后期可能加上-->
             <!-- <el-col :span="1.5">
@@ -61,40 +63,39 @@
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
+                    <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
-                    <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
+                        v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
-                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
+                    <el-button size="mini" @click="checkDetail(scope.row)" type="text"
-                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
+                        icon="el-icon-view">查看详情</el-button>
-                    <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
+                    <el-button size="mini" @click="caseFlow(scope.row)" type="text"
-                    <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
+                        icon="el-icon-zoom-in">查看流程</el-button>
-                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
                         icon="el-icon-edit-outline">案件日志</el-button>
-                    <!-- <el-button size="mini" @click="paymentconfirmationRow(scope.row)" type="text" icon="el-icon-zoom-in">缴费确认</el-button> -->
+                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text" icon="el-icon-edit"
-                    <!-- <el-button size="mini" @click="caseAccep(scope.row)" type="text" icon="el-icon-zoom-in">案件受理</el-button> -->
+                        v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
-                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
-                        icon="el-icon-edit">查看缴费单</el-button>
+                        v-hasPermi="['caseManagement:list:evidenceEdit']"
-                    <!-- <el-button size="mini" @click="caseFiling(scope.row)" type="text" icon="el-icon-tickets">案件归档</el-button> -->
+                        v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
-                    <!-- <el-button size="mini" @click="signMediation(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 ||
-                    <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
+            scope.row.caseFlowId == 16 ||
-                    <el-button size="mini" type="text" icon="el-icon-edit"
+            scope.row.caseFlowId == 17
-                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
+            " @click="caseFilingDetails(scope.row)">归档详情</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="payStatus(scope.row)">缴费</el-button> -->
+                        <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
+                            v-if="item.id == scope.row.caseFlowId &&
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button> -->
+            checkPermi([item.buttonAuthFlag]) &&
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="department(scope.row)">部门长审核</el-button> -->
+            scope.row.signButtonFlag != 1
-                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="timeConfirm(scope.row)">确认调解时间</el-button> -->
+            ">{{ item.nodeName }}</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-tickets" v-for="(item) in buttonList" :key="item.id"
+                    </div>
-                        @click="caseClick(scope.row,item.id)" v-if="item.id == scope.row.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</el-button>
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            @pagination="getList(queryParams)" />
+            :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
         <!-- 新增编辑详情 -->
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"></addCase>
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
+        </addCase>
         <!-- 压缩包导入     -->
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
             @cancelCompreess="cancelCompreess" :getList="getList">
@@ -104,23 +105,28 @@
             :caseFlowNumber="caseFlowNumber">
         </mediationCaseDetails>
         <!-- 案件日志 -->
-        <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr" :flagLoading="flagLoading"></mediationCaseLog>
+        <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
+            :flagLoading="flagLoading"></mediationCaseLog>
         <!-- 证据修改 -->
-        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
+        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence"
+            :evidenceData="evidenceData">
         </evidenceDialog>
         <!-- 缴费 -->
-        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
+        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow" :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
+            :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
+            :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
         <!-- 缴费确认查看详情 -->
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
-            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" :isapplicant="isapplicant" @getList="getList">
+            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma"
+            :isapplicant="isapplicant" @getList="getList">
         </paymentdetailsDialog>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
-            :caseAcceptanceData="caseAcceptanceData" @getList="getList"></caseAcceptance>
+            :caseAcceptanceData="caseAcceptanceData" @getList="getList" :queryParams="queryParams"></caseAcceptance>
         <!-- 被申请人缴费 -->
-        <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail" :resPayId="resPayId" :resPayForm="resPayForm"
+        <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail"
-            :queryParams="queryParams" @getList="getList" @paycancelRes="paycancelRes" :formResPay="formResPay"></respondentPay>    
+            :resPayId="resPayId" :resPayForm="resPayForm" :queryParams="queryParams" @getList="getList"
+            @paycancelRes="paycancelRes" :formResPay="formResPay"></respondentPay>
         <!-- 调解员弹窗 -->
         <selectMediator @cancelMediator="cancelMediator" :mediatorVisable="mediatorVisable" :mediatorData="mediatorData"
             @getList="getList" :queryParams="queryParams"></selectMediator>
@@ -139,31 +145,45 @@
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
-        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"></caseFilingDetailsPage>
+        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData"
+            @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
+        </caseFilingDetailsPage>
     </div>
 </template>
 
 <script>
-import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied,msCaseSignUrlApplyPC} from '@/api/caseManagement/caseManagement.js'
+import {
-import { listDept } from '@/api/system/dept.js'
+    caseApplicationList,
-import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
+    caseApplicationSelectById,
+    submitCaseApply,
+    selectPaymentDetail,
+    sealApply,
+    selectSealUrl,
+    listCaseLogRecord,
+    msCaseFile,
+    msCaseSign,
+    listDeptApplied,
+    msCaseSignUrlApplyPC,
+} from "@/api/caseManagement/caseManagement.js";
+import { listDept } from "@/api/system/dept.js";
+import { queryCaseFlowInfo } from "@/api/caseprocessManagement/caseprocessManagement.js";
 import moment from "moment";
-import addCase from './components/addCase.vue'
+import addCase from "./components/addCase.vue";
-import evidenceDialog from './components/evidenceDialog.vue';
+import evidenceDialog from "./components/evidenceDialog.vue";
-import caseCompressionPackage from './components/caseCompressionPackage.vue';
+import caseCompressionPackage from "./components/caseCompressionPackage.vue";
-import mediationCaseDetails from './components/mediationCaseDetails.vue'
+import mediationCaseDetails from "./components/mediationCaseDetails.vue";
-import mediationCaseLog from './components/mediationCaseLog.vue'
+import mediationCaseLog from "./components/mediationCaseLog.vue";
 import payDialog from "./components/payDialog.vue";
-import respondentPay from "./components/respondentPay.vue"
+import respondentPay from "./components/respondentPay.vue";
-import paymentdetailsDialog from './components/paymentdetailsDialog.vue'
+import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
-import caseAcceptance from './components/caseAcceptance.vue'
+import caseAcceptance from "./components/caseAcceptance.vue";
-import selectMediator from './components/selectMediator.vue'
+import selectMediator from "./components/selectMediator.vue";
-import confirmMediator from './components/confirmMediator.vue'
+import confirmMediator from "./components/confirmMediator.vue";
-import departmentMediator from './components/departmentMediator.vue'
+import departmentMediator from "./components/departmentMediator.vue";
-import timeConfirm from './components/timeConfirm.vue'
+import timeConfirm from "./components/timeConfirm.vue";
-import mediation from './components/mediation.vue'
+import mediation from "./components/mediation.vue";
-import confirmMediation from './components/confirmMediation.vue'
+import confirmMediation from "./components/confirmMediation.vue";
-import caseFilingDetailsPage from './components/caseFilingDetailsPage.vue'
+import caseFilingDetailsPage from "./components/caseFilingDetailsPage.vue";
 export default {
     name: "caseList",
     dicts: ["case_flow_node"],
@@ -176,14 +196,14 @@ export default {
         payDialog,
         paymentdetailsDialog,
         caseAcceptance,
-        selectMediator,//调解员弹窗
+        selectMediator, //调解员弹窗
         confirmMediator,
         departmentMediator,
         timeConfirm,
         mediation,
         confirmMediation,
         caseFilingDetailsPage,
-        respondentPay
+        respondentPay,
     },
     data() {
         return {
@@ -200,143 +220,155 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
-            addVisable: false,//新增弹窗
+            addVisable: false, //新增弹窗
             openPay: false, //缴费弹框
-            openResPay:false,//被申请人缴费弹窗
+            openResPay: false, //被申请人缴费弹窗
             formPayDetail: {},
-            formResPayDetail:{},
+            formResPayDetail: {},
             payId: null,
-            resPayId:null,
+            resPayId: null,
             payForm: {},
-            resPayForm:{},
+            resPayForm: {},
-            openCompressedPackages: false,//压缩包导入弹窗
+            openCompressedPackages: false, //压缩包导入弹窗
-            processVisable: false,//案件详情
+            processVisable: false, //案件详情
-            showcaseLog: false,//案件日志
+            showcaseLog: false, //案件日志
-            openDialog: false,//确认缴费和缴费详情
+            openDialog: false, //确认缴费和缴费详情
             detailform: {}, //缴费详情数据
-            evidenceVisable: false,//证据修改弹窗
+            evidenceVisable: false, //证据修改弹窗
-            mediationVisable:false,//待调解弹窗
+            mediationVisable: false, //待调解弹窗
-            mediationData:{},
+            mediationData: {},
-            payTitle:"",//缴费标题
+            payTitle: "", //缴费标题
-            resPayTitle:'',//被申请人缴费标题
+            resPayTitle: "", //被申请人缴费标题
-            paymentConfirma:{},//缴费确认
+            paymentConfirma: {}, //缴费确认
-            showAcceptance:false,//案件受理弹框
+            showAcceptance: false, //案件受理弹框
-            caseAcceptanceData:{},//案件受理数据
+            caseAcceptanceData: {}, //案件受理数据
-            mediatorVisable:false,//选择调解员弹窗
+            mediatorVisable: false, //选择调解员弹窗
-            timeVisable:false,//预约时间弹窗
+            timeVisable: false, //预约时间弹窗
-            confirmVisable:false,//确认时间/调解员
+            confirmVisable: false, //确认时间/调解员
-            caseFlowNumber:{},//案件流程数据
+            caseFlowNumber: {}, //案件流程数据
-            caselogDataArr:[],//案件日志数据
+            caselogDataArr: [], //案件日志数据
             flagLoading: true, //案件日志弹框loading
-            confirmTionVisable:false,//确认调解书弹窗
+            confirmTionVisable: false, //确认调解书弹窗
-            addModifyData:null,//新增修改传的参数
+            addModifyData: null, //新增修改传的参数
-            showarchiveDetails:false,//归档详情弹窗
+            showarchiveDetails: false, //归档详情弹窗
-            detailsAwardNum:{},
+            detailsAwardNum: {},
             flagLoadingS: true,
-            formPayDetailAffiliate:{},
+            formPayDetailAffiliate: {},
-            formResPay:{},
+            formResPay: {},
-            mediatorData:{},
+            mediatorData: {},
             flag: null,
             caseData: {},
             evidenceData: {},
             caseDisabled: false,
-            caseTime: '',
+            caseTime: "",
             deptList: [],
-            payTitle: '',
+            payTitle: "",
             tabFlag: false,
             confirmData: {},
             departmentVisable: false,
             departmentData: {},
             timeConfirmVisable: false,
             timeConfirmData: {},
-            confirmTionData:{},
+            confirmTionData: {},
             buttonList: [],
-            caseStausArr: [],//案件状态
+            caseStausArr: [], //案件状态
             isapplicant: true, //判断角色申请人或非申请人
-            caseFilingData:{}
+            caseFilingData: {},
         };
     },
     created() {
+        // this.getList(this.queryParams);
+        this.listDeptFn();
+        // this.getButtonList()
+        queryCaseFlowInfo({
+            pageNum: 1,
+            pageSize: 100000,
+        }).then((res) => {
+            res.rows.forEach((item) => {
+                if (item.id != 17) {
+                    this.buttonList.push(item);
+                }
+                this.caseStausArr.push(item);
+            });
+            // if (this.$route.query.caseFlowId) {
+            //     let querydata = Number(this.$route.query.caseFlowId);
+            //     if (querydata > 0) {
+            //         this.$set(this.queryParams, 'caseFlowId', querydata)
+            //     }
+            // }
+            // this.getList(this.queryParams);
+        });
+        if (this.$route.query.caseFlowId) {
+            let querydata = Number(this.$route.query.caseFlowId);
+            if (querydata > 0) {
+                this.$set(this.queryParams, 'caseFlowId', querydata)
+            }
+        }
         this.getList(this.queryParams);
-        this.listDeptFn()
-        this.getButtonList()
     },
     methods: {
         /**所有按钮事件 */
-        caseClick(val,type){
+        caseClick(val, type) {
-            if(type == 1){
+            if (type == 1) {
                 // 提交案件
                 this.onsubmitRow(val);
-            }else if(type == 2){
+            } else if (type == 2) {
                 // 缴费
                 this.payStatus(val);
-            }else if(type == 3 || type == 45){
+            } else if (type == 3 || type == 45) {
                 // 确认缴费
-                this.paymentconfirmationRow(val,type);
+                this.paymentconfirmationRow(val, type);
-            }else if(type == 4){
+            } else if (type == 4) {
                 // 受理分配
                 this.caseAccep(val);
-            }else if(type == 5){
+            } else if (type == 5) {
                 // 选择调解员
                 this.selectMediator(val);
-            }else if(type == 6){
+            } else if (type == 6) {
                 // 核实调解员
                 this.secretaryConfirm(val);
-            }else if(type == 7){
+            } else if (type == 7) {
                 // 确认调解员
                 this.department(val);
-            }else if(type == 8){
+            } else if (type == 8) {
                 // 确定调解时间
                 this.timeConfirm(val);
-            }else if(type == 9){
+            } else if (type == 9) {
                 // 调解
-                this.mediationClick(val)
+                this.mediationClick(val);
-            }else if(type == 10){
+            } else if (type == 10) {
                 // 确认调解书
-                this.confirmMediation(val)
+                this.confirmMediation(val);
-            }else if(type == 11){
+            } else if (type == 11) {
                 // 签名
-                this.msCaseSignUrlApplyPCFn(val)
+                this.msCaseSignUrlApplyPCFn(val);
-            }else if(type == 12){
+            } else if (type == 12) {
                 // 用印申请
-                this.consultantApplica(val)
+                this.consultantApplica(val);
-            }else if(type == 13){
+            } else if (type == 13) {
                 // 用印
-                this.departmentApplica(val)
+                this.departmentApplica(val);
-            }else if(type == 14){
+            } else if (type == 14) {
                 // 归档
                 this.caseFiling(val);
-            }else if(type == 15){
+            } else if (type == 15) {
                 // 申请人签收
-                this.signMediation(val)
+                this.signMediation(val);
-            }else if(type == 16){
+            } else if (type == 16) {
                 // 被申请人签收
-                this.receivedMediation(val)
+                this.receivedMediation(val);
-            }else if(type == 17){
+            } else if (type == 17) {
                 //结束
-            }else if(type == 44){
+            } else if (type == 44) {
                 // 被申请人缴费
-                this.resPayStatus(val)
+                this.resPayStatus(val);
             }
         },
         /**查询按钮列表 */
-        getButtonList() {
+        getButtonList() { },
-            queryCaseFlowInfo({
-                pageNum: 1,
-                pageSize: 100000
-            }).then(res => {
-                console.log(res)
-                res.rows.forEach(item => {
-                    if(item.id !=17){
-                        this.buttonList.push(item)
-                    }
-                    this.caseStausArr.push(item)
-                });               
-            })
-        },
         /** 新增案件 */
         addCase() {
-            this.addModifyData =1;
+            this.addModifyData = 1;
             this.addVisable = true;
             this.caseData = {};
             this.caseDisabled = false;
@@ -344,7 +376,7 @@ export default {
         },
         /** 查看详情 */
         checkDetail(val) {
-            this.addModifyData =2;
+            this.addModifyData = 2;
             this.addVisable = true;
             this.caseData = val;
             this.caseDisabled = true;
@@ -352,10 +384,10 @@ export default {
         },
         /** 修改案件 */
         eidtNodeprocess(row) {
-            this.addModifyData = 3
+            this.addModifyData = 3;
             this.addVisable = true;
             this.caseData = row;
-            this.$set(this.caseData,'flag',2)
+            this.$set(this.caseData, "flag", 2);
             this.caseDisabled = false;
             this.tabFlag = false;
         },
@@ -402,10 +434,10 @@ export default {
             //         this.$modal.msgSuccess("立案申请成功");
             //     })
             //     .catch(() => { });
-            msCaseSignUrlApplyPC({ caseId: row.id }).then(res=>{
+            msCaseSignUrlApplyPC({ caseId: row.id }).then((res) => {
-                console.log(res,"PPPPPPPPPPPPPPPPPPPP");
+                console.log(res, "PPPPPPPPPPPPPPPPPPPP");
                 window.open(res.data.sealUrl);
-            })
+            });
         },
         /** 选择调解员 */
         selectMediator(val) {
@@ -417,12 +449,12 @@ export default {
             this.timeVisable = true;
         },
         /** 调解 */
-        mediationClick(val){
+        mediationClick(val) {
             this.mediationVisable = true;
             this.mediationData = val;
         },
         /** 确认调解书 */
-        confirmMediation(val){
+        confirmMediation(val) {
             this.confirmTionVisable = true;
             this.confirmTionData = val;
         },
@@ -460,23 +492,22 @@ export default {
         /** 时间改变处理 */
         caseTimeChange() {
             if (this.caseTime) {
-                this.queryParams.startTime = moment(
+                this.queryParams.startTime = moment(this.caseTime[0]).format(
-                    this.caseTime[0]
+                    "YYYY-MM-DD HH:mm:ss"
-                ).format("YYYY-MM-DD HH:mm:ss");
+                );
-                this.queryParams.endTime = moment(
+                this.queryParams.endTime = moment(this.caseTime[1]).format(
-                    this.caseTime[1]
+                    "YYYY-MM-DD HH:mm:ss"
-                ).format("YYYY-MM-DD HH:mm:ss");
+                );
             } else {
-                this.queryParams.startTime = '';
+                this.queryParams.startTime = "";
-                this.queryParams.endTime = '';
+                this.queryParams.endTime = "";
             }
-
         },
         /** 获取所有部门 */
         listDeptFn() {
-            listDeptApplied().then(res => {
+            listDeptApplied().then((res) => {
                 this.deptList = res.data;
-            })
+            });
         },
         /** 修改证据 */
         evidenceUpload(row) {
@@ -512,14 +543,14 @@ export default {
             this.timeVisable = false;
         },
         /**取消调解 */
-        cancelMediation(){
+        cancelMediation() {
             this.timeConfirmVisable = false;
         },
         /** 取消确认调解弹窗 */
-        cancelConfirmTion(){
+        cancelConfirmTion() {
             this.confirmTionVisable = false;
         },
-        cancelMediation(){
+        cancelMediation() {
             this.mediationVisable = false;
         },
         cancelConfirm() {
@@ -548,162 +579,188 @@ export default {
                 this.dataList = response.rows;
                 this.total = response.total;
                 this.loading = false;
-            })
+            });
         },
         // 法律顾问用印申请
         consultantApplica(row) {
             let paramsValue = {
                 caseId: row.id,
                 batchNumber: "",
-                caseFlowId: row.caseFlowId
+                caseFlowId: row.caseFlowId,
-            }
+            };
-            this.$modal.confirm("你确定要用印申请吗？").then((res) => {
+            this.$modal
-                sealApply(paramsValue).then(res => {
+                .confirm("你确定要用印申请吗？")
+                .then((res) => {
+                    sealApply(paramsValue).then((res) => {
                         this.getList(this.queryParams);
                         this.$modal.msgSuccess("用印申请成功");
+                    });
                 })
-            }).catch(() => {
+                .catch(() => { });
-
-            })
         },
         // 部门长用印申请
         departmentApplica(row) {
-            this.$modal.confirm("你确定要用印确认吗？").then((res) => {
+            this.$modal
+                .confirm("你确定要用印确认吗？")
+                .then((res) => {
                     let paramsValue = {
-                    caseId: row.id
+                        caseId: row.id,
-                }
+                    };
-                selectSealUrl(paramsValue).then(res => {
+                    selectSealUrl(paramsValue).then((res) => {
-                    window.open(res.data.sealUrl)
+                        window.open(res.data.sealUrl);
-                    this.$modal.confirm("你确认用印了吗？").then((res) => {
+                        this.$modal
+                            .confirm("你确认用印了吗？")
+                            .then((res) => {
                                 this.getList(this.queryParams);
-                    }).catch(() => {
-
                             })
+                            .catch(() => { });
+                    });
                 })
-            }).catch(() => {
+                .catch(() => { });
-
-            })
         },
         // 案件受理
         caseAccep(row) {
-            this.caseAcceptanceData = row
+            this.caseAcceptanceData = row;
-            this.showAcceptance = true
+            this.showAcceptance = true;
         },
         cancelAcceptance() {
-            this.showAcceptance = false
+            this.showAcceptance = false;
         },
         // 缴费确认
-        paymentconfirmationRow(row,type) {
+        paymentconfirmationRow(row, type) {
-            this.paymentConfirma = row
+            this.paymentConfirma = row;
-            console.log(this.paymentConfirma)
+            console.log(this.paymentConfirma);
             this.paymentDetails({
-                id: row.id
+                id: row.id,
-            })
+            });
-            this.openDialog = true
+            this.openDialog = true;
-            this.payTitle = "缴费确认"
+            this.payTitle = "缴费确认";
             this.flag = 0;
-            this.detailform = {}
+            this.detailform = {};
             if (type == 3) {
                 // 申请人
-                this.isapplicant = true
+                this.isapplicant = true;
-            }else {
+            } else {
-                this.isapplicant = false
+                this.isapplicant = false;
             }
         },
         cancelpaymentdetails() {
-            this.openDialog = false
+            this.openDialog = false;
         },
         // 查看缴费确认
         viewpaymentformRow(row) {
             this.paymentDetails({
-                id: row.id
+                id: row.id,
-            })
+            });
-            this.payTitle = "缴费单详情"
+            this.payTitle = "缴费单详情";
             this.flag = 1;
-            this.detailform = {}
+            this.detailform = {};
-            this.openDialog = true
+            this.openDialog = true;
         },
         // 缴费详情
         paymentDetails(val) {
-            selectPaymentDetail(val).then(res => {
+            selectPaymentDetail(val).then((res) => {
                 this.detailform = res.data;
-            })
+            });
         },
         //案件流程
         caseFlow(row) {
-            this.caseFlowNumber = row
+            this.caseFlowNumber = row;
-            this.processVisable = true
+            this.processVisable = true;
         },
         cancelViewProcess() {
-            this.processVisable = false
+            this.processVisable = false;
         },
         //案件日志
         caseLog(row) {
-            this.caseLogNumber = row
+            this.caseLogNumber = row;
-            this.showcaseLog = true
+            this.showcaseLog = true;
             this.flagLoading = true;
-            listCaseLogRecord({caseId:row.id}).then(res=>{
+            listCaseLogRecord({ caseId: row.id }).then((res) => {
-                    this.caselogDataArr = res.data
+                this.caselogDataArr = res.data;
                 this.flagLoading = false;
-            })
+            });
         },
         cancelcaseLog() {
-            this.showcaseLog = false
+            this.showcaseLog = false;
         },
         // 案件送达
         caseFiling(row) {
-            console.log(row.id)
+            console.log(row.id);
             let paramValues = {
-                ids:[row.id]
+                ids: [row.id],
+            };
+            this.$confirm("你确定要案件送达吗？", "提示", {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    callback: () => { },
+                    beforeClose: (action, ctx, close) => {
+                        if (action !== 'confirm') {
+                            close();
+                            return;
                         }
-            this.$modal.confirm("你确定要案件送达吗？").then((res) => {
+                        ctx.confirmButtonLoading = true;
-               msCaseFile(paramValues).then(res=>{
+                        msCaseFile(paramValues).then((res) => {
                             this.$modal.msgSuccess("案件送达成功");
+                            close();
                             this.getList(this.queryParams);
+                        }).finally(() => {
+                            ctx.confirmButtonLoading = false;
                         })
-            }).catch(() => {
+                    }
-
+                }).finally(() => { })
-            })
+            // .then((res) => {
+            //     msCaseFile(paramValues).then((res) => {
+            //         this.$modal.msgSuccess("案件送达成功");
+            //         this.getList(this.queryParams);
+            //     });
+            // })
+            // .catch(() => { });
         },
         //申请人签收调解书
         signMediation(row) {
-            this.$modal.confirm("你确定要签收调解书吗？").then((res) => {
+            this.$modal
-                this.signingMediationAgreement({caseId:row.id,isSignApply:1})
+                .confirm("你确定要签收调解书吗？")
-            }).catch(() => {
+                .then((res) => {
-
+                    this.signingMediationAgreement({ caseId: row.id, isSignApply: 1 });
                 })
+                .catch(() => { });
         },
         //被申请人签收调解书
         receivedMediation(row) {
-            this.$modal.confirm("你确定要签收调解书吗？").then((res) => {
+            this.$modal
-                this.signingMediationAgreement({caseId:row.id,isSignRespon:1})
+                .confirm("你确定要签收调解书吗？")
-            }).catch(() => {
+                .then((res) => {
-
+                    this.signingMediationAgreement({ caseId: row.id, isSignRespon: 1 });
                 })
+                .catch(() => { });
         },
         // 申请人和被申请人签收调解书接口
-         signingMediationAgreement(val){
+        signingMediationAgreement(val) {
-             console.log(val)
+            console.log(val);
-             msCaseSign(val).then(res=>{
+            msCaseSign(val).then((res) => {
                 this.$modal.msgSuccess("签收成功");
                 this.getList(this.queryParams);
-             })
+            });
         },
         //归档详情
-        caseFilingDetails(val){
+        caseFilingDetails(val) {
             this.showarchiveDetails = true;
             this.caseFilingData = val;
-            let vals = {id:val.id}
+            let vals = { id: val.id };
-            caseApplicationSelectById(vals).then(res=>{
+            caseApplicationSelectById(vals).then((res) => {
-                this.detailsAwardNum = res.data
+                res.data.affiliate.respondentSex = Number(
-                console.log(this.detailsAwardNum)
+                    res.data.affiliate.respondentSex
-                this.flagLoadingS = false
+                );
-            })
+                this.detailsAwardNum = res.data;
+                console.log(this.detailsAwardNum);
+                this.flagLoadingS = false;
+            });
+        },
+        cancelDetail() {
+            this.showarchiveDetails = false;
         },
-        cancelDetail(){
-            this.showarchiveDetails = false
-        }
-        
     },
 };
 </script>

src/views/caseManagement/components/addCase.vue

@@ -7,14 +7,23 @@
         <el-tab-pane label="证据清单" name="second" v-if="tabFlag">
         </el-tab-pane>
       </el-tabs>
-      <el-form v-if="activeName == 'first'" :disabled="caseDisabled" :model="formData" ref="ruleForm" label-width="130px"
+      <el-form v-if="activeName == 'first'" :disabled="caseDisabled" :model="formData" ref="ruleForm"
-        class="demo-ruleForm">
+        label-width="130px" class="demo-ruleForm">
         <el-row>
           <div style="display: inline-flex">
             <div class="infoIcon"></div>
             <div class="caseInfo">案件信息：</div>
           </div>
           <el-divider></el-divider>
+          <el-col :span="24">
+            <el-form-item label="压缩包导入">
+              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
+                :limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
+                <el-button size="small" type="primary">点击上传</el-button>
+                <div slot="tip" class="el-upload__tip">只能上传zip压缩包</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="申请人调解请求" prop="arbitratClaims" :rules="[
       {
@@ -75,7 +84,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="12">
+          <el-col :span="12" v-if="buttonFlag">
             <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
                 :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
@@ -88,7 +97,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="modelFlag">
+          <el-col :span="24" v-if="modelFlag && showEvidence">
             <el-form-item label="证据:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 2">
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
@@ -130,6 +139,13 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">申请人</div>
+            </div>
+            <el-divider></el-divider>
+          </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="申请机构名称" prop="affiliate.applicationName" :rules="[
       {
@@ -153,7 +169,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
-            <el-form-item label="统一社会信用代码" prop="affiliate.code" :rules="[
+            <el-form-item label-width="140px" label="统一社会信用代码" prop="affiliate.code" :rules="[
       {
         required: true,
         message: '统一社会信用代码不能为空',
@@ -163,7 +179,39 @@
               <el-input v-model="formData.affiliate.code" placeholder="请输入统一社会信用代码" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item prop="affiliate.nationality" label="国籍" :rules="[
+      {
+        required: true,
+        message: '国籍不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-select v-model="formData.affiliate.nationality" placeholder="请选择国籍" auto-complete="off"
+                style="width: 100%;" :disabled="formData.affiliate.organizeFlag != 1">
+                <el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
+
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
+            <el-form-item prop="affiliate.idType" label="证件类型" :rules="[
+      {
+        required: true,
+        message: '证件类型不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
+                disabled>
+                <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
+
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 0">
             <el-form-item label="申请人身份证号码" prop="affiliate.code" :rules="[
       {
         required: true,
@@ -180,6 +228,17 @@
               <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 1">
+            <el-form-item label="申请人护照号码" prop="affiliate.code" :rules="[
+      {
+        required: true,
+        message: '申请人护照号码不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的申请人护照号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
             <el-form-item label="申请人邮箱" prop="affiliate.applicationEmail" :rules="[
       {
@@ -262,6 +321,13 @@
               <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">代理人</div>
+            </div>
+            <el-divider></el-divider>
+          </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="代理人联系电话" prop="affiliate.contactTelphoneAgent" :rules="[
       {
@@ -328,6 +394,13 @@
               <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">被申请人</div>
+            </div>
+            <el-divider></el-divider>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="被申请人姓名" prop="affiliate.respondentName" :rules="[
       {
@@ -340,7 +413,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
+            <el-form-item label-width="140px" label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
       {
         required: true,
         message: '被申请人联系电话不能为空',
@@ -356,7 +429,36 @@
             </el-form-item>
           </el-col>
                     <el-col :span="12">
-            <el-form-item label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
+            <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
+      {
+        required: true,
+        message: '被申请人申请人住所不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-input v-model="formData.affiliate.respondentHome" placeholder="请输入被申请人申请人住所" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
+      {
+        required: true,
+        message: '被申请人邮箱不能为空',
+        trigger: 'blur',
+      },
+      {
+        pattern:
+          /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
+        message: '请输入正确的邮箱地址',
+        trigger: 'blur',
+      },
+    ]">
+              <el-input v-model="formData.affiliate.respondentEmail" placeholder="请输入被申请人邮箱" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+              <el-col :span="12">
+                <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
           {
             required: true,
             message: '被申请人身份证号不能为空',
@@ -369,7 +471,14 @@
             trigger: 'blur',
           },
         ]">
-              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur" placeholder="请输入被申请人身份证号" />
+              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur"
+                placeholder="请输入被申请人身份证号" />
+            </el-form-item>
+            </el-col>
+                      <el-col :span="12">
+              <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
+                <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
+                </el-date-picker>
               </el-form-item>
             </el-col>
                   <el-col :span="12">
@@ -385,41 +494,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="被申请人出生年月日：" prop="affiliate.respondentBirth">
-              <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
-              {
-                required: true,
-                message: '被申请人申请人住所不能为空',
-                trigger: 'blur',
-              },
-            ]">
-              <el-input v-model="formData.affiliate.respondentHome" placeholder="请输入被申请人申请人住所" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
-              {
-                required: true,
-                message: '代理人邮箱不能为空',
-                trigger: 'blur',
-              },
-              {
-                pattern:
-                  /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
-                message: '请输入正确的邮箱地址',
-                trigger: 'blur',
-              },
-            ]">
-              <el-input v-model="formData.affiliate.respondentEmail" placeholder="请输入被申请人邮箱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-col :span="24" v-if="modelFlag">
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
             <el-input type="textarea" v-model="item.value"></el-input>
@@ -453,6 +527,7 @@
     </el-dialog>
   </div>
 </template>
+
 <script>
 import {
   caseApplicationInsert,
@@ -490,6 +565,7 @@ export default {
       modelFlag: false,
       fileURL: window.location.origin + "/API",
       fileList: [],
+      fileListZip: [],
       filedata: {
         annexType: 2,
       },
@@ -501,7 +577,29 @@ export default {
       buttonFlag: true,
       getUserInfoList: {},
       applicationFlag: null,
-      showmediate: false
+      showmediate: false,
+      showEvidence: false,//是否显示证据
+      formZipData: {},
+      nationalityList: [
+        {
+          value: '国内',
+          id: 0
+        },
+        {
+          value: '国外',
+          id: 1
+        }
+      ],
+      idTypeList: [
+        {
+          value: '身份证',
+          id: 0
+        },
+        {
+          value: '护照',
+          id: 1
+        }
+      ]
     };
   },
   watch: {
@@ -511,14 +609,6 @@ export default {
         this.getUserInfoFn();
         this.modelFlag = false;
         this.buttonFlag = true;
-        this.formData = {
-          affiliate: {
-            organizeFlag: 0,
-            respondentSex: 0,
-          },
-          columnValueList: [],
-          caseAttachList: [],
-        };
       } else if (val == 3) {
         this.title = "修改案件";
         this.modelFlag = true;
@@ -531,6 +621,22 @@ export default {
     },
     addVisable(val) {
       if (val) {
+        if (this.addModifyData == 1) {
+          this.formData = {
+            affiliate: {
+              organizeFlag: 0,
+              respondentSex: 0,
+            },
+            columnValueList: [],
+            caseAttachList: [],
+          };
+          this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
+          this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
+          this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
+          this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
+          this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
+          this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
+        }
         this.activeName = "first";
         this.showmediate = false;
         this.getTemplateFn();
@@ -558,20 +664,24 @@ export default {
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
+        this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
+        this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
       })
     },
     /** 根据案件id获取对应信息 */
     caseApplicationSelectByIdFn(data) {
       this.applicantEvidence = [];
       this.respondentEvidence = [];
+      this.showEvidence = false;
       caseApplicationSelectById({ id: data }).then((res) => {
         res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
         this.formData = res.data;
         this.formData.caseAttachList.forEach((item) => {
           if (item.annexType == 2) {
             this.applicantEvidence.push(item);
+            this.showEvidence = true
           } else if (item.annexType == 6) {
-            this.respondentEvidence.push(item);
+            // this.respondentEvidence.push(item);
           } else if (item.annexType == 7) {
             this.showmediate = true
           }
@@ -612,6 +722,9 @@ export default {
     UploadUrl() {
       return window.location.origin + "/API/common/upload";
     },
+    zipUrl() {
+      return window.location.origin + "/API/caseApplication/userIdentify";
+    },
     /**文件上传成功*/
     handlSuccess(res, file) {
       this.formData.caseAttachList.push({
@@ -630,9 +743,41 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove(file, fileList) {
-      this.caseAttachListArr = this.caseAttachListArr.filter(
+      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
-        (item) => item.annexId != file.annexId
+        item.annexId !== file.response.annexId
-      );
+      )
+      this.formData.caseAttachList = newcaseAttachList
+    },
+    handleExceedZip(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件`);
+    },
+    beforeRemoveZip(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    successZip(res) {
+      this.formZipData = res.data;
+      // this.formData = res.data;
+      this.$set(this.formData.affiliate, 'organizeFlag', 0);
+      this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+      this.$set(this.formData, 'facts', this.formZipData.facts);
+      // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+      // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+      // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+      // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+      this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+      this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+      this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+      this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+      this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+      this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+      this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+      this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+      this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+      this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+      this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+      this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+      this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate.compLegalPerson);
+      // this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
     },
     handlePreview(file) {
       window.open(
@@ -658,18 +803,62 @@ export default {
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 0);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+          // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+          // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+          // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+          this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        } else {
           this.formData.affiliate.nameAgent = null;
           this.formData.affiliate.agentEmail = null;
           this.formData.affiliate.contactTelphoneAgent = null;
+        }
       } else if (val == 1) {
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "contactTelphoneAgent", this.getUserInfoList.phonenumber);
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 1);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate.applicationName);
+          this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
+          this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail);
+          this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone);
+          // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          // this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          // this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        } else {
           this.formData.affiliate.applicationName = null;
           this.formData.affiliate.code = null;
           this.formData.affiliate.applicationEmail = null;
           this.formData.affiliate.applicationPhone = null;
         }
+      }
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {
@@ -710,4 +899,8 @@ export default {
   height: 700px !important;
   overflow: auto !important;
 }
+::v-deep .el-input--medium .el-input__inner{
+  height: 40px;
+  line-height: 40px;
+}
 </style>

src/views/caseManagement/components/caseAcceptance.vue

@@ -63,7 +63,13 @@ export default {
   watch: {
     showAcceptance(val) {
       if (val) {
-        console.log(this.caseAcceptanceData)
+        console.log(this.caseAcceptanceData);
+        this.courtReviewform = {
+          mediationMethod: 2,
+          paperFlag: 0,
+          arbitrateConfirm: 0,
+          agreeFlag: 1
+        }
       }
     },
   },

src/views/caseManagement/components/caseFilingDetailsPage.vue

@@ -6,6 +6,7 @@
       </div>
       <div v-else>
           <el-tabs v-model="activeName"  @tab-click="handleClick">
+            <el-tab-pane label="案件信息" name="five"></el-tab-pane>
             <el-tab-pane label="申请人案件证据资料" name="first"></el-tab-pane>
             <!-- <el-tab-pane label="被申请人案件证据资料" name="second"></el-tab-pane> -->
             <el-tab-pane label="调解书" name="third"></el-tab-pane>
@@ -43,6 +44,204 @@
              </div>
              <el-empty v-if="isNoData(detailsAwardNum.caseAttachList,6) == 0" description="暂无数据"></el-empty>
          </div>
+         <div v-show="activeName=='five'">
+              <el-form  :disabled="true" :model="detailsAwardNum"  label-width="130px"
+          class="demo-ruleForm">
+          <el-row>
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">案件信息：</div>
+            </div>
+            <el-divider></el-divider>
+            <el-col :span="24">
+              <el-form-item label="申请人调解请求">
+                <el-input v-model="detailsAwardNum.arbitratClaims" placeholder="请输入申请人调解诉求" type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 8 }" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="事实和理由">
+                <el-input v-model="detailsAwardNum.facts" placeholder="请输入事实和理由" type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 8 }" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
+                <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
+                  :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
+                  :before-remove="beforeRemove" :data="filedata" :headers="headers" multiple :limit="50"
+                  :on-exceed="handleExceed" :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">
+                    文件支持上传.jpg，png，.doc，docx，.txt，.pdf文件
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="证据:">
+                <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 2">
+                  <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
+                    {{ item.annexName }}
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="调解申请书:">
+                <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 3">
+                  <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
+                    {{ item.annexName }}
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="调解书:">
+                <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 7">
+                  <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
+                    {{ item.annexName }}
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div style="display: inline-flex">
+                <div class="infoIcon"></div>
+                <div class="caseInfo">双方信息：</div>
+              </div>
+              <el-divider></el-divider>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
+                <el-radio-group v-model="detailsAwardNum.affiliate.organizeFlag">
+                  <el-radio :label="0">自然人</el-radio>
+                  <el-radio :label="1">机构</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="申请机构名称">
+                <el-input v-model="detailsAwardNum.affiliate.applicationName" placeholder="请输入申请机构名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="申请人">
+                <el-input v-model="detailsAwardNum.affiliate.applicationName"  placeholder="请输入申请人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="统一社会信用代码">
+                <el-input v-model="detailsAwardNum.affiliate.code" placeholder="请输入统一社会信用代码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="申请人身份证号码">
+                <el-input v-model="detailsAwardNum.affiliate.code"  placeholder="请输入申请人的身份证号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="申请人邮箱">
+                <el-input v-model="detailsAwardNum.affiliate.applicationEmail"  placeholder="请输入申请人邮箱" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="申请人电话">
+                <el-input v-model="detailsAwardNum.affiliate.applicationPhone"  placeholder="请输入申请人联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="法定代表人">
+                <el-input v-model="detailsAwardNum.affiliate.compLegalPerson" placeholder="请输入法定代表人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请人住所">
+                <el-input v-model="detailsAwardNum.affiliate.applicantHome" placeholder="请输入申请人住所" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="申请人联系地址">
+                <el-input v-model="detailsAwardNum.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="代理人联系电话">
+                <el-input v-model="detailsAwardNum.affiliate.contactTelphoneAgent"  placeholder="请输入代理人联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="代理人联系电话" prop="affiliate.contactTelphoneAgent">
+                <el-input v-model="detailsAwardNum.affiliate.contactTelphoneAgent" placeholder="请输入代理人联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="代理人姓名" prop="affiliate.nameAgent">
+                <el-input v-model="detailsAwardNum.affiliate.nameAgent"  placeholder="请输入代理人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="代理人姓名" prop="affiliate.nameAgent">
+                <el-input v-model="detailsAwardNum.affiliate.nameAgent" placeholder="请输入代理人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 1">
+              <el-form-item label="代理人邮箱">
+                <el-input v-model="detailsAwardNum.affiliate.agentEmail"  placeholder="请输入代理人邮箱" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="detailsAwardNum.affiliate.organizeFlag == 0">
+              <el-form-item label="代理人邮箱">
+                <el-input v-model="detailsAwardNum.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人姓名">
+                <el-input v-model="detailsAwardNum.affiliate.respondentName" placeholder="请输入被申请人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人联系电话" >
+                <el-input v-model="detailsAwardNum.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人身份证号">
+                <el-input v-model="detailsAwardNum.affiliate.respondentIdentityNum"  placeholder="请输入被申请人身份证号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人性别：">
+                <el-radio-group v-model="detailsAwardNum.affiliate.respondentSex">
+                  <el-radio :label="0">男</el-radio>
+                  <el-radio :label="1">女</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人出生年月日：" prop="affiliate.respondentBirth">
+                <el-date-picker  v-model="detailsAwardNum.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人申请人住所">
+                <el-input v-model="detailsAwardNum.affiliate.respondentHome" placeholder="请输入被申请人申请人住所" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="被申请人邮箱">
+                <el-input v-model="detailsAwardNum.affiliate.respondentEmail" placeholder="请输入被申请人邮箱" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-col :span="24">
+            <el-form-item v-for="item in detailsAwardNum.columnValueList" :label="item.name" :key="item.id">
+              <el-input type="textarea" v-model="item.value"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+         </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -51,6 +250,7 @@
   </div>
 </template>
 <script>
+import { getToken } from "@/utils/auth";
 export default {
     props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts","caseFilingData"],
   components: {
@@ -58,16 +258,25 @@ export default {
   },
   data() {
     return {
-     activeName: 'first',
+     activeName: 'five',
       fileURL: window.location.origin + "/API",
       noData: false,
+      filedata: {
+        annexType: 2,
+      },
+      fileList: [],
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
     };
   },
 watch: {
     showarchiveDetails: {
       handler(val) {
         if (val) {
-          this.activeName = 'first'
+          this.activeName = 'five'
+          // this.detailsAwardNum.affiliate.respondentSex = Number(this.detailsAwardNum.affiliate.respondentSex)
+          console.log(this.detailsAwardNum)
         }
       },
     },
@@ -86,6 +295,42 @@ watch: {
             }
         }
         return resNumber
+    },
+      /** 查看证据 */
+    fileDetil(val) {
+      window.open(this.fileURL + val);
+    },
+       /** 文件上传地址 */
+    UploadUrl() {
+      return window.location.origin + "/API/common/upload";
+    },
+        /**文件上传成功*/
+    handlSuccess(res, file) {
+      this.detailsAwardNum.caseAttachList.push({
+        annexId: res.annexId,
+      });
+    },
+        /**文件超出个数限制时的钩子*/
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length
+        } 个文件`
+      );
+    },
+    // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove(file, fileList) {
+      this.caseAttachListArr = this.caseAttachListArr.filter(
+        (item) => item.annexId != file.annexId
+      );
+    },
+    handlePreview(file) {
+      window.open(
+        window.location.origin + "/API" + file.certificatePath,
+        "_blank"
+      );
     },
     handleClick(tab, event) {
 

src/views/caseManagement/components/mediation.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24" v-if="mediationType">
           <el-form-item label="调解结果:">
-            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole" @change="resultsMediation">
+            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -118,9 +118,10 @@
         <el-button @click="cancel" class="endbutton1" round>
           <span>取 消</span>
         </el-button>
-        <el-button v-if="isSecretaryRole" @click="submitMediation" :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1'"
+        <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
-          class="endbutton1" type="primary" round>
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1"
-          <span>提 交</span>
+          type="primary" round>
+          提 交
         </el-button>
       </div>
     </el-dialog>
@@ -169,10 +170,13 @@ export default {
       fileList: [],
       attachList: [],
       isSecretaryRole: true,
+      loadingSubmit: false,
+      selectRoido:true
     };
   },
   watch: {
     mediationVisable(val) {
+      this.mediaResult = 1;
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
@@ -188,6 +192,11 @@ export default {
         });
         this.getUser(); 
       }
+    },
+    recordArrMediate(val){
+      if(val.length >= 1){
+        this.selectRoido = false;
+      }
     }
   },
   created() { },
@@ -252,7 +261,6 @@ export default {
       caseApplicationSelectById({
         id: this.mediationData.id
       }).then(res => {
-        console.log(res)
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
             this.recordArr.push(item);
@@ -275,7 +283,7 @@ export default {
           });
         });
       })
-      this.isSecretaryRole = false
+      // this.selectRoido = true;
     },
     /** 庭审笔录附件 */
     toFile2(annexPath) {
@@ -290,16 +298,19 @@ export default {
         this.$modal.msgSuccess("成功");
         this.$emit("cancelMediation");
         this.$emit("getList", this.queryParams);
+        this.loadingSubmit = false;
       });
     },
     cancel() {
       this.$emit("cancelMediation");
     },
 
-    submitMediation: _.debounce(function() {
+    submitMediation() {
       if (this.fileList.length < 1 && !this.mediationType && this.mediationData.mediationMethod == "2") {
         this.$modal.msgError("请上传调解书");
         return
+      } else {
+        this.loadingSubmit = true;
       }
       let mediationVal = {}
       if (this.codes == 200) {
@@ -318,7 +329,7 @@ export default {
         }
       }
       this.mediationFn(mediationVal);
-    },5000),
+    },
     resultsMediation() {
 
     }

src/views/caseManagement/components/payDialog.vue

@@ -57,8 +57,8 @@
       </div>
       <div class="payTitle">{{ payMain }}</div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="payCancel" class="endbutton" round><span>取 消</span></el-button>
+        <el-button @click="payCancel" round><span>取 消</span></el-button>
-        <el-button @click="submitUpload" class="endbutton" type="primary" round><span>确认缴费</span></el-button>
+        <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -88,7 +88,8 @@ export default {
         payType:1,
         payOrderList:[],
         caseId:null
-      }
+      },
+      payFlagSubmit:true
     };
   },
   methods: {
@@ -112,6 +113,7 @@ export default {
         annexId: res.annexId,
         annexName:res.annexName
       });
+      this.payFlagSubmit = false;
     },
     submitUpload() {
       if (this.fileList.length < 1) {
@@ -128,7 +130,7 @@ export default {
     handleRemove(file, fileList) {
       (this.submitForm.payOrderList = []),
       fileList.forEach((item) => {
-          this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
+          this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
         });
     },
     handlePreview(file) {

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.length > 0">
+        <el-form-item label="申请人缴费凭证：" v-if="form.caseAttachList">
           <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.length > 0">
+        <el-form-item label="被申请人缴费凭证：" v-if="form.resCaseAttachList">
           <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/respondentPay.vue

@@ -57,8 +57,8 @@
         </div>
         <div class="resPayTitle">{{ payMain }}</div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="payCancel" class="endbutton" round><span>取 消</span></el-button>
+          <el-button @click="payCancel" round><span>取 消</span></el-button>
-          <el-button @click="submitUpload" class="endbutton" type="primary" round><span>确认缴费</span></el-button>
+          <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
         </div>
       </el-dialog>
     </div>
@@ -88,7 +88,8 @@
           payType:1,
           payOrderList:[],
           caseId:null
-        }
+        },
+        payFlagSubmit:true
       };
     },
     methods: {
@@ -112,6 +113,7 @@
           annexId: res.annexId,
           annexName:res.annexName
         });
+        this.payFlagSubmit = false;
       },
       submitUpload() {
         if (this.fileList.length < 1) {
@@ -128,7 +130,7 @@
       handleRemove(file, fileList) {
         (this.submitForm.payOrderList = []),
         fileList.forEach((item) => {
-            this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
+            this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
           });
       },
       handlePreview(file) {

src/views/caseManagement/components/selectMediator.vue

@@ -47,8 +47,15 @@ export default {
     watch: {
         mediatorVisable(val) {
             if (val) {
-                listMediator().then(res=>{
+                listMediator({caseAppliId: this.mediatorData.id}).then(res=>{
                     this.tableData = res.data;
+                    this.tableData.forEach((item)=> {
+                        if (item.echoFlag) {
+                            this.$nextTick(()=>{
+                                this.$refs.multipleTable.toggleRowSelection(item, true);
+                            })
+                        }
+                    })
                 })
             }
         }
@@ -88,7 +95,6 @@ export default {
         },
         handleSelectionChange(val) {
             this.multipleSelection = val;
-            // console.log(this.multipleSelection,"LLLLLLLLLLLLLLLLL");
         }
     },
 };

src/views/caseprocessManagement/caseprocessManage.vue

@@ -33,6 +33,12 @@
             <el-table-column label="案件状态" align="center" prop="caseStatusName" :show-overflow-tooltip="true" />
             <el-table-column label="驳回节点" align="center" prop="backFlowName" :show-overflow-tooltip="true" />
             <el-table-column label="关联角色" align="center" prop="roleNames" :show-overflow-tooltip="true" />
+            <el-table-column label="节点图标" align="center" prop="nodeIcon" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <img v-if="scope.row.fileName" class="nodeIcon" :src="iconHead+scope.row.fileName"/>
+                    <span v-else>暂无图标</span>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" @click="moveDown(scope.row)" type="text" icon="el-icon-arrow-down"></el-button>
@@ -80,10 +86,14 @@ export default {
             dataList: [],
             addvisiable: false,//新增弹窗
             editData: {},
+            iconHead: process.env.VUE_APP_BASE_API
         };
     },
     created() {
-        this.getList(this.queryParams)
+        this.getList(this.queryParams);
+    },
+    computed: {
+        
     },
     methods: {
         // 删除
@@ -160,4 +170,9 @@ export default {
 };
 </script>
   
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.nodeIcon {
+    width: 20%;
+    height: 20%;
+}
+</style>

src/views/caseprocessManagement/components/addNodeprocess.vue

@@ -4,7 +4,7 @@
             <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
                 class="demo-ruleForm">
                 <el-form-item label="节点名称" prop="nodeName">
-                    <el-select v-model="ruleForm.nodeName" placeholder="请选择" @change="changenodeName">
+                    <el-select v-model="ruleForm.nodeName" placeholder="请选择">
                         <el-option v-for="dict in dict.type.case_flow_node" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
@@ -28,6 +28,20 @@
                 <el-form-item label="权限字符" prop="buttonAuthFlag">
                     <el-input v-model="ruleForm.buttonAuthFlag" placeholder="请输入"></el-input>
                 </el-form-item>
+                <el-form-item label="节点图标" prop="nodeIcon">
+                    <el-upload
+                      class="avatar-uploader"
+                      :action="uploadImgUrl"
+                      :show-file-list="false"
+                      :headers="headers"
+                      :data="filedata" 
+                      :on-success="handleAvatarSuccess"
+                      :before-upload="beforeAvatarUpload">
+                      <img v-if="imageUrl" :src="imgSvgUrl" class="avatar">
+                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      <div slot="tip" class="el-upload__tip">只能上传SVG图片</div>
+                    </el-upload>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
@@ -39,6 +53,7 @@
 <script>
 import { queryCaseFlowInfo, saveCaseFlow } from "@/api/caseprocessManagement/caseprocessManagement.js";
 import { listRole } from "@/api/system/role";
+import { getToken } from "@/utils/auth";
 export default {
     props: ["addvisiable", "editData", "queryParams"],
     dicts: ["case_flow_node"],
@@ -49,7 +64,9 @@ export default {
             backflowArr: [],//驳回节点
             roleArr: [],//关联角色
             isImg: false,
-            filedata: {},
+            filedata: {
+                annexType: 11,
+            },
             flagBtn: false,
             ruleForm: {},
             rules: {
@@ -67,24 +84,46 @@ export default {
                 ]
             },
             dealvalue: [],
+            imageUrl: '',
+            uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+            headers: {
+                Authorization: "Bearer " + getToken(),
+            },
+            fileName: '',
+            imgSvgUrl: ''
         };
     },
     watch: {
         addvisiable(val) {
             if (val) {
                 this.ruleForm = this.editData;
+                this.fileName = '',
                 this.getRoles();
-                this.getbackflowArr()
+                this.getbackflowArr();
+                if (this.ruleForm && this.ruleForm.fileName) {
+                    this.imgSvgUrl = process.env.VUE_APP_BASE_API + this.ruleForm.fileName;
+                    this.imageUrl = process.env.VUE_APP_BASE_API + this.ruleForm.fileName;
+                    this.fileName = this.ruleForm.fileName
+                } else {
+                    this.imgSvgUrl = ''
+                    this.imageUrl = ''
                 }
             }
         },
+        fileName: {
+            handler(val) {
+                if (val) {
+                    this.imgSvgUrl = this.imageUrl
+                }
+            },
+            deep: true
+        }
+
+    },
     created() {
 
     },
     methods: {
-        changenodeName(val) {
-            console.log(val, 'changeval');
-        },
         // 获取驳回节点数据
         getbackflowArr() {
             let queryParams2 = {
@@ -119,6 +158,19 @@ export default {
         cancel() {
             this.$emit("cancelAdd");
         },
+        // 图标上传
+        handleAvatarSuccess(res, file) {
+        this.fileName = ''
+            this.imageUrl = URL.createObjectURL(file.raw);
+            this.fileName = file.response.fileName
+        },
+        beforeAvatarUpload(file) {
+            const isSvg = file.type === 'image/svg+xml';
+            if (!isSvg) {
+            this.$message.error('上传图片只能是 SVG 格式!');
+            }
+            return isSvg;
+        },
         // 提交
         submitForm() {
             this.$refs['ruleForm'].validate((valid) => {
@@ -141,7 +193,8 @@ export default {
                             backFlowId: this.ruleForm.backFlowId,
                             roleIds: this.ruleForm.roleIds,
                             sort: this.ruleForm.sort,
-                            buttonAuthFlag: this.ruleForm.buttonAuthFlag
+                            buttonAuthFlag: this.ruleForm.buttonAuthFlag,
+                            fileName: this.fileName
                         }
                     } else {
                         let nodevalue = this.dict.type.case_flow_node;
@@ -158,7 +211,8 @@ export default {
                             caseStatusName: this.ruleForm.caseStatusName,
                             backFlowId: this.ruleForm.backFlowId,
                             roleIds: this.ruleForm.roleIds,
-                            buttonAuthFlag: this.ruleForm.buttonAuthFlag
+                            buttonAuthFlag: this.ruleForm.buttonAuthFlag,
+                            fileName: this.fileName
                         }
                     }
                     if (params.backFlowId == undefined) {
@@ -181,4 +235,31 @@ export default {
 ::v-deep .el-select {
     width: 100%;
 }
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+//   .avatar-uploader .el-upload:hover {
+//     border-color: #409EFF;
+//   }
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  .avatar-uploader-icon:hover {
+    border-color: #409EFF;
+  }
+  .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
 </style>

src/views/index.vue

@@ -1,27 +1,149 @@
 <template>
   <div class="app-container home">
-    调解系统
+    <div class="header">
+      <div class="iconTitle"></div>
+      <div class="headerMain">我的待办</div>
+    </div>
+    <div class="homeMain">
+      <div
+        class="cardList"
+        v-for="(item, index) in pendingTasks"
+        :key="index"
+        @click="pushPage(item.caseFlowId)"
+      >
+        <div class="badge">{{ item.caseCount }}</div>
+        <div class="cardMain">
+          <img class="iconImg" :src="iconHead + item.fileName" alt="" />
+        </div>
+        <div class="cardMain1">
+          <div class="imgTitle">{{ item.caseStatusName }}</div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import { todoCount } from "@/api/system/homepage.js";
 export default {
   name: "Index",
   data() {
     return {
       // 版本号
-      version: "3.8.6"
+      version: "3.8.6",
+      pendingTasks: [], //案件代办状态
+      iconHead: process.env.VUE_APP_BASE_API
     };
   },
+  watch: {
+    $route(val) {
+    if (val) {
+      this.gettodoCount();
+    }
+    }
+  },
+  created() {
+    this.gettodoCount();
+  },
   methods: {
     goTarget(href) {
       window.open(href, "_blank");
-    }
+    },
-  }
+    // 查询代办状态
+    gettodoCount() {
+      todoCount({}).then((res) => {
+        this.pendingTasks = res.data.toDoCountList;
+        console.log(res.data.toDoCountList, "this.pendingTasks");
+      });
+    },
+    // 点击待办按钮跳转
+    pushPage(status) {
+      this.$router.push({
+        path: "/caseManagement/caseManagement/caseList",
+        query: { caseFlowId: status + "" },
+      });
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
+.home {
+  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  color: #676a6c;
+  overflow-x: hidden;
+  background-color: #f1f1f1;
+  height: 100vh;
 
+  .header {
+    width: 100%;
+    height: 80px;
+    display: flex;
+    align-items: center;
+
+    .iconTitle {
+      width: 5px;
+      height: 25px;
+      background-color: #0f5c9b;
+      margin-right: 25px;
+    }
+
+    .headerMain {
+      font-size: 20px;
+    }
+  }
+
+  .homeMain {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+
+    .cardList {
+      width: 13%;
+      height: 200px;
+      border-radius: 30px;
+      background-color: #ffffff;
+      position: relative;
+      margin-right: 38px;
+      margin-bottom: 30px;
+      cursor: pointer;
+
+      .badge {
+        width: 50px;
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        font-size: 18px;
+        font-weight: 500;
+        color: red;
+        border-radius: 10px 30px 10px 30px;
+        background-color: #1296DB;
+        position: absolute;
+        right: 0;
+      }
+
+      .cardMain {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        margin-top: 40px;
+        .iconImg {
+          width: 100px;
+          height: 110px;
+        }
+      }
+      .cardMain1 {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        .imgTitle {
+          font-size: 15px;
+          font-weight: 900;
+        }
+      }
+    }
+  }
+}
 </style>
 

src/views/login.vue

@@ -67,7 +67,8 @@
     </div>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</span>
+      <div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
+      <div>Version：1.0.1</div>
     </div>
   </div>
 </template>
@@ -176,17 +177,17 @@ export default {
     width: 50%;
     height: 90%;
     .leftIcon {
-      height: 10%;
+      height: 20%;
       width: 100%;
-      margin: 5% 10% 1% 15%;
+      margin: 0% 10% 1% 15%;
       .Icon {
-        width: 45px;
+        width: 100px;
-        height: 45px;
+        height: 105px;
-        background-image: url("../assets/images/mediate.svg");
+        background-image: url("../assets/images/logos.png");
         background-size: cover;
       }
       div {
-        font-size: 17px;
+        font-size: 18px;
       }
     }
     .leftImage {
@@ -247,8 +248,8 @@ export default {
 }
 .el-login-footer {
   background-color: rgb(126, 131, 135);
-  height: 40px;
+  height: 55px;
-  line-height: 40px;
+  line-height: 55px;
   position: fixed;
   bottom: 0;
   width: 100%;
@@ -257,6 +258,9 @@ export default {
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;
+  div {
+    height: 30%;
+  }
 }
 .login-code-img {
   height: 38px;

src/views/register.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">智慧调解系统注册</h3>
       <el-form-item prop="userName">
-        <el-input v-model="registerForm.userName" type="text" auto-complete="off" placeholder="账号">
+        <el-input v-model="registerForm.userName" type="text" auto-complete="off" @blur="changeInput" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -19,11 +19,32 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="identityNo">
+      <el-form-item prop="nationality">
+        <el-select v-model="registerForm.nationality" 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 nationalityList" :key="item.id" :label="item.value" :value="item.id">
+
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <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>
+        </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="身份证号码">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
+      <el-form-item prop="identityNo" v-if="registerForm.idType === 1">
+        <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>
       <el-form-item prop="email">
         <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
@@ -77,14 +98,14 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-register-footer">
+    <!-- <div class="el-register-footer">
       <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
-import { getCodeImg, register, sendCode, wxregister } from "@/api/login";
+import { getCodeImg, register, sendCode, wxregister,verifyUserName } from "@/api/login";
 import { listRoleNotoken } from "@/api/system/role.js"
 export default {
   name: "Register",
@@ -107,11 +128,19 @@ export default {
         confirmPassword: "",
         code: "",
         uuid: "",
+        nationality:0,
+        idType:0
       },
       registerRules: {
-        username: [
+        userName: [
           { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' },
+          {
+            pattern:
+            /^[0-9a-zA-Z]*$/g,
+            message: '只能输入英文或者数字',
+            trigger: 'blur',
+          },
         ],
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" },
@@ -128,12 +157,12 @@ export default {
             message: '被申请人身份证号不能为空',
             trigger: 'blur',
           },
-          {
+          // {
-            pattern:
+          //   pattern:
-              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+          //     /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-            message: '请输入正确的身份证号码',
+          //   message: '请输入正确的身份证号码',
-            trigger: 'blur',
+          //   trigger: 'blur',
-          },
+          // },
         ],
         email: [
           { required: true, trigger: "blur", message: "请再次输入您的密码" },
@@ -165,10 +194,36 @@ export default {
         verifyCode: [
           { required: true, trigger: "blur", message: "请输入验证码" },
         ],
+        idType: [
+          { required: true, trigger: "blur", message: "请选择证件类型" },
+        ],
+        nationality: [
+          { required: true, trigger: "blur", message: "请选择国籍" },
+        ],
       },
       loading: false,
       captchaEnabled: true,
-      roleList: []
+      roleList: [],
+      nationalityList:[
+        {
+          value:'国内',
+          id:0
+        },
+        {
+          value:'国外',
+          id:1
+        }
+      ],
+      idTypeList:[
+      {
+          value:'身份证',
+          id:0
+        },
+        {
+          value:'护照',
+          id:1
+        }
+      ]
     };
   },
   created() {
@@ -176,11 +231,14 @@ export default {
     this.getListRole();
   },
   methods: {
+    changeInput(){
+      verifyUserName({userName:this.registerForm.userName})
+    },
     /**获取角色 */
     getListRole() {
       listRoleNotoken().then(res => {
-        console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPPPPP");
+        const roleList = res.data.filter((item) => item.roleName == '申请人' || item.roleName == '被申请人');
-        this.roleList = res.data;
+        this.roleList = roleList;
       })
     },
     getCode() {
@@ -197,8 +255,8 @@ export default {
         if (valid) {
           this.loading = true;
           wxregister(this.registerForm).then(res => {
-            const username = this.registerForm.username;
+            const userName = this.registerForm.userName;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+            this.$alert("<font color='red'>恭喜你，您的账号 " + userName + " 注册成功！</font>", '系统提示', {
               dangerouslyUseHTMLString: true,
               type: 'success'
             }).then(() => {
@@ -246,7 +304,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
+  //height: 100%;
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
@@ -261,7 +319,7 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  height: 90%;
+  height: 80%;
   padding: 25px 25px 5px 25px;
 
   // .el-input {

vue.config.js

@@ -11,11 +11,11 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-// const API = 'http://121.40.189.20:9001'  //生产
+// const API = 'http://121.40.189.20:7001'  //生产
 const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://172.16.0.237:6001' //Q
-// const API = 'http://172.16.1.43:6001' //w
+// const API = 'http://172.16.1.26:6001' //w
 
 // vue.config.js 配置说明 
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -41,6 +41,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy 
       [process.env.VUE_APP_BASE_API]: {
+        // target: `http://192.168.3.77:8080`,
+        // target: `http://121.40.189.20:9001`,
         target: API,
         changeOrigin: true,
         pathRewrite: {
@@ -59,7 +61,6 @@ module.exports = {
   },
   configureWebpack: {
     name: name,
-    devtool: '#eval-source-map',
     resolve: {
       alias: {
         '@': resolve('src')