Эх сурвалжийг харах

调拨订单-列表页主表、搜索框优化

002390 1 жил өмнө
parent
commit
c39a03fc33

+ 182 - 2
src/views/purchase/transferOrder/columns.js

@@ -1,5 +1,119 @@
 export default function useColumns() {
 export default function useColumns() {
 
 
+  const TableColumns = [
+    {
+      item: { key: "code", title: "单据号", },
+      attr: {},
+    },
+    {
+      item: { key: "status", title: "单据状态", width: 80 },
+      attr: { is: "el-dict-tag", dictName: "sys_status", },
+    },
+    {
+      item: { key: "deliveryInventoryOrgName", title: "调出库存组织", },
+      attr: {},
+    },
+    {
+      item: { key: "billType", title: "订单类型", },
+      attr: { is: "el-dict-tag", dictName: "sys_allot_billtype", },
+    },
+    {
+      item: { key: "createByName", title: "制单人", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "approveUser", title: "当前审批人", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "billDate", title: "单据日期", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "allotType", title: "调拨方式", width: 100 },
+      attr: { is: "el-dict-tag", dictName: "sys_to_type", },
+    },
+    {
+      item: { key: "deliveryCode", title: "调拨出库单号", },
+      attr: {},
+    },
+    {
+      item: { key: "storageCode", title: "调拨入库单号", },
+      attr: {},
+    },
+    {
+      item: { key: "storageInventoryOrgName", title: "调拨入库组织", },
+      attr: {},
+    },
+    {
+      item: { key: "businessPersonalName", title: "调出业务员", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "deliveryDeptName", title: "调出部门", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "currencyName", title: "币种", width: 100 },
+      attr: {},
+    },
+    {
+      item: { key: "rate", title: "折本汇率", width: 80 },
+      attr: {},
+    },
+    {
+      item: { key: "onRouteAffilliation", title: "在途归属", },
+      attr: {},
+    },
+    {
+      item: { key: "qty", title: "总数量", width: 100 },
+      attr: { isSummary: true, },
+    },
+    {
+      item: { key: "accountPath", title: "结算路径", },
+      attr: {},
+    },
+    {
+      item: { key: "customerName", title: "客户", },
+      attr: {},
+    },
+    {
+      item: { key: "deliveryWarehouseName", title: "调出仓库", },
+      attr: {},
+    },
+    {
+      item: { key: "storageWarehouseName", title: "调入仓库", },
+      attr: {},
+    },
+    {
+      item: { key: "materialProject", title: "物流项目组", },
+      attr: {},
+    },
+    {
+      item: { key: "liacenterName", title: "利润中心", },
+      attr: {},
+    },
+    {
+      item: { key: "remark", title: "备注", },
+      attr: {},
+    },
+    {
+      item: { key: "createTime", title: "制单日期", width: 100 },
+      attr: {},
+    },
+
+  ].map(({ item, attr }) => ({
+    attr,
+    item: {
+      ...item,
+      width: item.width || 160,
+      sortabled: true,
+      fixedabled: true,
+      filterabled: true,
+      hiddenabled: true,
+    },
+  }));
+
   const TabColumns = [
   const TabColumns = [
     // 物料信息
     // 物料信息
     {
     {
@@ -414,7 +528,73 @@ export default function useColumns() {
         item: { ...item, width: item.width || 150 },
         item: { ...item, width: item.width || 150 },
       })),
       })),
     },
     },
-  ]
+  ];
+
+  const SearchColumns = [
+    {
+      item: { key: "deliveryInventoryOrgName", title: "调出库存组织" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "ORG_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          deliveryInventoryOrg: "id",
+          deliveryInventoryOrgName: "name"
+        },
+      },
+    },
+    {
+      item: { width: 100, key: "billDates", title: "单据日期", },
+      attr: {
+        clearable: true,
+        is: "el-date-picker",
+        type: "daterange",
+        rangeSeparator: "-",
+        startPlaceholder: "开始日期",
+        endPlaceholder: "结束日期",
+        valueFormat: "yyyy-MM-dd",
+      },
+    },
+    {
+      item: { key: "billType", title: "订单类型" },
+      attr: {
+        is: "el-select",
+        dictName: "sys_allot_billtype",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "storageInventoryOrgName", title: "调入库存组织" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "ORG_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          storageInventoryOrg: "id",
+          storageInventoryOrgName: "name"
+        },
+      },
+    },
+    {
+      item: { key: "code", title: "单据号" },
+      attr: {
+        is: "el-input",
+        clearable: true,
+      },
+    },
+    {
+      item: { key: "createByName", title: "制单人" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "CONTACTS_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          createBy: "code",
+          createByName: "name"
+        },
+      },
+    },
+  ];
 
 
-  return { TabColumns }
+  return { TableColumns, TabColumns, SearchColumns }
 }
 }

+ 14 - 0
src/views/purchase/transferOrder/dicts.js

@@ -0,0 +1,14 @@
+import { initDicts } from "@/utils/init.js";
+const modules = require.context("./", true, /columns.js$/);
+const columns = [];
+modules.keys().forEach((fileName) => {
+  const data = modules(fileName).default();
+  for (const key in data) {
+    if (key === "TabColumns") {
+      columns.push(...data[key].map((item) => item.TableColumns).flat());
+    } else {
+      columns.push(...data[key]);
+    }
+  }
+});
+export const dicts = initDicts(columns);

+ 62 - 518
src/views/purchase/transferOrder/index.vue

@@ -2,128 +2,18 @@
   <div id="transferOrder">
   <div id="transferOrder">
     <div v-if="isList">
     <div v-if="isList">
       <el-card style="position: relative">
       <el-card style="position: relative">
-        <el-form class="search_area" label-width="100px">
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-form-item label="调出库存组织">
-                <el-select
-                  clearable
-                  size="mini"
-                  v-model="queryParams.deliveryInventoryOrg"
-                  @focus="chooseRefer('ORG_PARAM', true, '调出库存组织')"
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in chuOrgOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="单据日期">
-                <el-date-picker
-                  size="mini"
-                  v-model="dateRange"
-                  style="width: 240px"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  range-separator="-"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="订单类型">
-                <el-select
-                  v-model="queryParams.billType"
-                  size="mini"
-                  style="width: 200px"
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in dict.type.sys_allot_billtype"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="调入库存组织">
-                <el-select
-                  clearable
-                  size="mini"
-                  v-model="queryParams.storageInventoryOrg"
-                  @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')"
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in ruOrgOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <div style="position: absolute; top: 3px; right: 10px">
-              <el-button type="primary" size="mini" @click="searchList"
-                >搜索</el-button
-              >
-              <el-button size="mini" plain @click="resetList">重置</el-button>
-            </div>
-          </el-row>
-
-          <CollapseTransition>
-            <div v-show="expanded">
-              <el-row :gutter="10">
-                <el-col :span="1.5">
-                  <el-form-item label="单据号">
-                    <el-input
-                      v-model.trim="queryParams.code"
-                      size="mini"
-                      clearable
-                      style="width: 200px"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-form-item label="制单人">
-                    <el-select
-                      clearable
-                      size="mini"
-                      v-model="queryParams.createBy"
-                      @focus="chooseRefer('CONTACTS_PARAM', true, '制单人')"
-                      style="width: 200px"
-                    >
-                      <el-option
-                        v-for="item in manOptions"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.code"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </CollapseTransition>
-        </el-form>
-        <el-divider class="lines"
-          ><i
-            style="cursor: pointer"
-            :class="expanded ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
-            @click="drop"
-          ></i
-        ></el-divider>
+        <el-super-search
+          v-model="params"
+          :size="size"
+          :dict="dict"
+          :columns="SearchColumns"
+          @reset="resetList"
+          @submit="getList(params, Pages)"
+        ></el-super-search>
 
 
         <div class="btn_grooup">
         <div class="btn_grooup">
-          <el-button-group>
-            <el-button type="primary" size="mini" @click="addOrder"
+          <el-button-group style="margin-right: 5px">
+            <el-button type="primary" :size="size" @click="addOrder"
               >新增</el-button
               >新增</el-button
             >
             >
           </el-button-group>
           </el-button-group>
@@ -133,233 +23,29 @@
             @temDownload="useImportTemplate"
             @temDownload="useImportTemplate"
             :fileSize="2"
             :fileSize="2"
           ></BatchImport>
           ></BatchImport>
-          <!-- <el-button-group>
-            <el-dropdown @command="btnImport">
-              <el-button type="primary" size="mini">
-                导入<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-button size="mini" type="primary" @click="useImportTemplate"
-                  >模板下载</el-button
-                >
-                <el-upload ref="upload" action="" :http-request="onUpload">
-                  <el-button size="mini" type="primary">数据导入</el-button>
-                </el-upload>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-button-group> -->
         </div>
         </div>
 
 
-        <el-table
-          v-loading="loading"
-          :data="tableList"
-          fit
-          :cell-style="{ borderColor: '#c0c0c0' }"
-          :header-cell-style="{ borderColor: '#c0c0c0' }"
-          class="exporttable"
-          border
-          show-summary
-          :summary-method="getSummaries"
-          highlight-current-row
-          height="600"
-          max-height="600"
-          style="font-size: 12px"
-          ref="multipleTable"
+        <el-super-ux-table
+          v-model="tableList"
+          :size="size"
+          :dict="dict"
+          :page="Pages"
+          :columns="TableColumns"
+          index
+          pagination
+          height="400"
+          showSummary
+          convenitentOperation
+          storage-key="TransferOrderSuperTable"
           @row-click="select"
           @row-click="select"
           @row-dblclick="doubleClick"
           @row-dblclick="doubleClick"
+          @pagination="getList(params, Pages)"
         >
         >
-          <el-table-column
-            show-overflow-tooltip
-            label="单据号"
-            align="center"
-            prop="code"
-            width="150px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="单据状态"
-            align="center"
-            prop="status"
-            width="100px"
-            :formatter="formatterStatus"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调出库存组织"
-            align="center"
-            prop="deliveryInventoryOrgName"
-            width="200px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="订单类型"
-            align="center"
-            prop="billType"
-            width="220px"
-            :formatter="formatterBillType"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="制单人"
-            align="center"
-            prop="createByName"
-            width="100px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="当前审批人"
-            align="center"
-            width="120"
-            prop="approveUser"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="单据日期"
-            align="center"
-            prop="billDate"
-            width="100px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调拨方式"
-            align="center"
-            prop="allotType"
-            width="180px"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                scope.row.allotType == "2"
-                  ? "财务组织间调拨"
-                  : "财务组织内库存组织内调拨"
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            label="调拨出库单号"
-            align="center"
-            prop="deliveryCode"
-            width="150px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调拨入库单号"
-            align="center"
-            prop="storageCode"
-            width="150px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调拨入库组织"
-            align="center"
-            prop="storageInventoryOrgName"
-            width="200px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调出业务员"
-            align="center"
-            prop="businessPersonalName"
-            width="100px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调出部门"
-            align="center"
-            prop="deliveryDeptName"
-            width="120px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="币种"
-            align="center"
-            prop="currencyName"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="折本汇率"
-            align="center"
-            prop="rate"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="在途归属"
-            align="center"
-            prop="onRouteAffilliation"
-            width="200px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="总数量"
-            align="center"
-            prop="qty"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="结算路径"
-            align="center"
-            prop="accountPath"
-            width="100px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="客户"
-            align="center"
-            prop="customerName"
-            width="150px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调出仓库"
-            align="center"
-            prop="deliveryWarehouseName"
-            width="180px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="调入仓库"
-            align="center"
-            prop="storageWarehouseName"
-            width="180px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="物流项目组"
-            align="center"
-            prop="materialProject"
-            width="120px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="利润中心"
-            align="center"
-            prop="liacenterName"
-            width="150px"
-          />
-          <!-- <el-table-column show-overflow-tooltip label="已同步WMS" align="center" prop="isSendWms" width="150px"/> -->
-          <el-table-column
-            show-overflow-tooltip
-            label="备注"
-            align="center"
-            prop="remark"
-            width="150px"
-          />
-          <el-table-column
-            show-overflow-tooltip
-            label="制单日期"
-            align="center"
-            prop="createTime"
-            width="150px"
-          />
-          <!-- <el-table-column show-overflow-tooltip label="审批人" align="center" prop="code" width="150px"/> -->
-          <!-- <el-table-column show-overflow-tooltip label="审批日期" align="center" prop="code" width="150px"/> -->
-          <!-- <el-table-column show-overflow-tooltip label="最后修改人" align="center" prop="updateByName" width="100px"/>
-          <el-table-column show-overflow-tooltip label="最后修改时间" align="center" prop="updateTime" width="150px"/> -->
-          <el-table-column
+          <ux-table-column
             fixed="right"
             fixed="right"
-            label="操作"
+            title="操作"
             align="center"
             align="center"
-            width="180"
+            width="160"
           >
           >
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button type="text" size="mini" @click="check(scope.row)"
               <el-button type="text" size="mini" @click="check(scope.row)"
@@ -394,15 +80,8 @@
                 >删除</el-button
                 >删除</el-button
               >
               >
             </template>
             </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList(queryParams)"
-          style="height: 32px; padding: 0 !important; flex: 1; overflow-x: auto"
-        />
+          </ux-table-column>
+        </el-super-ux-table>
 
 
         <el-tabs v-model="tabName" style="margin-top: 10px">
         <el-tabs v-model="tabName" style="margin-top: 10px">
           <el-tab-pane
           <el-tab-pane
@@ -432,7 +111,7 @@
       :pageStu="page"
       :pageStu="page"
       :disable="disable"
       :disable="disable"
       :row="rowDetail"
       :row="rowDetail"
-      @refresh="searchList"
+      @refresh="getList(params, Pages)"
     />
     />
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true" />
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true" />
   </div>
   </div>
@@ -440,6 +119,7 @@
 
 
 <script>
 <script>
 import useColumns from "./columns";
 import useColumns from "./columns";
+import { dicts } from "./dicts";
 import Add from "./add.vue";
 import Add from "./add.vue";
 import CollapseTransition from "@/components/MyCollapse/collapse.vue";
 import CollapseTransition from "@/components/MyCollapse/collapse.vue";
 import Refers from "@/components/Refers/refers.vue";
 import Refers from "@/components/Refers/refers.vue";
@@ -453,37 +133,36 @@ import {
 } from "@/api/purchase/transferOrder.js";
 } from "@/api/purchase/transferOrder.js";
 export default {
 export default {
   name: "transferOrder",
   name: "transferOrder",
-  dicts: ["sys_allot_billtype", "oa_templete_id"],
+  dicts: [...dicts, "oa_templete_id"],
   components: {
   components: {
     Add,
     Add,
     CollapseTransition,
     CollapseTransition,
     Refers,
     Refers,
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
     BatchImport: () => import("@/components/BatchImport/index.vue"),
     BatchImport: () => import("@/components/BatchImport/index.vue"),
+    ElSuperSearch: () => import("@/components/super-search/index.vue"),
   },
   },
   data() {
   data() {
-    const { TabColumns } = useColumns();
+    const { TableColumns, TabColumns, SearchColumns } = useColumns();
+    const Pages = this.$init.page();
+    const params = this.$init.params(SearchColumns);
     return {
     return {
+      params: {
+        ...params,
+        code: this.$route.query.billCode,
+      },
+      TableColumns: TableColumns,
       TabColumns: TabColumns,
       TabColumns: TabColumns,
+      SearchColumns: SearchColumns,
       tabName: "materialInfo",
       tabName: "materialInfo",
       size: "mini",
       size: "mini",
-      loading: true,
+      Pages: Pages,
+      loading: false,
       itemLoading: false,
       itemLoading: false,
-      expanded: false,
       // 页面配置
       // 页面配置
       isList: true,
       isList: true,
       // 页面状态
       // 页面状态
       page: "",
       page: "",
-      queryParams: {
-        deliveryInventoryOrg: "",
-        storageInventoryOrg: "",
-        code: this.$route.query.billCode,
-        createBy: "",
-        pageNum: 1,
-        pageSize: 50,
-      },
-      //单据日期查询范围
-      dateRange: [],
       referCondition: {
       referCondition: {
         type: "",
         type: "",
         isPage: true,
         isPage: true,
@@ -503,7 +182,7 @@ export default {
       ruOrgOptions: [],
       ruOrgOptions: [],
       manOptions: [],
       manOptions: [],
       tableList: [],
       tableList: [],
-      total: 0,
+      // total: 0,
       tabParams: {
       tabParams: {
         materialInfo: [],
         materialInfo: [],
         receiveInfo: [],
         receiveInfo: [],
@@ -531,93 +210,28 @@ export default {
     },
     },
   },
   },
   created() {
   created() {
-    this.getList(this.queryParams);
+    this.getList(this.params, this.Pages);
   },
   },
   methods: {
   methods: {
-    // 指定列合计
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "合计";
-          return;
-        }
-        const values = data.map((item) => Number(item[column.property]));
-        if (column.property === "qty") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index];
-        }
-      });
-      return sums;
-    },
-    formatterBillType(row) {
-      switch (row.billType) {
-        case "5X-01":
-          return "普通+不传wms+外仓互调(同组织)";
-        case "5X-Cxx-01":
-          return "普通+传wms+外仓调中心仓";
-        case "5X-Cxx-02":
-          return "普通+传wms+中心仓调中心仓(跨组织)";
-        case "5X-Cxx-03":
-          return "普通+传wms+中心仓调外仓";
-        case "5X-Cxx-04":
-          return "普通+传wms+中心仓中心分仓互调";
-        case "5X-Cxx-05":
-          return "GH+不传WMS+外仓互调(同组织)";
-        case "5X-Cxx-06":
-          return "GH+传WMS+中心仓调外仓";
-        case "5X-Cxx-07":
-          return "GH+传WMS+外仓调中心仓";
-        case "5X-Cxx-08":
-          return "GH+传WMS+中心仓调中心仓";
-        case "5X-Cxx-09":
-          return "GH+传WMS+中心仓中心分仓互调";
-      }
-    },
-    // 格式化表格内容
-    formatterStatus(row) {
-      switch (row.status) {
-        case "0":
-          return "未提交";
-        case "1":
-          return "审批中";
-        case "2":
-          return "已完成";
-        case "3":
-          return "已驳回";
-      }
-    },
-    searchList() {
-      this.getList(this.queryParams);
-    },
     resetList() {
     resetList() {
-      this.dateRange = [];
-      this.queryParams = {
-        deliveryInventoryOrg: "",
-        billType: "",
-        storageInventoryOrg: "",
-        code: "",
-        createBy: "",
-        pageNum: 1,
-        pageSize: 50,
+      this.Pages = this.$init.page();
+      const { SearchColumns } = useColumns();
+      this.params = {
+        ...this.$init.params(SearchColumns),
+        code: this.$route.query.billCode,
       };
       };
-      this.getList(this.queryParams);
+      this.getList(this.params, this.Pages);
     },
     },
-    getList(params) {
+    getList(params, Pages) {
       this.loading = true;
       this.loading = true;
-      getOrderList(this.addDateRange(params, this.dateRange))
+      getOrderList({
+        ...this.addDateRange(params, params.billDates),
+        ...Pages,
+      })
         .then((res) => {
         .then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.tableList = res.rows;
             this.tableList = res.rows;
-            this.total = res.total;
+            this.Pages.total = res.total;
           }
           }
           this.loading = false;
           this.loading = false;
         })
         })
@@ -664,17 +278,13 @@ export default {
           if (res.code === 200) {
           if (res.code === 200) {
             this.$modal.closeLoading();
             this.$modal.closeLoading();
             this.$modal.notifySuccess("提交成功");
             this.$modal.notifySuccess("提交成功");
-            this.getList(this.queryParams);
+            this.getList(this.params, this.Pages);
           }
           }
         })
         })
         .catch((err) => {
         .catch((err) => {
           this.$modal.closeLoading();
           this.$modal.closeLoading();
         });
         });
     },
     },
-    //查询条件单据日期改变后
-    billDateAfterChange(val) {
-      console.log("val", val);
-    },
     // 选中某行
     // 选中某行
     select(row) {
     select(row) {
       this.getlistStAllotItem(row.id);
       this.getlistStAllotItem(row.id);
@@ -688,22 +298,13 @@ export default {
           delOrder(row.id).then((res) => {
           delOrder(row.id).then((res) => {
             if (res.code === 200) {
             if (res.code === 200) {
               this.$modal.notifySuccess("删除成功");
               this.$modal.notifySuccess("删除成功");
-              this.getList(this.queryParams);
+              this.getList(this.params, this.Pages);
             }
             }
           });
           });
         })
         })
         .catch(() => {});
         .catch(() => {});
     },
     },
 
 
-    drop() {
-      this.expanded = !this.expanded;
-    },
-    chooseRefer(type, isPage, title) {
-      this.referCondition.type = type;
-      this.referCondition.isPage = isPage;
-      this.referCondition.title = title;
-      this.$refs.refer.init(this.referCondition);
-    },
     selectionsToInput(selection) {
     selectionsToInput(selection) {
       if (this.referCondition.title == "调出库存组织") {
       if (this.referCondition.title == "调出库存组织") {
         this.chuOrgOptions = selection;
         this.chuOrgOptions = selection;
@@ -718,15 +319,6 @@ export default {
         this.queryParams.createBy = selection[0].code;
         this.queryParams.createBy = selection[0].code;
       }
       }
     },
     },
-    //导入按钮
-    btnImport(command) {
-      if (command == "useImportTemplate") {
-        this.useImportTemplate();
-      }
-      if (command == "useImportData") {
-        this.useImportData();
-      }
-    },
     //模板下载
     //模板下载
     useImportTemplate() {
     useImportTemplate() {
       this.download(
       this.download(
@@ -747,7 +339,7 @@ export default {
         formData.append("file", file[0].raw);
         formData.append("file", file[0].raw);
         let { code, msg } = await importData(formData);
         let { code, msg } = await importData(formData);
         if (code == 200) {
         if (code == 200) {
-          this.$message.success(msg);
+          this.$notify.success({ message: msg });
           let { setVisible } = this.$refs.batchImport;
           let { setVisible } = this.$refs.batchImport;
           setVisible(false);
           setVisible(false);
           this.resetList();
           this.resetList();
@@ -757,27 +349,6 @@ export default {
       } finally {
       } finally {
         this.$modal.closeLoading();
         this.$modal.closeLoading();
       }
       }
-      // this.loading = true;
-      // let formData = new FormData();
-      // formData.append("file", file.file);
-      // importData(formData)
-      //   .then((res) => {
-      //     console.log("res", res);
-      //     if (res.code == "200") {
-      //       this.$message.success(res.msg);
-      //     } else {
-      //       this.$message.success(res.msg);
-      //     }
-      //   })
-      //   .catch((e) => {
-      //     console.log("e", e);
-      //     this.$message.error(e.message);
-      //   })
-      //   .finally((e) => {
-      //     this.$refs["upload"].clearFiles();
-      //     this.resetList();
-      //     this.loading = false;
-      //   });
     },
     },
     //流程收回
     //流程收回
     async handleBack(row) {
     async handleBack(row) {
@@ -796,7 +367,7 @@ export default {
       } catch (err) {
       } catch (err) {
         console.error(err);
         console.error(err);
       } finally {
       } finally {
-        this.getList(this.queryParams);
+        this.getList(this.params, this.Pages);
       }
       }
     },
     },
   },
   },
@@ -810,35 +381,8 @@ export default {
   overflow-y: scroll;
   overflow-y: scroll;
 }
 }
 .btn_grooup {
 .btn_grooup {
-  margin-bottom: 10px;
+  margin: 10px 0;
   display: flex;
   display: flex;
   justify-content: flex-end;
   justify-content: flex-end;
 }
 }
-.lines {
-  margin-top: 0;
-}
-.el-pagination {
-  margin-top: 10px;
-  text-align: right;
-}
-::v-deep .el-table__row > td {
-  border-right: none;
-}
-::v-deep .el-card .el-form-item {
-  margin-bottom: 3px;
-}
-</style>
-<style>
-.exporttable {
-  border: solid 1px #c0c0c0;
-}
-.el-dropdown {
-  vertical-align: top;
-}
-.el-dropdown + .el-dropdown {
-  margin-left: 15px;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
 </style>
 </style>