Merge branch 'main' into 'stg'

Main

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

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

@@ -25,7 +25,7 @@
                             <span >{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column  label="操作" width="220">
+                    <el-table-column  label="操作" width="260">
                         <template slot-scope="scope">
                             <div class="flex-row align-items-center">
                                 <el-button size="mini" @click="handleCaseShow(scope)">查看凭证</el-button>

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

@@ -448,7 +448,7 @@ export default {
       fileDialog: null,
       eventTraDialog: null,
       navactive: 1,
-      Qualitydesc: '结清应还金额：16776.74逾期未还费用：2486.88',
+      Qualitydesc: '',
       tableData: [{
         H: '电话调解',
         A: '一次性全部还款',

src/pages/event-tracing/components/voideDialog.vue

@@ -79,9 +79,9 @@
 
             <el-table-column prop="invitee" label="受邀人" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column prop="createByName" label="操作人" show-overflow-tooltip></el-table-column> -->
-            <el-table-column prop="createAt" label="操作时间" show-overflow-tooltip>
+            <el-table-column label="操作时间" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
+                <span>{{ scope.row.updateAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
               </template>
             </el-table-column>
 

src/pages/mediation-package/index.vue

@@ -177,7 +177,11 @@
                             <template slot-scope="scope">
                                 <div class="flex-row align-items-center">
                                     <el-button size="mini" @click="jumpUrl(`/mediation-management?pkgId=${scope.row.id}&pkgName=${scope.row.pkgName}`)">查看案件</el-button>
-                                    <el-button size="mini" @click="handleDe1lete(scope)">办结</el-button>
+
+                                    <!-- <span v-for="(item,index) in scope.row.mediateStatus" :key="index">
+                                        {{ item.status == 1 ? item.count:'' }}
+                                    </span> -->
+                                    <el-button v-if="scope.row.mediateStatus.find(item=>{return item.status == 1 }).count > 0" size="mini" @click="handleConclude(scope.row)">办结</el-button>
                                 </div>
                             </template>
                         </el-table-column>
@@ -203,6 +207,7 @@
 </template>
 <script>
 import api from "@/services/casePackageManagement";
+import cmapi from "@/services/caseManagement";
     export default {
         components: {
             
@@ -348,6 +353,19 @@ import api from "@/services/casePackageManagement";
                 }
 
             },
+            handleConclude(item) {
+                this.$confirm("请确定是否对该案件包进行办结?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }).then(() => {
+                    if(!this.$clickThrottle()) { return }//防止重复点击
+                    cmapi.updateCaseStatus({caseStatus: 2, pkgId: item.id}).then((res) => {
+                        this.$message.success("办结成功");
+                        this.getCaseInfoList(1)
+                    });
+                }).catch(() => {});
+            },
             
         }
     }

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

@@ -13,7 +13,7 @@
             title="发起签字"
             trigger="click">
             
-            <singleofficeWritPopover :caseId="caseId" :singleofficevisible.sync="singleofficevisible"/>
+            <singleofficeWritPopover :caseId="caseId" :singleofficevisible.sync="singleofficevisible" @handleUpdate='getSetTimeWritCaseList'/>
 
             <span slot="reference" class="cursor-pointer border-E5E6EB"><i class="el-icon-edit-outline"></i> 发起签字</span>
         </el-popover>
@@ -131,6 +131,15 @@ export default {
     await this.getWritCaseList();
   },
   methods: {
+
+    // 列表数据
+    getSetTimeWritCaseList() {
+      let _this = this
+      setTimeout(() => {
+        _this.getWritCaseList()
+      }, 1500);
+    },
+
     // 列表数据
     getWritCaseList() {
       let dataJson = {

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

@@ -125,7 +125,7 @@ import api from "@/services/caseManagement";
                 api.traceSignCreate(this.ObjectInfo).then((res) => {
                     this.$message.success("发起签字成功");
                     this.handleClose()
-                    this.$parent.getWritCaseList()
+                    this.$emit('handleUpdate',null)
                 });
             },