From 621c82c7cfbaf9a495e7938636068719a925da2a Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Sun, 17 Sep 2023 17:53:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=8A?= =?UTF-8?q?=E8=BD=AC=E7=A0=81=5F=E5=8F=82=E8=80=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Sidebar/index.vue | 28 +- src/views/jhzx/sydgWH.vue | 331 ++++++++++++++++++++++++ 2 files changed, 345 insertions(+), 14 deletions(-) create mode 100644 src/views/jhzx/sydgWH.vue diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 50dccf0..65c9ef1 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,21 +1,21 @@ diff --git a/src/views/jhzx/sydgWH.vue b/src/views/jhzx/sydgWH.vue new file mode 100644 index 0000000..cc883d5 --- /dev/null +++ b/src/views/jhzx/sydgWH.vue @@ -0,0 +1,331 @@ + + + + From bc29c47007943dae41694b787648ef1bf0ce6891 Mon Sep 17 00:00:00 2001 From: xiezuo003 Date: Fri, 22 Sep 2023 19:33:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E8=AE=BE=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E4=B8=AD=E5=BF=83=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzx/dhqdCX.js | 12 + src/api/jhzx/dhqdSH.js | 30 ++ src/api/jhzx/dhqdWH.js | 39 ++ src/api/jhzx/jtsyWH.js | 39 ++ src/api/jhzx/tzCX.js | 21 + src/api/jhzx/zrcCX.js | 12 + src/api/jhzx/zrcSH.js | 30 ++ src/api/jhzx/zrcWH.js | 39 ++ src/api/sjzx/gcrlWH.js | 29 ++ src/api/sjzx/sbcnWH.js | 38 ++ src/api/sjzx/sbryWH.js | 47 +++ src/api/sjzx/sbwxjhWH.js | 38 ++ src/api/sjzx/sbxxWH.js | 65 ++++ src/layout/components/AppMain.vue | 2 + src/styles/sidebar.scss | 5 + src/views/jhzx/dhqdCX.vue | 283 ++++++++++++++ src/views/jhzx/dhqdSH.vue | 377 ++++++++++++++++++ src/views/jhzx/dhqdWH.vue | 379 ++++++++++++++++++ src/views/jhzx/jtsyWH.vue | 299 ++++++++++++++ src/views/jhzx/tzCX.vue | 270 +++++++++++++ src/views/jhzx/zrcCX.vue | 352 +++++++++++++++++ src/views/jhzx/zrcSH.vue | 440 +++++++++++++++++++++ src/views/jhzx/zrcWH.vue | 454 ++++++++++++++++++++++ src/views/sjzx/gcrlWH.vue | 221 +++++++++++ src/views/sjzx/sbcnWH.vue | 288 ++++++++++++++ src/views/sjzx/sbryWH.vue | 309 +++++++++++++++ src/views/sjzx/sbwxjhWH.vue | 421 ++++++++++++++++++++ src/views/sjzx/sbxxWH.vue | 625 ++++++++++++++++++++++++++++++ 28 files changed, 5164 insertions(+) create mode 100644 src/api/jhzx/dhqdCX.js create mode 100644 src/api/jhzx/dhqdSH.js create mode 100644 src/api/jhzx/dhqdWH.js create mode 100644 src/api/jhzx/jtsyWH.js create mode 100644 src/api/jhzx/tzCX.js create mode 100644 src/api/jhzx/zrcCX.js create mode 100644 src/api/jhzx/zrcSH.js create mode 100644 src/api/jhzx/zrcWH.js create mode 100644 src/api/sjzx/gcrlWH.js create mode 100644 src/api/sjzx/sbcnWH.js create mode 100644 src/api/sjzx/sbryWH.js create mode 100644 src/api/sjzx/sbwxjhWH.js create mode 100644 src/api/sjzx/sbxxWH.js create mode 100644 src/views/jhzx/dhqdCX.vue create mode 100644 src/views/jhzx/dhqdSH.vue create mode 100644 src/views/jhzx/dhqdWH.vue create mode 100644 src/views/jhzx/jtsyWH.vue create mode 100644 src/views/jhzx/tzCX.vue create mode 100644 src/views/jhzx/zrcCX.vue create mode 100644 src/views/jhzx/zrcSH.vue create mode 100644 src/views/jhzx/zrcWH.vue create mode 100644 src/views/sjzx/gcrlWH.vue create mode 100644 src/views/sjzx/sbcnWH.vue create mode 100644 src/views/sjzx/sbryWH.vue create mode 100644 src/views/sjzx/sbwxjhWH.vue create mode 100644 src/views/sjzx/sbxxWH.vue diff --git a/src/api/jhzx/dhqdCX.js b/src/api/jhzx/dhqdCX.js new file mode 100644 index 0000000..9991e16 --- /dev/null +++ b/src/api/jhzx/dhqdCX.js @@ -0,0 +1,12 @@ +import request from "@/utils/request"; + +// 订货清单查询 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmDhqdp/getList", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/src/api/jhzx/dhqdSH.js b/src/api/jhzx/dhqdSH.js new file mode 100644 index 0000000..eacfd06 --- /dev/null +++ b/src/api/jhzx/dhqdSH.js @@ -0,0 +1,30 @@ +import request from "@/utils/request"; + +// 订货清单审核 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmDhqdp/getList", + method: "post", + data, + }); +} + +// 批量审核 +export function sh(data) { + return request({ + url: "/dmDhqdp/sh", + method: "post", + data, + }); +} + +// 批量提交 +export function tj(data) { + return request({ + url: "/dmDhqdp/tj", + method: "post", + data, + }); +} diff --git a/src/api/jhzx/dhqdWH.js b/src/api/jhzx/dhqdWH.js new file mode 100644 index 0000000..bb1faf7 --- /dev/null +++ b/src/api/jhzx/dhqdWH.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +// 订货清单维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmDhqdp/getList", + method: "post", + data, + }); +} + +// 批量保存 +export function save(data) { + return request({ + url: "/dmDhqdp/save", + method: "post", + data, + }); +} + +// 批量提交 +export function tj(data) { + return request({ + url: "/dmDhqdp/tj", + method: "post", + data, + }); +} + +// 导入 +export function upload(data) { + return request({ + url: "/dmDhqdp/upload", + method: "post", + data, + }); +} diff --git a/src/api/jhzx/jtsyWH.js b/src/api/jhzx/jtsyWH.js new file mode 100644 index 0000000..015c291 --- /dev/null +++ b/src/api/jhzx/jtsyWH.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +// 集团三月滚动计划维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmJtsyjh/getList", + method: "post", + data, + }); +} + +// 批量保存 +export function save(data) { + return request({ + url: "/dmJtsyjh/save", + method: "post", + data, + }); +} + +// 批量提交 +export function tj(data) { + return request({ + url: "/dmJtsyjh/tj", + method: "post", + data, + }); +} + +// 导入 +export function upload(data) { + return request({ + url: "/dmJtsyjh/upload", + method: "post", + data, + }); +} diff --git a/src/api/jhzx/tzCX.js b/src/api/jhzx/tzCX.js new file mode 100644 index 0000000..28ef5fa --- /dev/null +++ b/src/api/jhzx/tzCX.js @@ -0,0 +1,21 @@ +import request from "@/utils/request"; + +// 图纸查询 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmTzjh/getList", + method: "post", + data, + }); +} + +// 批量审核 +export function sh(data) { + return request({ + url: "/dmTzjh/sh", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/src/api/jhzx/zrcCX.js b/src/api/jhzx/zrcCX.js new file mode 100644 index 0000000..de1b29f --- /dev/null +++ b/src/api/jhzx/zrcCX.js @@ -0,0 +1,12 @@ +import request from "@/utils/request"; + +// 中日程计划查询 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmZrcjh/getList", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/src/api/jhzx/zrcSH.js b/src/api/jhzx/zrcSH.js new file mode 100644 index 0000000..64b8894 --- /dev/null +++ b/src/api/jhzx/zrcSH.js @@ -0,0 +1,30 @@ +import request from "@/utils/request"; + +// 中日程计划维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmZrcjh/getList", + method: "post", + data, + }); +} + +// 批量退回 +export function tj(data) { + return request({ + url: "/dmZrcjh/tj", + method: "post", + data, + }); +} + +//批量审核 +export function sh(data) { + return request({ + url: "/dmZrcjh/sh", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/src/api/jhzx/zrcWH.js b/src/api/jhzx/zrcWH.js new file mode 100644 index 0000000..16c0b57 --- /dev/null +++ b/src/api/jhzx/zrcWH.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +// 中日程计划维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmZrcjh/getList", + method: "post", + data, + }); +} + +// 批量保存 +export function save(data) { + return request({ + url: "/dmZrcjh/save", + method: "post", + data, + }); +} + +//批量提交 +export function tj(data) { + return request({ + url: "/dmZrcjh/tj", + method: "post", + data, + }); +} + +// 导入 +export function upload(data) { + return request({ + url: "/dmZrcjh/upload", + method: "post", + data, + }); +} diff --git a/src/api/sjzx/gcrlWH.js b/src/api/sjzx/gcrlWH.js new file mode 100644 index 0000000..7207964 --- /dev/null +++ b/src/api/sjzx/gcrlWH.js @@ -0,0 +1,29 @@ +import request from "@/utils/request"; + +//工厂日历 + +// 获取列表 +export function getList(data) { + return request({ + url: "/emGcrl/getList", + method: "post", + data, + }); +} + +// 点击新增 生成日历 +export function generate(data) { + return request({ + url: "/emGcrl/generate", + method: "post", + data, + }); +} +// 批量修改 +export function update(data) { + return request({ + url: "/emGcrl/update", + method: "post", + data, + }); +} diff --git a/src/api/sjzx/sbcnWH.js b/src/api/sjzx/sbcnWH.js new file mode 100644 index 0000000..2a0d126 --- /dev/null +++ b/src/api/sjzx/sbcnWH.js @@ -0,0 +1,38 @@ +import request from "@/utils/request"; + +// 设备产能维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/emSbcnp/getList", + method: "post", + data, + }); +} + +// 批量新增 +export function save(data) { + return request({ + url: "/emSbcnp/save", + method: "post", + data, + }); +} +// 批量修改 +export function update(data) { + return request({ + url: "/emSbcnp/update", + method: "post", + data, + }); +} + +// 批量删除 +export function delete1(data) { + return request({ + url: "/emSbcnp/delete", + method: "post", + data, + }); +} diff --git a/src/api/sjzx/sbryWH.js b/src/api/sjzx/sbryWH.js new file mode 100644 index 0000000..b3719aa --- /dev/null +++ b/src/api/sjzx/sbryWH.js @@ -0,0 +1,47 @@ +import request from "@/utils/request"; + +// 设备人员信息维护 + +// 获取人员信息 +export function getRYList(data) { + return request({ + url: "/emSbrydyp/getRYList", + method: "post", + data, + }); +} + +// 获取列表 +export function getList(data) { + return request({ + url: "/emSbrydyp/getList", + method: "post", + data, + }); +} + +// 批量新增 +export function save(data) { + return request({ + url: "/emSbrydyp/save", + method: "post", + data, + }); +} +// 批量修改 +export function update(data) { + return request({ + url: "/emSbrydyp/update", + method: "post", + data, + }); +} + +// 批量删除 +export function delete1(data) { + return request({ + url: "/emSbrydyp/delete", + method: "post", + data, + }); +} diff --git a/src/api/sjzx/sbwxjhWH.js b/src/api/sjzx/sbwxjhWH.js new file mode 100644 index 0000000..49f613a --- /dev/null +++ b/src/api/sjzx/sbwxjhWH.js @@ -0,0 +1,38 @@ +import request from "@/utils/request"; + +// 设备维修计划维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/emSbwxjh/getList", + method: "post", + data, + }); +} + +// 批量新增 +export function save(data) { + return request({ + url: "/emSbwxjh/save", + method: "post", + data, + }); +} +// 批量修改 +export function update(data) { + return request({ + url: "/emSbwxjh/update", + method: "post", + data, + }); +} + +// 批量删除 +export function delete1(data) { + return request({ + url: "/emSbwxjh/delete", + method: "post", + data, + }); +} diff --git a/src/api/sjzx/sbxxWH.js b/src/api/sjzx/sbxxWH.js new file mode 100644 index 0000000..4a5d319 --- /dev/null +++ b/src/api/sjzx/sbxxWH.js @@ -0,0 +1,65 @@ +import request from "@/utils/request"; + +// 设备信息维护 + +// 获取供应商 +export function getGYS(data) { + return request({ + url: "/emSbjbb/getGYS", + method: "post", + data, + }); +} + +// 获取设备分类 +export function getSBLX(data) { + return request({ + url: "/emSbjbb/getSBLX", + method: "post", + data, + }); +} + +// 获取设备状态 +export function getZhbmAll(data) { + return request({ + url: "/api/sy/getZhbmAll", + method: "post", + data, + }); +} + +// 获取列表 +export function getList(data) { + return request({ + url: "/emSbjbb/getList", + method: "post", + data, + }); +} + +// 批量新增 +export function save(data) { + return request({ + url: "/emSbjbb/save", + method: "post", + data, + }); +} +// 批量修改 +export function update(data) { + return request({ + url: "/emSbjbb/update", + method: "post", + data, + }); +} + +// 批量删除 +export function delete1(data) { + return request({ + url: "/emSbjbb/delete", + method: "post", + data, + }); +} diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index a897638..c437185 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -27,6 +27,8 @@ export default { /* 50= navbar 50 */ min-height: calc(100vh - 50px); width: 100%; + padding-left: 10px; + padding-right: 10px; position: relative; overflow: hidden; } diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 94760cc..98335e2 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -63,10 +63,15 @@ } .el-menu { + overflow-y: auto !important; border: none; height: 100%; width: 100% !important; } + ::-webkit-scrollbar { + width: 10px; + height: 10px; + } // menu hover .submenu-title-noDropdown, diff --git a/src/views/jhzx/dhqdCX.vue b/src/views/jhzx/dhqdCX.vue new file mode 100644 index 0000000..a193ae6 --- /dev/null +++ b/src/views/jhzx/dhqdCX.vue @@ -0,0 +1,283 @@ + + + + diff --git a/src/views/jhzx/dhqdSH.vue b/src/views/jhzx/dhqdSH.vue new file mode 100644 index 0000000..a73c859 --- /dev/null +++ b/src/views/jhzx/dhqdSH.vue @@ -0,0 +1,377 @@ + + + + diff --git a/src/views/jhzx/dhqdWH.vue b/src/views/jhzx/dhqdWH.vue new file mode 100644 index 0000000..b14e80c --- /dev/null +++ b/src/views/jhzx/dhqdWH.vue @@ -0,0 +1,379 @@ + + + + diff --git a/src/views/jhzx/jtsyWH.vue b/src/views/jhzx/jtsyWH.vue new file mode 100644 index 0000000..b581983 --- /dev/null +++ b/src/views/jhzx/jtsyWH.vue @@ -0,0 +1,299 @@ + + + + diff --git a/src/views/jhzx/tzCX.vue b/src/views/jhzx/tzCX.vue new file mode 100644 index 0000000..492062d --- /dev/null +++ b/src/views/jhzx/tzCX.vue @@ -0,0 +1,270 @@ + + + + diff --git a/src/views/jhzx/zrcCX.vue b/src/views/jhzx/zrcCX.vue new file mode 100644 index 0000000..17222b2 --- /dev/null +++ b/src/views/jhzx/zrcCX.vue @@ -0,0 +1,352 @@ + + + + diff --git a/src/views/jhzx/zrcSH.vue b/src/views/jhzx/zrcSH.vue new file mode 100644 index 0000000..ddd2720 --- /dev/null +++ b/src/views/jhzx/zrcSH.vue @@ -0,0 +1,440 @@ + + + + diff --git a/src/views/jhzx/zrcWH.vue b/src/views/jhzx/zrcWH.vue new file mode 100644 index 0000000..0abf26f --- /dev/null +++ b/src/views/jhzx/zrcWH.vue @@ -0,0 +1,454 @@ + + + + diff --git a/src/views/sjzx/gcrlWH.vue b/src/views/sjzx/gcrlWH.vue new file mode 100644 index 0000000..e10a274 --- /dev/null +++ b/src/views/sjzx/gcrlWH.vue @@ -0,0 +1,221 @@ + + + + diff --git a/src/views/sjzx/sbcnWH.vue b/src/views/sjzx/sbcnWH.vue new file mode 100644 index 0000000..d234882 --- /dev/null +++ b/src/views/sjzx/sbcnWH.vue @@ -0,0 +1,288 @@ + + + + diff --git a/src/views/sjzx/sbryWH.vue b/src/views/sjzx/sbryWH.vue new file mode 100644 index 0000000..6dc6f9e --- /dev/null +++ b/src/views/sjzx/sbryWH.vue @@ -0,0 +1,309 @@ + + + + diff --git a/src/views/sjzx/sbwxjhWH.vue b/src/views/sjzx/sbwxjhWH.vue new file mode 100644 index 0000000..0198d52 --- /dev/null +++ b/src/views/sjzx/sbwxjhWH.vue @@ -0,0 +1,421 @@ + + + + diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue new file mode 100644 index 0000000..2cb8d76 --- /dev/null +++ b/src/views/sjzx/sbxxWH.vue @@ -0,0 +1,625 @@ + + + + From 4786eff560de3ed9cc1078822d0387ba9ce27d79 Mon Sep 17 00:00:00 2001 From: xiezuo003 Date: Fri, 22 Sep 2023 22:31:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E7=BA=BF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzx/xbjhWH.js | 39 +++ src/views/jhzx/dhqdWH.vue | 19 +- src/views/jhzx/jtsyWH.vue | 30 +- src/views/jhzx/tzCX.vue | 4 +- src/views/jhzx/xbjhWH.vue | 569 ++++++++++++++++++++++++++++++++++++++ src/views/jhzx/zrcWH.vue | 16 ++ 6 files changed, 665 insertions(+), 12 deletions(-) create mode 100644 src/api/jhzx/xbjhWH.js create mode 100644 src/views/jhzx/xbjhWH.vue diff --git a/src/api/jhzx/xbjhWH.js b/src/api/jhzx/xbjhWH.js new file mode 100644 index 0000000..5b079e5 --- /dev/null +++ b/src/api/jhzx/xbjhWH.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +// 线表计划维护 + +// 获取列表 +export function getList(data) { + return request({ + url: "/dmXbjh/getList", + method: "post", + data, + }); +} + +// 批量保存 +export function save(data) { + return request({ + url: "/dmXbjh/save", + method: "post", + data, + }); +} + +// 批量提交 +export function tj(data) { + return request({ + url: "/dmXbjh/tj", + method: "post", + data, + }); +} + +// 导入 +export function upload(data) { + return request({ + url: "/dmXbjh/upload", + method: "post", + data, + }); +} diff --git a/src/views/jhzx/dhqdWH.vue b/src/views/jhzx/dhqdWH.vue index b14e80c..62381ea 100644 --- a/src/views/jhzx/dhqdWH.vue +++ b/src/views/jhzx/dhqdWH.vue @@ -71,7 +71,7 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" - :scroll-y="{enabled: true}" + :scroll-y="{ enabled: true }" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" highlight-hover-row @@ -241,7 +241,7 @@ export default { if (this.list.length > 0) { this.list.forEach((item, index) => { arrList.push(item.dcCh); - this.ShipNoList = [] + this.ShipNoList = []; Array.from(new Set(arrList)).forEach((em, eindex) => { this.ShipNoList.push({ label: em, @@ -260,6 +260,21 @@ export default { if (res.success) { this.list = res.data; this.$message.success("导入成功！"); + this.checkedList = []; + this.ShipNoList = []; + var arrList = []; + if (this.list.length > 0) { + this.list.forEach((item, index) => { + arrList.push(item.dcCh); + this.ShipNoList = []; + Array.from(new Set(arrList)).forEach((em, eindex) => { + this.ShipNoList.push({ + label: em, + value: eindex + 1, + }); + }); + }); + } } }); }, diff --git a/src/views/jhzx/jtsyWH.vue b/src/views/jhzx/jtsyWH.vue index b581983..9debced 100644 --- a/src/views/jhzx/jtsyWH.vue +++ b/src/views/jhzx/jtsyWH.vue @@ -70,7 +70,7 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" - :scroll-y="{enabled: true}" + :scroll-y="{ enabled: true }" highlight-hover-row @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" @@ -100,23 +100,23 @@ export default { { type: "seq", width: 60, title: "序号" }, { field: "dcCh", - title: "船号" + title: "船号", }, - { field: "dcPl", title: "批量"}, - { field: "dcFd", title: "分段"}, + { field: "dcPl", title: "批量" }, + { field: "dcFd", title: "分段" }, { field: "jhrq", title: "计划期" }, - { field: "bz", title: "备注"}, + { field: "bz", title: "备注" }, { field: "bzy", - title: "编制人" + title: "编制人", }, { field: "bzrq", - title: "编制日期" + title: "编制日期", }, { field: "zt", - title: "状态" + title: "状态", }, ], statusOptions: [ @@ -178,6 +178,20 @@ export default { if (res.success) { this.$message.success("上传成功！"); this.list = res.data; + this.ShipNoList = []; + var arrList = []; + if (this.list.length > 0) { + this.list.forEach((item, index) => { + arrList.push(item.dcCh); + this.ShipNoList = []; + Array.from(new Set(arrList)).forEach((em, eindex) => { + this.ShipNoList.push({ + label: em, + value: eindex + 1, + }); + }); + }); + } } }); }, diff --git a/src/views/jhzx/tzCX.vue b/src/views/jhzx/tzCX.vue index 492062d..9e3da3a 100644 --- a/src/views/jhzx/tzCX.vue +++ b/src/views/jhzx/tzCX.vue @@ -77,7 +77,7 @@ export default { return { request: { dcCh: "", - zt: "", + Zt: "", }, list: [], height: "500px", @@ -158,7 +158,7 @@ export default { // 获取列表接口(船号) initList() { let params = { - zt: this.request.zt, + Zt: this.request.Zt, dcCh: "", }; if (this.ShipNoList.length > 0 && this.request.dcCh) { diff --git a/src/views/jhzx/xbjhWH.vue b/src/views/jhzx/xbjhWH.vue new file mode 100644 index 0000000..295cbd0 --- /dev/null +++ b/src/views/jhzx/xbjhWH.vue @@ -0,0 +1,569 @@ + + + + + diff --git a/src/views/jhzx/zrcWH.vue b/src/views/jhzx/zrcWH.vue index 0abf26f..f35df70 100644 --- a/src/views/jhzx/zrcWH.vue +++ b/src/views/jhzx/zrcWH.vue @@ -70,6 +70,7 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" + :scroll-y="{ enabled: true }" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" highlight-hover-row @@ -333,6 +334,21 @@ export default { if (res.success) { this.list = res.data; this.$message.success("导入成功！"); + this.checkedList = []; + this.ShipNoList = []; + var arrList = []; + if (this.list.length > 0) { + this.list.forEach((item, index) => { + arrList.push(item.dcCh); + this.ShipNoList = []; + Array.from(new Set(arrList)).forEach((em, eindex) => { + this.ShipNoList.push({ + label: em, + value: eindex + 1, + }); + }); + }); + } } }); },