Merge branch 'main' into 'stg'

UI优化调整

See merge request cloud-mediate/mediate-manage-web!118

src/assets/style/common.scss

@@ -836,7 +836,7 @@ html{
         border-radius: 3px;
         margin: 0 5px;
     }
-    // 调解进度 承诺客户、重点客户
+    // 调解进度、进度标签 承诺客户、重点客户
     .case-status0{
         background-color: #ecf5ff;
         border-color: #d9ecff;

src/components/uploadSingleFile.vue

@@ -8,7 +8,7 @@
                 :show-file-list="false"
                 :http-request="httpRequest">
             <div class="upload-file">
-                <i class="el-icon-plus uploader-file-icon"></i>上传模板
+                <i class="el-icon-plus uploader-file-icon"></i>上传文件
             </div>
         </el-upload>
         <!-- <div class="f12 text-center color-text-regular line-height-20">{{uploadName}}</div> -->

src/pages/case-management/detail/index.vue

@@ -99,7 +99,7 @@
                       <!-- {{$util.getTelephoneTypeData(scope.row.linkedSituation).label}} -->
                     </template>
                   </el-table-column>
-                  <el-table-column label="调解进度" width="140">
+                  <el-table-column label="进度标签" width="140">
                     <template slot-scope="scope">
                       {{scope.row.mediateStatus != null ? materialTypeOptions.find(item => item.value == scope.row.mediateStatus).label : ''}}
                       <!-- {{ materialTypeOptions.find(item => item.value == scope.row.mediateStatus).label }} -->

src/pages/case-management/index.vue

@@ -101,9 +101,9 @@
                             </el-col>
                             <el-col :span="6">
                                 <div class="flex-row-center align-items-center height-40 mb-24">
-                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">调解进度</span>
+                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">进度标签</span>
                                     <el-select v-model="queryParam.mediateRecordStatus"
-                                            clearable placeholder="请选择调解进度"
+                                            clearable placeholder="请选择进度标签"
                                             @keydown.enter.native="handleSearch"
                                             :multiple="true" :multiple-limit="3"
                                             class="width100">
@@ -375,7 +375,7 @@ import { values } from "lodash";
                 CaseStatusEnum:[{label:'在办',value:1},{label:'办结',value:2}],
                 //分案状态
                 PartCaseStatusEnum:[{label:'待分案',value:false},{label:'已分案',value:true}],
-                //调解进度
+                //进度标签
                 MediateProgEnum:this.$util.getMediationprogress(),
                 //调解状态
                 MediateStatusEnum:this.$util.getMediationType(),

src/pages/mediation-management/index.vue

@@ -115,9 +115,9 @@
                            
                             <el-col :span="6">
                                 <div class="flex-row-center align-items-center height-40 mb-24">
-                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">调解进度</span>
+                                    <span class="tabs__search-criteria-title flex-shrink-0 pr-16">进度标签</span>
                                     <el-select v-model="queryParam.mediateRecordStatus"
-                                            clearable placeholder="请选择调解进度"
+                                            clearable placeholder="请选择进度标签"
                                             @keydown.enter.native="handleSearch"
                                             :multiple="true" :multiple-limit="3"
                                             class="width100">
@@ -405,7 +405,7 @@ import { values } from "lodash";
                 CaseStatusEnum:[{label:'在办',value:1},{label:'办结',value:2}],
                 //分案状态
                 PartCaseStatusEnum:[{label:'待分案',value:false},{label:'已分案',value:true}],
-                //调解进度
+                //调解进度、进度标签
                 MediateProgEnum:this.$util.getMediationprogress(),
                 //调解状态
                 MediateStatusEnum:this.$util.getMediationType(),

src/pages/mediation-page/components/MediationRecordDialog.vue

@@ -67,7 +67,7 @@
                 placeholder="请输入内容" v-model="mrObj.communicationRemarks" maxlength="100">
               </el-input>
             </div>
-            <span class="f16 f-weight500 mt-8">调解进度</span>
+            <span class="f16 f-weight500 mt-8">进度标签</span>
             <div class="mt-8 mr—schedule">
               <span :class="mrObj.mediateStatus == item.value ? 'active':''" v-for="(item,index) in materialTypeOptions" :key="index" @click="mrObj.mediateStatus = item.value">{{item.label}}</span>
             </div>

src/services/index.js

@@ -25,7 +25,7 @@
  const service = axios.create({
     //  baseURL: projectConfig.netHost,
      // baseURL: 'https://lz.dev.trydotec.com:8416/miniapp',
-     timeout: 30000,
+     timeout: 60000,
  });
  
  // 请求拦截器

src/utils/util.js

@@ -462,7 +462,7 @@ const util = {
         }
     },
     /**
-     * 调解进度枚举 
+     * 调解进度枚举  进度标签
      */
     getMediationprogress() {
         return [