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

src/layout/components/Navbar.vue

@@ -485,7 +485,7 @@ export default {
       }
     },
     getNoticeList() {
-      this.listLoading = true
+      // this.listLoading = true
       getNoticeList({
         pageNum: this.currentPage2,
         pageSize: this.pageSize2,
@@ -493,11 +493,11 @@ export default {
       }).then(res => {
         this.noticeList = res.data.records
         this.listTotal2 = res.data.total
-        this.listLoading = false
+        // this.listLoading = false
       })
     },
     getNoticeLists() {
-      this.listLoading = true
+      // this.listLoading = true
       getNoticeList({
         pageNum: 1,
         pageSize: this.pageSize2,
@@ -505,17 +505,21 @@ export default {
       }).then(res => {
         this.noticeList = res.data.records
         this.listTotal2 = res.data.total
-        this.listLoading = false
+        // this.listLoading = false
       })
     },
-      // 获取物流列表
-     async getListInvoiceOrder(data) {
-      const res = await getListInvoiceOrder({
+    // 获取物流列表
+    getListInvoiceOrder(data) {
+      // this.listLoading = true
+
+      getListInvoiceOrder({
         pageSize: this.pageSize,
         pageNum: this.currentPage
+      }).then(res => {
+        this.invoiceOrderList = res.data.records
+        this.listTotal = res.data.total
+        // this.listLoading = false
       })
-      this.invoiceOrderList = res.data.records
-      this.listTotal = res.data.total
     },
     handleNotice(flag = true) {
       if (flag || flag == 'click') {
@@ -753,7 +757,7 @@ export default {
         that.lockReconnect = false
       }, 20000)
     },
- 
+
     handleShow() {
       ;(this.isLogistics = true), this.getListInvoiceOrder()
     },

src/views/supply/sales/sales_list.vue

@@ -9,6 +9,7 @@
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
   >
+    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm"  @submit="submitExamineForm"/>
     <Popu v-if="isShowDetail || isShowExamine || isShowReturnForm">
       <SalesDetail v-if="isShowDetail" :list-item="queryItem" :edit="edit" @close="handleClose" />
       <SalesExamine v-if="isShowExamine" :list-item="queryItem" @close="handleClose" />