Merge branch 'dev_v2' of ssh://gogs.zfire.top:2222/zfire-front/supply-front into dev_v2

src/layout/components/Navbar.vue

@@ -79,7 +79,14 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="到货通知" :modal="false" width="70%" :visible.sync="hasNotice" @close="handleNotice(false)">
+    <el-dialog
+      title="到货通知"
+      :modal="false"
+      width="70%"
+      :visible.sync="hasNotice"
+      :append-to-body="true"
+      @close="handleNotice(false)"
+    >
       <div style="margin-top: 20px">
         <el-radio-group v-model="noticeType" size="mini" @change="handleChangeNotice">
           <el-radio-button :label="1">物流通知</el-radio-button>
@@ -222,7 +229,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="物流通知" :visible.sync="isLogistics" width="60%" :modal="false" @close="isLogistics = false">
+    <el-dialog title="物流通知" :visible.sync="isLogistics" width="60%" :modal="true" @close="isLogistics = false">
       <div class="table">
         <el-table
           ref="table"

src/views/finance/rebate_list.vue

@@ -90,7 +90,7 @@ export default {
       detailId: null,
       isCustomer: null,
       secondId: null,
-      isShow: null,
+      isShow: false,
       isCollapse: true,
       isShowExamineDialog: false,
       examineForm: {

src/views/supply/sales/sales_list.vue

@@ -344,7 +344,7 @@ export default {
 
     // 提交 批量审批
     submitExamineForm() {
-      const ids = this.multipleSelection.map(item => {
+      const ids = this.recordSelected.map(item => {
         return item.id
       })
       examineBatch({