diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js
index 1109cf1..ee36f82 100644
--- a/src/api/caseManagement/caseManagement.js
+++ b/src/api/caseManagement/caseManagement.js
@@ -56,6 +56,14 @@ export function confirmPaid(data) {
     data: data,
   });
 }
+//   缴费确认（被申请人）
+export function resConfirmPaid(data) {
+  return request({
+    url: "/pay/resConfirmPaid",
+    method: "post",
+    data: data,
+  });
+}
 //   案件id查询缴费清单
 export function selectPaymentDetail(data) {
   return request({
diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index 0fafc83..15c1948 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -79,7 +79,7 @@
                     <!-- <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>
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId > 14" @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> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="secretaryConfirm(scope.row)">秘书审核</el-button> -->
@@ -113,7 +113,7 @@
             :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow" :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
         <!-- 缴费确认查看详情 -->
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
-            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" @getList="getList">
+            :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" :isapplicant="isapplicant" @getList="getList">
         </paymentdetailsDialog>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
@@ -250,7 +250,8 @@ export default {
             timeConfirmVisable: false,
             timeConfirmData: {},
             confirmTionData:{},
-            buttonList: []
+            buttonList: [],
+            isapplicant: true, //判断角色申请人或非申请人
         };
     },
     created() {
@@ -269,7 +270,7 @@ export default {
                 this.payStatus(val);
             }else if(type == 3 || type == 45){
                 // 确认缴费
-                this.paymentconfirmationRow(val);
+                this.paymentconfirmationRow(val,type);
             }else if(type == 4){
                 // 受理分配
                 this.caseAccep(val);
@@ -589,7 +590,7 @@ export default {
             this.showAcceptance = false
         },
         // 缴费确认
-        paymentconfirmationRow(row) {
+        paymentconfirmationRow(row,type) {
             this.paymentConfirma = row
             console.log(this.paymentConfirma)
             this.paymentDetails({
@@ -599,6 +600,12 @@ export default {
             this.payTitle = "缴费确认"
             this.flag = 0;
             this.detailform = {}
+            if (type == 3) {
+            // 申请人
+                this.isapplicant = true
+            }else {
+                this.isapplicant = false
+            }
         },
         cancelpaymentdetails() {
             this.openDialog = false
diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue
index f512b83..1b08f93 100644
--- a/src/views/caseManagement/components/addCase.vue
+++ b/src/views/caseManagement/components/addCase.vue
@@ -97,6 +97,15 @@
               </div>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="modelFlag">
+            <el-form-item label="调解申请书:">
+              <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 3">
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
+                  {{ item.annexName }}
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="modelFlag">
             <el-form-item label="调解书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
diff --git a/src/views/caseManagement/components/caseAcceptance.vue b/src/views/caseManagement/components/caseAcceptance.vue
index 6d9fb38..afd9dab 100644
--- a/src/views/caseManagement/components/caseAcceptance.vue
+++ b/src/views/caseManagement/components/caseAcceptance.vue
@@ -11,7 +11,7 @@
         </el-form-item>
         <el-form-item label="调解方式:" v-if="courtReviewform.agreeFlag == 1">
           <el-radio-group v-model="courtReviewform.mediationMethod">
-            <el-radio :label="1">开庭调解</el-radio>
+            <el-radio :label="1">线上调解</el-radio>
             <el-radio :label="2">线下调解</el-radio>
           </el-radio-group>
         </el-form-item>
diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue
index a8f978d..8f20491 100644
--- a/src/views/caseManagement/components/mediation.vue
+++ b/src/views/caseManagement/components/mediation.vue
@@ -130,7 +130,7 @@ export default {
   data() {
     return {
       loanStartDate: "",
-      title: "开庭调解",
+      title: "线上调解",
       applicateArr: [],
       quiltArr: [],
       recordArr: [],
@@ -159,7 +159,7 @@ export default {
     mediationVisable(val) {
       this.recordArr = [];
       if (this.mediationData.mediationMethod == "1") {
-        this.title = "开庭调解";
+        this.title = "线上调解";
         this.mediationType = true;
       } else if (this.mediationData.mediationMethod == "2") {
         this.title = "线下调解";
diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue
index 52c6be4..96ccf48 100644
--- a/src/views/caseManagement/components/payDialog.vue
+++ b/src/views/caseManagement/components/payDialog.vue
@@ -23,6 +23,11 @@
             {{ formPayDetail.caseStatusName }}
           </el-tag>
         </el-descriptions-item>
+        <el-descriptions-item label="驳回原因" v-if="formPayDetail.reason">
+          <el-tag size="mini" type='danger' effect="dark">
+            {{ formPayDetail.reason }}
+          </el-tag>
+        </el-descriptions-item>
       </el-descriptions>
       <div class="paySelectType">
         <el-radio-group v-model="paySelect" @input="changPayType">
diff --git a/src/views/caseManagement/components/paymentdetailsDialog.vue b/src/views/caseManagement/components/paymentdetailsDialog.vue
index 2dac014..80f7084 100644
--- a/src/views/caseManagement/components/paymentdetailsDialog.vue
+++ b/src/views/caseManagement/components/paymentdetailsDialog.vue
@@ -3,18 +3,15 @@
     <el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
       <el-form ref="form" :model="form" label-width="180px" :disabled="true">
         <el-form-item label="案件编号：" prop="caseNum">
-          <el-input v-model="form.caseNum" placeholder="" />
+          <el-input v-model="form.caseNum" placeholder="" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="案件标的：" prop="caseSubjectAmount">
+          <el-input v-model="form.caseSubjectAmount" :disabled="true"/>
         </el-form-item>
-        <!-- <el-form-item label="案件标的：" prop="caseSubjectAmount">
-          <el-input v-model="form.caseSubjectAmount" />
-        </el-form-item> -->
         <!-- <el-form-item label="缴费人：" prop="applicantName">
           <el-input v-model="form.applicationName" placeholder="" />
         </el-form-item> -->
-        <el-form-item label="申请人缴费金额：" prop="feePayable">
-          <el-input v-model="form.feePayable" />
-        </el-form-item>
-        <el-form-item label="被申请人缴费金额：" prop="feePayable">
+        <el-form-item label="缴费金额：" prop="feePayable">
           <el-input v-model="form.feePayable" />
         </el-form-item>
         <el-form-item label="申请人缴费凭证：" v-if="form.caseAttachList.length > 0">
@@ -29,9 +26,21 @@
             {{ item.annexName }}
           </div>
         </el-form-item>
+        <!-- 判断缴费是否通过 -->
+        <el-form-item label="是否缴费通过：" v-if="flag == 0">
+          <el-radio-group v-model="yesOrNo">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">驳回</el-radio>
+          </el-radio-group>   
+        </el-form-item>
+        <!-- 缴费驳回原因-->
+        <el-form-item label="驳回原因：" v-if="yesOrNo == 0" prop="reason" :rules="[{ required: true, message: '请输入驳回原因',trigger: 'blur',},]">
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model="form.reason"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确认已缴费</el-button>
+        <!-- <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确认已缴费</el-button> -->
+        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton">确 认</el-button>
         <el-button @click="cancel" class="endbutton1">取 消</el-button>
       </div>
     </el-dialog>
@@ -39,13 +48,16 @@
 </template>
 
 <script>
-import { confirmPaid } from '@/api/caseManagement/caseManagement.js'
+import { confirmPaid, resConfirmPaid } from '@/api/caseManagement/caseManagement.js'
 export default {
-  props: ["openDialog", "title", "flag", "detailform", "getList", "paymentConfirma", "queryParams"],
+  props: ["openDialog", "title", "flag", "detailform", "getList", "paymentConfirma", "queryParams",'isapplicant'],
   data() {
     return {
-      form: {},
-      srcList: []
+      form: {
+        reason: '',//驳回原因
+      },
+      yesOrNo: 1,
+      srcList: [],
     };
   },
   watch: {
@@ -56,6 +68,13 @@ export default {
         }
       },
     },
+    openDialog: {
+      handler(val) {
+        if (val) {
+          this.yesOrNo = 1
+        }
+      }
+    }
   },
   methods: {
     preview(data) {
@@ -69,16 +88,34 @@ export default {
       let paramsVal = {
         caseId: this.paymentConfirma.id,
         batchNumber: "",
-        caseFlowId: this.paymentConfirma.caseFlowId
+        caseFlowId: this.paymentConfirma.caseFlowId,
+        yesOrNo: this.yesOrNo,
+        reason: this.form.reason
       }
-      confirmPaid(paramsVal).then((res) => {
-        this.$message({
-          message: "确认成功",
-          type: "success",
-        });
-        this.cancel();
-        this.$emit("getList", this.queryParams);
-      });
+      this.$refs["form"].validate((valid) => {
+      if (valid) {
+      if (this.isapplicant) {
+        confirmPaid(paramsVal).then((res) => {
+          this.$message({
+            message: "确认成功",
+            type: "success",
+          });
+        })
+        console.log('申请人');
+      } else {
+        // 被申请人 resConfirmPaid
+        resConfirmPaid(paramsVal).then((res) => {
+          this.$message({
+            message: "确认成功",
+            type: "success",
+          });
+        })
+        console.log('被申请人');
+      }
+      this.cancel();
+      this.$emit("getList", this.queryParams);
+      }
+      })
     },
     cancel() {
       this.$emit("cancelpaymentdetails");
diff --git a/src/views/caseManagement/components/respondentPay.vue b/src/views/caseManagement/components/respondentPay.vue
index b9a51f8..563c021 100644
--- a/src/views/caseManagement/components/respondentPay.vue
+++ b/src/views/caseManagement/components/respondentPay.vue
@@ -23,6 +23,11 @@
               {{ formResPayDetail.caseStatusName }}
             </el-tag>
           </el-descriptions-item>
+          <el-descriptions-item label="驳回原因" v-if="formResPayDetail.reason">
+            <el-tag size="mini" type='danger' effect="dark">
+              {{ formResPayDetail.reason }}
+            </el-tag>
+          </el-descriptions-item>
         </el-descriptions>
         <div class="paySelectType">
           <el-radio-group v-model="paySelect" @input="changPayType">
diff --git a/vue.config.js b/vue.config.js
index 2a8d471..6efe258 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,10 +12,20 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // const API = 'http://121.40.189.20:9001'  //生产
-const API = 'http://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
-// const API = 'http://172.16.1.30:6001' //Q
+<<<<<<< HEAD
+// const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.43:6001' //w
+=======
+// const API = 'http://172.16.1.30:6001' //Q
+<<<<<<< HEAD
+// const API = 'http://172.16.1.43:6001' //w
+=======
+// const API = 'http://172.16.1.17:6001' //w
+>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
+>>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
+
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档