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

src/views/caseManagement/components/courtReviewDialog.vue

@@ -80,16 +80,10 @@ export default {
   props: ["showcourtReview", "form", "queryParams"],
   data() {
     return {
-<<<<<<< HEAD
-      // hearDate: "",
-      courtReviewform: {
-        // hearDate:null
-=======
       dataList: [],
       hearDate: "",
       courtReviewform: {
         hearDate: null,
->>>>>>> b3d6ee9b94fa5033af22ec92cd06c09c5ed2abcd
       },
       noArbitrator: false,
       isAgreePendTral: 1,
@@ -114,11 +108,7 @@ export default {
     showcourtReview(val) {
       if (val) {
         this.isAgreePendTral = 1;
-<<<<<<< HEAD
-        // this.courtReviewform.hearDate = null
-=======
         this.courtReviewform.hearDate = null;
->>>>>>> b3d6ee9b94fa5033af22ec92cd06c09c5ed2abcd
       }
     },
     form: {
@@ -172,17 +162,7 @@ export default {
       }
       this.$refs["courtReviewform"].validate((valid) => {
         if (valid) {
-<<<<<<< HEAD
-          // this.courtReviewform.hearDate = moment(
-          //   this.courtReviewform.hearDate
-          // ).format("YYYY-MM-DD HH:mm:ss");
-          // this.paramsdata.hearDate = this.courtReviewform.hearDate;
-          pendTralSure(
-            this.paramsdata
-          )
-=======
           pendTralSure(this.paramsdata)
->>>>>>> b3d6ee9b94fa5033af22ec92cd06c09c5ed2abcd
             .then((res) => {
               this.$modal.msgSuccess("确认成功");
               this.cancel();

src/views/caseManagement/components/formateCourtDialog.vue

@@ -9,7 +9,7 @@
       destroy-on-close
       center
     >
-      <el-form label-width="150px" v-if="!noArbitrator">
+      <el-form label-width="150px">
         <el-form-item label="是否同意组庭：">
           <el-radio-group v-model="isAgreePendTral">
             <el-radio :label="1">是</el-radio>