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

src/views/caseManagement/caseList.vue

@@ -143,6 +143,7 @@
             type="text"
             icon="el-icon-edit"
             @click="editRow(scope.row)"
+            v-if="scope.row.caseStatus == 0"
             v-hasPermi="['monitor:online:forceLogout']"
             >修改</el-button
           >
@@ -151,6 +152,7 @@
             type="text"
             icon="el-icon-delete"
             @click="deleteRow(scope.row)"
+            v-if="scope.row.caseStatus == 0"
             v-hasPermi="['monitor:online:forceLogout']"
             >删除</el-button
           >
@@ -159,6 +161,7 @@
             type="text"
             icon="el-icon-zoom-in"
             @click="filingreviewRow(scope.row)"
+            v-if="scope.row.caseStatus == 1"
             v-hasPermi="['monitor:online:forceLogout']"
             >立案审查</el-button
           >
@@ -167,6 +170,7 @@
             type="text"
             icon="el-icon-tickets"
             @click="viewpaymentRow(scope.row)"
+            v-if="scope.row.caseStatus == 2"
             v-hasPermi="['monitor:online:forceLogout']"
             >查看缴费</el-button
           >
@@ -183,6 +187,7 @@
             type="text"
             icon="el-icon-s-check"
             @click="courtconfirmationRow(scope.row)"
+            v-if="scope.row.caseStatus == 6"
             v-hasPermi="['monitor:online:forceLogout']"
             >组庭确认</el-button
           >
@@ -191,6 +196,7 @@
             type="text"
             icon="el-icon-check"
             @click="courtreviewRow(scope.row)"
+            v-if="scope.row.caseStatus == 5"
             v-hasPermi="['monitor:online:forceLogout']"
             >组庭审核</el-button
           >
@@ -199,6 +205,7 @@
             type="text"
             icon="el-icon-sort"
             @click="choosetrialmethodRow(scope.row)"
+            v-if="scope.row.caseStatus == 7"
             v-hasPermi="['monitor:online:forceLogout']"
             >选择开庭方式</el-button
           >
@@ -207,6 +214,7 @@
             type="text"
             icon="el-icon-edit-outline"
             @click="adjudicaterecordRow(scope.row)"
+            v-if="scope.row.caseStatus == 9"
             v-hasPermi="['monitor:online:forceLogout']"
             >书面审理</el-button
           >
@@ -215,6 +223,7 @@
             type="text"
             icon="el-icon-service"
             @click="trialcourtRow(scope.row)"
+            v-if="scope.row.caseStatus == 8"
             v-hasPermi="['monitor:online:forceLogout']"
             >开庭审理</el-button
           >
@@ -223,6 +232,7 @@
             type="text"
             icon="el-icon-document"
             @click="generateawardRow(scope.row)"
+            v-if="scope.row.caseStatus == 10"
             v-hasPermi="['monitor:online:forceLogout']"
             >生成裁决书</el-button
           >
@@ -231,6 +241,7 @@
             type="text"
             icon="el-icon-receiving"
             @click="fileRow(scope.row)"
+            v-if="scope.row.caseStatus == 16"
             v-hasPermi="['monitor:online:forceLogout']"
             >归档</el-button
           >
@@ -285,6 +296,7 @@
     <adjudicaterecordDialog
       :showadjudicaterecord="showadjudicaterecord"
       :form="form"
+      :adjudicatename="adjudicatename"
       @canceladjudicaterecord="canceladjudicaterecord"
       @getcaseApply="getcaseApply"
     ></adjudicaterecordDialog>
@@ -356,6 +368,7 @@ export default {
       showchoosetrialmethod: false, //选择仲裁方式页面
       choosetrialmethodata:{},
       showadjudicaterecord: false, //书面审理弹框
+      adjudicatename: {},//书面仲裁（被）申请人姓名
       showtrialincourt: false, //开庭审理
     };
   },
@@ -524,7 +537,7 @@ export default {
       // console.log(row, "书面审理");
       this.showadjudicaterecord = true;
       this.form = row;
-      // this.getInfo(row)
+      this.getInfo(row)
     },
     canceladjudicaterecord() {
       this.showadjudicaterecord = false;
@@ -549,8 +562,15 @@ export default {
     getInfo(row) {
       const id = row.id;
       selectCaseApply({ id }).then((res) => {
-        this.visible = true;
+        console.log(res,'nnnnnnnnnnnn');
-        this.formData = res.data;
+        // this.visible = true;
+        // this.formData = res.data;
+        this.adjudicatename = {
+          applicantName: res.data.applicantName,
+          respondentName: res.data.respondentName,
+          feePayable: res.data.feePayable,
+          hearDate: res.data.hearDate
+        }
         this.initpaymentArr = [];
         this.initpaymentArr1 = [];
         res.data.caseAffiliates.forEach((item) => {

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -3,9 +3,9 @@
     <el-dialog
       title="书面审理"
       :visible="showadjudicaterecord"
-      width="1000px"
       @close="cancel"
       :destroy-on-close="true"
+      center
     >
       <el-form
         ref="form"
@@ -15,19 +15,23 @@
       >
         <p>案件信息：</p>
         <el-divider></el-divider>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="案件编号：" prop="caseNum">
-            <el-input v-model="formData.caseNum" placeholder="请输入案件编号" />
+              <el-input
+                v-model="formData.caseNum"
+                placeholder="请输入案件编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="申请人：" prop="caseNum">
+            <el-form-item label="申请人：" prop="applicantName">
-            <el-input v-model="formData.caseNum" />
+              <el-input v-model="adjudicatename.applicantName" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="被申请人：" prop="caseNum">
+            <el-form-item label="被申请人：" prop="respondentName">
-            <el-input v-model="formData.caseNum" />
+              <el-input v-model="adjudicatename.respondentName" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -58,25 +62,28 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="12">
+          <!-- <el-col :span="12">
           <el-form-item label="逾期天数：" prop="caseSubjectAmount">
             <el-input
               v-model="formData.caseSubjectAmount"
               placeholder="请输入逾期天数"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
           <el-col :span="12">
-          <el-form-item label="仲裁费用：" prop="caseSubjectAmount">
+            <el-form-item label="仲裁费用：" prop="feePayable">
               <el-input
-              v-model="formData.caseSubjectAmount"
+                v-model="adjudicatename.feePayable"
                 placeholder="请输入仲裁费用"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请人主张欠本金：" prop="claimPrinciOwed">
-            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+              <el-input
+                v-model="formData.claimPrinciOwed"
+                placeholder="请输入"
+              />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -86,25 +93,29 @@
         </el-col> -->
           <el-col :span="12">
             <el-form-item label="案件状态：" prop="caseStatus">
-            <el-input v-model="formData.caseStatus" placeholder="请输入" />
+              <el-input v-model="formData.caseStatusName" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="仲裁员：" prop="claimPrinciOwed">
+            <el-form-item label="仲裁员：" prop="arbitratorName">
-            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+              <el-input
+                v-model="formData.arbitratorName"
+                placeholder="请输入"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-          <el-form-item label="开庭日期：" prop="loanEndDate">
+            <el-form-item label="开庭日期：" prop="hearDate">
               <el-date-picker
-              v-model="formData.loanEndDate"
+                v-model="adjudicatename.hearDate"
                 type="datetime"
                 placeholder="开庭日期"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
         <el-col :span="24">
           <el-form-item label="案件资料：" prop="claimPrinciOwed">
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
@@ -167,7 +178,7 @@
 import { writtenHear } from "@/api/caseManagement/caseManagement.js";
 
 export default {
-  props: ["showadjudicaterecord", "form"],
+  props: ["showadjudicaterecord", "form", "adjudicatename"],
   data() {
     return {
       formData: {},
@@ -179,6 +190,7 @@ export default {
       handler(val) {
         if (val) {
           this.formData = this.form;
+          console.log('this.formData',this.formData);
           this.form2 = {};
         }
       },
@@ -212,4 +224,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 800px;
+  background: #ffffff;
+  border-radius: 20px;
+}
 </style>

vue.config.js

@@ -11,8 +11,8 @@ 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://192.168.3.77:8080' //Q
+const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions