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

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -49,7 +49,7 @@
       </el-descriptions>
       <el-form ref="form" :model="arbitrateRecord" label-width="300px" label-position="left" :rules="rules"
         :disabled="flag == 3">
-        <el-form-item label="经庭审质证，对各方提供的证据认定如下" prop="evidenDetermi">
+        <!-- <el-form-item label="经庭审质证，对各方提供的证据认定如下" prop="evidenDetermi">
           <el-input type="textarea" autosize :disabled="flag == 2" placeholder="请输入内容"
             v-model="arbitrateRecord.evidenDetermi" />
         </el-form-item>
@@ -72,6 +72,9 @@
         <el-form-item label="核验裁决书意见：" prop="verificaOpinion">
           <el-input type="textarea" autosize :disabled="flag == 2" placeholder="请输入内容"
             v-model="arbitrateRecord.verificaOpinion" />
+        </el-form-item> -->
+        <el-form-item label="笔录内容：" prop="responCrossOpin">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" />
           </el-form-item>
         <el-form-item label="审核裁决书意见：" prop="checkOpinion" v-if="flag == 2">
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -150,49 +150,10 @@
         </el-col>
       </el-form>
       <el-form ref="form2" :model="form2" label-width="150px">
+        <el-form-item label="笔录内容：" prop="responCrossOpin">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.responCrossOpin" placeholder="请输入" />
+          </el-form-item>
         <!-- <el-col :span="24">
-          <el-form-item
-            label="案情描述："
-            prop="accidentDescription"
-            :rules="[
-              {
-                required: true,
-                message: '请进行案情描述',
-                trigger: 'blur',
-              },
-            ]"
-          >
-            <el-input
-              type="textarea"
-              autosize
-              placeholder="请进行案情描述"
-              v-model="form2.accidentDescription"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col> 
-        <el-col :span="24">
-          <el-form-item
-            label="仲裁结果："
-            prop="arbitrationResult"
-            :rules="[
-              {
-                required: true,
-                message: '请输入仲裁结果',
-                trigger: 'blur',
-              },
-            ]"
-          >
-            <el-input
-              type="textarea"
-              autosize
-              placeholder="请输入仲裁结果"
-              v-model="form2.arbitrationResult"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>-->
-        <el-col :span="24">
           <el-form-item
             label="经庭审质证，对各方提供的证据认定如下："
             prop="evidenDetermi"
@@ -296,7 +257,7 @@
             >
             </el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">提交仲裁结果</el-button>

src/views/caseManagement/components/courtReviewDialog.vue

@@ -80,10 +80,16 @@ export default {
   props: ["showcourtReview", "form", "queryParams"],
   data() {
     return {
+<<<<<<< HEAD
+      // hearDate: "",
+      courtReviewform: {
+        // hearDate:null
+=======
       dataList: [],
       hearDate: "",
       courtReviewform: {
         hearDate: null,
+>>>>>>> b3d6ee9b94fa5033af22ec92cd06c09c5ed2abcd
       },
       noArbitrator: false,
       isAgreePendTral: 1,
@@ -108,7 +114,11 @@ export default {
     showcourtReview(val) {
       if (val) {
         this.isAgreePendTral = 1;
+<<<<<<< HEAD
+        // this.courtReviewform.hearDate = null
+=======
         this.courtReviewform.hearDate = null;
+>>>>>>> b3d6ee9b94fa5033af22ec92cd06c09c5ed2abcd
       }
     },
     form: {
@@ -162,7 +172,17 @@ 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();