diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afe95ec..3a08faa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ before_script:
 构建:
   stage: build
   only:
-    - dev
+    - main
   script:
     - export JAVA_HOME=/usr/local/java/jdk-11.0.2
     - mvn -B clean package -DskipTests
@@ -29,14 +29,14 @@ before_script:
 推送:
   stage: push
   only:
-    - dev
+    - main
   script:
     - docker push $CEWCS_IMAGE
 
 部署:
   stage: clean
   only:
-    - dev
+    - main
   script:
 #    - echo '不用清理，用作缓存'
      - docker rmi -f $CEWCS_IMAGE
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 7a02186..2153845 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -84,6 +84,9 @@ html{
 .f32{
     font-size: $f32;
 }
+.f48{
+    font-size: 48px;
+}
 .f-weight400{
     font-weight: 400;
 }
diff --git a/src/components/showFile.vue b/src/components/showFile.vue
new file mode 100644
index 0000000..a7f224c
--- /dev/null
+++ b/src/components/showFile.vue
@@ -0,0 +1,98 @@
+<template>
+    <div>
+        <el-dialog title="查看文件" :visible="true" width="1200px" append-to-body :close-on-click-modal="false" 
+            @close="handleClose()" :modal="false">
+            <div class="dialog-content dialog-file">
+                <div class="pt-8 flex-row justify-content-between m-16">
+                    <div class="previous-file text-center" @click="previousClick">
+                        <span><i class="el-icon-arrow-left f48 f-weight600 "></i></span>
+                    </div>
+                    <div class="show-file">
+                        <img :src="`/manage-center/minio/preview/${fileObj.url}`" />
+                        <!-- <iframe :src="`/manage-center/minio/preview/${fileObj.url}`" frameborder="0" width="100%" height="100%"></iframe> -->
+                    </div>
+                    <div class="next-file text-center" @click="nextClick">
+                        <span><i class="el-icon-arrow-right f48 f-weight600"></i></span>
+                    </div>
+                </div>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="handleClose()">关闭</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import api from "@/services/caseManagement";
+    export default {
+        components: {
+
+        },
+        props: {
+            fileDialog: {
+                type: Object,
+                default: () => {
+                    return {}
+                },
+            },
+        },
+        data() {
+            return {
+                CurrentPosition:0,//当前位置
+                fileObj:{},
+
+            };
+        },
+        mounted () {
+            this.fileObj = this.fileDialog.showfile
+            this.fileDialog.filelist.forEach((item,index) =>{
+                if(item.url == this.fileDialog.showfile){
+                    this.CurrentPosition = index
+                }
+            })
+        },
+        methods: {
+            previousClick(){
+                let nextCurrent = this.CurrentPosition-1;
+                if(this.fileDialog.filelist[nextCurrent]!=undefined)
+                {
+                    this.fileObj = this.fileDialog.filelist[nextCurrent]
+                    this.CurrentPosition = nextCurrent
+                }
+                else
+                {
+                    this.$message.warning(`已经是第一个了！`)
+                    return
+                }
+            },
+            nextClick(){
+                let nextCurrent = this.CurrentPosition+1;
+                if(this.fileDialog.filelist[nextCurrent]!=undefined)
+                {
+                    this.fileObj = this.fileDialog.filelist[nextCurrent]
+                    this.CurrentPosition = nextCurrent
+                }
+                else
+                {
+                    this.$message.warning(`已经是最后一个了！`)
+                    return
+                }
+                
+                // console.log(this.fileDialog.filelist[this.CurrentPosition+1],11)
+            },
+            handleClose() {
+                this.$emit('update:fileDialog', null)
+            },
+        }
+    };
+</script>
+
+<style scoped lang="scss">
+.dialog-file{
+    min-height: 500px;
+    .previous-file{width: 50px;margin-right: 10px; background-color: #F7F8FA;line-height: 650px;}
+    .next-file{width: 50px;margin-left: 10px; background-color: #F7F8FA;line-height: 650px;}
+    .show-file{width: calc(100% - 120px);height: 700px;}
+    
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/case-management/detail/index.vue b/src/pages/case-management/detail/index.vue
index eded1a6..c90e3f8 100644
--- a/src/pages/case-management/detail/index.vue
+++ b/src/pages/case-management/detail/index.vue
@@ -202,17 +202,17 @@
                     </div>
                     <div class="case-detail-label f-weight500 f16">证据材料<a><i class="el-icon-plus"></i>上传材料</a></div>
                     <div class="case-detail-des">
-                        <el-table :data="tableData" :height="300" >
+                        <el-table :data="fileList" :height="300" >
                             <el-table-column type="index" label="序号" width="55"></el-table-column>
-                            <el-table-column prop="A" label="材料类型" show-overflow-tooltip ></el-table-column>
-                            <el-table-column prop="B" label="文件名称" show-overflow-tooltip ></el-table-column>
-                            <el-table-column prop="F" label="上传时间" show-overflow-tooltip ></el-table-column>
-                            <el-table-column prop="G" label="上传人" show-overflow-tooltip ></el-table-column>
+                            <el-table-column prop="name" label="材料类型" show-overflow-tooltip ></el-table-column>
+                            <el-table-column prop="name" label="文件名称" show-overflow-tooltip ></el-table-column>
+                            <el-table-column prop="url" label="上传时间" show-overflow-tooltip ></el-table-column>
+                            <el-table-column prop="url" label="上传人" show-overflow-tooltip ></el-table-column>
                             <el-table-column  label="操作" width="170">
                                 <template slot-scope="scope">
                                     <div class="flex-row align-items-center">
                                         <el-button size="mini" @click="handleCaseAllocation(scope)">删除</el-button>
-                                        <el-button size="mini" @click="handleCaseAllocation(scope)">查看</el-button>
+                                        <el-button size="mini" @click="handleCaseShow(scope,fileList)">查看</el-button>
                                     </div>
                                 </template>
                             </el-table-column>
@@ -266,6 +266,9 @@
         </div>
         <!-- 事项追踪 -->
         <eventTracingDialog v-if="eventTraDialog" :eventTraDialog.sync="eventTraDialog" />
+
+         <!-- 文件预览 -->
+         <showFile v-if="fileDialog" :fileDialog.sync="fileDialog" />
     </div>
 </template>
 <script>
@@ -275,9 +278,11 @@ import { subtract } from "lodash";
     export default {
         components: {
             eventTracingDialog: () => import('../../event-tracing/index.vue'),//事项追踪
+            showFile: () => import('../../../components/showFile.vue'),//事项追踪
         },
         data() {
             return {
+                fileDialog:null,
                 eventTraDialog:null,
                 navactive:1,
                 Qualitydesc:'结清应还金额：16776.74逾期未还费用：2486.88',
@@ -286,6 +291,7 @@ import { subtract } from "lodash";
                 tableData2:[{A:'2024-12-05 00:00:00',B:'14,289.86元',C:'孟利',D:'2024-12-05 14:13:56',E:'',F:'',G:'',H:''}],
                 caseId:'',
                 baseInfo:{},
+                fileList:[],
 
 
 
@@ -307,6 +313,9 @@ import { subtract } from "lodash";
             }
         },
         methods: {
+            handleCaseShow(scope,filelist){
+                this.fileDialog = {showfile:scope.row,filelist:filelist}
+            },
             debtorEntityCardNo(datalist,len){
                 let datacardno=''
                 let dataphone=''
diff --git a/src/pages/event-tracing/index.vue b/src/pages/event-tracing/index.vue
index b1324e0..2732da0 100644
--- a/src/pages/event-tracing/index.vue
+++ b/src/pages/event-tracing/index.vue
@@ -37,8 +37,8 @@
                 
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="handleClose()">取消</el-button>
-                <el-button type="primary" @click="handleSubmit()">确认</el-button>
+                <el-button @click="handleClose()">关闭</el-button>
+                <!-- <el-button type="primary" @click="handleSubmit()">确认</el-button> -->
             </span>
         </el-dialog>
     </div>
diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue
index 7eb1c7b..11aac4a 100644
--- a/src/pages/mediation-management/index.vue
+++ b/src/pages/mediation-management/index.vue
@@ -234,9 +234,9 @@
                 <div class="height-56 flex-row align-items-center justify-content-between">
                     <div class="f22 color-text-primary">案件列表</div>
                     <div class="flex-row">
-                        <el-button size="small" @click="handleAddForm">案件办结</el-button> 
+                        <el-button size="small" @click="handleConclude">案件办结</el-button> 
                         <el-button size="small" @click="handleSMSSend">发送短信</el-button> 
-                        <el-button size="small" @click="handleAddForm">智能外呼</el-button> 
+                        <el-button size="small" @click="handleBrainCall">智能外呼</el-button> 
                         <el-button size="small" @click="handleOffice">文书生成</el-button> 
                         <el-button size="small" @click="handleOfficeWrite">发起签字</el-button> 
                         <el-button size="small" @click="handleOfficeSeal">发起签章</el-button> 
@@ -278,6 +278,7 @@
                                             <a class="case-status1">疑难客户</a>
                                             <a class="case-status2">分期客户</a>
                                             <a class="case-status3">已签署协议</a>
+                                            <a class="case-status0">协办</a>
                                         </span>
                                     </div>
                                     <div class="flex-row justify-content-between table-span-one">
@@ -506,19 +507,53 @@ import { values } from "lodash";
             }  
         },
         methods: {
+            handleConclude(){
+                // 批量办结
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
+            }, 
+            handleBrainCall(){
+                // 智能外呼
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
+            },
             handleOfficeDelivery(){
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
                 this.officeDeliveryIdsDialog={titile:'批量文书送达',caseids:this.selectionData}
             },
             handleOfficeSeal(){
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
                 this.officeSealIdsDialog={titile:'批量文书签章',caseids:this.selectionData}
             },
             handleOfficeWrite(){
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
                 this.officeWriteIdsDialog={titile:'批量文书签字',caseids:this.selectionData}
             },
             handleOffice(){
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
                 this.officeIdsDialog={titile:'批量文书生成',caseids:this.selectionData}
             },
             handleSMSSend(){
+                if(this.selectionData.length == 0 ){
+                    this.$message.warning(`请至少选中一个调解案件！`)
+                    return
+                }
                 this.smsIdsDialog={titile:'批量发送短信',caseids:this.selectionData}
             },
             // tab切换