From c686d1c4638f71010e33938129e147ea078aec0d Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Sat, 2 Mar 2024 15:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               |   2 +-
 src/views/basicData/number/index.vue       | 161 ++++++++++++++-------
 src/views/wcs/base/AGV/index.vue           |  19 ++-
 src/views/wcs/base/changeTerm/index.vue    |  19 ++-
 src/views/wcs/base/eyeletMachine/index.vue |  12 +-
 src/views/wcs/base/plcConnect/index.vue    |  12 +-
 src/views/wcs/base/pointgroup/index.vue    |  12 +-
 src/views/wcs/base/wcsDevice/index.vue     |  12 +-
 8 files changed, 168 insertions(+), 81 deletions(-)

diff --git a/package.json b/package.json
index 590453f..c0598a8 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "axios": "0.24.0",
     "canvas": "^2.11.0",
     "clipboard": "2.0.8",
-    "core-js": "^3.33.1",
+    "core-js": "^3.30.2",
     "echarts": "4.9.0",
     "element-ui": "2.15.6",
     "file-saver": "2.0.5",
diff --git a/src/views/basicData/number/index.vue b/src/views/basicData/number/index.vue
index aec65f2..9b1bfb0 100644
--- a/src/views/basicData/number/index.vue
+++ b/src/views/basicData/number/index.vue
@@ -1,15 +1,25 @@
 <template>
   <div class="app-container">
     <div class="search-box number-search">
-      <el-form :inline="true" :model="searchForm" ref="searchForm">
-        <el-form-item label="序列号编号" prop="seqCode">
+      <el-form
+        :inline="true"
+        :model="searchForm"
+        ref="searchForm"
+      >
+        <el-form-item
+          label="序列号编号"
+          prop="seqCode"
+        >
           <el-input
             v-model="searchForm.seqCode"
             placeholder="请输入序列号编号"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="序列号类型" prop="seqType">
+        <el-form-item
+          label="序列号类型"
+          prop="seqType"
+        >
           <el-select
             v-model="searchForm.seqType"
             placeholder="请选择"
@@ -25,7 +35,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSearch">搜索</el-button>
+          <el-button
+            type="primary"
+            @click="onSearch"
+          >搜索</el-button>
           <el-button @click="resetForm('searchForm')">重置</el-button>
           <!-- <el-button @click="onExport">导出</el-button> -->
         </el-form-item>
@@ -34,8 +47,14 @@
 
     <div class="opt-box">
       <div class="opt-box-right">
-        <el-button type="primary" @click="onAdd">新增</el-button>
-        <el-button type="primary" @click="onSave">保存</el-button>
+        <el-button
+          type="primary"
+          @click="onAdd"
+        >新增</el-button>
+        <el-button
+          type="primary"
+          @click="onSave"
+        >保存</el-button>
       </div>
     </div>
     <el-form
@@ -49,6 +68,9 @@
       <heavy-table
         class="heavy-table tablem"
         highlight-current-row
+        @current-change="handleCurrentChange"
+        :paging="paging"
+        :loading="loading"
         :data="tableForm.numberList"
         :config="tableConfig.config"
         @del="onDel"
@@ -80,7 +102,10 @@
             :prop="`numberList.${scope.row.index}.seqType`"
             :rules="tableConfig.rules.seqType"
           >
-            <el-select v-model="scope.row.seqType" placeholder="请选择">
+            <el-select
+              v-model="scope.row.seqType"
+              placeholder="请选择"
+            >
               <el-option
                 v-for="item in dict.type.seqType"
                 :key="item.value"
@@ -118,7 +143,10 @@
             :prop="`numberList.${scope.row.index}.seqDate`"
             :rules="tableConfig.rules.seqDate"
           >
-            <el-select v-model="scope.row.seqDate" placeholder="请选择">
+            <el-select
+              v-model="scope.row.seqDate"
+              placeholder="请选择"
+            >
               <el-option
                 v-for="item in dict.type.seq_date_dict"
                 :key="item.value"
@@ -168,56 +196,61 @@
 </template>
 
 <script>
-import { tableConfig } from "./config.js";
-import {
-  getNumberList,
-  numberExport,
-  numberSaveOrUpdate,
-  numberRemove,
-} from "@/api/basicData/number";
-import { dealEmptyQueryCondition, downloadFile } from "@/utils/index";
-import { Throttle } from "@/utils/index";
+import { tableConfig } from './config.js'
+import { getNumberList, numberExport, numberSaveOrUpdate, numberRemove } from '@/api/basicData/number'
+import { dealEmptyQueryCondition, downloadFile } from '@/utils/index'
+import { Throttle } from '@/utils/index'
 export default {
-  name: "Number",
-  dicts: ["seqType", "seq_date_dict"],
+  name: 'Number',
+  dicts: ['seqType', 'seq_date_dict'],
   data() {
     return {
+      loading: false,
       searchForm: {},
       tableConfig: {},
       typeList: [],
       tableForm: {
-        numberList: [],
+        numberList: []
+      },
+      paging: {
+        page: 1, // 当前页
+        size: 10, // 页面大小
+        total: 0, // 总条数
+        pagerCount: 7, // 设置最大页码数
+        oldPage: 1 // 上一次记录的页数
       },
       handleSelect: [],
-      handleSelectId: [],
-    };
+      handleSelectId: []
+    }
   },
   async created() {
-    this.onSearch();
-    this.tableConfig = await this.getTableHeaderCom(
-      "sys_seq_mana",
-      tableConfig.call(this)
-    );
+    this.onSearch()
+    this.tableConfig = await this.getTableHeaderCom('sys_seq_mana', tableConfig.call(this))
   },
   methods: {
     async onSearch() {
-      const request = { ...this.searchForm };
-      dealEmptyQueryCondition(request);
-      const { rows } = await getNumberList(request);
-      this.tableForm.numberList = rows;
+      const request = {
+        ...this.searchForm,
+        pageSize: this.paging.size,
+        pageNum: this.paging.page
+      }
+      dealEmptyQueryCondition(request)
+      const { rows } = await getNumberList(request)
+      this.tableForm.numberList = rows
+      this.paging.total = total
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
-      this.onSearch();
+      this.$refs[formName].resetFields()
+      this.onSearch()
     },
     onAdd() {
-      this.tableForm.numberList.unshift({});
+      this.tableForm.numberList.unshift({})
     },
     downloadFile,
     onExport() {
       numberExport(this.searchForm).then((res) => {
-        this.downloadFile(res);
-      });
+        this.downloadFile(res)
+      })
       // this.download(
       //   "/wms/seqMana/export",
       //   {
@@ -228,38 +261,54 @@ export default {
     },
     // 删除
     onDel({ id, index }) {
-      this.$confirm("是否确认删除所选明细?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确认删除所选明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(async () => {
         if (id) {
-          await numberRemove([id]);
+          await numberRemove([id])
         }
-        this.tableForm.numberList.splice(index, 1);
-      });
+        this.tableForm.numberList.splice(index, 1)
+      })
     },
     onSave: Throttle(function () {
-      this.$refs["tableForm"].validate(async (valid) => {
+      this.$refs['tableForm'].validate(async (valid) => {
         if (valid) {
-          await numberSaveOrUpdate(this.tableForm.numberList);
+          await numberSaveOrUpdate(this.tableForm.numberList)
 
           this.$message({
-            message: "保存成功!",
-            type: "success",
-          });
-          this.onSearch();
+            message: '保存成功!',
+            type: 'success'
+          })
+          this.onSearch()
         } else {
-          this.$message("请填写完整数据!");
+          this.$message('请填写完整数据!')
         }
-      });
+      })
     }),
-    handleselection(data) {
-      this.handleSelect = data;
-      this.handleSelectId = data.map((ele) => ele.id);
+    // 点击分页
+    handleCurrentChange(val) {
+      this.$confirm('此操作会清空当前页编辑过的数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.paging.page = val
+          this.paging.oldPage = val
+          this.onSearch()
+        })
+        .catch(() => {
+          this.paging.page = this.paging.oldPage
+        })
     },
-  },
-};
+    handleselection(data) {
+      this.handleSelect = data
+      this.handleSelectId = data.map((ele) => ele.id)
+    }
+  }
+}
 </script>
 
 <style lang="scss">
diff --git a/src/views/wcs/base/AGV/index.vue b/src/views/wcs/base/AGV/index.vue
index 6c531d3..accdb03 100644
--- a/src/views/wcs/base/AGV/index.vue
+++ b/src/views/wcs/base/AGV/index.vue
@@ -229,7 +229,8 @@ export default {
           label: '交互点位-出库',
           prop: 'handshakePoint',
           istrue: true
-        },{
+        },
+        {
           label: '交互点位-回库',
           prop: 'handshakePointBack',
           istrue: true
@@ -343,9 +344,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
     /** 查询区域列表 */
     getList() {
@@ -355,10 +362,10 @@ export default {
         res.data.forEach((item, index) => {
           this.devNameArr.push({ devName: item.devName, devCode: item.id })
         })
-        console.log(this.devNameArr)
+        // console.log(this.devNameArr)
       })
       queryPointList(this.queryParams).then((response) => {
-        console.log(response)
+        // console.log(response)
         this.pointList = response.rows
         this.paging.total = response.total
         this.loading = false
diff --git a/src/views/wcs/base/changeTerm/index.vue b/src/views/wcs/base/changeTerm/index.vue
index 9c0ecab..3c9d88e 100644
--- a/src/views/wcs/base/changeTerm/index.vue
+++ b/src/views/wcs/base/changeTerm/index.vue
@@ -163,7 +163,7 @@
 </template>
 
 <script>
-import { getCarrierInfo, getDeviceList, rcsLayerChanges,rcsRestore } from '@/api/wms/setMold/materialVehicleBind.js'
+import { getCarrierInfo, getDeviceList, rcsLayerChanges, rcsRestore } from '@/api/wms/setMold/materialVehicleBind.js'
 import { areahoisterList, areahoisterInfo, areahoisterAdd, areahoisterEdit, areahoisterDel, queryBaseAreaList, switchStatus, gettAllDeviceList } from '@/api/wms/setMold/areahoister'
 import JsBarcode from 'jsbarcode'
 import * as XLSX from 'xlsx'
@@ -259,7 +259,8 @@ export default {
             {
               name: '换层',
               event: 'handleUpdate'
-            },{
+            },
+            {
               name: '恢复',
               event: 'handleRestore'
             }
@@ -341,9 +342,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
 
     /** 查询区域列表 */
@@ -427,7 +434,7 @@ export default {
         type: 'warning'
       }).then(() => {
         let nextData = {
-          carId: row.carId,
+          carId: row.carId
         }
         rcsRestore(nextData).then((res) => {
           debugger
diff --git a/src/views/wcs/base/eyeletMachine/index.vue b/src/views/wcs/base/eyeletMachine/index.vue
index 5aec3f1..f598fd6 100644
--- a/src/views/wcs/base/eyeletMachine/index.vue
+++ b/src/views/wcs/base/eyeletMachine/index.vue
@@ -344,9 +344,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
     /** 查询区域列表 */
     getList() {
diff --git a/src/views/wcs/base/plcConnect/index.vue b/src/views/wcs/base/plcConnect/index.vue
index eede65f..5b73e71 100644
--- a/src/views/wcs/base/plcConnect/index.vue
+++ b/src/views/wcs/base/plcConnect/index.vue
@@ -488,9 +488,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
     /** 查询区域列表 */
     getList() {
diff --git a/src/views/wcs/base/pointgroup/index.vue b/src/views/wcs/base/pointgroup/index.vue
index 82fbbd5..d74c4ae 100644
--- a/src/views/wcs/base/pointgroup/index.vue
+++ b/src/views/wcs/base/pointgroup/index.vue
@@ -316,9 +316,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
     /** 查询区域列表 */
     getList() {
diff --git a/src/views/wcs/base/wcsDevice/index.vue b/src/views/wcs/base/wcsDevice/index.vue
index 731e565..3cb71e2 100644
--- a/src/views/wcs/base/wcsDevice/index.vue
+++ b/src/views/wcs/base/wcsDevice/index.vue
@@ -367,9 +367,15 @@ export default {
   methods: {
     // 分页
     handleCurrentChange(val) {
-      this.paging.page = val
-      this.queryParams.pageNum = val
-      this.getList()
+      if (Object.prototype.toString.call(val) === '[object Object]') {
+        this.queryParams.pageSize = val.size
+        this.paging.size = val.size
+        this.getList()
+      } else {
+        this.paging.page = val
+        this.queryParams.pageNum = val
+        this.getList()
+      }
     },
     /** 查询区域列表 */
     getList() {