Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into hcb

src/api/caseManagement/caseManagement.js

@@ -105,3 +105,29 @@ export function logistics(data) {
     params: data,
   })
 }
+// 申请人撤销修改
+export function revoke(data) {
+  return request({
+    url: "/caseApplicationLog/revoke",
+    method: "post",
+    data: data,
+  })
+}
+// 秘书审核修改
+export function updateAudit(data) {
+  return request({
+    url: "/caseApplicationLog/updateAudit",
+    method: "post",
+    data: data,
+  })
+}
+// 查询案件对比信息
+export function selectCompareCase(data) {
+  return request({
+    url: "/caseApplicationLog/selectCompareCase",
+    method: "post",
+    data: data,
+  })
+}
+
+

src/views/caseManagement/caseList.vue

@@ -89,9 +89,11 @@
           <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="viewProcess(scope.row)">查看流程</el-button>
           <!-- 案件日志 -->
           <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="caselogRow(scope.row)">案件日志</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="editRow(scope.row)" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.updateSubmitStatus !== 1) &&
             checkPermi(['caseManagement:list:update']) && btnStatus
             ">修改</el-button>
+          <!-- 撤销修改 -->
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="undoRow(scope.row,1)" v-if="(scope.row.updateSubmitStatus == 1 || scope.row.updateSubmitStatus == 3) && scope.row.caseStatus > 0 && checkPermi(['caseManagement:list:undo'])">撤销修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="scope.row.caseStatus == 0 &&
             checkPermi(['caseManagement:list:submit']) && btnStatus
             ">提交</el-button>
@@ -115,6 +117,10 @@
             v-hasPermi="['monitor:online:forceLogout']"
             >组庭</el-button
           > -->
+          <!-- 审核修改，秘书角色 -->
+          <el-button size="mini" type="text" icon="el-icon-s-check" @click="reviewCase(scope.row)" v-if="scope.row.updateSubmitStatus == 1 && checkPermi(['caseManagement:list:reviewCase'])">审核修改</el-button>
+          <!-- 审核撤销，秘书角色 -->
+          <el-button size="mini" type="text" icon="el-icon-s-check" @click="reviewRevocation(scope.row)" v-if="scope.row.updateSubmitStatus == 2 && checkPermi(['caseManagement:list:reviewRevocation'])">审核撤销</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-check" @click="courtconfirmationRow(scope.row)" v-if="scope.row.caseStatus == 6 &&
             checkPermi(['caseManagement:list:confirmgroup']) && btnStatus
             ">组庭确认</el-button>
@@ -133,7 +139,10 @@
             scope.row.arbitratMethod == 1 &&
             checkPermi(['caseManagement:list:hear']) && btnStatus
             ">开庭审理</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus < 8 &&
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus < 8 &&
+            checkPermi(['caseManagement:list:evidenceUpdate']) && btnStatus"
+            @click="evidenceUpload(scope.row)">证据修改</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-edit" v-if="(scope.row.caseStatus < 10 && scope.row.caseStatus != 2 && scope.row.caseStatus != 0) &&
             checkPermi(['caseManagement:list:evidenceUpdate']) && btnStatus"
             @click="evidenceUpload(scope.row)">证据修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31 && btnStatus"
@@ -144,8 +153,9 @@
           <el-button size="mini" type="text" icon="el-icon-unlock"
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1 && btnStatus"
             @click="ulockClick(scope.row)">解锁</el-button>
-          <el-button v-if="checkPermi(['caseManagement:list:listEvidence']) && scope.row.caseStatus <= 1 && btnStatus"
-            size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button>
+            <!-- 暂时隐藏后期可能会放其他地方 -->
+          <!-- <el-button v-if="checkPermi(['caseManagement:list:listEvidence']) && scope.row.caseStatus <= 1 && btnStatus"
+            size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button> -->
           <!-- <el-button
             size="mini"
             type="text"
@@ -217,6 +227,10 @@
     <uploadCaseDialog :uploadCaseVisable="uploadCaseVisable" @uploadCaseCancel="uploadCaseCancel"
       :uploadCaseData="uploadCaseData">
     </uploadCaseDialog>
+    <!-- 秘书审核修改页面 -->
+    <caseentryExamineDialog :dialogtitle="dialogtitle" :caseentryExamineVisible="caseentryExamineVisible" :queryParams="queryParams"
+    :getcaseApply="getcaseApply"
+    @caseentryExamineCancel="caseentryExamineCancel" :caseentryExamineData="caseentryExamineData" :caseentryExamineDataAll="caseentryExamineDataAll"></caseentryExamineDialog>
   </div>
 </template>
 
@@ -236,6 +250,8 @@ import evidenceDialog from './components/evidenceDialog.vue';
 import timeDialog from './components/timeDialog.vue';
 import operateDialog from './components/operateDialog.vue';
 import uploadCaseDialog from './components/uploadCaseDialog.vue';
+// 秘书审核页面
+import caseentryExamineDialog from './components/caseentryExamine.vue';
 import { caseApplicationDetail } from "@/api/pay/pay";
 import {
   caseApply,
@@ -248,6 +264,9 @@ import { listDept } from "@/api/system/dept";
 import {
   document,
   caseLogRecordList,
+  revoke,
+  selectCompareCase,
+  updateAudit
 } from "@/api/caseManagement/caseManagement";
 import { getDicts } from '@/api/system/dict/data.js';
 export default {
@@ -268,7 +287,8 @@ export default {
     evidenceDialog,
     timeDialog,
     operateDialog,
-    uploadCaseDialog
+    uploadCaseDialog,
+    caseentryExamineDialog
   },
   data() {
     return {
@@ -332,6 +352,9 @@ export default {
       operateTitle: "",
       operateStatus: 0,
       uploadCaseVisable: false,
+      caseentryExamineVisible: false,
+      caseentryExamineData: {},
+      caseentryExamineDataAll: {},
       uploadCaseData: {},
       selectCaseStatusList: [
         {
@@ -603,7 +626,7 @@ export default {
     },
     // 是否进行缴费
     payStatus(val) {
-      this.getDetail({ id: val.id });
+      this.getDetail({ id: val.id, version: val.version });
       this.payTitle = "缴费";
       this.openPay = true;
       this.payId = val.id;
@@ -629,6 +652,33 @@ export default {
     cancelcourtDialog() {
       this.showformateCourt = false;
     },
+    // 审核案件 selectCompareCase caseentryExamineData
+    reviewCase(row) {
+      this.caseentryExamineVisible = true;
+      this.dialogtitle = "审核修改详情";
+      this.getSelectCompareCase(row)
+    },
+    // 秘书审核修改页面 caseentryExamineVisible
+    caseentryExamineCancel() {
+      this.caseentryExamineVisible = false;
+    },
+    // 查询修改字段
+    getSelectCompareCase(val) {
+      let param = {
+        caseId:val.id,
+        version:val.version
+      }
+      selectCompareCase(param).then((res) => {
+        this.caseentryExamineData = res.data.afterCase
+        this.caseentryExamineDataAll = res.data.afterCase
+      })
+    },
+    // 审核撤销
+    reviewRevocation(row) {
+      this.caseentryExamineVisible = true;
+      this.dialogtitle = "审核撤销";
+      this.getSelectCompareCase(row)
+    },
     // 组庭确认
     courtconfirmationRow(row) {
       // console.log(row, "组庭确认");
@@ -696,8 +746,11 @@ export default {
     },
     // 查找主体信息数据
     getInfo(row) {
-      const id = row.id;
-      selectCaseApply({ id }).then((res) => {
+      let params = {
+        id: row.id,
+        version: row.version
+      }
+      selectCaseApply(params).then((res) => {
         // this.visible = true;
         // this.formData = res.data;
         this.form.caseName = res.data.caseName;
@@ -738,6 +791,31 @@ export default {
         })
         .catch(() => { });
     },
+    // 申请人撤销修改 revoke
+    undoRow(row) {
+      if (row.updateSubmitStatus == 1) {
+        this.$modal.confirm("是否确认撤销修改？").then(function () {
+          return revoke({ caseId: row.id, version: row.version });
+        }).then((res) => {
+          if (res.code == 200) {
+            this.getcaseApply(this.queryParams);
+            this.$modal.msgSuccess("撤销成功");
+          }      
+        })
+        .catch(() => { });
+      } else if (row.updateSubmitStatus == 3) {
+        this.$modal.confirm("是否确认撤销已审核的修改？").then(function () {
+          return revoke({ caseId: row.id, version: row.version });
+        }).then((res) => {
+          if (res.code == 200) {
+            this.getcaseApply(this.queryParams);
+            this.$modal.msgSuccess("撤销申请已提交，等待审核");
+          }
+        })
+        .catch(() => { });
+      }
+      
+    }
   },
 };
 </script>