Merge branch 'hhl' of SH-Arbitrate/Mediation-Frontend into dev

src/utils/request.js

@@ -36,6 +36,10 @@ service.interceptors.request.use(config => {
     config.params = {};
     config.url = url;
   }
+  if (config.url === '/caseApplication/mediation') {
+    // 调解时对于特定的请求设置超时时间为20秒
+    config.timeout = 20000; // 20秒
+  }
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     const requestObj = {
       url: config.url,

src/views/caseManagement/caseList.vue

@@ -22,7 +22,7 @@
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="创建时间" prop="caseTime">
-                <el-date-picker v-model="caseTime" type="datetimerange" align="right" unlink-panels range-separator="至"
+                <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
                     start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" @change="caseTimeChange">
                 </el-date-picker>
             </el-form-item>
@@ -55,6 +55,7 @@
             <el-table-column label="被申请人" align="center" prop="respondentName" :show-overflow-tooltip="true" />
             <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" :show-overflow-tooltip="true" />
             <el-table-column label="调解员" align="center" prop="mediatorName" :show-overflow-tooltip="true" />
+            <el-table-column label="调解方式" align="center" prop="mediationMethodName" :show-overflow-tooltip="true" />
             <el-table-column label="调解时间" align="center" prop="hearDate" :show-overflow-tooltip="true" />
             <el-table-column label="案件状态" align="center" prop="caseStatusName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />

vue.config.js

@@ -19,8 +19,12 @@ const API = 'http://121.40.189.20:6001'  //测试
 // 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