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

src/views/caseManagement/caseList.vue

@@ -63,7 +63,7 @@
                 <template slot-scope="scope">
                     <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
-                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']">修改</el-button>
+                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
                     <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
                     <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
@@ -78,7 +78,7 @@
                     <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
                     <el-button size="mini" type="text" icon="el-icon-edit"
-                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">上传证据</el-button>
+                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 || scope.row.caseFlowId == 16 || scope.row.caseFlowId == 17" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
@@ -139,7 +139,7 @@
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
-        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"></caseFilingDetailsPage>
+        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"></caseFilingDetailsPage>
     </div>
 </template>
 
@@ -253,6 +253,7 @@ export default {
             buttonList: [],
             caseStausArr: [],//案件状态
             isapplicant: true, //判断角色申请人或非申请人
+            caseFilingData:{}
         };
     },
     created() {
@@ -690,7 +691,8 @@ export default {
          },
         //归档详情
         caseFilingDetails(val){
-            this.showarchiveDetails = true
+            this.showarchiveDetails = true;
+            this.caseFilingData = val;
             let vals = {id:val.id}
             caseApplicationSelectById(vals).then(res=>{
                 res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)

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;
             }
         },
     },

src/views/officialSeal/components/addTemplate.vue

@@ -139,7 +139,7 @@ export default {
         handleSuccessC(res) {
         console.log(res,'自然人上传成功');
             this.$message.success('上传成功');
-            this.submitForm.annexIds[4] = res.annexId;
+            this.submitForm.annexIds.push(res.annexId)
         },
         handleRemoveC(file, fileList) {
             console.log(file, fileList);
@@ -174,8 +174,8 @@ export default {
         submitUpload() {
             this.$refs['ruleForm'].validate((valid) => {
                 if (valid) {
-                    if(this.submitForm.annexIds.length < 3){
-                        this.$message.error('三种类型模板必须上传');
+                    if(this.submitForm.annexIds.length < 4){
+                        this.$message.error('四种类型模板必须上传');
                         return
                     }
                     this.submitForm.identifyId = this.ruleForm.identifyId;

src/views/officialSeal/components/editTemplate.vue

@@ -115,7 +115,8 @@ export default {
         },
         editVisable(val){
             if(val){
-                this.getTemplateDetailFn({ id: this.editData.id })
+                this.getTemplateDetailFn({ id: this.editData.id });
+                this.submitForm.annexIds = []
             }
         }
     },
@@ -138,8 +139,7 @@ export default {
         getTemplateDetailFn(data) {
             getTemplateDetail(data).then(res => {
                 this.ruleForm = res;
-                this.submitForm.annexIds = [this.ruleForm.agreementFile.fileId,this.ruleForm.applicationFile.fileId,this.ruleForm.bookFile.fileId]
-                console.log(this.submitForm.annexIds,"PPPPPPPPPPPPPPPPPPPPPPPP");
+                // this.submitForm.annexIds = [this.ruleForm.agreementFile.fileId,this.ruleForm.applicationFile.fileId,this.ruleForm.bookFile.fileId]
             })
         },
         submitUpload() {
@@ -175,13 +175,13 @@ export default {
         console.log(res,'机构上传成功');
             this.$message.success('上传成功');
             // this.submitForm.annexIds.push(res.annexId);
-            this.submitForm.annexIds[1] = res.annexId;
+            this.submitForm.annexIds.push(res.annexId);
         },
         // 自然人
         handleSuccessC(res) {
         console.log(res,'自然人上传成功');
             this.$message.success('上传成功');
-            this.submitForm.annexIds[4] = res.annexId;
+            this.submitForm.annexIds.push(res.annexId);
         },
         handleRemoveC(file, fileList) {
             console.log(file, fileList);
@@ -202,7 +202,7 @@ export default {
         handleSuccessA(res) {
             this.$message.success('上传成功');
             // this.submitForm.annexIds.push(res.annexId);
-            this.submitForm.annexIds[0] = res.annexId;
+            this.submitForm.annexIds.push(res.annexId);
         },
 
         handleChangeB(file, fileList) {
@@ -218,7 +218,7 @@ export default {
         handleSuccessB(res) {
             this.$message.success('上传成功');
             // this.submitForm.annexIds.push(res.annexId);
-            this.submitForm.annexIds[3] = res.annexId;
+            this.submitForm.annexIds.push(res.annexId);
         },
         // handleSuccess() {
         //     this.$message.success('修改成功');