Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:17:20
+ * @LastEditTime: 2023-10-08 15:08:19
 -->
 <template>
   <div class="clmlmx-box">
@@ -9,7 +9,7 @@
       :pagination="false" :data="tableData">
     </lb-table>
     <div class="text-center">
-      <el-button @click="$popupCacel">取消</el-button>
+      <el-button @click="handleCancel">取消</el-button>
       <el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation && tableData.length>0" :loading="loading">保存</el-button>
     </div>
   </div>
@@ -180,6 +180,9 @@
       }
     },
     methods: {
+      handleCancel () {
+        ywPopupCacel()
+      },
       handleSubmit () {
         this.loading = true
         store.dispatch('user/reWorkFresh', false)