Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

src/views/caseManagement/components/caseFilingDetailsPage.vue

@@ -10,8 +10,8 @@
             <el-tab-pane label="申请人案件证据资料" name="first"></el-tab-pane>
             <!-- <el-tab-pane label="被申请人案件证据资料" name="second"></el-tab-pane> -->
             <el-tab-pane label="调解书" name="third"></el-tab-pane>
-            <el-tab-pane label="案件视频" name="fourth"></el-tab-pane>
-            <el-tab-pane label="庭审笔录" name="six"></el-tab-pane>
+            <el-tab-pane label="案件视频" name="fourth" v-if="caseFilingData.mediationMethod == '1'"></el-tab-pane>
+            <el-tab-pane label="庭审笔录" name="six" v-if="caseFilingData.mediationMethod == '1'"></el-tab-pane>
          </el-tabs>
          <div v-show="activeName=='first'">
              
@@ -252,7 +252,7 @@
 <script>
 import { getToken } from "@/utils/auth";
 export default {
-    props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts"],
+    props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts","caseFilingData"],
   components: {
     
   },

src/views/caseManagement/components/confirmMediator.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="秘书确认调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
+        <el-dialog title="核实调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
             :distroy-on-close="true">
             <div>
                 <div v-if="tableDataFlag">

src/views/caseManagement/components/evidenceDialog.vue

@@ -4,7 +4,7 @@
             <el-descriptions title="案件内容" :column="2" border>
                 <el-descriptions-item label="案件编号">{{ evidenceData.caseNum }}</el-descriptions-item>
                 <el-descriptions-item label="申请人">{{ evidenceData.applicationName }}</el-descriptions-item>
-                <el-descriptions-item label="案件标的">{{ evidenceData.caseSubjectAmount }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="案件标的">{{ evidenceData.caseSubjectAmount }}</el-descriptions-item> -->
                 <el-descriptions-item label="案件状态">
                     <el-tag size="small">{{ evidenceData.caseStatusName }}</el-tag>
                 </el-descriptions-item>

src/views/caseManagement/components/timeConfirm.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="秘书确认时间" :visible="timeConfirmVisable" v-if="timeConfirmVisable" @close="cancel" center
+        <el-dialog title="确认时间" :visible="timeConfirmVisable" v-if="timeConfirmVisable" @close="cancel" center
             :distroy-on-close="true">
             <!-- <div style="margin-bottom: 20px;">
                 <el-radio-group v-model="confirmFlag">
@@ -13,7 +13,7 @@
                     <!-- <div style="margin-top: 20px;margin-bottom: 20px;">时间</div> -->
                     <el-form label-position="right" label-width="80px" :model="formLabelAlign">
                         <el-form-item label="时间">
-                            <el-date-picker v-model="formLabelAlign.name" type="datetime" placeholder="选择日期时间">
+                            <el-date-picker v-model="formLabelAlign.name" type="datetime" :picker-options="pickerOptions" placeholder="选择日期时间">
                             </el-date-picker>
                             <!-- <el-input v-else v-model="formLabelAlign.name"></el-input> -->
                         </el-form-item>
@@ -43,13 +43,18 @@ export default {
                 time: [],
                 name: ""
             },
-            formTimeArr: [],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() <= Date.now() -1 * 24 * 3600 * 1000; // 禁用超过当前时间的日期
+                },
+                selectableRange: `${new Date()}- 23:59:59`,//这
+            },
         };
     },
     watch: {
         timeConfirmVisable(val) {
             if (val) {
-                this.formTimeArr = [];
+                this.formLabelAlign.name = null;
             }
         },
     },