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

src/views/awardManagement/listofAwards.vue

@@ -33,6 +33,10 @@
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(3)"
                     v-hasPermi="['caseManagement:list:check']">案件批量归档</el-button>
             </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(5)"
+                    v-hasPermi="['awardManagement: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">
@@ -203,6 +207,9 @@ export default {
             } else if (type == 3) {
                 this.operateTitle = '批量归档';
                 this.operateStatus = 3;
+            }else if (type == 5) {
+                this.operateTitle = '批量核查';
+                this.operateStatus = 5;
             }
         },
         updataList() {

src/views/caseManagement/caseList.vue

@@ -15,7 +15,8 @@
           clearable></el-cascader>
       </el-form-item>
       <el-form-item label="案件状态" prop="caseStatus">
-        <el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable @keyup.enter.native="handleQuery">
+        <el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
+          @keyup.enter.native="handleQuery">
           <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
             :value="dict.dictSort"></el-option>
         </el-select>
@@ -53,6 +54,8 @@
           v-hasPermi="['caseManagement:list:delete']">案件批量删除</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(2)"
           v-hasPermi="['caseManagement:list:check']">案件批量立案审查</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(4)"
+          v-hasPermi="['caseManagement:list:hear']">批量生成裁决书</el-button>
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
@@ -129,16 +132,18 @@
             checkPermi(['caseManagement:list:hear']) && btnStatus
             ">开庭审理</el-button>
           <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 == 31  && btnStatus"
+            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"
             @click="timeUpdata(scope.row)">开庭时间</el-button>
           <el-button size="mini" type="text" icon="el-icon-lock"
-            v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0 && btnStatus" 
+            v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 0 && btnStatus"
             @click="lockClick(scope.row)">锁定</el-button>
           <el-button size="mini" type="text" icon="el-icon-unlock"
-            v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1  && btnStatus" 
+            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"
@@ -199,14 +204,16 @@
     </evidenceDialog>
 
     <!-- 开庭时间修改 -->
-    <timeDialog :timeVisable="timeVisable" @getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData" :queryParams="queryParams">
+    <timeDialog :timeVisable="timeVisable" @getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData"
+      :queryParams="queryParams">
     </timeDialog>
     <!-- 批量操作弹窗 -->
     <operateDialog :queryParams="queryParams" :operateStatus="operateStatus" :operateVisable="operateVisable"
       @getcaseApply="getcaseApply" :operateTitle="operateTitle" @cancelOperate="cancelOperate" :operateData="operateData">
     </operateDialog>
     <!-- 上传证据目录弹窗 -->
-    <uploadCaseDialog :uploadCaseVisable="uploadCaseVisable" @uploadCaseCancel="uploadCaseCancel" :uploadCaseData="uploadCaseData">
+    <uploadCaseDialog :uploadCaseVisable="uploadCaseVisable" @uploadCaseCancel="uploadCaseCancel"
+      :uploadCaseData="uploadCaseData">
     </uploadCaseDialog>
   </div>
 </template>
@@ -322,20 +329,20 @@ export default {
       operateData: {},
       operateTitle: "",
       operateStatus: 0,
-      uploadCaseVisable:false,
-      uploadCaseData:{},
-      selectCaseStatusList:[
+      uploadCaseVisable: false,
+      uploadCaseData: {},
+      selectCaseStatusList: [
         {
-          label:"待办案件",
-          value:0
+          label: "待办案件",
+          value: 0
         },
         {
-          label:"已办案件",
-          value:1
+          label: "已办案件",
+          value: 1
         }
       ],
-      caseStatusType:false,
-      btnStatus:true,
+      caseStatusType: false,
+      btnStatus: true,
     };
   },
   created() {
@@ -363,11 +370,11 @@ export default {
     cancelOperate() {
       this.operateVisable = false;
     },
-    uploadCaseCancel(){
+    uploadCaseCancel() {
       this.uploadCaseVisable = false;
     },
     // 上传证据目录弹窗
-    uploadCase(row){
+    uploadCase(row) {
       this.uploadCaseData = row;
       this.uploadCaseVisable = true;
     },
@@ -383,6 +390,9 @@ export default {
       } else if (type == 2) {
         this.operateTitle = '批量立案审查';
         this.operateStatus = 2;
+      }else if(type == 4){
+        this.operateTitle = '批量生成裁决书';
+        this.operateStatus = 4;
       }
     },
     // 修改开庭时间
@@ -458,13 +468,13 @@ export default {
     handleQuery() {
       this.queryParams.caseStatusList = [];
       if (!this.queryParams.caseStatus) {
-        this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10,31]
+        this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10, 31]
       }
-      if(this.queryParams.selectCaseStatus == 1){
+      if (this.queryParams.selectCaseStatus == 1) {
         this.queryParams.caseStatus = null;
         this.caseStatusType = true;
         this.btnStatus = false;
-      }else if(this.queryParams.selectCaseStatus == 0){
+      } else if (this.queryParams.selectCaseStatus == 0) {
         this.caseStatusType = false;
         this.btnStatus = true;
       }
@@ -474,7 +484,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10,31]),
+      (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10, 31]),
         (this.queryParams.applicantName = ""),
         (this.queryParams.nameId = ""),
         this.getcaseApply(this.queryParams);
@@ -727,6 +737,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-#formContainer {}
-</style>
+<style lang="scss" scoped>#formContainer {}</style>

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -329,7 +329,7 @@ export default {
       this.$refs["form2"].validate((valid) => {
         if (valid) {
           writtenHear({
-            caseAppliId: this.formData.id,
+            ids: [this.formData.id],
             evidenDetermi: this.form2.evidenDetermi,
             factDetermi: this.form2.factDetermi,
             caseSketch: this.form2.caseSketch,

src/views/caseManagement/components/formateCourtDialog.vue

@@ -102,8 +102,9 @@ export default {
     this.getarbitrAtor();
   },
   watch: {
-    showformateCourt(val) {
-      if (val) {
+    showformateCourt(val){
+      this.Arbitor = ""
+      if(val){
         this.isAgreePendTral = 1;
       }
     },

src/views/caseManagement/components/operateDialog.vue

@@ -47,6 +47,7 @@ import {
     removeCaseApply,
     submitCaseApplicationCheck
 } from "@/api/caseAccess/caseEntry";
+import { writtenHear } from "@/api/caseManagement/caseManagement.js";
 import {
     adjudicationCaseFile,
 } from "@/api/awardManagement/awardManagement";
@@ -102,6 +103,12 @@ export default {
                 this.submitCaseApplicationCheckFn({ ids: this.batchData,agreeOrNotCheck:this.radio })
             }else if (this.operateStatus == 3) {
                 this.adjudicationCaseFileFn({ ids: this.batchData })
+            }else if (this.operateStatus == 4) {
+                // this.adjudicationCaseFileFn({ ids: this.batchData })
+                this.writtenHearFn({ids: this.batchData})
+            }else if (this.operateStatus == 5) {
+                // this.adjudicationCaseFileFn({ ids: this.batchData })
+                // this.writtenHearFn({ids: this.batchData})
             }
         },
         // 批量提交
@@ -136,6 +143,14 @@ export default {
                 this.$emit("getcaseApply", this.queryParams);
             })
         },
+        // 批量生成裁决书
+        writtenHearFn(data){
+            writtenHear(data).then(res=>{
+                this.$modal.msgSuccess("生成成功");
+                this.cancel();
+                this.$emit("getcaseApply", this.queryParams);
+            })
+        },
         /** 查询列表 */
         getcaseApply(val) {
             this.loading = true;
@@ -147,6 +162,10 @@ export default {
                 this.queryParamsData.caseStatus = 1
             }else if (this.operateStatus == 3) {
                 this.queryParamsData.caseStatus = 16
+            }else if (this.operateStatus == 4) {
+                this.queryParamsData.caseStatus = 9
+            }else if (this.operateStatus == 5) {
+                this.queryParamsData.caseStatus = 11
             }
             caseApply(val).then((response) => {
                 this.dataList = response.rows;

vue.config.js

@@ -11,11 +11,12 @@ 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:9001'  //生产
+// const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:9001' //Q
 
-// vue.config.js 配置说明
+// vue.config.js 配置说明 
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 module.exports = {