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

src/api/formationCourt/formationCourt.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询仲裁员列表
+export function arbitrAtor(data) {
+    return request({
+      url: '/arbitrator/list',
+      method: 'get',
+      params: data
+    })
+  }
+// 组庭
+export function pendTral(data) {
+    return request({
+      url: '/caseApplication/pendTral',
+      method: 'post',
+      data: data
+    })
+  }

src/api/pay/pay.js

@@ -6,8 +6,8 @@ export function caseApplicationList(data) {
         // headers: {
         //   isToken: false
         // },
-        method: 'post',
+        method: 'get',
-        data: data
+        params: data
     })
 }
 // 查看详情

src/views/formationCourt/components/formateCourtDialog.vue

@@ -6,37 +6,55 @@
       :visible="showformateCourt"
       width="800px"
       @close="cancel"
-      :destroy-on-close= true
+      :destroy-on-close="true"
     >
-      <el-form ref="form">
+      <!-- <el-form ref="form"> -->
-        <el-table
+      <el-table
-          :data="dataList"
+        :data="dataList"
-          style="width: 100%"
+        style="width: 100%"
-          @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChange"
-        >
+      >
-          <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column
+        <el-table-column
-            label="仲裁员姓名"
+          label="仲裁员姓名"
-            align="center"
+          align="center"
-            prop="caseName"
+          prop="arbitratorName"
-            :show-overflow-tooltip="true"
+          :show-overflow-tooltip="true"
-          />
+        />
-          <el-table-column
+        <el-table-column
-            label="当前案件数量"
+          label="专业分类"
-            align="center"
+          align="center"
-            prop="nowNum"
+          prop="professiClassifi"
-            :show-overflow-tooltip="true"
+          :show-overflow-tooltip="true"
-          />
+        />
-          <el-table-column
+        <el-table-column
-            label="已结案数量"
+          label="当前案件数量"
-            align="center"
+          align="center"
-            prop="numed"
+          prop="currentCaseNum"
-            :show-overflow-tooltip="true"
+          :show-overflow-tooltip="true"
-          />
+        />
-        </el-table>
+        <el-table-column
-      </el-form>
+          label="已结案数量"
+          align="center"
+          prop="closedCaseNum"
+          :show-overflow-tooltip="true"
+        />
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getarbitrAtor"
+      />
+      <!-- </el-form> -->
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm"
+          :disabled="!this.arbitrators.length > 0"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -44,31 +62,62 @@
 </template>
 
 <script>
+import { arbitrAtor, pendTral } from "@/api/formationCourt/formationCourt";
 export default {
-  props: ["showformateCourt"],
+  props: [
+    "showformateCourt",
+    "formateCourtData",
+  ],
   data() {
     return {
       dataList: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      arbitrators: [],
     };
   },
   created() {
-    this.dataList = [
+    this.getarbitrAtor();
-      {
-        caseName: "hhk",
-        nowNum: 1,
-        numed: 100,
-      },
-    ];
   },
   methods: {
+    // 获取仲裁员信息
+    getarbitrAtor() {
+      arbitrAtor({}).then((res) => {
+        this.dataList = res.rows;
+        this.total = res.total;
+      });
+    },
+    // 勾选仲裁员
     handleSelectionChange(val) {
-      console.log(val, "pppppppppp");
+      this.arbitrators = [];
+      val.forEach((item) => {
+        this.arbitrators.push({
+          id: item.id,
+          arbitratorName: item.arbitratorName,
+        });
+      });
     },
     // 确认
-    submitForm() {},
+    submitForm() {
+      if (this.arbitrators.length > 0) {
+        let params = {
+          id: this.formateCourtData.id,
+          arbitrators: this.arbitrators,
+        };
+        pendTral(params).then((res) => {
+          this.cancel();
+          this.$modal.msgSuccess("组庭成功");
+          this.$emit("getformationData");
+        });
+      }
+    },
     // 取消
     cancel() {
       this.$emit("cancelcourtDialog");
+      this.arbitrators = [];
     },
   },
 };

src/views/formationCourt/components/formateCourtdetailDaiog.vue

@@ -7,75 +7,11 @@
       width="1000px"
       @close="cancel"
     >
-      <!-- <el-form ref="form" label-width="150px" disabled>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="案件编号：" prop="caseNum">
-              <el-input
-                v-model="formData.caseNum"
-                placeholder="请输入案件编号"
-              />
-            </el-form-item>
-          </el-col>
-          申请人
-          <el-col :span="12">
-            <el-form-item label="申请人：" prop="name">
-              <el-input v-model="formData.name" placeholder="请输入申请人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="案件标的：" prop="caseSubjectAmount">
-              <el-input
-                v-model="formData.caseSubjectAmount"
-                placeholder="请输入案件标的"
-              />
-            </el-form-item>
-          </el-col>
-          立案日期
-          <el-col :span="12">
-            <el-form-item label="立案日期：" prop="registerDate">
-              <el-date-picker
-                v-model="formData.registerDate"
-                type="datetime"
-                placeholder="立案日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开庭日期：" prop="hearDate">
-              <el-date-picker
-                v-model="formData.hearDate"
-                type="datetime"
-                placeholder="开庭日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          案件仲裁员
-          <el-col :span="12">
-            <el-form-item label="案件仲裁员：" prop="caseArbitrator">
-              <el-input
-                v-model="formData.caseArbitrator"
-                placeholder="请输入"
-              />
-            </el-form-item>
-          </el-col>
-          案件状态
-          <el-col :span="12">
-            <el-form-item label="案件状态：" prop="caseStatus">
-              <el-input
-                v-model="formData.caseStatus"
-                placeholder="请输入案件状态"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form> -->
       <!-- 案件信息 -->
       <el-form
         ref="form"
         :model="formData"
+        :rules="rules"
         label-width="150px"
         :disabled="true"
       >
@@ -555,7 +491,12 @@
 <script>
 export default {
   name: "formateCourtdetailDaiog",
-  props: ["formateListdata", "showDetails"],
+  props: [
+    "formateListdata",
+    "showDetails",
+    "initpaymentArr",
+    "initpaymentArr1",
+  ],
   data() {
     return {
       formData: {},
@@ -592,7 +533,81 @@ export default {
           },
         ],
       },
-      fileList:[]
+      // 表单校验
+      rules: {
+        caseNum: [
+          {
+            required: true,
+            message: "案件编号不能为空",
+            trigger: ["change", "blur"],
+          },
+          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
+        ],
+        caseSubjectAmount: [
+          {
+            required: true,
+            message: "案件标的不能为空",
+            trigger: ["change", "blur"],
+          },
+        ],
+        loanStartDate: [
+          {
+            required: true,
+            message: "借款开始日期不能为空",
+            trigger: "blur",
+          },
+        ],
+        loanEndDate: [
+          {
+            required: true,
+            message: "借款结束日期不能为空",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: "申请人姓名不能为空",
+            trigger: "blur",
+          },
+        ],
+        contractNumber: [
+          {
+            required: true,
+            message: "合同编号不能为空",
+            trigger: "blur",
+          },
+        ],
+        claimPrinciOwed: [
+          {
+            required: true,
+            message: "申请人主张欠本金不能为空",
+            trigger: "blur",
+          },
+        ],
+        claimInterestOwed: [
+          {
+            required: true,
+            message: "申请人主张欠利息不能为空",
+            trigger: "blur",
+          },
+        ],
+        Overduedays: [
+          {
+            required: true,
+            message: "逾期天数不能为空",
+            trigger: "blur",
+          },
+        ],
+        claimLiquidDamag: [
+          {
+            required: true,
+            message: "申请人主张违约金不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      fileList: [],
     };
   },
   watch: {
@@ -600,6 +615,10 @@ export default {
       handler(val) {
         if (val) {
           this.formData = this.formateListdata;
+          setTimeout(() => {
+            this.form2.paymentArr = this.initpaymentArr;
+            this.form3.paymentArr1 = this.initpaymentArr1;
+          }, 1000);
         }
       },
     },

src/views/formationCourt/formationCourtlist.vue

@@ -42,36 +42,36 @@
         prop="caseNum"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="申请人"
         align="center"
         prop="name"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
         label="案件标的"
         align="center"
         prop="caseSubjectAmount"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="立案日期"
         align="center"
         prop="registerDate"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <!-- 开庭日期 -->
-      <el-table-column
+      <!-- <el-table-column
         label="开庭日期"
         align="center"
         prop="hearDate"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <!-- 案件仲裁员 -->
-      <el-table-column
+      <!-- <el-table-column
         label="案件仲裁员"
         align="center"
-        prop="caseArbitrator"
+        prop="arbitratorName"
-      />
+      /> -->
       <el-table-column label="案件状态" align="center" prop="caseStatus" />
       <el-table-column
         label="操作"
@@ -115,26 +115,31 @@
     />
     <!-- 详情页面 -->
     <formateCourtdetailDaiog
-    :showDetails="showDetails"
+      :showDetails="showDetails"
-    @cancelDetails="cancelDetails"
+      @cancelDetails="cancelDetails"
-    :formateListdata="formateListdata"
+      :formateListdata="formateListdata"
+      :initpaymentArr="initpaymentArr"
+      :initpaymentArr1="initpaymentArr1"
     ></formateCourtdetailDaiog>
     <!-- 组庭页面 -->
     <formateCourtDialog
-    :showformateCourt="showformateCourt"
+      :showformateCourt="showformateCourt"
-    @cancelcourtDialog="cancelcourtDialog"
+      @cancelcourtDialog="cancelcourtDialog"
+      :formateCourtData="formateCourtData"
+      @getformationData="getformationData"
     ></formateCourtDialog>
   </div>
 </template>
 
 <script>
-import formateCourtdetailDaiog from './components/formateCourtdetailDaiog.vue';
+import { caseApply, selectCaseApply } from "@/api/caseAccess/caseEntry";
-import formateCourtDialog from './components/formateCourtDialog.vue';
+import formateCourtdetailDaiog from "./components/formateCourtdetailDaiog.vue";
+import formateCourtDialog from "./components/formateCourtDialog.vue";
 export default {
   name: "formationCourtlist",
-  components:{
+  components: {
     formateCourtdetailDaiog,
-    formateCourtDialog
+    formateCourtDialog,
   },
   data() {
     return {
@@ -143,14 +148,18 @@ export default {
       // 总条数
       total: 0,
       queryParams: {
-        caseNum: undefined,
+        // caseNum: undefined,
+        caseStatus: 6,
         pageNum: 1,
         pageSize: 10,
       },
       formationData: [],
-      showDetails:false,//详情界面显示
+      showDetails: false, //详情界面显示
-      formateListdata:{},
+      formateListdata: {},
+      formateCourtData: {},
       showformateCourt: false, //组庭界面显示
+      initpaymentArr:[],
+      initpaymentArr1:[],
     };
   },
   created() {
@@ -170,37 +179,48 @@ export default {
     // 查询列表数据
     getformationData() {
       this.loading = true;
-      this.formationData = [
+      caseApply(this.queryParams).then((response) => {
-        {
+        this.formationData = response.rows;
-          caseNum: "1",
+        this.total = response.total;
-          name: "hcb",
+        this.loading = false;
-          caseSubjectAmount: "3000",
+      });
-          registerDate: "2022-05-05 20:23:08",
-          hearDate: "2022-09-05 20:23:08",
-          caseArbitrator: "hhl",
-          caseStatus: "待组庭",
-        },
-      ];
-      this.total = this.formationData.length;
-      this.loading = false;
     },
     // 详情
     viewdetails(val) {
-        this.showDetails = true
+      this.showDetails = true;
-        this.formateListdata = val
+      this.formateListdata = val;
+      this.getInfo(val);
+    },
+    // 查找主体信息数据
+    getInfo(row) {
+      const id = row.id;
+      selectCaseApply({ id }).then((res) => {
+        this.visible = true;
+        this.formData = res.data;
+        this.initpaymentArr = [];
+        this.initpaymentArr1 = [];
+        res.data.caseAffiliates.forEach((item) => {
+          if (item.identityType == 1) {
+            this.initpaymentArr.push(item);
+          } else {
+            this.initpaymentArr1.push(item);
+          }
+        });
+      });
     },
     // 关闭详情
     cancelDetails() {
-        this.showDetails = false
+      this.showDetails = false;
     },
     // 组庭
     formateCourt(val) {
-        this.showformateCourt = true
+      this.formateCourtData = val;
+      this.showformateCourt = true;
     },
     // 关闭组庭页面
     cancelcourtDialog() {
-        this.showformateCourt = false
+      this.showformateCourt = false;
-    }
+    },
   },
 };
 </script>