diff --git a/src/api/factory/mt/factoryOrderMain.js b/src/api/factory/mt/factoryOrderMain.js
index d47eeb37..2f163c5e 100644
--- a/src/api/factory/mt/factoryOrderMain.js
+++ b/src/api/factory/mt/factoryOrderMain.js
@@ -48,3 +48,14 @@ export const update = (row) => {
   })
 }
 
+export const beachPush = (ids,data) => {
+  return request({
+    url: '/logpm-factory/mtfactoryOrderMain/beachPush',
+    method: 'post',
+    params: {
+      ids,
+      data
+    }
+  })
+}
+
diff --git a/src/api/factory/mt/packageInfo.js b/src/api/factory/mt/packageInfo.js
index 18af877a..93f27afd 100644
--- a/src/api/factory/mt/packageInfo.js
+++ b/src/api/factory/mt/packageInfo.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/logpm-factory/mtpackageInfo/list',
+    url: '/logpm-factory/mtpackageInfo/listBySendData',
     method: 'get',
     params: {
       ...params,
@@ -48,3 +48,13 @@ export const update = (row) => {
   })
 }
 
+export const beachPush = (ids,data) => {
+  return request({
+    url: '/logpm-factory/mtpackageInfo/beachPush',
+    method: 'post',
+    params: {
+      ids,
+      data
+    }
+  })
+}
diff --git a/src/option/factory/mt/factoryOrderMain.js b/src/option/factory/mt/factoryOrderMain.js
index c8b0d961..2820dc7a 100644
--- a/src/option/factory/mt/factoryOrderMain.js
+++ b/src/option/factory/mt/factoryOrderMain.js
@@ -6,7 +6,10 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  viewBtn: true,
+  addBtn:false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
   selection: true,
   dialogClickModal: false,
   column: [
@@ -23,6 +26,7 @@ export default {
       label: "发货单编号",
       prop: "invoiceOrderCode",
       type: "input",
+      search: true
     },
     {
       label: "中心仓编号",
diff --git a/src/option/factory/mt/packageInfo.js b/src/option/factory/mt/packageInfo.js
index 72763800..33126a60 100644
--- a/src/option/factory/mt/packageInfo.js
+++ b/src/option/factory/mt/packageInfo.js
@@ -6,7 +6,10 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  viewBtn: true,
+  viewBtn: false,
+  delBtn: false,
+  addBtn:false,
+  editBtn: false,
   selection: true,
   dialogClickModal: false,
   column: [
@@ -19,6 +22,18 @@ export default {
       viewDisplay: false,
       hide: true,
     },
+    {
+      label: "发货单编号",
+      prop: "invoiceOrderCode",
+      type: "input",
+      search: true,
+      width: "100",
+    },
+    {
+      label: "订单自编码",
+      prop: "orderCode",
+      type: "input",
+    },
     {
       label: "出库人",
       prop: "outboundMan",
@@ -69,14 +84,10 @@ export default {
       prop: "size",
       type: "input",
     },
+
     {
-      label: "订单id",
-      prop: "orderId",
-      type: "input",
-    },
-    {
-      label: "订单自编码",
-      prop: "orderCode",
+      label: "推送状态",
+      prop: "pushStatusName",
       type: "input",
     },
     {
@@ -142,5 +153,6 @@ export default {
       viewDisplay: false,
       hide: true,
     },
+
   ]
 }
diff --git a/src/views/factory/mt/factoryOrderMain.vue b/src/views/factory/mt/factoryOrderMain.vue
index 5bfcc4ba..3a5967aa 100644
--- a/src/views/factory/mt/factoryOrderMain.vue
+++ b/src/views/factory/mt/factoryOrderMain.vue
@@ -1,224 +1,342 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               v-model:search="search"
-               v-model:page="page"
-               v-model="form"
-               :table-loading="loading"
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template #menu-left>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.mtfactoryOrderMain_delete"
-                   @click="handleDelete">删 除
+        <!-- <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="permission.mtfactoryOrderMain_delete"
+          @click="handleDelete"
+          >删 除
+        </el-button> -->
+        <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
+          >导 出
         </el-button>
-        <el-button type="warning"
-                   plain
-                   icon="el-icon-download"
-                   @click="handleExport">导 出
+
+        <el-button type="warning" plain icon="el-icon-download" @click="handlePush"
+          >推 送
         </el-button>
       </template>
+
+      <template #menu="{ row, index, size }">
+        <el-button type="success" icon="el-icon" :size="size" @click="$refs.crud.rowView(row,index)"
+          >查看</el-button
+        >
+      </template>
     </avue-crud>
+
+    <el-dialog title="推送数据" append-to-body v-model="showPushDialog" width="555px">
+      <el-form   label-width="80px">
+        <!-- 表单字段 -->
+        <el-date-picker
+          v-model="showPushData"
+          type="datetime"
+          placeholder="选择推送时间"
+          format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            >确 定</el-button
+          >
+          <el-button icon="el-icon-circle-close" @click="showPushDialog = false">取 消</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/factory/mt/factoryOrderMain";
-  import option from "@/option/factory/mt/factoryOrderMain";
-  import {mapGetters} from "vuex";
-  import {exportBlob} from "@/api/common";
-  import {getToken} from '@/utils/auth';
-  import {downloadXls} from "@/utils/util";
-  import {dateNow} from "@/utils/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
-
-  export default {
-    data() {
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  beachPush,
+} from '@/api/factory/mt/factoryOrderMain';
+import option from '@/option/factory/mt/factoryOrderMain';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+      showPushDialog: false,
+      showPushData: null,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
       return {
-        form: {},
-        query: {},
-        search: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: option,
-        data: []
+        addBtn: this.validData(this.permission.mtfactoryOrderMain_add, false),
+        viewBtn: this.validData(this.permission.mtfactoryOrderMain_view, false),
+        delBtn: this.validData(this.permission.mtfactoryOrderMain_delete, false),
+        editBtn: this.validData(this.permission.mtfactoryOrderMain_edit, false),
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.mtfactoryOrderMain_add, false),
-          viewBtn: this.validData(this.permission.mtfactoryOrderMain_view, false),
-          delBtn: this.validData(this.permission.mtfactoryOrderMain_delete, false),
-          editBtn: this.validData(this.permission.mtfactoryOrderMain_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      handleExport() {
-        let downloadUrl = `/logpm-factory/mtfactoryOrderMain/export-mtfactoryOrderMain?${this.website.tokenHeader}=${getToken()}`;
-        const {
-        } = this.query;
-        let values = {
-        };
-        this.$confirm("是否导出数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(downloadUrl, values).then(res => {
-            downloadXls(res.data, `梦天工厂主订单${dateNow()}.xlsx`);
-            NProgress.done();
-          })
         });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/logpm-factory/mtfactoryOrderMain/export-mtfactoryOrderMain?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `梦天工厂主订单${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+
+    // 推送数据
+    handlePush() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+
+      // 获取选中的数据
+      let pushStatuses = this.selectionList.map(item => item.pushStatus);
+      console.log(pushStatuses);
+      if (pushStatuses.includes(1)) {
+        this.$message.warning('选择的数据中存在已推送的数据');
+        return;
+      }
+
+      // 获取选中的数据
+      let pushIds = this.selectionList.map(item => item.id);
+      console.log(pushIds);
+
+      // 打开对话框
+      this.showPushDialog = true;
+    },
+
+    /**
+     * 格式化时间
+     * @param {时间} dataString 
+     */
+    formarDataTime(dataString) {
+      const date = new Date(dataString);
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      const hours = date.getHours().toString().padStart(2, '0');
+      const minutes = date.getMinutes().toString().padStart(2, '0');
+      const seconds = date.getSeconds().toString().padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+
+    /**
+     * 提交弹出框的数据
+     */
+    handleSubmit() {
+      // 构建请求对象
+
+      let pushStatuses = this.selectionList.map(item => item.pushStatus);
+      console.log(pushStatuses);
+      if (pushStatuses.includes(1)) {
+        this.$message.warning('选择的数据中存在已推送的数据');
+        return;
+      }
+
+      this.showPushData = this.formarDataTime(this.showPushData);
+      console.log(this.showPushData);
+
+      // 打开对话框
+      this.showPushDialog = false;
 
-        const {
-        } = this.query;
+      beachPush(this.ids, this.showPushData).then(res => {
+        console.log(' 推送结果 =', res);
+        if (res.data.code === 200) {
+          this.$message.success('推送成功');
+          this.onLoad(this.page);
+        }
+      });
 
-        let values = {
-        };
+      // 打开对话框
+      this.showPushDialog = false;
+    },
 
-        getList(page.currentPage, page.pageSize, values).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
       }
-    }
-  };
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const {invoiceOrderCode} = this.query;
+
+      let values = {
+        invoiceOrderCode:invoiceOrderCode
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
 
 <style>
diff --git a/src/views/factory/mt/packageInfo.vue b/src/views/factory/mt/packageInfo.vue
index 1d9da2f2..1a28c917 100644
--- a/src/views/factory/mt/packageInfo.vue
+++ b/src/views/factory/mt/packageInfo.vue
@@ -1,224 +1,381 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               v-model:search="search"
-               v-model:page="page"
-               v-model="form"
-               :table-loading="loading"
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template #menu-left>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.mtpackageInfo_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-        <el-button type="warning"
-                   plain
-                   icon="el-icon-download"
-                   @click="handleExport">导 出
+        <!-- <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="permission.mtpackageInfo_delete"
+          @click="handleDelete"
+          >删 除
+        </el-button> -->
+        <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
+          >导 出
         </el-button>
+
+        <el-button type="warning"  @click="handlePush">推送 </el-button>
+      </template>
+
+      <template #menu="{ row, index, size }">
+        <el-button type="success"  :size="size" @click="showRowView(row, index)"
+          >查看</el-button
+        >
       </template>
     </avue-crud>
+
+    <el-dialog title="推送数据" append-to-body v-model="showPushDialog" width="555px">
+      <el-form  label-width="80px">
+        <!-- 表单字段 -->
+        <el-date-picker
+          v-model="showPushData"
+          type="date"
+          placeholder="选择推送时间"
+          :disabled-date="disabledDate"
+          :shortcuts="shortcuts"
+          :size="size"
+        />
+      </el-form>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            >确 定</el-button
+          >
+          <el-button icon="el-icon-circle-close" @click="showPushDialog = false">取 消</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="查看数据" append-to-body v-model="showRowViewDialog" width="1000px">
+      <el-form :model="showRowViewData" label-width="80px">
+        <!-- 表单字段 -->
+
+        <el-row>
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple">
+              <el-form-item label="车次号">
+                <el-input v-model="showRowViewData.invoiceOrderCode" disabled />
+              </el-form-item></div
+          ></el-col>
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple-light">
+              <el-form-item label="订单号">
+                <el-input v-model="showRowViewData.orderCode" disabled />
+              </el-form-item></div
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple">
+              <el-form-item label="包件码">
+                <el-input v-model="showRowViewData.packageCode" disabled />
+              </el-form-item></div
+          ></el-col>
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple-light">
+              <el-form-item label="推送状态">
+                <el-input v-model="showRowViewData.pushStatusName" disabled />
+              </el-form-item></div
+          ></el-col>
+        </el-row>
+        <span>请求日志</span>
+
+        <el-row   v-for="(item) in showRowViewData.mtOrderLogVOS" :key="item.id">
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple">
+              <el-form-item label="请求体">
+                <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="item.reqArgs" disabled />
+              </el-form-item></div
+          ></el-col>
+          <el-col :span="12"
+            ><div class="grid-content ep-bg-purple-light">
+              <el-form-item label="响应体">
+                <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="item.resBody" disabled />
+              </el-form-item></div
+          ></el-col>
+        </el-row>
+       
+
+
+
+
+      </el-form>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/factory/mt/packageInfo";
-  import option from "@/option/factory/mt/packageInfo";
-  import {mapGetters} from "vuex";
-  import {exportBlob} from "@/api/common";
-  import {getToken} from '@/utils/auth';
-  import {downloadXls} from "@/utils/util";
-  import {dateNow} from "@/utils/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
-
-  export default {
-    data() {
+import { getList, getDetail, add, update, remove, beachPush } from '@/api/factory/mt/packageInfo';
+import option from '@/option/factory/mt/packageInfo';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+      showPushDialog: false,
+      showPushData: null,
+      showRowViewDialog: false,
+      showRowViewData: null,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
       return {
-        form: {},
-        query: {},
-        search: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: option,
-        data: []
+        addBtn: this.validData(this.permission.mtpackageInfo_add, false),
+        viewBtn: this.validData(this.permission.mtpackageInfo_view, false),
+        delBtn: this.validData(this.permission.mtpackageInfo_delete, false),
+        editBtn: this.validData(this.permission.mtpackageInfo_edit, false),
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.mtpackageInfo_add, false),
-          viewBtn: this.validData(this.permission.mtpackageInfo_view, false),
-          delBtn: this.validData(this.permission.mtpackageInfo_delete, false),
-          editBtn: this.validData(this.permission.mtpackageInfo_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      handleExport() {
-        let downloadUrl = `/logpm_factory/mtpackageInfo/export-mtpackageInfo?${this.website.tokenHeader}=${getToken()}`;
-        const {
-        } = this.query;
-        let values = {
-        };
-        this.$confirm("是否导出数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(downloadUrl, values).then(res => {
-            downloadXls(res.data, `梦天订单包件${dateNow()}.xlsx`);
-            NProgress.done();
-          })
         });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/logpm_factory/mtpackageInfo/export-mtpackageInfo?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `梦天订单包件${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+
+    // 推送数据
+    handlePush() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+
+      // 获取选中的数据
+      let pushStatuses = this.selectionList.map(item => item.pushStatus);
+      console.log(pushStatuses);
+      if (pushStatuses.includes(1)) {
+        this.$message.warning('选择的数据中存在已推送的数据');
+        return;
+      }
+
+      // 获取选中的数据
+      let pushIds = this.selectionList.map(item => item.id);
+      console.log(pushIds);
+
+      // 打开对话框
+      this.showPushDialog = true;
+    },
+    /**
+     * 提交弹出框的数据
+     */
+    handleSubmit() {
+      // 构建请求对象
+
+      let pushStatuses = this.selectionList.map(item => item.pushStatus);
+      console.log(pushStatuses);
+      if (pushStatuses.includes(1)) {
+        this.$message.warning('选择的数据中存在已推送的数据');
+        return;
+      }
+
+      beachPush(this.ids, this.showPushData).then(res => {
+        console.log(' 推送结果 =', res.data);
+        if (res.data.code === 200) {
+          this.$message.success('推送成功');
+          this.onLoad(this.page, this.query)
         }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
+      });
+
+      // 关闭对话框
+      this.showPushDialog = false;
+    },
 
-        const {
-        } = this.query;
+    showRowView(row, index) {
+      this.showRowViewData = row;
 
-        let values = {
-        };
+      getDetail(row.id).then(res => {
+        this.showRowViewData = res.data.data;
+      });
 
-        getList(page.currentPage, page.pageSize, values).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+      this.showRowViewDialog = true;
+    },
+
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
       }
-    }
-  };
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const { invoiceOrderCode } = this.query;
+
+      let values = {
+        invoiceOrderCode: invoiceOrderCode,
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
 
 <style>