Merge branch 'main' of http://139.155.124.81:8088/cloud-mediate/mediate-manage-web

src/pages/case-management/components/RepaymentUpdateDialog.vue

@@ -97,6 +97,7 @@ import api from "@/services/caseManagement";
         },
         mounted () {
             this.Effectobj = JSON.parse(JSON.stringify(this.EffectDialog))
+            this.Effectobj.mediaPath = JSON.parse(JSON.stringify(this.EffectDialog)).proofUrl
             this.fileList = [{url: this.Effectobj.proofUrl,fileName:'上传'}]
         },
         methods: {
@@ -115,6 +116,8 @@ import api from "@/services/caseManagement";
                         api.gettraceProof_edit(this.Effectobj).then(res => {
                             if(!res.code){
                                 this.$parent.getProofList(1)
+                                this.$message.success('编辑成功!')
+                                this.handleClose()
                             }
                         })
                     }

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

@@ -86,7 +86,8 @@
             </div>
             <div class="flex-row align-items-center pb-6 f-weight600">
               {{item.contact}} {{item.phone}}
-              <el-tag class="ml-8" size="small" effect="danger">{{ item.status.desc }}</el-tag>
+              <el-tag class="ml-8" v-if="item.status.code == 2" size="small" effect="success">{{ item.status.desc }}</el-tag>
+              <el-tag class="ml-8" v-else size="small" effect="danger">{{ item.status.desc }}</el-tag>
             </div>
             <div class="pb-6 color-4E5969 f12">失败原因：{{item.failureReason}}</div>
             <div class="pb-6 color-86909C f12">{{ item.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</div>

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

@@ -6,7 +6,7 @@
         <div class="color-F53F3F" v-if="videoRecordingSts">{{ formattedTime }}</div>
       </div>
       <div class="flex-row">
-        <div class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
+        <div v-if="remoteUsersViews.length == 1" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
             @click="handleClose">
           <span class="mr-4">退出房间</span>
         </div>

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

@@ -12,7 +12,7 @@
         <a class="case-img"><img :src="reg_img(item)"/></a>
         <div class="flex-column pl-8">
           <a class="mt-8 f-weight500">{{item.materialType}}</a>
-          <a class="color-86909C">{{item.createBy + ' ' + item.createAt}}</a>
+          <a class="color-86909C">{{item.createAt}}</a>
         </div>
       </div>
       <div class="color-86909C mt-8">

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

@@ -24,9 +24,12 @@
                 <div class="mr-8 color-000 f-weight600 f16">
                   {{item.bookingTime}}
                 </div>
-                
 
-                <el-tag v-if="$util.getTimeContrast(item.bookingEndTime)" size="small" :type="queryCondition.type?'success':''">{{ queryCondition.type ? '已视频' : '待视频' }}</el-tag>
+                <el-tag v-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 0" size="small" type="info">未开始</el-tag>
+                <el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 1" size="small" type="info">进行中</el-tag>
+                <el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 2" size="small" type="success">已结束</el-tag>
+                <el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 3" size="small" type="warning">视频失败</el-tag>
+                <el-tag v-else-if="$util.getTimeContrast(item.bookingEndTime) && item.status.code == 4" size="small" type="warning">已取消</el-tag>
                 <el-tag v-else size="small" type="warning">已过期</el-tag>
               </div>
               <div class="flex-row align-items-center">

src/pages/payment-receipt/index.vue

@@ -277,6 +277,9 @@ import smapi from "@/services/systemManage";
                     }
                 })
             },
+            getProofList(){
+                this.getCaseInfoList(1)
+            },
             // 列表数据
             getCaseInfoList(val){
                 this.queryParam.current = val

src/pages/system-management/take-management/components/addOrEditRoleDialog.vue

@@ -33,9 +33,9 @@
                             <el-select v-model="userInfo.seatTelephone" placeholder="请选择">
                                 <el-option
                                   v-for="item in phoneList"
-                                  :key="item.value"
+                                  :key="item"
-                                  :label="item.label"
+                                  :label="item"
-                                  :value="item.value">
+                                  :value="item">
                                 </el-option>
                               </el-select>
                         </el-form-item>
@@ -106,7 +106,7 @@ export default {
             let _this=this;
             this.$refs.ruleForm.validate((valid) => {
                 if(valid) {
-                    systemManageApi.seatUnbind(_this.userInfo).then(res => {
+                    systemManageApi.seatBind(_this.userInfo).then(res => {
                         this.$message({
                             showClose: true,
                             message: '绑定成功！',

src/pages/system-management/take-management/index.vue

@@ -30,7 +30,7 @@
               <el-table-column  label="操作" width="100">
                 <template slot-scope="scope">
                     <div class="flex-row">
-                        <div class="f14 color-1960F4 cursor-pointer mr-8" @click="handleAddForm(scope)">解绑</div>
+                        <div class="f14 color-1960F4 cursor-pointer mr-8" @click="handleDelete(scope)">解绑</div>
                     </div>
                   
                 </template>
@@ -105,10 +105,7 @@ export default {
                 }
             })
         },
-        // 新增
+        
-        handleAddForm(){
-            this.addOrEditRoleConfig = true
-        },
         // 删除
         handleDelete(scope){
             this.$confirm("确定解绑坐席电话, 是否继续?", "提示", {

src/pages/system-management/user-management/components/addOrEditUserDialog.vue

@@ -199,7 +199,7 @@ export default {
                     { pattern: /^(13[0-9]{9})|(18[0-9]{9})|(14[0-9]{9})|(17[0-9]{9})|(15[0-9]{9})|(19[0-9]{9})$/, message: '请输入正确手机号码', trigger: ['blur', 'change']}
                 ],
                 email: [
-                    { required: false, message: '请输入邮箱地址', trigger: 'blur' },
+                    { required: true, message: '请输入邮箱地址', trigger: 'blur' },
                     { pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入正确邮箱地址', trigger: ['blur', 'change']}
                 ],