Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/api/caseAccess/caseEntry.js

@@ -49,7 +49,14 @@ export function submitCaseApply(data) {
     data: data
   })
 }
-
+// 立案审查
+export function submitCaseApplicationCheck(data) {
+  return request({
+    url: "/caseApplication/submitCaseApplicationCheck",
+    method: "post",
+    data: data,
+  });
+}
 // 下载模板
 export function importTemplate(data) {
   return request({
@@ -58,3 +65,11 @@ export function importTemplate(data) {
     data: data
   })
 }
+// 更新案件锁定状态
+export function updateCaseLockStatus(data) {
+  return request({
+    url: "/caseApplication/updateCaseLockStatus",
+    method: "post",
+    data: data,
+  });
+}

src/views/awardManagement/listofAwards.vue

@@ -21,6 +21,12 @@
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(3)"
+                    v-hasPermi="['caseManagement:list:check']">案件批量归档</el-button>
+            </el-col>
+        </el-row>
         <el-table v-loading="loading" :data="dataList" style="width: 100%">
             <el-table-column label="序号" type="index" align="center">
                 <template slot-scope="scope">
@@ -81,6 +87,11 @@
         <!-- 快递信息页面 -->
         <expressDeliveryDialog :showDelivery="showDelivery" :deliveryDataArr="deliveryDataArr"
             @closeDeliveryModel="closeDeliveryModel" :flagLoading="flagLoading"></expressDeliveryDialog>
+        <!-- 批量操作弹窗 -->
+        <operateDialog :queryParams="queryParams" :operateStatus="operateStatus" :operateVisable="operateVisable"
+            @getcaseApply="getList" :operateTitle="operateTitle" @cancelOperate="cancelOperate"
+            :operateData="operateData">
+        </operateDialog>
     </div>
 </template>
   
@@ -98,11 +109,12 @@ import {
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
 import expressDeliveryDialog from './components/expressDeliveryDialog.vue';
+import operateDialog from '@/views/caseManagement/components/operateDialog.vue'
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { paymentdetailsDialog, mailawardDialog, expressDeliveryDialog },
+    components: { paymentdetailsDialog, mailawardDialog, expressDeliveryDialog,operateDialog },
     data() {
         return {
             queryParams: {
@@ -136,6 +148,10 @@ export default {
             showDelivery: false, //快递信息弹框
             deliveryDataArr: [],//快递信息数据
             flagLoading: true,
+            operateVisable: false,
+            operateData:{},
+            operateStatus:0,
+            operateTitle:""
         };
     },
     created() {
@@ -152,6 +168,25 @@ export default {
         // this.queryParams.caseStatusList = [10, 11, 12, 13, 14, 15, 16]
     },
     methods: {
+        cancelOperate() {
+            this.operateVisable = false;
+        },
+        operateClick(type) {
+            this.operateVisable = true;
+            if (type == 0) {
+                this.operateTitle = '批量提交';
+                this.operateStatus = 0;
+            } else if (type == 1) {
+                this.operateTitle = '批量删除';
+                this.operateStatus = 1;
+            } else if (type == 2) {
+                this.operateTitle = '批量立案申请';
+                this.operateStatus = 2;
+            } else if (type == 3) {
+                this.operateTitle = '批量归档';
+                this.operateStatus = 3;
+            }
+        },
         updataList() {
             this.getList(this.queryParams);
         },

src/views/caseManagement/caseList.vue

@@ -126,10 +126,13 @@
             checkPermi(['caseManagement:list:evidenceUpdate'])" @click="evidenceUpload(scope.row)">证据修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 31"
             @click="timeUpdata(scope.row)">开庭时间</el-button>
-          <el-button size="mini" type="text" icon="el-icon-lock" v-if="checkPermi(['caseManagement:list:lock'])"
+          <el-button size="mini" type="text" icon="el-icon-lock"
+            v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0"
             @click="lockClick(scope.row)">锁定</el-button>
-          <el-button size="mini" type="text" icon="el-icon-unlock" v-if="checkPermi(['caseManagement:list:lock'])"
+          <el-button size="mini" type="text" icon="el-icon-unlock"
+            v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1"
             @click="ulockClick(scope.row)">解锁</el-button>
+          <el-button size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button>
           <!-- <el-button
             size="mini"
             type="text"
@@ -188,12 +191,17 @@
     <!-- 证据修改 -->
     <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
     </evidenceDialog>
+
     <!-- 开庭时间修改 -->
-    <timeDialog :timeVisable="timeVisable" :getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData">
+    <timeDialog :timeVisable="timeVisable" @getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData">
     </timeDialog>
     <!-- 批量操作弹窗 -->
-    <operateDialog :operateVisable="operateVisable" :getcaseApply="getcaseApply" :operateTitle="operateTitle" @cancelOperate="cancelOperate" :operateData="operateData">
+    <operateDialog :queryParams="queryParams" :operateStatus="operateStatus" :operateVisable="operateVisable"
+      @getcaseApply="getcaseApply" :operateTitle="operateTitle" @cancelOperate="cancelOperate" :operateData="operateData">
     </operateDialog>
+    <!-- 上传证据目录弹窗 -->
+    <uploadCaseDialog :uploadCaseVisable="uploadCaseVisable" @uploadCaseCancel="uploadCaseCancel" :uploadCaseData="uploadCaseData">
+    </uploadCaseDialog>
   </div>
 </template>
 
@@ -209,22 +217,24 @@ import payDialog from "./components/payDialog.vue";
 import filingreviewDialog from "./components/filingreviewDialog.vue";
 import caselogDialog from "./components/caselogDialog.vue";
 import viewprocessDialog from "./components/viewprocessDialog.vue";
-import evidenceDialog from './components/evidenceDialog.vue'
+import evidenceDialog from './components/evidenceDialog.vue';
-import timeDialog from './components/timeDialog.vue'
+import timeDialog from './components/timeDialog.vue';
-import operateDialog from './components/operateDialog.vue'
+import operateDialog from './components/operateDialog.vue';
+import uploadCaseDialog from './components/uploadCaseDialog.vue';
 import { caseApplicationDetail } from "@/api/pay/pay";
 import {
   caseApply,
   removeCaseApply,
   submitCaseApply,
   selectCaseApply,
+  updateCaseLockStatus
 } from "@/api/caseAccess/caseEntry";
 import { listDept } from "@/api/system/dept";
 import {
   document,
   caseLogRecordList,
 } from "@/api/caseManagement/caseManagement";
-import { getDicts } from '@/api/system/dict/data.js'
+import { getDicts } from '@/api/system/dict/data.js';
 export default {
   name: "caseList",
   // dicts: ["case_status"],
@@ -242,7 +252,8 @@ export default {
     viewprocessDialog,
     evidenceDialog,
     timeDialog,
-    operateDialog
+    operateDialog,
+    uploadCaseDialog
   },
   data() {
     return {
@@ -303,14 +314,17 @@ export default {
       timeData: {},
       operateVisable: false,
       operateData: {},
-      operateTitle:""
+      operateTitle: "",
+      operateStatus: 0,
+      uploadCaseVisable:false,
+      uploadCaseData:{}
     };
   },
   created() {
     getDicts("case_status").then(res => {
       this.caseStatus = res.data;
       let params = this.$route.params.status;
-      if (params) {
+      if (params >= 0) {
         this.queryParams.caseStatus = params;
       }
       this.getcaseApply(this.queryParams);
@@ -331,15 +345,26 @@ export default {
     cancelOperate() {
       this.operateVisable = false;
     },
+    uploadCaseCancel(){
+      this.uploadCaseVisable = false;
+    },
+    // 上传证据目录弹窗
+    uploadCase(row){
+      this.uploadCaseData = row;
+      this.uploadCaseVisable = true;
+    },
     // 批量操作弹窗
     operateClick(type) {
       this.operateVisable = true;
       if (type == 0) {
-        this.operateTitle = '批量提交'
+        this.operateTitle = '批量提交';
+        this.operateStatus = 0;
       } else if (type == 1) {
-        this.operateTitle = '批量删除'
+        this.operateTitle = '批量删除';
+        this.operateStatus = 1;
       } else if (type == 2) {
-        this.operateTitle = '批量立案申请'
+        this.operateTitle = '批量立案申请';
+        this.operateStatus = 2;
       }
     },
     // 修改开庭时间
@@ -347,15 +372,16 @@ export default {
       this.timeData = row;
       this.timeVisable = true;
     },
+
     // 锁定案件
     lockClick(row) {
       this.$modal
         .confirm("是否锁定案件")
         .then(function () {
-          // return removeCaseApply({ id: row.id });
+          return updateCaseLockStatus({ id: row.id, lockStatus: 1 });
         })
         .then((res) => {
-          // this.getcaseApply(this.queryParams);
+          this.getcaseApply(this.queryParams);
           this.$modal.msgSuccess("锁定成功");
         })
         .catch(() => { });
@@ -363,12 +389,12 @@ export default {
     // 解锁案件
     ulockClick(row) {
       this.$modal
-        .confirm("是否解锁锁案件")
+        .confirm("是否解锁案件")
         .then(function () {
-          // return removeCaseApply({ id: row.id });
+          return updateCaseLockStatus({ id: row.id, lockStatus: 0 });
         })
         .then((res) => {
-          // this.getcaseApply(this.queryParams);
+          this.getcaseApply(this.queryParams);
           this.$modal.msgSuccess("解锁成功");
         })
         .catch(() => { });

src/views/caseManagement/components/caseentryDialog.vue

@@ -874,6 +874,9 @@ export default {
                     ...this.form3.paymentArr1,
                   ];
                   this.formData.caseAttachList = [...this.caseAttachListArr];
+                  this.formData.caseAffiliates[1].responBirth = moment(this.formData.caseAffiliates[1].responBirth).format(
+                    "YYYY-MM-DD HH:mm:ss"
+                  );
                   if (this.formData.id) {
                     editCaseApply({
                       ...this.formData,

src/views/caseManagement/components/choosetrialmethodDaiog.vue

@@ -56,12 +56,11 @@ export default {
     submitForm(val) {
       let paramsdata = {
         opinion: val,
-        ids: [this.choosetrialmethodata.id]
       };
-      // let id = {
+      let id = {
-      //   id: this.choosetrialmethodata.id,
+        id: this.choosetrialmethodata.id,
-      // };
+      };
-      arbitrateMethod(paramsdata)
+      arbitrateMethod(paramsdata,id)
         .then((res) => {
           this.$modal.msgSuccess("提交成功");
           this.cancel();

src/views/caseManagement/components/operateDialog.vue

@@ -1,13 +1,13 @@
 <template>
     <div>
         <el-dialog :title="operateTitle" :visible="operateVisable" @close="cancel" center :distroy-on-close="true">
-            <el-table v-loading="loading" :data="dataList" style="width: 100%">
+            <el-table v-loading="loading" :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
                 <el-table-column type="selection">
                 </el-table-column>
                 <el-table-column label="序号" type="index" align="center">
                     <template slot-scope="scope">
                         <span>{{
-                            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+                            (queryParamsData.pageNum - 1) * queryParamsData.pageSize + scope.$index + 1
                         }}</span>
                     </template>
                 </el-table-column>
@@ -25,17 +25,33 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            <div class="radiobox" v-if="operateStatus == 2">
-                :limit.sync="queryParams.pageSize" @pagination="getcaseApply(queryParams)" />
+                <el-radio-group v-model="radio">
+                    <el-radio :label="1">同意</el-radio>
+                    <el-radio :label="2">拒绝</el-radio>
+                </el-radio-group>
+            </div>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParamsData.pageNum"
+                :limit.sync="queryParamsData.pageSize" @pagination="getcaseApply(queryParamsData)" />
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+                <el-button @click="submitBatch" type="primary" class="endbutton" :disabled="dataList.length == 0"><span>确 认</span></el-button>
+            </div>
         </el-dialog>
     </div>
 </template>
 <script>
 import {
     caseApply,
+    submitCaseApply,
+    removeCaseApply,
+    submitCaseApplicationCheck
 } from "@/api/caseAccess/caseEntry";
+import {
+    adjudicationCaseFile,
+} from "@/api/awardManagement/awardManagement";
 export default {
-    props: ["operateVisable", "operateData", "operateTitle"],
+    props: ["operateVisable", "operateData", "operateTitle", 'operateStatus','queryParams'],
     data() {
         return {
             // 遮罩层
@@ -43,19 +59,21 @@ export default {
             // 总条数
             total: 0,
             // 查询参数
-            queryParams: {
+            queryParamsData: {
                 caseStatus: null,
                 pageNum: 1,
                 pageSize: 10,
             },
             // 表格数据
             dataList: [],
+            batchData: [],
+            radio:1
         };
     },
     watch: {
         operateVisable(val) {
             if (val) {
-                this.getcaseApply()
+                this.getcaseApply(this.queryParamsData)
             }
         }
     },
@@ -63,12 +81,72 @@ export default {
 
     },
     methods: {
+        // 选择勾选框
+        handleSelectionChange(val) {
+            this.batchData = [];
+            val.forEach(item => {
+                this.batchData.push(item.id)
+            })
+        },
         cancel() {
             this.$emit("cancelOperate");
         },
+        // 批量操作
+        submitBatch() {
+            if (this.operateStatus == 0) {
+                this.submitCaseApplyFn({ ids: this.batchData })
+            } else if (this.operateStatus == 1) {
+                this.removeCaseApplyFn({ ids: this.batchData })
+            } else if (this.operateStatus == 2) {
+                this.submitCaseApplicationCheckFn({ ids: this.batchData,agreeOrNotCheck:this.radio })
+            }else if (this.operateStatus == 3) {
+                this.adjudicationCaseFileFn({ ids: this.batchData })
+            }
+        },
+        // 批量提交
+        submitCaseApplyFn(data) {
+            submitCaseApply(data).then(res => {
+                this.$modal.msgSuccess("提交成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
+        // 批量删除
+        removeCaseApplyFn(data) {
+            removeCaseApply(data).then(res => {
+                this.$modal.msgSuccess("删除成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
+        // 批量立案审查
+        submitCaseApplicationCheckFn(data){
+            submitCaseApplicationCheck(data).then(res=>{
+                this.$modal.msgSuccess("立案审查成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
+        //批量归档
+        adjudicationCaseFileFn(data){
+            adjudicationCaseFile(data).then(res=>{
+                this.$modal.msgSuccess("归档成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
         /** 查询列表 */
         getcaseApply(val) {
             this.loading = true;
+            if (this.operateStatus == 0) {
+                this.queryParamsData.caseStatus = 0
+            } else if (this.operateStatus == 1) {
+                this.queryParamsData.caseStatus = 0
+            } else if (this.operateStatus == 2) {
+                this.queryParamsData.caseStatus = 1
+            }else if (this.operateStatus == 3) {
+                this.queryParamsData.caseStatus = 16
+            }
             caseApply(val).then((response) => {
                 this.dataList = response.rows;
                 this.total = response.total;
@@ -84,4 +162,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
 }
+.radiobox{
+    margin-top: 30px;
+}
 </style>

src/views/caseManagement/components/uploadCaseDialog.vue

@@ -0,0 +1,103 @@
+<template>
+    <div>
+        <el-dialog title="上传证据目录" :visible="uploadCaseVisable" @close="cancel" center :distroy-on-close="true">
+            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
+                :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+            </el-upload>
+            <div class="title">证据目录结构</div>
+            <el-tree :data="data" @node-click="handleNodeClick"></el-tree>
+        </el-dialog>
+    </div>
+</template>
+<!-- hearDate -->
+<script>
+// import { updateHeardate } from '@/api/caseManagement/caseManagement'
+export default {
+    props: ["uploadCaseVisable", "uploadCaseData"],
+    data() {
+        return {
+            fileList: [],
+            data: [{
+                label: '寓件编号_中请人名称 / 中请人',
+                children: [
+                    {
+                        label: '1_货款申调表pdf',
+                    },
+                    {
+                        label: '2_款白同pdf',
+                    },
+                    {
+                        label: '3_抵押证明材林pdt',
+                    },
+                    {
+                        label: '5.贷款利期罚息计算表pdf',
+                    },
+                    {
+                        label: '6.数字签名验证报告.pdl',
+                    },
+                    {
+                        label: '7_律师费明妞报售.pdt',
+                    },
+                ]
+            },
+            {
+                label: '寓件编号_中请人名称 / 中请人',
+                children: [
+                    {
+                        label: '1_货款申调表pdf',
+                    },
+                    {
+                        label: '2_款白同pdf',
+                    },
+                    {
+                        label: '3_抵押证明材林pdt',
+                    },
+                    {
+                        label: '5.贷款利期罚息计算表pdf',
+                    },
+                    {
+                        label: '6.数字签名验证报告.pdl',
+                    },
+                    {
+                        label: '7_律师费明妞报售.pdt',
+                    },
+                ]
+            }],
+        };
+    },
+    watch: {
+
+    },
+    created() {
+
+    },
+    methods: {
+        cancel() {
+            this.$emit("uploadCaseCancel");
+        },
+        submitUpload() {
+            this.$refs.upload.submit();
+        },
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePreview(file) {
+            console.log(file);
+        },
+        handleNodeClick(data) {
+            console.log(data);
+        }
+    },
+};
+</script>
+  
+<style lang="scss" scoped>
+.title {
+    margin-top: 30px;
+    margin-bottom: 30px;
+    font-size: 18px;
+    font-weight: 600;
+}
+</style>

src/views/index.vue

@@ -41,7 +41,7 @@
           <div class="imgTitle">待缴费确认</div>
         </div>
       </div>
-      <div class="cardList" v-hasPermi="['home:caseApplyEvidence']" @click="pushPage(4)">
+      <!-- <div class="cardList" v-hasPermi="['home:caseApplyEvidence']" @click="pushPage(4)">
         <div class="badge">{{ dataCount.caseApplyEvidence }}</div>
         <div class="cardMain">
           <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
@@ -49,7 +49,7 @@
         <div class="cardMain">
           <div class="imgTitle">待案件质证</div>
         </div>
-      </div>
+      </div> -->
       <div class="cardList" v-hasPermi="['home:caseApplyGroupCheck']" @click="pushPage(5)">
         <div class="badge">{{ dataCount.caseApplyGroupCheck }}</div>
         <div class="cardMain">
@@ -77,6 +77,15 @@
           <div class="imgTitle">待审核仲裁方式</div>
         </div>
       </div>
+      <div class="cardList" v-hasPermi="['home:caseApplyArbitrateWay']" @click="pushPage(31)">
+        <div class="badge">{{ dataCount.updateOnlineHearDate }}</div>
+        <div class="cardMain">
+          <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
+        </div>
+        <div class="cardMain">
+          <div class="imgTitle">待确认开庭时间</div>
+        </div>
+      </div>
       <div class="cardList" v-hasPermi="['home:caseApplyGroupOnline']" @click="pushPage(8)">
         <div class="badge">{{ dataCount.caseApplyGroupOnline }}</div>
         <div class="cardMain">
@@ -175,10 +184,12 @@ export default {
     },
     // 点击代办案件按钮
     pushPage(status) {
-      if (status < 10) {
+      if (status == 0 || status == 1 || status == 2 || status == 5 || status == 6 || status == 7 || status == 31 || status == 8 || status == 9) {
         this.$router.push({ name: 'CaseManagement/caseList', params: { status: status } })
-      } else if (status > 10) {
+      } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16) {
         this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status } })
+      } else if (status == 3){
+        this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status } })
       }
     }
     // goTarget(href) {

src/views/paymentManagement/paymentList.vue

@@ -23,10 +23,10 @@
           @keyup.enter.native="handleQuery"
         >
           <el-option
-            v-for="dict in dict.type.case_status"
+            v-for="dict in caseStatus"
-            :key="dict.value"
+            :key="dict.dictSort"
-            :label="dict.label"
+            :label="dict.dictLabel"
-            :value="dict.value"
+            :value="dict.dictSort"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -136,10 +136,10 @@ import {
   casePay,
 } from "@/api/pay/pay";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
-
+import { getDicts } from '@/api/system/dict/data.js'
 export default {
   name: "paymentList",
-  dicts: ["case_status"],
+  // dicts: ["case_status"],
   components: { paymentdetailsDialog },
   data() {
     return {
@@ -180,10 +180,18 @@ export default {
       detailform: {}, //缴费详情数据
       openDialog: false, //缴费详情数据弹框
       flag: null,
+      caseStatus:[]
     };
   },
   created() {
+    getDicts("case_status").then(res => {
+      this.caseStatus = res.data;
+      let params = this.$route.params.status;
+      if (params >= 0) {
+        this.queryParams.caseStatus = params;
+      }
       this.getList();
+    })
   },
   methods: {
     /** 搜索按钮操作 */