The open source simple and complete warehouse management system is derived from our many years of experience in implementing erp projects. We stripped the original commercial system wms function and opened it up for free, hoping to help the majority of small and medium-sized enterprises. At present, the system supports cross-platform。
feat(): Front-end version 2.0 update
fxysyd32a995d8e4d
diff --git a/frontend/index.html b/frontend/index.htmlindex 15bdd4a..c70b9c6 100644--- a/frontend/index.html+++ b/frontend/index.html@@ -1,5 +1,5 @@<!DOCTYPE html>-<html lang="en">+<html lang="en" style="overflow: auto;"><head><meta charset="UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1.0" />diff --git a/frontend/package.json b/frontend/package.jsonindex bf1724c..fc840ff 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -10,6 +10,7 @@},"dependencies": {"@claviska/jquery-minicolors": "2.3.6",+ "@kjgl77/datav-vue3": "^1.7.2","axios": "1.2.1","canvg": "3.0.10","echarts": "^5.4.3",diff --git a/frontend/src/App.vue b/frontend/src/App.vueindex d0b4801..08469d8 100644--- a/frontend/src/App.vue+++ b/frontend/src/App.vue@@ -17,6 +17,7 @@import { reactive, nextTick, onMounted, ref, computed, watch } from 'vue'import { emitter } from './utils/bus'import { store } from './store'+import { installNewLang } from '@/languages/method/index'const loadingFlag = ref(false)@@ -27,6 +28,7 @@ const data = reactive({const method = reactive({refreshSystem: () => {data.isShow = false+ installNewLang()nextTick(() => {data.isShow = truestore.commit('system/setRefreshFlag', false)diff --git a/frontend/src/api/wms/deliveryManagement.ts b/frontend/src/api/wms/deliveryManagement.tsindex f380cb2..7da4513 100644--- a/frontend/src/api/wms/deliveryManagement.ts+++ b/frontend/src/api/wms/deliveryManagement.ts@@ -161,7 +161,12 @@ export const confirmOrder = (data: ConfirmOrderVO[]) => http({method: 'post',data})-+// Confirm pickingDetail+export const confirmPickingDetail = (data: number[]) => http({+ url: '/dispatchlist/confirm-pick-detail',+ method: 'post',+ data+})// Confirm pickingexport const confirmPicking = (dispatch_no: string) => http({url: '/dispatchlist/confirm-pick-dispatchlistno',diff --git a/frontend/src/api/wms/stockAsn.ts b/frontend/src/api/wms/stockAsn.tsindex 049fe5c..ed91336 100644--- a/frontend/src/api/wms/stockAsn.ts+++ b/frontend/src/api/wms/stockAsn.ts@@ -178,3 +178,9 @@ export const getSkuInfo = (id: number) => http({sku_id: id}})++ export const getPrintAsnList = (data: number[]) => http({+ url: '/asn/print-sn',+ method: 'post',+ data+ })diff --git a/frontend/src/api/wms/stockageStatistic.ts b/frontend/src/api/wms/stockageStatistic.tsnew file mode 100644index 0000000..16aeb8c--- /dev/null+++ b/frontend/src/api/wms/stockageStatistic.ts@@ -0,0 +1,22 @@+import http from '@/utils/http/request'++interface ListProps {+ pageIndex: number+ pageSize: number+ spu_code?: string+ spu_name?: string+ sku_code?: string+ sku_name?: string+ warehouse_name?: string+ customer_name?: string+ stock_age_from?: string+ stock_age_to?: string+ expiry_date_from?: string+ expiry_date_to?: string+}+// Get stock Age+export const list = (data: ListProps) => http({+ url: '/stock/stock-age-list',+ method: 'post',+ data+})diff --git a/frontend/src/assets/fonts/demo.css b/frontend/src/assets/fonts/demo.cssnew file mode 100644index 0000000..a67054a--- /dev/null+++ b/frontend/src/assets/fonts/demo.css@@ -0,0 +1,539 @@+/* Logo 字体 */+@font-face {+ font-family: "iconfont logo";+ src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');+ src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),+ url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),+ url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),+ url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');+}++.logo {+ font-family: "iconfont logo";+ font-size: 160px;+ font-style: normal;+ -webkit-font-smoothing: antialiased;+ -moz-osx-font-smoothing: grayscale;+}++/* tabs */+.nav-tabs {+ position: relative;+}++.nav-tabs .nav-more {+ position: absolute;+ right: 0;+ bottom: 0;+ height: 42px;+ line-height: 42px;+ color: #666;+}++#tabs {+ border-bottom: 1px solid #eee;+}++#tabs li {+ cursor: pointer;+ width: 100px;+ height: 40px;+ line-height: 40px;+ text-align: center;+ font-size: 16px;+ border-bottom: 2px solid transparent;+ position: relative;+ z-index: 1;+ margin-bottom: -1px;+ color: #666;+}+++#tabs .active {+ border-bottom-color: #f00;+ color: #222;+}++.tab-container .content {+ display: none;+}++/* 页面布局 */+.main {+ padding: 30px 100px;+ width: 960px;+ margin: 0 auto;+}++.main .logo {+ color: #333;+ text-align: left;+ margin-bottom: 30px;+ line-height: 1;+ height: 110px;+ margin-top: -50px;+ overflow: hidden;+ *zoom: 1;+}++.main .logo a {+ font-size: 160px;+ color: #333;+}++.helps {+ margin-top: 40px;+}++.helps pre {+ padding: 20px;+ margin: 10px 0;+ border: solid 1px #e7e1cd;+ background-color: #fffdef;+ overflow: auto;+}++.icon_lists {+ width: 100% !important;+ overflow: hidden;+ *zoom: 1;+}++.icon_lists li {+ width: 100px;+ margin-bottom: 10px;+ margin-right: 20px;+ text-align: center;+ list-style: none !important;+ cursor: default;+}++.icon_lists li .code-name {+ line-height: 1.2;+}++.icon_lists .icon {+ display: block;+ height: 100px;+ line-height: 100px;+ font-size: 42px;+ margin: 10px auto;+ color: #333;+ -webkit-transition: font-size 0.25s linear, width 0.25s linear;+ -moz-transition: font-size 0.25s linear, width 0.25s linear;+ transition: font-size 0.25s linear, width 0.25s linear;+}++.icon_lists .icon:hover {+ font-size: 100px;+}++.icon_lists .svg-icon {+ /* 通过设置 font-size 来改变图标大小 */+ width: 1em;+ /* 图标和文字相邻时,垂直对齐 */+ vertical-align: -0.15em;+ /* 通过设置 color 来改变 SVG 的颜色/fill */+ fill: currentColor;+ /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示+ normalize.css 中也包含这行 */+ overflow: hidden;+}++.icon_lists li .name,+.icon_lists li .code-name {+ color: #666;+}++/* markdown 样式 */+.markdown {+ color: #666;+ font-size: 14px;+ line-height: 1.8;+}++.highlight {+ line-height: 1.5;+}++.markdown img {+ vertical-align: middle;+ max-width: 100%;+}++.markdown h1 {+ color: #404040;+ font-weight: 500;+ line-height: 40px;+ margin-bottom: 24px;+}++.markdown h2,+.markdown h3,+.markdown h4,+.markdown h5,+.markdown h6 {+ color: #404040;+ margin: 1.6em 0 0.6em 0;+ font-weight: 500;+ clear: both;+}++.markdown h1 {+ font-size: 28px;+}++.markdown h2 {+ font-size: 22px;+}++.markdown h3 {+ font-size: 16px;+}++.markdown h4 {+ font-size: 14px;+}++.markdown h5 {+ font-size: 12px;+}++.markdown h6 {+ font-size: 12px;+}++.markdown hr {+ height: 1px;+ border: 0;+ background: #e9e9e9;+ margin: 16px 0;+ clear: both;+}++.markdown p {+ margin: 1em 0;+}++.markdown>p,+.markdown>blockquote,+.markdown>.highlight,+.markdown>ol,+.markdown>ul {+ width: 80%;+}++.markdown ul>li {+ list-style: circle;+}++.markdown>ul li,+.markdown blockquote ul>li {+ margin-left: 20px;+ padding-left: 4px;+}++.markdown>ul li p,+.markdown>ol li p {+ margin: 0.6em 0;+}++.markdown ol>li {+ list-style: decimal;+}++.markdown>ol li,+.markdown blockquote ol>li {+ margin-left: 20px;+ padding-left: 4px;+}++.markdown code {+ margin: 0 3px;+ padding: 0 5px;+ background: #eee;+ border-radius: 3px;+}++.markdown strong,+.markdown b {+ font-weight: 600;+}++.markdown>table {+ border-collapse: collapse;+ border-spacing: 0px;+ empty-cells: show;+ border: 1px solid #e9e9e9;+ width: 95%;+ margin-bottom: 24px;+}++.markdown>table th {+ white-space: nowrap;+ color: #333;+ font-weight: 600;+}++.markdown>table th,+.markdown>table td {+ border: 1px solid #e9e9e9;+ padding: 8px 16px;+ text-align: left;+}++.markdown>table th {+ background: #F7F7F7;+}++.markdown blockquote {+ font-size: 90%;+ color: #999;+ border-left: 4px solid #e9e9e9;+ padding-left: 0.8em;+ margin: 1em 0;+}++.markdown blockquote p {+ margin: 0;+}++.markdown .anchor {+ opacity: 0;+ transition: opacity 0.3s ease;+ margin-left: 8px;+}++.markdown .waiting {+ color: #ccc;+}++.markdown h1:hover .anchor,+.markdown h2:hover .anchor,+.markdown h3:hover .anchor,+.markdown h4:hover .anchor,+.markdown h5:hover .anchor,+.markdown h6:hover .anchor {+ opacity: 1;+ display: inline-block;+}++.markdown>br,+.markdown>p>br {+ clear: both;+}+++.hljs {+ display: block;+ background: white;+ padding: 0.5em;+ color: #333333;+ overflow-x: auto;+}++.hljs-comment,+.hljs-meta {+ color: #969896;+}++.hljs-string,+.hljs-variable,+.hljs-template-variable,+.hljs-strong,+.hljs-emphasis,+.hljs-quote {+ color: #df5000;+}++.hljs-keyword,+.hljs-selector-tag,+.hljs-type {+ color: #a71d5d;+}++.hljs-literal,+.hljs-symbol,+.hljs-bullet,+.hljs-attribute {+ color: #0086b3;+}++.hljs-section,+.hljs-name {+ color: #63a35c;+}++.hljs-tag {+ color: #333333;+}++.hljs-title,+.hljs-attr,+.hljs-selector-id,+.hljs-selector-class,+.hljs-selector-attr,+.hljs-selector-pseudo {+ color: #795da3;+}++.hljs-addition {+ color: #55a532;+ background-color: #eaffea;+}++.hljs-deletion {+ color: #bd2c00;+ background-color: #ffecec;+}++.hljs-link {+ text-decoration: underline;+}++/* 代码高亮 */+/* PrismJS 1.15.0+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */+/**+ * prism.js default theme for JavaScript, CSS and HTML+ * Based on dabblet (http://dabblet.com)+ * @author Lea Verou+ */+code[class*="language-"],+pre[class*="language-"] {+ color: black;+ background: none;+ text-shadow: 0 1px white;+ font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;+ text-align: left;+ white-space: pre;+ word-spacing: normal;+ word-break: normal;+ word-wrap: normal;+ line-height: 1.5;++ -moz-tab-size: 4;+ -o-tab-size: 4;+ tab-size: 4;++ -webkit-hyphens: none;+ -moz-hyphens: none;+ -ms-hyphens: none;+ hyphens: none;+}++pre[class*="language-"]::-moz-selection,+pre[class*="language-"] ::-moz-selection,+code[class*="language-"]::-moz-selection,+code[class*="language-"] ::-moz-selection {+ text-shadow: none;+ background: #b3d4fc;+}++pre[class*="language-"]::selection,+pre[class*="language-"] ::selection,+code[class*="language-"]::selection,+code[class*="language-"] ::selection {+ text-shadow: none;+ background: #b3d4fc;+}++@media print {++ code[class*="language-"],+ pre[class*="language-"] {+ text-shadow: none;+ }+}++/* Code blocks */+pre[class*="language-"] {+ padding: 1em;+ margin: .5em 0;+ overflow: auto;+}++:not(pre)>code[class*="language-"],+pre[class*="language-"] {+ background: #f5f2f0;+}++/* Inline code */+:not(pre)>code[class*="language-"] {+ padding: .1em;+ border-radius: .3em;+ white-space: normal;+}++.token.comment,+.token.prolog,+.token.doctype,+.token.cdata {+ color: slategray;+}++.token.punctuation {+ color: #999;+}++.namespace {+ opacity: .7;+}++.token.property,+.token.tag,+.token.boolean,+.token.number,+.token.constant,+.token.symbol,+.token.deleted {+ color: #905;+}++.token.selector,+.token.attr-name,+.token.string,+.token.char,+.token.builtin,+.token.inserted {+ color: #690;+}++.token.operator,+.token.entity,+.token.url,+.language-css .token.string,+.style .token.string {+ color: #9a6e3a;+ background: hsla(0, 0%, 100%, .5);+}++.token.atrule,+.token.attr-value,+.token.keyword {+ color: #07a;+}++.token.function,+.token.class-name {+ color: #DD4A68;+}++.token.regex,+.token.important,+.token.variable {+ color: #e90;+}++.token.important,+.token.bold {+ font-weight: bold;+}++.token.italic {+ font-style: italic;+}++.token.entity {+ cursor: help;+}diff --git a/frontend/src/assets/fonts/demo_index.html b/frontend/src/assets/fonts/demo_index.htmlnew file mode 100644index 0000000..dcb7e1a--- /dev/null+++ b/frontend/src/assets/fonts/demo_index.html@@ -0,0 +1,303 @@+<!DOCTYPE html>+<html>+<head>+ <meta charset="utf-8"/>+ <title>iconfont Demo</title>+ <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>+ <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>+ <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">+ <link rel="stylesheet" href="demo.css">+ <link rel="stylesheet" href="iconfont.css">+ <script src="iconfont.js"></script>+ <!-- jQuery -->+ <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>+ <!-- 代码高亮 -->+ <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>+ <style>+ .main .logo {+ margin-top: 0;+ height: auto;+ }++ .main .logo a {+ display: flex;+ align-items: center;+ }++ .main .logo .sub-title {+ margin-left: 0.5em;+ font-size: 22px;+ color: #fff;+ background: linear-gradient(-45deg, #3967FF, #B500FE);+ -webkit-background-clip: text;+ -webkit-text-fill-color: transparent;+ }+ </style>+</head>+<body>+ <div class="main">+ <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">+ <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">++ </a></h1>+ <div class="nav-tabs">+ <ul id="tabs" class="dib-box">+ <li class="dib active"><span>Unicode</span></li>+ <li class="dib"><span>Font class</span></li>+ <li class="dib"><span>Symbol</span></li>+ </ul>++ <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4535486" target="_blank" class="nav-more">查看项目</a>++ </div>+ <div class="tab-container">+ <div class="content unicode" style="display: block;">+ <ul class="icon_lists dib-box">++ <li class="dib">+ <span class="icon iconfont"></span>+ <div class="name">407饼图</div>+ <div class="code-name">&#xe902;</div>+ </li>++ <li class="dib">+ <span class="icon iconfont"></span>+ <div class="name">图表_折线图</div>+ <div class="code-name">&#xe67e;</div>+ </li>++ <li class="dib">+ <span class="icon iconfont"></span>+ <div class="name">库位设置</div>+ <div class="code-name">&#xe61a;</div>+ </li>++ <li class="dib">+ <span class="icon iconfont"></span>+ <div class="name">库存</div>+ <div class="code-name">&#xe63b;</div>+ </li>++ <li class="dib">+ <span class="icon iconfont"></span>+ <div class="name">柱形图</div>+ <div class="code-name">&#xe6c0;</div>+ </li>++ </ul>+ <div class="article markdown">+ <h2 id="unicode-">Unicode 引用</h2>+ <hr>++ <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>+ <ul>+ <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>+ <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>+ </ul>+ <blockquote>+ <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>+ </blockquote>+ <p>Unicode 使用步骤如下:</p>+ <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>+<pre><code class="language-css"+>@font-face {+ font-family: 'iconfont';+ src: url('iconfont.woff2?t=1715302906993') format('woff2'),+ url('iconfont.woff?t=1715302906993') format('woff'),+ url('iconfont.ttf?t=1715302906993') format('truetype');+}+</code></pre>+ <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>+<pre><code class="language-css"+>.iconfont {+ font-family: "iconfont" !important;+ font-size: 16px;+ font-style: normal;+ -webkit-font-smoothing: antialiased;+ -moz-osx-font-smoothing: grayscale;+}+</code></pre>+ <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>+<pre>+<code class="language-html"+><span class="iconfont">&#x33;</span>+</code></pre>+ <blockquote>+ <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>+ </blockquote>+ </div>+ </div>+ <div class="content font-class">+ <ul class="icon_lists dib-box">++ <li class="dib">+ <span class="icon iconfont icon-chart-pie"></span>+ <div class="name">+ 407饼图+ </div>+ <div class="code-name">.icon-chart-pie+ </div>+ </li>++ <li class="dib">+ <span class="icon iconfont icon-chart-line"></span>+ <div class="name">+ 图表_折线图+ </div>+ <div class="code-name">.icon-chart-line+ </div>+ </li>++ <li class="dib">+ <span class="icon iconfont icon-chart-location"></span>+ <div class="name">+ 库位设置+ </div>+ <div class="code-name">.icon-chart-location+ </div>+ </li>++ <li class="dib">+ <span class="icon iconfont icon-chart-stock"></span>+ <div class="name">+ 库存+ </div>+ <div class="code-name">.icon-chart-stock+ </div>+ </li>++ <li class="dib">+ <span class="icon iconfont icon-chart-bar"></span>+ <div class="name">+ 柱形图+ </div>+ <div class="code-name">.icon-chart-bar+ </div>+ </li>++ </ul>+ <div class="article markdown">+ <h2 id="font-class-">font-class 引用</h2>+ <hr>++ <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>+ <p>与 Unicode 使用方式相比,具有如下特点:</p>+ <ul>+ <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>+ <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>+ </ul>+ <p>使用步骤如下:</p>+ <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>+<pre><code class="language-html"><link rel="stylesheet" href="./iconfont.css">+</code></pre>+ <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>+<pre><code class="language-html"><span class="iconfont icon-xxx"></span>+</code></pre>+ <blockquote>+ <p>"+ iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>+ </blockquote>+ </div>+ </div>+ <div class="content symbol">+ <ul class="icon_lists dib-box">++ <li class="dib">+ <svg class="icon svg-icon" aria-hidden="true">+ <use xlink:href="#icon-chart-pie"></use>+ </svg>+ <div class="name">407饼图</div>+ <div class="code-name">#icon-chart-pie</div>+ </li>++ <li class="dib">+ <svg class="icon svg-icon" aria-hidden="true">+ <use xlink:href="#icon-chart-line"></use>+ </svg>+ <div class="name">图表_折线图</div>+ <div class="code-name">#icon-chart-line</div>+ </li>++ <li class="dib">+ <svg class="icon svg-icon" aria-hidden="true">+ <use xlink:href="#icon-chart-location"></use>+ </svg>+ <div class="name">库位设置</div>+ <div class="code-name">#icon-chart-location</div>+ </li>++ <li class="dib">+ <svg class="icon svg-icon" aria-hidden="true">+ <use xlink:href="#icon-chart-stock"></use>+ </svg>+ <div class="name">库存</div>+ <div class="code-name">#icon-chart-stock</div>+ </li>++ <li class="dib">+ <svg class="icon svg-icon" aria-hidden="true">+ <use xlink:href="#icon-chart-bar"></use>+ </svg>+ <div class="name">柱形图</div>+ <div class="code-name">#icon-chart-bar</div>+ </li>++ </ul>+ <div class="article markdown">+ <h2 id="symbol-">Symbol 引用</h2>+ <hr>++ <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>+ 这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>+ <ul>+ <li>支持多色图标了,不再受单色限制。</li>+ <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>+ <li>兼容性较差,支持 IE9+,及现代浏览器。</li>+ <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>+ </ul>+ <p>使用步骤如下:</p>+ <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>+<pre><code class="language-html"><script src="./iconfont.js"></script>+</code></pre>+ <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>+<pre><code class="language-html"><style>+.icon {+ width: 1em;+ height: 1em;+ vertical-align: -0.15em;+ fill: currentColor;+ overflow: hidden;+}+</style>+</code></pre>+ <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>+<pre><code class="language-html"><svg class="icon" aria-hidden="true">+ <use xlink:href="#icon-xxx"></use>+</svg>+</code></pre>+ </div>+ </div>++ </div>+ </div>+ <script>+ $(document).ready(function () {+ $('.tab-container .content:first').show()++ $('#tabs li').click(function (e) {+ var tabContent = $('.tab-container .content')+ var index = $(this).index()++ if ($(this).hasClass('active')) {+ return+ } else {+ $('#tabs li').removeClass('active')+ $(this).addClass('active')++ tabContent.hide().eq(index).fadeIn()+ }+ })+ })+ </script>+</body>+</html>diff --git a/frontend/src/assets/fonts/iconfont.css b/frontend/src/assets/fonts/iconfont.cssnew file mode 100644index 0000000..a17f048--- /dev/null+++ b/frontend/src/assets/fonts/iconfont.css@@ -0,0 +1,35 @@+@font-face {+ font-family: "iconfont"; /* Project id 4535486 */+ src: url('iconfont.woff2?t=1715302906993') format('woff2'),+ url('iconfont.woff?t=1715302906993') format('woff'),+ url('iconfont.ttf?t=1715302906993') format('truetype');+}++.iconfont {+ font-family: "iconfont" !important;+ font-size: 16px;+ font-style: normal;+ -webkit-font-smoothing: antialiased;+ -moz-osx-font-smoothing: grayscale;+}++.icon-chart-pie:before {+ content: "\e902";+}++.icon-chart-line:before {+ content: "\e67e";+}++.icon-chart-location:before {+ content: "\e61a";+}++.icon-chart-stock:before {+ content: "\e63b";+}++.icon-chart-bar:before {+ content: "\e6c0";+}+diff --git a/frontend/src/assets/fonts/iconfont.js b/frontend/src/assets/fonts/iconfont.jsnew file mode 100644index 0000000..ed647b9--- /dev/null+++ b/frontend/src/assets/fonts/iconfont.js@@ -0,0 +1 @@+window._iconfont_svg_string_4535486='<svg><symbol id="icon-chart-pie" viewBox="0 0 1024 1024"><path d="M912.8 311.2C943.2 372 960 440 960 512c0 247.2-200.8 448-448 448S64 759.2 64 512 264 64 512 64v478.4l400.8-231.2zM576 62.4v363.2l304-175.2c-69.6-99.2-178.4-169.6-304-188z" fill="#48D6E8" ></path></symbol><symbol id="icon-chart-line" viewBox="0 0 1024 1024"><path d="M147.911 876.089v-800.995h-72.818v800.995h-0.182v72.818h873.813v-72.818h-800.814z" fill="#48D6E8" ></path><path d="M622.137 657.271l-209.078-184.047-139.537 175.218-56.98-45.329 187.324-235.11 210.352 185.322 282.533-337.783 55.796 46.785-330.411 394.945z" fill="#48D6E8" ></path></symbol><symbol id="icon-chart-location" viewBox="0 0 1264 1024"><path d="M1264.570394 585.194672v237.623949a72.137895 72.137895 0 0 1-41.270923 65.125286l-260.386185 128.008838a72.655218 72.655218 0 0 1-66.217414 0l-260.328704-128.008838a37.419737 37.419737 0 0 1-4.081108-2.241735 12.875608 12.875608 0 0 1-4.081108 2.241735L367.876247 1015.952745a72.655218 72.655218 0 0 1-66.217414 0l-260.386185-128.008838A72.137895 72.137895 0 0 1 0.001725 822.818621v-237.623949a69.378836 69.378836 0 0 1 12.530726-40.236276 77.426091 77.426091 0 0 1 32.821305-27.418148l252.223969-106.223768V182.774433a68.976473 68.976473 0 0 1 12.530726-39.948874 77.36861 77.36861 0 0 1 32.821305-27.418148L603.258461 5.734819a76.333963 76.333963 0 0 1 58.112678 0l260.328705 109.672592a77.483571 77.483571 0 0 1 32.821305 27.418148 69.436316 69.436316 0 0 1 12.473245 39.948874v228.542047l252.223969 106.223768a74.724512 74.724512 0 0 1 33.108707 27.418148 70.585924 70.585924 0 0 1 12.185844 40.236276zM334.76754 673.024714l234.749929-98.866278-234.749929-98.808797-234.80741 98.808797z m37.189815 259.351538l223.19637-109.730072v-179.33883l-223.19637 93.693042v195.43334zM632.28606 289.285603l256.305077-107.94818L632.28606 73.331762 375.980982 181.337423z m37.189815 216.528644l223.138889-94.267846V259.568239l-223.138889 93.693043v152.552965z m260.328704 167.382908l234.74993-98.866278-234.74993-98.808797-234.749929 98.808797z m37.189815 259.351538l223.13889-109.730072v-179.33883l-223.13889 93.693043v195.433339z m0 0" fill="#48D6E8" fill-opacity=".5" ></path></symbol><symbol id="icon-chart-stock" viewBox="0 0 1024 1024"><path d="M921.6 366.592L512 102.4 102.4 366.592l409.6 264.192z m-409.6-153.6L759.296 358.4 512 503.296 264.704 358.4z m0 621.568l-361.472-224.256-48.128 47.104L512 921.6l409.6-264.192-48.64-48.128z m0-145.408L150.528 464.896 102.4 512l409.6 264.192L921.6 512l-48.64-48.128z" fill="#48D6E8" ></path></symbol><symbol id="icon-chart-bar" viewBox="0 0 1025 1024"><path d="M835.962454 918.243407H31.132225c-22.012684 0-30.968155 9.434008-30.968155 32.403766v44.36718a25.90934 25.90934 0 0 0 27.344949 28.917285h971.360972a25.499165 25.499165 0 0 0 26.798051-28.302023v-47.853662a25.704253 25.704253 0 0 0-28.096936-29.190734h-161.403565z" fill="#48D6E8" ></path><path d="M947.461486 658.603111v-185.262033a39.240003 39.240003 0 0 0-44.982442-45.050805h-66.926764a38.488017 38.488017 0 0 0-42.111223 42.453034v300.04246a39.034916 39.034916 0 0 0 42.931571 42.931571h69.11436a38.351292 38.351292 0 0 0 41.906136-41.495961c0.341812-37.941118 0-75.813873 0-113.686628z" fill="#48D6E8" ></path><path d="M590.473169 598.649309V273.85967c0-28.438748-14.629548-41.837773-45.666066-41.906135h-66.926764c-26.251152 0-42.111222 13.672475-42.179585 37.941118v485.783029c0 24.337005 16.13352 38.351292 42.863209 38.488017h64.670806c32.472128 0 47.2384-13.672475 47.2384-42.726484V598.512584z" fill="#48D6E8" ></path><path d="M77.003378 558.520596v242.959877c0 33.70265 13.672475 47.443488 47.2384 47.443487h64.670806a38.624741 38.624741 0 0 0 42.111223-41.495961V41.769411a38.00948 38.00948 0 0 0-41.017425-41.017425c-23.379932-0.478537-46.828226 0-70.208158 0a38.351292 38.351292 0 0 0-42.521396 43.068296v515.17885z" fill="#48D6E8" ></path></symbol></svg>',function(l){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,n,a,o,c,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=l._iconfont_svg_string_4535486,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),i()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(a=i,o=l.document,c=!1,h(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){c||(c=!0,a())}function h(){try{o.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}s()}}(window);\ No newline at end of filediff --git a/frontend/src/assets/fonts/iconfont.json b/frontend/src/assets/fonts/iconfont.jsonnew file mode 100644index 0000000..997cb02--- /dev/null+++ b/frontend/src/assets/fonts/iconfont.json@@ -0,0 +1,44 @@+{+ "id": "4535486",+ "name": "wms",+ "font_family": "iconfont",+ "css_prefix_text": "icon-",+ "description": "",+ "glyphs": [+ {+ "icon_id": "1727592",+ "name": "407饼图",+ "font_class": "chart-pie",+ "unicode": "e902",+ "unicode_decimal": 59650+ },+ {+ "icon_id": "1526412",+ "name": "图表_折线图",+ "font_class": "chart-line",+ "unicode": "e67e",+ "unicode_decimal": 59006+ },+ {+ "icon_id": "3014772",+ "name": "库位设置",+ "font_class": "chart-location",+ "unicode": "e61a",+ "unicode_decimal": 58906+ },+ {+ "icon_id": "6844449",+ "name": "库存",+ "font_class": "chart-stock",+ "unicode": "e63b",+ "unicode_decimal": 58939+ },+ {+ "icon_id": "20331107",+ "name": "柱形图",+ "font_class": "chart-bar",+ "unicode": "e6c0",+ "unicode_decimal": 59072+ }+ ]+}diff --git a/frontend/src/assets/fonts/iconfont.ttf b/frontend/src/assets/fonts/iconfont.ttfnew file mode 100644index 0000000..97279caBinary files /dev/null and b/frontend/src/assets/fonts/iconfont.ttf differdiff --git a/frontend/src/assets/fonts/iconfont.woff b/frontend/src/assets/fonts/iconfont.woffnew file mode 100644index 0000000..bfbe43eBinary files /dev/null and b/frontend/src/assets/fonts/iconfont.woff differdiff --git a/frontend/src/assets/fonts/iconfont.woff2 b/frontend/src/assets/fonts/iconfont.woff2new file mode 100644index 0000000..fecefa2Binary files /dev/null and b/frontend/src/assets/fonts/iconfont.woff2 differdiff --git a/frontend/src/assets/img/home_bg.png b/frontend/src/assets/img/home_bg.pngnew file mode 100644index 0000000..d393f2bBinary files /dev/null and b/frontend/src/assets/img/home_bg.png differdiff --git a/frontend/src/components/codeDialog/barCodeDialog.vue b/frontend/src/components/codeDialog/barCodeDialog.vueindex 6dcc21f..dfa5c7f 100644--- a/frontend/src/components/codeDialog/barCodeDialog.vue+++ b/frontend/src/components/codeDialog/barCodeDialog.vue@@ -4,7 +4,7 @@<v-card :title="$t('system.page.preView')"><v-card-text><div class="print-area-container">- <div class="print-area-scroll">+ <div class="print-area-scroll" @click="method.resetIndex()"><divid="printArea":style="{@@ -14,7 +14,13 @@}"class="printArea">- <div v-for="(item, index) in data.printData" :key="index" class="code-container">+ <div+ v-for="(item, index) in data.printData"+ :key="index"+ class="code-container"+ :class="{ 'code-click': data.clickIndex === index }"+ @click.stop="method.setIndex(index)"+ ><svg :id="'printBarCode' + item.id"></svg></div></div>@@ -25,7 +31,7 @@<v-card-actions class="justify-space-between"><div class="row-number-input"><v-row no-gutters>- <v-col cols="6" class="col">+ <v-col cols="4" class="col"><div class="colText"><v-text-fieldv-model.number="data.rowsNumber"@@ -35,7 +41,7 @@></v-text-field></div></v-col>- <v-col cols="6" class="col">+ <v-col cols="4" class="col"><div class="colText"><v-text-fieldv-model.number="data.gridRowGap"@@ -45,11 +51,22 @@></v-text-field></div></v-col>+ <v-col cols="4" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.count"+ hide-details="auto"+ :label="$t('system.page.count')"+ :disabled="data.clickIndex === -1"+ @keydown="method.handleKeyDown"+ ></v-text-field>+ </div>+ </v-col></v-row></div><div class="padding-lr-16"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>- <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text">{{ $t('system.page.print') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text" @click="method.resetIndex()">{{ $t('system.page.print') }}</v-btn></div></v-card-actions></v-card>@@ -71,10 +88,11 @@ const data = reactive({printData: [] as any,rowsNumber: 5,gridColumnGap: 15,- gridRowGap: 15+ gridRowGap: 15,+ clickIndex: -1,+ count: 1})const isDisabled = computed(() => data.printData.length === 0)-watch(() => data.printData,() => {@@ -95,6 +113,24 @@ const method = reactive({setStorage(`BarCode-${ props.menu }`, storage)},+ setIndex: (index: number) => {+ data.clickIndex = index+ },+ resetIndex: () => {+ data.clickIndex = -1+ },+ handleKeyDown: (event: any) => {+ if (event.key === 'Enter') {+ if (data.count > 1) {+ const object = data.printData[data.clickIndex]+ while (data.count > 1) {+ data.printData.splice(data.clickIndex, 0, object)+ data.count--+ }+ method.resetIndex()+ }+ }+ },openDialog: (row: any) => {try {const storage: any = getStorage(`BarCode-${ props.menu }`)@@ -158,6 +194,9 @@ defineExpose({justify-content: center;}}+.code-click {+ border: 2px dashed #7ebdaa !important;+}.row-number-input {width: 350px;diff --git a/frontend/src/components/codeDialog/qrCodeDialog.vue b/frontend/src/components/codeDialog/qrCodeDialog.vueindex dd19bd0..d241dd8 100644--- a/frontend/src/components/codeDialog/qrCodeDialog.vue+++ b/frontend/src/components/codeDialog/qrCodeDialog.vue@@ -4,7 +4,7 @@<v-card :title="$t('system.page.preView')"><v-card-text><div class="print-area-container">- <div class="print-area-scroll">+ <div class="print-area-scroll" @click="method.resetIndex()"><divid="printArea"class="printArea"@@ -14,7 +14,13 @@columnGap: `${data.gridColumnGap}px`}">- <div v-for="(item, index) in data.printData" :key="index" class="code-container">+ <div+ v-for="(item, index) in data.printData"+ :key="index"+ class="code-container"+ :class="{ 'code-click': data.clickIndex === index }"+ @click.stop="method.setIndex(index)"+ ><div><vue-qr :key="index" :size="150" :auto-color="true" :dot-scale="1" :text="method.formatPrintData(item)"></vue-qr></div>@@ -30,7 +36,7 @@<v-card-actions class="justify-space-between"><div class="row-number-input"><v-row no-gutters>- <v-col cols="6" class="col">+ <v-col cols="4" class="col"><div class="colText"><v-text-fieldv-model.number="data.rowsNumber"@@ -40,7 +46,7 @@></v-text-field></div></v-col>- <v-col cols="6" class="col">+ <v-col cols="4" class="col"><div class="colText"><v-text-fieldv-model.number="data.gridRowGap"@@ -50,11 +56,24 @@></v-text-field></div></v-col>+ <v-col cols="4" class="col">+ <div class="colText">+ <v-text-field+ v-model.number="data.count"+ hide-details="auto"+ :label="$t('system.page.count')"+ :disabled="data.clickIndex === -1"+ @keydown="method.handleKeyDown"+ ></v-text-field>+ </div>+ </v-col></v-row></div><div class="padding-lr-16"><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn>- <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text">{{ $t('system.page.print') }}</v-btn>+ <v-btn v-print="'#printArea'" color="primary" :disabled="isDisabled" variant="text" @click="method.resetIndex()">+ {{ $t('system.page.print') }}+ </v-btn></div></v-card-actions></v-card>@@ -75,9 +94,11 @@ const data = reactive({showDialog: false,printData: [] as any,printText: '',+ clickIndex: -1,rowsNumber: 5,gridColumnGap: 15,- gridRowGap: 15+ gridRowGap: 15,+ count: 1})const isDisabled = computed(() => data.printData.length === 0)@@ -91,6 +112,24 @@ const method = reactive({setStorage(`QRCode-${ props.menu }`, storage)},+ setIndex: (index: number) => {+ data.clickIndex = index+ },+ resetIndex: () => {+ data.clickIndex = -1+ },+ handleKeyDown: (event: any) => {+ if (event.key === 'Enter') {+ if (data.count > 1) {+ const object = data.printData[data.clickIndex]+ while (data.count > 1) {+ data.printData.splice(data.clickIndex, 0, object)+ data.count--+ }+ method.resetIndex()+ }+ }+ },openDialog: (row: any) => {try {const storage: any = getStorage(`QRCode-${ props.menu }`)@@ -103,14 +142,29 @@ const method = reactive({data.rowsNumber = 5data.gridRowGap = 15}-+ data.clickIndex = -1data.printData = rowdata.showDialog = true},- formatPrintData: (val: any) => JSON.stringify({+ formatPrintData: (val: any) => {+ const form = {id: val.id,type: val.type- }),+ } as any+ if (val.hasOwnProperty('sku_id')) {+ form.sku_id = val.sku_id+ }+ if (val.hasOwnProperty('asn_id')) {+ form.asn_id = val.asn_id+ }+ if (val.hasOwnProperty('asnmaster_id')) {+ form.asnmaster_id = val.asnmaster_id+ }+ if (val.hasOwnProperty('series_number')) {+ form.SN = val.series_number+ }+ return JSON.stringify(form)+ },closeDialog: () => {data.showDialog = false}@@ -155,8 +209,11 @@ defineExpose({justify-content: center;}}+.code-click {+ border: 2px dashed #7ebdaa !important;+}.row-number-input {- width: 350px;+ width: 450px;padding: 0 16px;}diff --git a/frontend/src/components/login/login-form.vue b/frontend/src/components/login/login-form.vueindex 008aa00..2a116d9 100644--- a/frontend/src/components/login/login-form.vue+++ b/frontend/src/components/login/login-form.vue@@ -38,6 +38,19 @@ import { hookComponent } from '@/components/system'import { router } from '@/router/index'// import userRegisterForm from './user-register-form.vue'+// 加解密算法+function simpleEncrypt(text: string, key: string) {+ let encrypted = ''+ for (let i = 0; i < text.length; i++) {+ encrypted += String.fromCharCode(text.charCodeAt(i) ^ key.charCodeAt(i % key.length))+ }+ return encrypted+}++function simpleDecrypt(encryptedText: string, key: string) {+ return simpleEncrypt(encryptedText, key) // 因为异或运算具有对称性,加密和解密过程相同+}+// Get v-form refconst VFormRef = ref()@@ -45,8 +58,8 @@ const data = reactive({showDialog: false,valid: true,showPassword: false,- userName: '',- password: '',+ userName: 'admin', // 240507 刘福: 默认账号 admin 1+ password: '1',remember: false,dialogForm: {id: 0,@@ -58,7 +71,8 @@ const data = reactive({is_valid: true},userNameVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.userName') }!`],- passwordVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.password') }!`]+ passwordVaildRules: [(v: string) => !!v || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('login.password') }!`],+ encryption: 'ModernWMS2024'})const method = reactive({@@ -123,13 +137,14 @@ const method = reactive({// Remember user login infoif (data.remember) {const rememberJSON = JSON.stringify({- userName: window.btoa(encodeURIComponent(data.userName)),- password: window.btoa(encodeURIComponent(data.password))+ user_num: simpleEncrypt(data.userName, data.encryption),+ password: simpleEncrypt(data.password, data.encryption)})localStorage.setItem('userLoginInfo', rememberJSON)} else {localStorage.setItem('userLoginInfo', '')}+// Jump homestore.commit('system/setCurrentRouterPath', 'homepage')router.push('home')@@ -167,15 +182,30 @@ onMounted(() => {const rememberJSON = localStorage.getItem('userLoginInfo')if (rememberJSON) {const obj = JSON.parse(rememberJSON)+ data.remember = true+try {- data.userName = decodeURIComponent(window.atob(obj.userName))- data.password = decodeURIComponent(window.atob(obj.password))+ data.userName = simpleDecrypt(obj.user_num, data.encryption)+ data.password = simpleDecrypt(obj.password, data.encryption)} catch {- data.userName = window.atob(obj.userName)- data.password = window.atob(obj.password)+ // Compatible with old encrypted data+ try {+ data.userName = decodeURIComponent(window.atob(obj.userName))+ data.password = decodeURIComponent(window.atob(obj.password))+ } catch {+ // Compatible with old encrypted data+ try {+ data.userName = window.atob(obj.userName)+ data.password = window.atob(obj.password)+ } catch {+ data.userName = ''+ data.password = ''+ data.remember = false+ }+ }}- data.remember = true}+ // 旧的加密数据})</script>diff --git a/frontend/src/components/select/commodity-select.vue b/frontend/src/components/select/commodity-select.vueindex 2d2a79d..48c46fc 100644--- a/frontend/src/components/select/commodity-select.vue+++ b/frontend/src/components/select/commodity-select.vue@@ -73,6 +73,9 @@<vxe-column field="sku_name" :title="$t('base.commodityManagement.sku_name')"></vxe-column><vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="qty_available" :title="$t('wms.stock.qty_available')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')"> </vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.stockAsnInfo.putaway_date')"> </vxe-date-column></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"diff --git a/frontend/src/components/system/languages.vue b/frontend/src/components/system/languages.vueindex a445e1e..2c44cd1 100644--- a/frontend/src/components/system/languages.vue+++ b/frontend/src/components/system/languages.vue@@ -21,7 +21,7 @@ import { useLocale } from 'vuetify'import { getSelectedLang } from '@/languages/method/index'import { getSelcectedLangForVuetify } from '@/plugins/vuetify/method/index'import { store } from '@/store'-import { router } from '@/router'+// import { router } from '@/router'const { locale } = useI18n()const { current } = useLocale()@@ -45,9 +45,9 @@ const method = reactive({locale.value = getSelectedLang(lang) // globalcurrent.value = getSelcectedLangForVuetify(lang) // vuetify- if (!['/', '/login'].includes(router.currentRoute.value.path)) {- store.commit('system/setRefreshFlag', true) // change language refresh page- }+ // if (!['/', '/login'].includes(router.currentRoute.value.path)) {+ store.commit('system/setRefreshFlag', true) // change language refresh page+ // }}})</script>diff --git a/frontend/src/components/system/search-group.vue b/frontend/src/components/system/search-group.vueindex 742a7b8..1fbcdd2 100644--- a/frontend/src/components/system/search-group.vue+++ b/frontend/src/components/system/search-group.vue@@ -15,6 +15,19 @@></v-text-field></template>+ <template v-if="item.type === 'number'">+ <v-text-field+ v-model="searchForm[item.name]"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t(`${props.i18nPrefix}.${item.name}`)"+ variant="solo"+ type="input"+ >+ </v-text-field>+ </template><template v-else-if="item.type === 'datetime'"><v-datetime-picker v-model="searchForm[item.name]" :label="$t(`${props.i18nPrefix}.${item.name}`)" /></template>diff --git a/frontend/src/components/system/view-log-dialog.vue b/frontend/src/components/system/view-log-dialog.vueindex e1522e3..4ac451d 100644--- a/frontend/src/components/system/view-log-dialog.vue+++ b/frontend/src/components/system/view-log-dialog.vue@@ -40,13 +40,8 @@<vxe-column type="seq" width="60"></vxe-column><vxe-column field="user_name" width="140" :title="$t('system.viewLog.user_name')"></vxe-column><vxe-column field="action_content" :title="$t('system.viewLog.action_content')"></vxe-column>- <vxe-column- field="action_time"- width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"- :title="$t('system.viewLog.action_time')"- >- </vxe-column>+ <vxe-date-column field="action_time" :title="$t('system.viewLog.action_time')" format="yyyy-MM-dd HH:mm" width="170px">+ </vxe-date-column></vxe-table><custom-pager@@ -80,7 +75,6 @@ import { getActionLog } from '@/api/sys/system'import { DEFAULT_PAGE_SIZE, PAGE_SIZE, PAGE_LAYOUT } from '@/constant/vxeTable'import { hookComponent } from '.'import { PageConfigProps } from '@/types/System/Form'-import { formatDate } from '@/utils/format/formatSystem'import customPager from '@/components/custom-pager.vue'import { actionDict } from '@/view/base/roleMenu/actionList'import NavListVue from '@/components/page/nav-list.vue'diff --git a/frontend/src/components/table/vxe-date-column.vue b/frontend/src/components/table/vxe-date-column.vuenew file mode 100644index 0000000..00f9934--- /dev/null+++ b/frontend/src/components/table/vxe-date-column.vue@@ -0,0 +1,27 @@+<template>+ <vxe-column :field="field" :title="title" :width="width">+ <template #default="{ row, column }">+ <span>{{ formatDate(row[column.property], format) }}</span>+ </template>+ </vxe-column>+</template>++<script setup lang="tsx">+import { defineProps, withDefaults } from 'vue'+import { formatDate } from '@/utils/format/formatSystem'++withDefaults(+ defineProps<{+ field: string+ title: string+ width?: string | number+ format?: string+ }>(),+ {+ format: 'yyyy-MM-dd',+ width: ''+ }+)+</script>++<style scoped lang="less"></style>diff --git a/frontend/src/constant/searchSettingSet.ts b/frontend/src/constant/searchSettingSet.tsindex 5a0622b..ea2964b 100644--- a/frontend/src/constant/searchSettingSet.ts+++ b/frontend/src/constant/searchSettingSet.ts@@ -64,5 +64,50 @@ export default {name: 'delivery_date_to'}]+ },+ stockageStatistic: {+ default: ['sku_code', 'warehouse_name', 'location_name'],+ list: [+ {+ type: 'string',+ name: 'spu_code'+ },+ {+ type: 'string',+ name: 'spu_name'+ },+ {+ type: 'string',+ name: 'sku_code'+ },+ {+ type: 'string',+ name: 'sku_name'+ },+ {+ type: 'string',+ name: 'warehouse_name'+ },+ {+ type: 'string',+ name: 'location_name'+ },+ {+ type: 'number',+ name: 'stock_age_from'+ },+ {+ type: 'number',+ name: 'stock_age_to'+ },+ {+ type: 'datetime',+ name: 'expiry_date_from'+ },+ {+ type: 'datetime',+ name: 'expiry_date_to'+ }+ ]}}diff --git a/frontend/src/languages/i18n.ts b/frontend/src/languages/i18n.tsindex 35561e1..ea610b9 100644--- a/frontend/src/languages/i18n.ts+++ b/frontend/src/languages/i18n.ts@@ -1,32 +1,15 @@-import zhCN from 'vxe-table/lib/locale/lang/zh-CN'-import enUS from 'vxe-table/lib/locale/lang/en-US'-import zhTW from 'vxe-table/lib/locale/lang/zh-TW'-import { createI18n } from 'vue-i18n'-import { getSelectedLang } from './method/index'+import XEUtils from 'xe-utils'+import { getSelectedLang, getLangPackage } from './method/index'-import en from './langsJson/en.json'-import cn from './langsJson/cn.json'-import tw from './langsJson/tw.json'+// get language+const defaultLang = getStorageLang()const i18n = createI18n({legacy: false,globalInjection: true,- locale: getStorageLang(),- messages: {- zh_CN: {- ...cn,- ...zhCN- },- en_US: {- ...en,- ...enUS- },- zh_TW: {- ...tw,- ...zhTW- }- }+ locale: defaultLang,+ messages: getLangPackage(defaultLang)})// get language in storage or default@@ -35,7 +18,27 @@ function getStorageLang() {if (lang) {return getSelectedLang(lang)}- return 'en_US'++ // Default browser language+ const browserLang = navigator.language+ let langStr = ''+ if (browserLang && XEUtils.isString(browserLang)) {+ // String+ langStr = browserLang+ } else if (browserLang && XEUtils.isArray(browserLang) && browserLang.length > 0) {+ // Array+ langStr = browserLang[0]+ }++ switch (langStr) {+ case 'zh-CN':+ return 'zh_CN'+ case 'zh-TW':+ return 'zh_TW'+ case 'en':+ default:+ return 'en_US'+ }}export default i18ndiff --git a/frontend/src/languages/langsJson/cn.json b/frontend/src/languages/langsJson/cn.jsonindex 3048304..351c4c7 100644--- a/frontend/src/languages/langsJson/cn.json+++ b/frontend/src/languages/langsJson/cn.json@@ -34,7 +34,8 @@"volume_unit": "体积单位","weight": "商品重量","weight_unit": "重量单位",- "width": "商品宽度"+ "width": "商品宽度",+ "checkboxIsNullByPrint": "未选中数据 或 选中的sku不具备商品条码!"},"companySetting": {"address": "详细地址",@@ -246,6 +247,7 @@"customer": "客户信息","deliveryManagement": "发货管理","deliveryStatistic": "发货统计",+ "stockageStatistic":"库龄分析","freightSetting": "运费设置","homepage": "首页","menuBasicSettings": "菜单基础设置",@@ -260,6 +262,7 @@"userManagement": "用户管理","userRoleSetting": "角色设置","vwms": "可视化仓库",+ "largeScreen":"大屏","warehouseAdjust": "库存调整","warehouseFreeze": "库存冻结","warehouseMove": "库存移动",@@ -331,6 +334,7 @@"exportTemplate": "导出模板","gridColumnGap": "列间距(px)","gridRowGap": "行间距(px)",+ "count":"个数","import": "导入","insertOneRow": "新增一行","noData": "暂无数据",@@ -347,7 +351,8 @@"view": "查看","setSearch": "设置查询条件","chart": "图表",- "table": "表格"+ "table": "表格",+ "fullScreen":"全屏"},"pager": {"goTo": "前往",@@ -392,7 +397,7 @@"confirmBack": "确认撤回","confirmDelivery": "确认出库","confirmOrder": "确认发货单",- "confirmPicking": "确认拣货",+ "confirmPicking": "拣货复核","confirmSignIn": "确认签收","confirmSuccess": "确认发货单成功!","create_time": "创建时间",@@ -430,6 +435,8 @@"packaged": "打包","picked": "已拣货","picked_qty": "已拣货数量",+ "picker":"拣货员",+ "pick_checker":"拣货复核员","preShipment": "预发货","qty": "总数量","qty_available": "可用数量",@@ -505,6 +512,26 @@"spu_name": "商品名称","warehouse_name": "仓库名称"},+ "stockageStatistic":{+ "warehouse_name": "仓库名称",+ "location_name": "库位名称",+ "spu_code": "商品编码",+ "spu_name": "商品名称",+ "sku_id": "规格标识",+ "sku_code": "规格编码",+ "sku_name": "规格名称",+ "qty": "数量",+ "goods_owner_name": "货主名称",+ "series_number": "序列号",+ "expiry_date": "过期日期",+ "price": "商品价格",+ "putaway_date": "上架日期",+ "stock_age": "库龄",+ "stock_age_from": "库龄从",+ "stock_age_to": "库龄至",+ "expiry_date_from": "过期日期从",+ "expiry_date_to": "过期日期至"+ },"skuInfo": {"bar_code": "商品条码","brand": "品牌",@@ -554,6 +581,7 @@"asn_batch": "批次","asn_no": "到货通知书编号","asn_qty": "到货通知书数据",+ "price":"商品价格","asn_status": "到货通知书状态","can_putaway_qty": "可上架数量","confirmArrival": "确认到货",@@ -585,6 +613,8 @@"sku_id": "商品sku标识","sku_name": "规格名称","sorted_qty": "分拣数量",+ "expiry_date":"过期日期",+ "putaway_date":"上架日期","spu_code": "商品编码","spu_id": "商品spu标识","spu_name": "商品名称",@@ -596,7 +626,8 @@"volume": "总体积","volume_unit": "体积单位","weight": "总重量",- "weight_unit": "重量单位"+ "weight_unit": "重量单位",+ "consecutive_number":"连续编号"},"stockList": {"qty": "数量",@@ -708,7 +739,10 @@"target": "目标","target_location": "目标库位","target_warehouse": "目标仓库",- "unit": "商品单位"+ "unit": "商品单位",+ "price": "商品价格",+ "expiry_date":"过期日期",+ "putaway_date":"上架日期"},"warehouseTaking": {"addFromCommodity": "选择商品",@@ -729,7 +763,10 @@"job_status": "作业状态","location_name": "所在库位","unfinish": "待作业",- "warehouse": "所在仓库"+ "warehouse": "所在仓库",+ "price": "商品价格",+ "expiry_date":"过期日期",+ "putaway_date":"上架日期"}}}diff --git a/frontend/src/languages/langsJson/en.json b/frontend/src/languages/langsJson/en.jsonindex 79a70b8..09e5204 100644--- a/frontend/src/languages/langsJson/en.json+++ b/frontend/src/languages/langsJson/en.json@@ -34,7 +34,8 @@"volume_unit": "Volume Unit","weight": "Commodity Weight","weight_unit": "Weight Unit",- "width": "Commodity Width"+ "width": "Commodity Width",+ "checkboxIsNullByPrint": "No data selected or the selected SKU does not have a product barcode."},"companySetting": {"address": "Detailed Address",@@ -246,6 +247,7 @@"customer": "Customer Info","deliveryManagement": "Delivery Management","deliveryStatistic": "Shipment statistics",+ "stockageStatistic":"Stock Age Analysis","freightSetting": "Freight Setting","homepage": "Home Page","menuBasicSettings": "Menu",@@ -260,6 +262,7 @@"userManagement": "User Management","userRoleSetting": "User Role","vwms": "Visual warehouse",+ "largeScreen":"Large Screen","warehouseAdjust": "Inventory Adjust","warehouseFreeze": "Inventory freeze","warehouseMove": "Inventory Move",@@ -331,6 +334,7 @@"exportTemplate": "Export Template","gridColumnGap": "Column spacing(px)","gridRowGap": "Row spacing(px)",+ "count":"Count","import": "Import","insertOneRow": "Insert One Row","noData": "No data",@@ -347,7 +351,8 @@"view": "View","setSearch": "Set query criteria","chart": "Chart",- "table": "Table"+ "table": "Table",+ "fullScreen":"FullScreen"},"pager": {"goTo": "Go to",@@ -392,7 +397,7 @@"confirmBack": "Confirm withdrawal","confirmDelivery": "Confirm Delivery","confirmOrder": "Confirm Shipment Doc",- "confirmPicking": "Confirm Picking",+ "confirmPicking": "Picking Audit","confirmSignIn": "Confirm Signing","confirmSuccess": "Confirm the shipment order successfully!","create_time": "Creation Time",@@ -430,6 +435,8 @@"packaged": "Packaged","picked": "Picked","picked_qty": "Picked Quantity",+ "picker":"picker",+ "pick_checker":"Picking Auditor","preShipment": "Pre Shipment","qty": "Total Quantity","qty_available": "Available Quantity",@@ -505,6 +512,26 @@"spu_name": "Commodity Name","warehouse_name": "Warehouse name"},+ "stockageStatistic":{+ "warehouse_name": "Warehouse name",+ "location_name": "Location Code",+ "spu_code": "Commodity Code",+ "spu_name": "Commodity Name",+ "sku_id": "Identifying",+ "sku_code": "Specification Code",+ "sku_name": "Specification Name",+ "qty": "Quantity",+ "goods_owner_name": "Goods Owner Name",+ "series_number": "Serial number",+ "expiry_date":"Expiration Date",+ "price":"Commodity Price",+ "putaway_date":"Listing Date",+ "stock_age": "Stock Age",+ "stock_age_from": "Stock Age from",+ "stock_age_to": "Stock Age to",+ "expiry_date_from": "Expiration Date from",+ "expiry_date_to": "Expiration Date to"+ },"skuInfo": {"bar_code": "Specification Code","brand": "Brand",@@ -554,6 +581,7 @@"asn_batch": "Batch","asn_no": "Asn No","asn_qty": "Asn Quantity",+ "price":"Commodity Price","asn_status": "Asn Status","can_putaway_qty": "Quantity available for listing","confirmArrival": "Confirm arrival",@@ -585,6 +613,8 @@"sku_id": "Sku Id","sku_name": "Form Name","sorted_qty": "Sorted Quantity",+ "expiry_date":"Expiration Date",+ "putaway_date":"Listing Date","spu_code": "Commodity code","spu_id": "Spu Id","spu_name": "Trade name",@@ -596,7 +626,8 @@"volume": "Volume","volume_unit": "Volume Unit","weight": "Weight",- "weight_unit": "Weight Unit"+ "weight_unit": "Weight Unit",+ "consecutive_number":"consecutive numbering"},"stockList": {"qty": "Quantity",@@ -708,7 +739,10 @@"target": "Target","target_location": "Target Location","target_warehouse": "Target Warehouse",- "unit": "Unit"+ "unit": "Unit",+ "price":"Commodity Price",+ "expiry_date":"Expiration Date",+ "putaway_date":"Listing Date"},"warehouseTaking": {"addFromCommodity": "Choose From Commodity",@@ -729,7 +763,10 @@"job_status": "Job Status","location_name": "Location Code","unfinish": "Unfinish",- "warehouse": "Warehouse"+ "warehouse": "Warehouse",+ "price":"Commodity Price",+ "expiry_date":"Expiration Date",+ "putaway_date":"Listing Date"}}}diff --git a/frontend/src/languages/langsJson/tw.json b/frontend/src/languages/langsJson/tw.jsonindex 66203fe..b8d4691 100644--- a/frontend/src/languages/langsJson/tw.json+++ b/frontend/src/languages/langsJson/tw.json@@ -34,7 +34,8 @@"volume_unit": "體積單位","weight": "商品重量","weight_unit": "重量單位",- "width": "商品寬度"+ "width": "商品寬度",+ "checkboxIsNullByPrint": "未選中數據 或 選中的sku不具備商品條碼!"},"companySetting": {"address": "詳細地址",@@ -246,6 +247,7 @@"customer": "客戶資訊","deliveryManagement": "發貨管理","deliveryStatistic": "發貨統計",+ "stockageStatistic":"庫齡分析","freightSetting": "運費設置","homepage": "首頁","menuBasicSettings": "功能基礎設置",@@ -260,6 +262,7 @@"userManagement": "用戶管理","userRoleSetting": "角色設置","vwms": "視覺化倉庫",+ "largeScreen":"大螢幕","warehouseAdjust": "庫存調整","warehouseFreeze": "庫存凍結","warehouseMove": "庫存移動",@@ -331,6 +334,7 @@"exportTemplate": "匯出範本","gridColumnGap": "列間距(px)","gridRowGap": "行間距(px)",+ "count":"個數","import": "匯入","insertOneRow": "新增一行","noData": "暫無數據",@@ -347,7 +351,8 @@"view": "查看","setSearch": "設定查詢準則","chart": "圖表",- "table": "表格"+ "table": "表格",+ "fullScreen":"全屏"},"pager": {"goTo": "前往",@@ -392,7 +397,7 @@"confirmBack": "確認撤回","confirmDelivery": "確認出庫","confirmOrder": "確認發貨單",- "confirmPicking": "確認揀貨",+ "confirmPicking": "揀貨複核","confirmSignIn": "確認簽收","confirmSuccess": "確認發貨單成功!","create_time": "創建時間",@@ -430,6 +435,8 @@"packaged": "打包","picked": "已揀貨","picked_qty": "已揀貨數量",+ "picker":"揀貨員",+ "pick_checker":"揀貨複核員","preShipment": "預發貨","qty": "總數量","qty_available": "可用數量",@@ -505,6 +512,26 @@"spu_name": "商品名稱","warehouse_name": "倉庫名稱"},+ "stockageStatistic":{+ "warehouse_name": "倉庫名稱",+ "location_name": "庫位名稱",+ "spu_code": "商品編碼",+ "spu_name": "商品名稱",+ "sku_id": "規格標識",+ "sku_code": "規格編碼",+ "sku_name": "規格名稱",+ "qty": "數量",+ "goods_owner_name": "貨主名稱",+ "series_number": "SN號",+ "expiry_date":"過期日期",+ "price":"商品價格",+ "putaway_date":"上架日期",+ "stock_age": "庫齡",+ "stock_age_from": "庫齡從",+ "stock_age_to": "庫齡至",+ "expiry_date_from": "過期日期從",+ "expiry_date_to": "過期日期至"+ },"skuInfo": {"bar_code": "商品條碼","brand": "品牌",@@ -554,6 +581,7 @@"asn_batch": "批次","asn_no": "到貨通知書編號","asn_qty": "到貨通知書數據",+ "price":"商品價格","asn_status": "到貨通知書狀態","can_putaway_qty": "可上架數量","confirmArrival": "確認到貨",@@ -585,6 +613,8 @@"sku_id": "商品sku標識","sku_name": "規格名稱","sorted_qty": "分揀數量",+ "expiry_date":"過期日期",+ "putaway_date":"上架日期","spu_code": "商品編碼","spu_id": "商品spu標識","spu_name": "商品名稱",@@ -596,7 +626,8 @@"volume": "總體積","volume_unit": "體積單位","weight": "總重量",- "weight_unit": "重量單位"+ "weight_unit": "重量單位",+ "consecutive_number":"連續編號"},"stockList": {"qty": "數量",@@ -708,7 +739,10 @@"target": "目標","target_location": "目標儲位","target_warehouse": "目標倉庫",- "unit": "商品單位"+ "unit": "商品單位",+ "price":"商品價格",+ "expiry_date":"過期日期",+ "putaway_date":"上架日期"},"warehouseTaking": {"addFromCommodity": "選擇商品",@@ -729,7 +763,10 @@"job_status": "作業狀態","location_name": "所在庫位","unfinish": "待作業",- "warehouse": "所在倉庫"+ "warehouse": "所在倉庫",+ "price":"商品價格",+ "expiry_date":"過期日期",+ "putaway_date":"上架日期"}}}diff --git a/frontend/src/languages/method/index.ts b/frontend/src/languages/method/index.tsindex 1d0aeea..cb2d204 100644--- a/frontend/src/languages/method/index.ts+++ b/frontend/src/languages/method/index.ts@@ -1,4 +1,14 @@// Get different languages according to the key+import zhCN from 'vxe-table/lib/locale/lang/zh-CN'+import enUS from 'vxe-table/lib/locale/lang/en-US'+import zhTW from 'vxe-table/lib/locale/lang/zh-TW'+import { store } from '@/store'+import i18n from '../i18n'++import en from '../langsJson/en.json'+import cn from '../langsJson/cn.json'+import tw from '../langsJson/tw.json'+export function getSelectedLang(lang: string) {switch (lang) {case 'zh':@@ -11,3 +21,35 @@ export function getSelectedLang(lang: string) {return 'en_US'}}++// Obtain default language pack based on language+export function getLangPackage(lang: string) {+ const result = { zh_CN: {}, zh_TW: {}, en_US: {} }+ switch (lang) {+ case 'zh_CN':+ result.zh_CN = { ...cn, ...zhCN }+ break+ case 'zh_TW':+ result.zh_TW = { ...tw, ...zhTW }+ break+ case 'en_US':+ default:+ result.en_US = { ...en, ...enUS }+ break+ }+ return result+}++// Because it is lazy to load the language pack, the user will reload the language pack after switching languages+export function installNewLang() {+ let lang = store.getters['system/language']+ lang = getSelectedLang(lang)+ const messages = getLangPackage(lang)+ if (lang && messages) {+ // Use setLocaleMessage to add or update language packs+ i18n.global.setLocaleMessage(lang, messages[lang])+ return+ }+ // Default English+ i18n.global.setLocaleMessage('en_US', { ...en, ...enUS })+}diff --git a/frontend/src/main.ts b/frontend/src/main.tsindex e7942e1..afa6724 100644--- a/frontend/src/main.ts+++ b/frontend/src/main.ts@@ -2,16 +2,20 @@ import { createApp } from 'vue'import './style.css' // Global Stylesimport print from 'vue3-print-nb'import { setup } from 'yk-vue-plugin-hiprint'+import DataVVue3 from '@kjgl77/datav-vue3'import { VXETable } from '@/plugins/VXETable/index'import { vuetify } from '@/plugins/vuetify/index'import i18n from './languages/i18n'import App from './App.vue'+import '@/assets/fonts/iconfont.css'// import routerimport { router } from './router'import { store } from './store/index'import hookComponent from '@/components/system/index'+import VxeDateColumn from '@/components/table/vxe-date-column.vue'+const app = createApp(App)app.config.globalProperties.hiprint = setup()@@ -26,5 +30,9 @@ app.use(vuetify)app.use(i18n)app.use(hookComponent)app.use(VXETable)+app.use(DataVVue3)++// 自定义组件挂载+app.component('VxeDateColumn', VxeDateColumn)app.mount('#app')diff --git a/frontend/src/plugins/VXETable/index.ts b/frontend/src/plugins/VXETable/index.tsindex 7e94da1..970f2ac 100644--- a/frontend/src/plugins/VXETable/index.ts+++ b/frontend/src/plugins/VXETable/index.ts@@ -9,7 +9,7 @@ import 'vxe-table/lib/style.css'*/VXETable.formats.add('formatDate', ({ cellValue }, format) => {const date = new Date(cellValue)- if (!cellValue || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01') {+ if (!cellValue || !date || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1900-01-01' || XEUtils.toDateString(date, 'yyyy-MM-dd') === '1000-01-01') {return ''}return XEUtils.toDateString(date, format || 'yyyy-MM-dd HH:mm:ss')diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsindex 3a02335..91b4b4a 100644--- a/frontend/src/router/index.ts+++ b/frontend/src/router/index.ts@@ -32,7 +32,16 @@ const routes: RouteRecordRaw[] = [meta: {menuPath: 'vwms'}- }+ },+ // {+ // name: 'largeScreen',+ // path: '/largeScreen',+ // component: () => import('@/view/largeScreen/largeScreen.vue'),+ // meta: {+ // menuPath: 'largeScreen'+ // }+ // }+]},]diff --git a/frontend/src/types/WMS/StockAgeStatistic.ts b/frontend/src/types/WMS/StockAgeStatistic.tsnew file mode 100644index 0000000..e37f4d2--- /dev/null+++ b/frontend/src/types/WMS/StockAgeStatistic.ts@@ -0,0 +1,17 @@+export interface StockAgeStatisticVo {+ warehouse_name: string,+ location_name: string,+ spu_code: string,+ spu_name: string,+ sku_id: number,+ sku_code: string,+ sku_name: string,+ qty: number,+ goods_owner_name: string,+ series_number: string,+ goods_location_id: number,+ expiry_date: string,+ price: number,+ putaway_date: string,+ stock_age: number+}diff --git a/frontend/src/types/WMS/StockAsn.ts b/frontend/src/types/WMS/StockAsn.tsindex 22f74a3..e3e45a7 100644--- a/frontend/src/types/WMS/StockAsn.ts+++ b/frontend/src/types/WMS/StockAsn.ts@@ -1,3 +1,11 @@+/*+ * @Author: yanguoping [email protected]+ * @Date: 2024-03-27 10:59:36+ * @LastEditors: yanguoping [email protected]+ * @LastEditTime: 2024-05-08 17:20:34+ * @FilePath: \frontend\src\types\WMS\StockAsn.ts+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE+ */import { UniformFileNaming } from '../System/Form'export interface StockAsnVO extends UniformFileNaming {@@ -14,6 +22,7 @@ export interface StockAsnVO extends UniformFileNaming {origin?: stringsku_id?: numberasn_qty?: number+ price?: numberasn_batch?: stringestimated_arrival_time?: stringasn_status?: number@@ -42,12 +51,14 @@ export interface StockAsnDetailVO {volume_unit?: numberweight_unit?: numberasn_qty?: number+ price?: numberactual_qty?: numberweight?: numbervolume?: numbersupplier_id?: numbersupplier_name?: stringis_valid?: boolean+ is_check?; boolean}export interface PutawayVo {@@ -59,7 +70,8 @@ export interface PutawayVo {export interface SortingVo {asn_id: number- sorted_qty: number+ sorted_qty: number,+ expiry_date: string,}export interface SkuInfoVo {diff --git a/frontend/src/types/WMS/StockManagement.ts b/frontend/src/types/WMS/StockManagement.tsindex b94fff6..c2d5f24 100644--- a/frontend/src/types/WMS/StockManagement.ts+++ b/frontend/src/types/WMS/StockManagement.ts@@ -1,5 +1,5 @@export interface StockLocationVO {- warehouse: string+ warehouse_name: stringlocation_name: stringspu_code: stringspu_name: stringdiff --git a/frontend/src/types/WarehouseWorking/WarehouseMove.ts b/frontend/src/types/WarehouseWorking/WarehouseMove.tsindex d35ab29..b8461b7 100644--- a/frontend/src/types/WarehouseWorking/WarehouseMove.ts+++ b/frontend/src/types/WarehouseWorking/WarehouseMove.ts@@ -19,7 +19,10 @@ export interface WarehouseMoveVO extends UniformFileNaming {spu_name: stringsku_code: stringsku_name: string- series_number: string+ series_number: string,+ price: number,+ expiry_date: string,+ putaway_date: string}export enum MoveStatus {diff --git a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts b/frontend/src/types/WarehouseWorking/WarehouseTaking.tsindex 046d2b1..8a1bd51 100644--- a/frontend/src/types/WarehouseWorking/WarehouseTaking.ts+++ b/frontend/src/types/WarehouseWorking/WarehouseTaking.ts@@ -18,5 +18,8 @@ export interface WarehouseTakingVO extends UniformFileNaming {location_name: stringadjust_status: booleanhandler: string- handle_time: string+ handle_time: string,+ price: number,+ expiry_date: string,+ putaway_date:string}diff --git a/frontend/src/utils/dataVerification/tableRule.ts b/frontend/src/utils/dataVerification/tableRule.tsindex 4415f31..4f4f606 100644--- a/frontend/src/utils/dataVerification/tableRule.ts+++ b/frontend/src/utils/dataVerification/tableRule.ts@@ -1,3 +1,11 @@+/*+ * @Author: yanguoping [email protected]+ * @Date: 2023-10-12 10:29:48+ * @LastEditors: yanguoping [email protected]+ * @LastEditTime: 2024-05-09 09:12:32+ * @FilePath: \frontend\src\utils\dataVerification\tableRule.ts+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE+ */import i18n from '@/languages/i18n'// Judge whether it is integer@@ -7,7 +15,7 @@ export function isInteger(rule: any, value: any) {rule = rule.rule}return new Promise((resolve, reject) => {- let validText = ''+ let validText = ''if (value === '' || value == null) {resolve(true)} else {diff --git a/frontend/src/utils/largeScreenResize.ts b/frontend/src/utils/largeScreenResize.tsnew file mode 100644index 0000000..1b07afc--- /dev/null+++ b/frontend/src/utils/largeScreenResize.ts@@ -0,0 +1,64 @@+import { ref } from 'vue'++export default function windowResize() {+ // * Point to the outermost container+ const screenRef = ref()+ const screenContainerRef = ref()+ // * Timing function+ const timer = ref(0)+ // * Default scaling value+ const scale = {+ width: '1',+ height: '1',+ }+ // * Design draft size(px)+ const baseWidth = 1920+ const baseHeight = 1080++ const calcRate = () => {+ let width = screenContainerRef.value.offsetWidth+ let height = screenContainerRef.value.offsetHeight+ const fullScreen = screenContainerRef.value.dataset.screen++ if (fullScreen === 'true' || fullScreen === true) {+ width = window.innerWidth+ height = window.innerHeight+ }++ const widthPre = (width / baseWidth).toFixed(5)+ const heightPre = (height / baseHeight).toFixed(5)+ let pre = widthPre+ if (heightPre < widthPre) {+ pre = heightPre+ }++ if (screenRef.value) {+ screenRef.value.style.transform = `scale(${ pre }, ${ pre })`+ }+ }++ const resize = () => {+ clearTimeout(timer.value)+ timer.value = window.setTimeout(() => {+ calcRate()+ }, 100)+ }++ // Change window size and redraw+ const windowDraw = () => {+ window.addEventListener('resize', resize)+ }++ // Change window size and redraw+ const unWindowDraw = () => {+ window.removeEventListener('resize', resize)+ }++ return {+ screenContainerRef,+ screenRef,+ calcRate,+ windowDraw,+ unWindowDraw,+ }+}diff --git a/frontend/src/utils/router/index.ts b/frontend/src/utils/router/index.tsindex f397584..3d7cb56 100644--- a/frontend/src/utils/router/index.ts+++ b/frontend/src/utils/router/index.ts@@ -65,6 +65,7 @@ export function menusToSideBar(): SideBarMenu[] {}}result.push({ icon: GetModuleAndIcon('homepage'), lable: i18n.global.t('router.sideBar.vwms'), routerPath: 'vwms', showDetail: false })+ // result.push({ icon: GetModuleAndIcon('homepage'), lable: i18n.global.t('router.sideBar.largeScreen'), routerPath: 'largeScreen', showDetail: false })return result}@@ -121,6 +122,10 @@ function GetMenuNameAndModule(path: string): string {return i18n.global.t('router.sideBar.deliveryStatistic')case 'asnStatistic':return i18n.global.t('router.sideBar.asnStatistic')+ case 'stockageStatistic':+ return i18n.global.t('router.sideBar.stockageStatistic')+ case 'largeScreen':+ return i18n.global.t('router.sideBar.largeScreen')default:return ''}@@ -171,7 +176,7 @@ function GetModuleAndIcon(name: string) {return 'ballot-recount-outline'case 'customer':return 'account-box-outline'- case 'print':+ case 'print':return 'printer-outline'case 'supplier':return 'account-badge'@@ -179,6 +184,10 @@ function GetModuleAndIcon(name: string) {return 'chart-pie'case 'saftyStock':return 'alarm-light'+ case 'stockageStatistic':+ return 'calendar-month'+ case 'largeScreen':+ return 'monitor-screenshot'default:return ''}diff --git a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vueindex 5a278bc..63b7558 100644--- a/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue+++ b/frontend/src/view/base/commodityCategorySetting/commodityCategorySetting.vue@@ -74,12 +74,12 @@<vxe-column type="seq" width="80"></vxe-column><vxe-column field="category_name" align="left" :title="$t('base.commodityCategorySetting.category_name')" tree-node></vxe-column><vxe-column field="creator" :title="$t('base.commodityCategorySetting.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('base.commodityCategorySetting.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/base/commodityManagement/commodityManagement.vue b/frontend/src/view/base/commodityManagement/commodityManagement.vueindex 0652e1e..9115149 100644--- a/frontend/src/view/base/commodityManagement/commodityManagement.vue+++ b/frontend/src/view/base/commodityManagement/commodityManagement.vue@@ -338,6 +338,10 @@ const method = reactive({}}}+ records.forEach((item) => {+ item.sku_id = item.id+ })+qrCodeDialogRef.value.openDialog(records)} else {hookComponent.$message({@@ -358,7 +362,7 @@ const method = reactive({} else {hookComponent.$message({type: 'error',- content: i18n.global.t('base.userManagement.checkboxIsNull')+ content: i18n.global.t('base.commodityManagement.checkboxIsNullByPrint')})}},diff --git a/frontend/src/view/base/customer/customer.vue b/frontend/src/view/base/customer/customer.vueindex a7e9f8a..12b36a5 100644--- a/frontend/src/view/base/customer/customer.vue+++ b/frontend/src/view/base/customer/customer.vue@@ -71,15 +71,10 @@<vxe-column field="email" :title="$t('base.customer.email')"></vxe-column><vxe-column field="contact_tel" :title="$t('base.customer.contact_tel')"></vxe-column><vxe-column field="creator" :title="$t('base.customer.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.customer.create_time')">- </vxe-column>- <vxe-column- field="last_update_time"- width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"- :title="$t('base.customer.last_update_time')"- >- </vxe-column>+ <vxe-date-column field="create_time" width="170px" format="yyyy-MM-dd HH:mm" :title="$t('base.customer.create_time')">+ </vxe-date-column>+ <vxe-date-column field="last_update_time" width="170px" format="yyyy-MM-dd HH:mm" :title="$t('base.customer.last_update_time')">+ </vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/base/freightSetting/freightSetting.vue b/frontend/src/view/base/freightSetting/freightSetting.vueindex 82ea4d6..f6d51bc 100644--- a/frontend/src/view/base/freightSetting/freightSetting.vue+++ b/frontend/src/view/base/freightSetting/freightSetting.vue@@ -85,12 +85,12 @@<vxe-column field="price_per_volume" :title="$t('base.freightSetting.price_per_volume')"></vxe-column><vxe-column field="min_payment" :title="$t('base.freightSetting.min_payment')"></vxe-column><vxe-column field="creator" :title="$t('base.freightSetting.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('base.freightSetting.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="is_valid" :title="$t('base.freightSetting.is_valid')"><template #default="{ row, column }"><span>{{ row[column.property] ? $t('system.combobox.yesOrNo.yes') : $t('system.combobox.yesOrNo.no') }}</span>diff --git a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vueindex e5e2453..ca8fed3 100644--- a/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue+++ b/frontend/src/view/base/ownerOfCargo/ownerOfCargo.vue@@ -66,12 +66,12 @@<vxe-column field="contact_tel" :title="$t('base.ownerOfCargo.contact_tel')"></vxe-column><vxe-column field="manager" :title="$t('base.ownerOfCargo.manager')"></vxe-column><vxe-column field="creator" :title="$t('base.ownerOfCargo.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('base.ownerOfCargo.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/base/roleMenu/actionList.ts b/frontend/src/view/base/roleMenu/actionList.tsindex 63eca20..9a1e8dd 100644--- a/frontend/src/view/base/roleMenu/actionList.ts+++ b/frontend/src/view/base/roleMenu/actionList.ts@@ -32,6 +32,7 @@ export const actionDict: any = {'notice-delete','notice-export','notice-printQrCode',+ 'putOnTheShelf-printQrCode','delivered-confirm','delivered-export','unloaded-confirm',@@ -51,6 +52,7 @@ export const actionDict: any = {saftyStock: ['export'],asnStatistic: ['export'],deliveryStatistic: ['export'],+ stockageStatistic: ['export'],warehouseProcessing: ['split', 'group', 'confirmOpeartion', 'confirmAdjust', 'delete', 'export'],warehouseMove: ['save', 'delete', 'export', 'confirm'],diff --git a/frontend/src/view/base/supplier/supplier.vue b/frontend/src/view/base/supplier/supplier.vueindex 2183d2f..c88bac8 100644--- a/frontend/src/view/base/supplier/supplier.vue+++ b/frontend/src/view/base/supplier/supplier.vue@@ -71,15 +71,9 @@<vxe-column field="email" :title="$t('base.supplier.email')"></vxe-column><vxe-column field="contact_tel" :title="$t('base.supplier.contact_tel')"></vxe-column><vxe-column field="creator" :title="$t('base.supplier.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.supplier.create_time')">- </vxe-column>- <vxe-column- field="last_update_time"- width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"- :title="$t('base.supplier.last_update_time')"- >- </vxe-column>+ <vxe-date-column field="create_time" :title="$t('base.supplier.create_time')" format="yyyy-MM-dd HH:mm" width="170px"></vxe-date-column>+ <vxe-date-column field="last_update_time" width="170px" format="yyyy-MM-dd HH:mm" :title="$t('base.supplier.last_update_time')">+ </vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -93,7 +87,7 @@:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="!data.authorityList.includes('delete')?'':errorColor"+ :icon-color="!data.authorityList.includes('delete') ? '' : errorColor":disabled="!data.authorityList.includes('delete')"@click="method.deleteRow(row)"></tooltip-btn>diff --git a/frontend/src/view/base/warehouseSetting/tab-warehouse.vue b/frontend/src/view/base/warehouseSetting/tab-warehouse.vueindex b92237a..cf9e556 100644--- a/frontend/src/view/base/warehouseSetting/tab-warehouse.vue+++ b/frontend/src/view/base/warehouseSetting/tab-warehouse.vue@@ -73,12 +73,12 @@<vxe-column field="email" :title="$t('base.warehouseSetting.email')"></vxe-column><vxe-column field="manager" :title="$t('base.warehouseSetting.manager')"></vxe-column><vxe-column field="creator" :title="$t('base.warehouseSetting.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('base.warehouseSetting.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="is_valid" :title="$t('base.warehouseSetting.is_valid')"><template #default="{ row, column }"><span>{{ formatIsValid(row[column.property]) }}</span>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vueindex cee9dae..0bc4f99 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/confirm-order.vue@@ -73,6 +73,9 @@<vxe-input v-model="row.pick_qty" type="text"></vxe-input></template></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')"></vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.stockAsnInfo.putaway_date')"></vxe-date-column></vxe-table></v-col></v-row>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vueindex 262eba3..557343e 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/search-delivered-detail.vue@@ -29,6 +29,27 @@<vxe-column field="location_name" :title="$t('base.warehouseSetting.location_name')"></vxe-column><!-- <vxe-column field="pick_qty" :title="$t('wms.deliveryManagement.unpicked_qty')"></vxe-column> --><vxe-column field="picked_qty" :title="$t('wms.deliveryManagement.picked_qty')"></vxe-column>+ <vxe-column field="picker" :title="$t('wms.deliveryManagement.picker')"></vxe-column>+ <vxe-column+ v-if="sourceType === 'picking'"+ field="operate"+ :title="$t('system.page.operate')"+ width="120"+ :resizable="false"+ show-overflow+ >+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">+ <tooltip-btn+ :disabled="!data.authorityList.includes('picked-confirm') || row.picker_id > 0"+ :flat="true"+ icon="mdi-cart-arrow-down"+ :tooltip-text="$t('base.roleMenu.opeartionFunctionName.deliveryManagement.picked')"+ @click="method.pickRow(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column></vxe-table></v-card-text><v-card-actions class="justify-end">@@ -40,25 +61,55 @@</template><script lang="ts" setup>-import { reactive, computed, watch } from 'vue'+import { reactive, computed, watch, withDefaults } from 'vue'import { hookComponent } from '@/components/system/index'-import { viewInventoryDetails } from '@/api/wms/deliveryManagement'+import { getMenuAuthorityList } from '@/utils/common'+import { viewInventoryDetails, confirmPickingDetail } from '@/api/wms/deliveryManagement'import i18n from '@/languages/i18n'+import tooltipBtn from '@/components/tooltip-btn.vue'const emit = defineEmits(['close', 'submit'])-const props = defineProps<{- showDialog: boolean- id: number-}>()+const props = withDefaults(+ defineProps<{+ showDialog: boolean+ id: number+ sourceType: string+ }>(),+ {+ sourceType: ''+ }+)const isShow = computed(() => props.showDialog)const data = reactive({- tableData: []+ tableData: [],+ // Menu operation permissions+ authorityList: getMenuAuthorityList()})const method = reactive({+ pickRow: async (row) => {+ hookComponent.$dialog({+ content: `${ i18n.global.t('base.roleMenu.opeartionFunctionName.deliveryManagement.picked') }?`,+ handleConfirm: async () => {+ const { data: res } = await confirmPickingDetail([row.id])+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.getTableData()+ }+ })+ },getTableData: async () => {const { data: res } = await viewInventoryDetails(props.id)if (!res.isSuccess) {diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vueindex 6d804bb..cb0481d 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabAllocation.vue@@ -46,19 +46,19 @@{{ i18n.global.t('system.page.noData') }}</template><vxe-column type="seq" width="60"></vxe-column>- <vxe-column field="dateFrom" :formatter="['formatDate', 'HH:mm:ss']" :title="$t('wms.deliveryBatchAllocation.dateFrom')"></vxe-column>- <vxe-column field="dateTo" :formatter="['formatDate', 'HH:mm:ss']" :title="$t('wms.deliveryBatchAllocation.dateTo')"></vxe-column>+ <vxe-date-column field="dateFrom" format="HH:mm:ss" :title="$t('wms.deliveryBatchAllocation.dateFrom')"></vxe-date-column>+ <vxe-date-column field="dateTo" format="HH:mm:ss" :title="$t('wms.deliveryBatchAllocation.dateTo')"></vxe-date-column><vxe-column field="allocationRule" :title="$t('wms.deliveryBatchAllocation.allocationRule')"></vxe-column><vxe-column field="creator" :title="$t('base.supplier.creator')"></vxe-column>- <vxe-column field="create_time" width="170px" :formatter="['formatDate', 'yyyy-MM-dd HH:mm']" :title="$t('base.supplier.create_time')">- </vxe-column>- <vxe-column+ <vxe-date-column field="create_time" width="170px" format="yyyy-MM-dd HH:mm" :title="$t('base.supplier.create_time')">+ </vxe-date-column>+ <vxe-date-columnfield="last_update_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('base.supplier.last_update_time')">- </vxe-column>+ </vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vueindex 7b27216..4d8d2a7 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabDelivered.vue@@ -98,13 +98,14 @@</vxe-column><vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="pick_checker" :title="$t('wms.deliveryManagement.pick_checker')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vueindex 647034a..f03a58a 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabGoodsToBePicked.vue@@ -87,12 +87,12 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">@@ -111,7 +111,7 @@@page-change="method.handlePageChange"></custom-pager>- <SearchDeliveredDetail :id="data.showDeliveredDetailID" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" />+ <SearchDeliveredDetail :id="data.showDeliveredDetailID" :source-type="'picking'" :show-dialog="data.showDeliveredDetail" @close="method.closeDeliveredDetail" /></div></template>diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vueindex 291fe7a..3512bba 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPackaged.vue@@ -101,20 +101,21 @@</template></vxe-column><vxe-column field="package_person" :title="$t('wms.deliveryManagement.package_person')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="package_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.package_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="pick_checker" :title="$t('wms.deliveryManagement.pick_checker')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vueindex 21bd0af..d38328c 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPicked.vue@@ -86,13 +86,14 @@</template></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="pick_checker" :title="$t('wms.deliveryManagement.pick_checker')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vueindex ab0d787..7b65277 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue@@ -88,12 +88,6 @@</vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <!-- <vxe-column- field="create_time"- width="120px"- :formatter="['formatDate', 'yyyy-MM-dd']"- :title="$t('wms.deliveryManagement.create_time')"- ></vxe-column> --><vxe-column field="operate" :title="$t('system.page.operate')" width="300px" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vueindex 6e75d5a..404142b 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabSignIn.vue@@ -100,12 +100,12 @@<vxe-column field="weighing_no" :title="$t('wms.deliveryManagement.weighing_no')"></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="120" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vueindex 5147070..bf805b3 100644--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabWeighed.vue@@ -108,13 +108,14 @@</template></vxe-column><vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="pick_checker" :title="$t('wms.deliveryManagement.pick_checker')"></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.deliveryManagement.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140" :resizable="false" show-overflow><template #default="{ row }"><div style="width: 100%; display: flex; justify-content: center">diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenBottomLeft.vue b/frontend/src/view/largeScreen/largeScreen/ScreenBottomLeft.vuenew file mode 100644index 0000000..d84ee2d--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenBottomLeft.vue@@ -0,0 +1,204 @@+<template>+ <div class="screen-bottom-left">+ <div class="screen-bottom-header flex-l">+ <div class="header-left flex-c">+ <i class="iconfont icon-chart-line" />+ </div>+ <div class="header-right flex-l">+ <span class="header-title">{{ $t('router.sideBar.asnStatistic') }}</span>+ <dv-decoration-1 class="dv-dec-1" />+ </div>+ </div>+ <div class="screen-bottom-chart">+ <div ref="chatRef" class="chat" />+ </div>+ </div>+</template>++<script setup lang="ts">+import { reactive, onMounted, ref } from 'vue'+import _ from 'lodash'+import * as echarts from 'echarts'+import { EChartsOption, EChartsType } from 'echarts'+import { getStockAsnList } from '@/api/wms/stockAsn'+import { formatDate } from '@/utils/format/formatSystem'+import i18n from '@/languages/i18n'++const chatRef = ref()+let chat: EChartsType+const chartData = reactive({+ category: [] as Array<string>,+ countData: [] as Array<number>,+ moneyData: [] as Array<number>+})++const method = reactive({+ initCharts: () => {+ if (chat) chat.dispose()+ chat = echarts.init(chatRef.value)+ const option: EChartsOption = {+ tooltip: {+ show: true,+ trigger: 'item',+ axisPointer: {+ type: 'shadow',+ label: {+ show: true+ }+ }+ },+ calculable: true,+ legend: {+ show: true,+ textStyle: {+ color: 'white',+ fontSize: '14px'+ },+ },+ grid: {+ width: '88%',+ bottom: '7%'+ },++ xAxis: [+ {+ axisLine: {+ lineStyle: {+ color: '#ffffff'+ }+ },+ axisTick: {+ show: false+ },+ data: chartData.category+ }+ ],+ yAxis: [+ {+ type: 'value',+ axisLine: {+ lineStyle: {+ color: '#ffffff'+ }+ },+ axisLabel: {+ formatter(a) {+ return a.toLocaleString()+ }+ }+ }+ ],++ series: [+ {+ name: i18n.global.t('wms.deliveryStatistic.amount'),+ type: 'bar',+ barWidth: 20,+ // type: 'line',+ // smooth: true,+ // showAllSymbol: true,+ // symbol: 'emptyCircle',+ itemStyle: {+ // normal: {+ // barBorderRadius: 5,+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [+ { offset: 0, color: '#e7bcf3' },+ { offset: 1, color: '#3EACE5' }+ ])+ // }+ },+ data: chartData.countData+ }+ ]+ }+ chat.setOption(option)+ },+ getStockAsnList: async () => {+ chartData.category = []+ chartData.countData = []+ const myDate = new Date()+ const nowDate = formatDate(myDate, 'yyyy-MM-dd')+ const year = myDate.getFullYear()+ const startDate = `${ year }-01-01`+ const { data: res } = await getStockAsnList({+ total: 0,+ sqlTitle: 'asn_status:4',+ pageIndex: 1,+ pageSize: 999999,+ searchObjects: [+ { name: 'create_time', operator: 3, text: startDate, value: startDate },+ { name: 'create_time', operator: 5, text: nowDate, value: nowDate }+ ]+ })+ if (res.isSuccess) {+ const groupedData = _.groupBy(res.data.rows, 'sku_name')+ _.forEach(groupedData, (group, key) => {+ const sumAmount = _.sumBy(group, 'actual_qty')+ chartData.category.push(key)+ chartData.countData.push(sumAmount)+ })+ }+ method.initCharts()+ }+})+// 生命周期+onMounted(() => {+ method.getStockAsnList()+ setInterval(() => {+ method.getStockAsnList()+ }, 10 * 60 * 1000)+})+</script>++<style lang="less" scoped>+.screen-bottom-left {+ height: 450px;+ background-color: #0f1325;+ margin: 15px 5px;+ border-radius: 20px;++ .screen-bottom-header {+ height: 40px;++ .header-left {+ width: 40px;+ }++ .header-right {+ width: calc(100% - 40px);++ .header-title {+ color: #fff;+ font-size: 13px;+ }++ .dv-dec-1 {+ width: 100px;+ height: 20px;+ margin-left: 10px;+ }+ }+ }+}+.flex-l {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+ align-items: center;+}++.flex-c {+ display: flex;+ justify-content: center;+ align-items: center;+}+// 图标+.iconfont {+ font-size: 20px !important;+ color: #5cd9e8;+}+.chat {+ height: 400px;+ width: 100%;+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenBottomRight.vue b/frontend/src/view/largeScreen/largeScreen/ScreenBottomRight.vuenew file mode 100644index 0000000..b567909--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenBottomRight.vue@@ -0,0 +1,199 @@+<template>+ <div class="screen-bottom-left">+ <div class="screen-bottom-header flex-l">+ <div class="header-left flex-c">+ <i class="iconfont icon-chart-line" />+ </div>+ <div class="header-right flex-l">+ <span class="header-title">{{ $t('router.sideBar.deliveryStatistic') }}</span>+ <dv-decoration-3 class="dv-dec-1" />+ </div>+ </div>+ <div class="screen-bottom-chart">+ <div ref="chatRef" class="chat" />+ </div>+ </div>+</template>++<script setup lang="ts">+import { reactive, onMounted, ref } from 'vue'+import _ from 'lodash'+import * as echarts from 'echarts'+import { EChartsOption, EChartsType } from 'echarts'+import { formatDate } from '@/utils/format/formatSystem'+import { list as getDeliveryStatisticList } from '@/api/wms/deliveryStatistic'+import i18n from '@/languages/i18n'++const chatRef = ref()+let chat: EChartsType+const chartData = reactive({+ category: [] as Array<string>,+ countData: [] as Array<number>,+ moneyData: [] as Array<number>+})++const method = reactive({+ initCharts: () => {+ if (chat) chat.dispose()+ chat = echarts.init(chatRef.value)+ const option: EChartsOption = {+ tooltip: {+ show: true,+ trigger: 'item',+ axisPointer: {+ type: 'shadow',+ label: {+ show: true+ }+ }+ },+ legend: {+ show: true,+ textStyle: {+ color: 'white',+ fontSize: '14px'+ }+ },+ grid: {+ width: '88%',+ // top: '5%',+ bottom: '7%'+ },++ xAxis: [+ {+ axisLine: {+ lineStyle: {+ color: '#ffffff'+ }+ },+ axisTick: {+ show: false+ },+ data: chartData.category+ }+ ],+ yAxis: [+ {+ type: 'value',+ axisLine: {+ lineStyle: {+ color: '#ffffff'+ }+ },+ axisLabel: {+ formatter(a) {+ return a.toLocaleString()+ }+ }+ }+ ],+ series: [+ {+ name: i18n.global.t('wms.deliveryStatistic.amount'),+ type: 'bar',+ barWidth: 20,+ // type: 'line',+ // smooth: true,+ // showAllSymbol: true,+ // symbol: 'emptyCircle',+ // itemStyle: {+ // color: '#5cd9e8'+ // },+ itemStyle: {+ // normal: {+ // barBorderRadius: 5,+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [+ { offset: 0, color: '#FFAE8B' },+ { offset: 1, color: '#FFF065' }+ ])+ // }+ },+ data: chartData.countData+ }+ ]+ }+ chat.setOption(option)+ },+ getDeliveryStatisticList: async () => {+ chartData.category = []+ chartData.countData = []+ const myDate = new Date()+ const nowDate = formatDate(myDate, 'yyyy-MM-dd HH:mm:ss')+ const year = myDate.getFullYear()+ const startDate = `${ year }-01-01`+ const { data: res } = await getDeliveryStatisticList({ pageIndex: 1, pageSize: 999999, delivery_date_from: startDate, delivery_date_to: nowDate })+ if (res.isSuccess) {+ const groupedData = _.groupBy(res.data.rows, 'sku_name')+ _.forEach(groupedData, (group, key) => {+ const sumQty = _.sumBy(group, 'delivery_qty')+ const sumAmount = _.sumBy(group, 'delivery_amount')+ chartData.category.push(key)+ chartData.countData.push(sumQty)+ chartData.moneyData.push(sumAmount)+ })+ }+ method.initCharts()+ }+})+// 生命周期+onMounted(() => {+ method.getDeliveryStatisticList()+ setInterval(() => {+ method.getDeliveryStatisticList()+ }, 10 * 60 * 1000)+})+</script>++<style lang="less" scoped>+.screen-bottom-left {+ height: 450px;+ background-color: #0f1325;+ margin: 15px 5px;+ border-radius: 20px;++ .screen-bottom-header {+ height: 40px;++ .header-left {+ width: 40px;+ }++ .header-right {+ width: calc(100% - 40px);++ .header-title {+ color: #fff;+ font-size: 13px;+ }++ .dv-dec-1 {+ width: 100px;+ height: 20px;+ margin-left: 10px;+ }+ }+ }+}+.flex-l {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+ align-items: center;+}++.flex-c {+ display: flex;+ justify-content: center;+ align-items: center;+}+// 图标+.iconfont {+ font-size: 20px !important;+ color: #5cd9e8;+}+.chat {+ height: 400px;+ width: 100%;+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenFooter.vue b/frontend/src/view/largeScreen/largeScreen/ScreenFooter.vuenew file mode 100644index 0000000..74346b3--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenFooter.vue@@ -0,0 +1,44 @@+<template>+ <div class="screen-footer">+ <div class="screen-footer-left">+ <dv-decoration-10 :color="['#45a1f1', '#000000']" class="dv-dec-10" :dur="10" />+ </div>+ <div class="screen-footer-middle">+ <dv-decoration-5 :color="['#45a1f1', '#000000']" :dur="10" class="dv-dec-5" />+ </div>+ <div class="screen-footer-right">+ <dv-decoration-10 :color="['#45a1f1', '#000000']" class="dv-dec-10 dev-reverse" :dur="10" />+ </div>+ </div>+</template>++<script setup lang="ts"></script>++<style lang="less" scoped>+.screen-footer {+ display: flex;+ // align-items: center;++ .screen-footer-left {+ width: 35%;+ }++ .screen-footer-middle {+ width: 30%;+ }++ .screen-footer-right {+ width: 35%;+ }+ .dv-dec-5 {+ height: 40px;+ }+ .dv-dec-10 {+ margin-top: -2px;+ height: 20px;+ }+ .dev-reverse {+ transform: rotateY(180deg);+ }+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenHeader.vue b/frontend/src/view/largeScreen/largeScreen/ScreenHeader.vuenew file mode 100644index 0000000..dd14fa1--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenHeader.vue@@ -0,0 +1,92 @@+<template>+ <div class="screen-header">+ <div class="screen-header-top-section">+ <dv-decoration-10 :color="['#45a1f1', '#000000']" class="dv-dec-10" :dur="10" />+ <div class="screen-header-title-section">+ <dv-decoration-8 :color="['#45a1f1', '#000000']" class="dv-dec-8" />+ <div class="title-section">+ <p class="header-title">ModernWms {{ $t('router.sideBar.largeScreen') }}</p>+ </div>+ <dv-decoration-8 :color="['#45a1f1', '#000000']" class="dv-dec-8" :reverse="true" />+ </div>++ <dv-decoration-10 :color="['#45a1f1', '#000000']" class="dv-dec-10 dev-reverse" :reverse="true" :dur="10" />+ </div>+ <div class="screen-header-bottom-section">+ <div class="sub-dec-section">+ <dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']" />+ </div>+ </div>+ </div>+</template>++<script setup lang="ts">+import i18n from '@/languages/i18n'+</script>++<style lang="less" scoped>+.screen-header {+ .screen-header-top-section {+ display: flex;+ align-items: center;++ .screen-header-title-section {+ width: 50%;+ display: flex;+ align-items: center;+ padding-top: 20px;++ .dv-dec-8 {+ width: 30%;+ height: 20px;+ }++ .title-section {+ width: 40%;+ text-align: center;+ .sub-dec-section {+ width: 20%;+ padding: 0 40px;++ .dv-dec-6 {+ height: 20px;+ margin-top: 15px;+ }+ }++ .header-title {+ background-color: transparent;+ font-size: 24px;+ font-weight: 550;+ background-image: linear-gradient(#fff, #45a1f1);+ background-clip: text;+ -webkit-background-clip: text;+ -webkit-text-fill-color: transparent;+ }+ }+ }++ .dv-dec-10 {+ width: 25%;+ height: 20px;+ }+ }++ .screen-header-bottom-section {+ display: flex;+ justify-content: center;+ .sub-dec-section {+ width: 20%;+ padding: 0 40px;++ .dv-dec-6 {+ height: 20px;+ // margin-top: 15px;+ }+ }+ }+}+.dev-reverse {+ transform: rotateY(180deg);+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenTopCenter.vue b/frontend/src/view/largeScreen/largeScreen/ScreenTopCenter.vuenew file mode 100644index 0000000..a243dc3--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenTopCenter.vue@@ -0,0 +1,111 @@+<template>+ <div class="screen-top-right2">+ <div class="screen-top-header flex-l">+ <div class="header-left flex-c">+ <i class="iconfont icon-chart-location" />+ </div>+ <div class="header-right flex-l">+ <span class="header-title">{{ $t('wms.stockManagement.stockLocation') }}</span>+ <dv-decoration-1 class="dv-dec-1" />+ </div>+ </div>+ <div class="screen-top-chart">+ <dv-scroll-board class="dv-scr-board" :config="config" />+ </div>+ </div>+</template>++<script setup lang="ts">+import { reactive, onMounted } from 'vue'+import { getStockLocationList } from '@/api/wms/stockManagement'+import { StockLocationVO } from '@/types/WMS/StockManagement'+import i18n from '@/languages/i18n'++const config = reactive({+ header: [+ i18n.global.t('wms.stockLocation.warehouse_name'),+ i18n.global.t('wms.stockLocation.location_name'),+ i18n.global.t('wms.stockLocation.spu_code'),+ i18n.global.t('wms.stockLocation.spu_name'),+ i18n.global.t('wms.stockLocation.sku_code'),+ i18n.global.t('wms.stockLocation.qty')+ ] as string[],+ data: [],+ rowNum: 7, // Table Rows+ headerHeight: 35,+ headerBGC: '#0f1325', // Meter header+ oddRowBGC: '#0f1325', // Odd Rows+ evenRowBGC: '#171c33', // Even rows+ index: true,+ columnWidth: [50],+ align: ['center']+})+const method = reactive({+ getStockLocationList: async () => {+ const { data: res } = await getStockLocationList({ total: 0, pageIndex: 1, pageSize: 99999 })+ config.data = res.data.rows.map((item: StockLocationVO) => [item.warehouse_name, item.location_name, item.spu_code, item.spu_name, item.sku_code, item.qty])+ }+})+onMounted(() => {+ method.getStockLocationList()+ setInterval(() => {+ method.getStockLocationList()+ }, 10 * 60 * 1000)+})+</script>++<style lang="less" scoped>+.screen-top-right2 {+ height: 405px;+ background-color: #0f1325;+ margin: 10px 10px;+ border-radius: 20px;++ .screen-top-header {+ height: 40px;++ .header-left {+ width: 30px;+ }++ .header-right {+ width: calc(100% - 30px);++ .header-title {+ color: #fff;+ font-size: 13px;+ }++ .dv-dec-1 {+ width: 100px;+ height: 20px;+ margin-left: 10px;+ }+ }+ }++ .screen-top-chart {+ .dv-scr-board {+ width:100%;+ // width: calc(100% - 30px);+ height: 340px;+ }+ }+}+.flex-l {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+ align-items: center;+}++.flex-c {+ display: flex;+ justify-content: center;+ align-items: center;+}+.iconfont {+ font-size: 20px !important;+ color: #5cd9e8;+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenTopLeft.vue b/frontend/src/view/largeScreen/largeScreen/ScreenTopLeft.vuenew file mode 100644index 0000000..992b58b--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenTopLeft.vue@@ -0,0 +1,177 @@+<template>+ <div class="screen-top-right2">+ <div class="screen-top-header flex-l">+ <div class="header-left flex-c">+ <i class="iconfont icon-chart-pie" />+ </div>+ <div class="header-right flex-l">+ <span class="header-title">{{ $t('router.sideBar.stockageStatistic') }}</span>+ <dv-decoration-1 class="dv-dec-1" />+ </div>+ </div>+ <div class="screen-top-chart">+ <div ref="chatRef" class="chat" />+ </div>+ </div>+</template>++<script setup lang="ts">+import { reactive, onMounted, ref } from 'vue'+import _ from 'lodash'+import * as echarts from 'echarts'+import { EChartsOption, EChartsType } from 'echarts'+import { list as getStockAgeStatisticList } from '@/api/wms/stockageStatistic'++const chatRef = ref()+let chat: EChartsType+const chartData = reactive({+ category: [] as Array<string>,+ countData: [] as Array<any>+})++const method = reactive({+ initCharts: () => {+ if (chat) chat.dispose()+ chat = echarts.init(chatRef.value)+ const option: EChartsOption = {+ tooltip: {+ trigger: 'item',+ formatter: '{b} : {c} ({d}%)'+ },+ toolbox: {+ show: true+ },+ calculable: true,+ legend: {+ orient: 'horizontal',+ icon: 'circle',+ bottom: 0,+ data: chartData.category,+ textStyle: {+ color: '#fff'+ }+ },+ series: [+ {+ type: 'pie',+ radius: '55%',+ // roseType: 'area',+ // center: ['50%', '40%'],+ itemStyle: {+ borderRadius: 5+ },+ data: chartData.countData,+ label: {+ show: true,+ position: 'outside',+ formatter: '{b} : {d}%',+ color: '#fff'+ }+ // emphasis: {+ // itemStyle: {+ // shadowBlur: 10,+ // shadowOffsetX: 0,+ // shadowColor: 'rgba(0, 0, 0, 0.5)'+ // }+ // }+ }+ ]+ }+ chat.setOption(option)+ },+ getStockAgeStatisticList: async () => {+ chartData.category = []+ chartData.countData = []+ const { data: res } = await getStockAgeStatisticList({+ pageIndex: 1,+ pageSize: 99999999+ })+ if (res.isSuccess) {+ res.data.rows.forEach((item) => {+ if (item.stock_age < 30) {+ item.category = '<30(day)'+ } else if (item.stock_age < 61) {+ item.category = '30-60(day)'+ } else if (item.stock_age < 181) {+ item.category = '61-180(day)'+ } else if (item.stock_age < 361) {+ item.category = '181-360(day)'+ } else {+ item.category = '>360(day)'+ }+ })+ const groupedData = _.groupBy(res.data.rows, 'category')+ _.forEach(groupedData, (group, key) => {+ const sumAmount = _.sumBy(group, 'qty')+ chartData.category.push(key)+ chartData.countData.push({ name: key, value: sumAmount })+ })+ }+ method.initCharts()+ }+})+onMounted(() => {+ method.getStockAgeStatisticList()+ setInterval(() => {+ method.getStockAgeStatisticList()+ }, 10 * 60 * 1000)+})+</script>++<style lang="less" scoped>+.screen-top-right2 {+ height: 405px;+ background-color: #0f1325;+ margin: 10px 10px;+ border-radius: 20px;++ .screen-top-header {+ height: 40px;++ .header-left {+ width: 30px;+ }++ .header-right {+ width: calc(100% - 30px);++ .header-title {+ color: #fff;+ font-size: 13px;+ }++ .dv-dec-1 {+ width: 100px;+ height: 20px;+ margin-left: 10px;+ }+ }+ }++ .screen-top-chart {+ .chat {+ width: 100%;+ height: 340px;+ display: flex;+ justify-content: center;+ align-items: center;+ }+ }+}+.flex-l {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+ align-items: center;+}++.flex-c {+ display: flex;+ justify-content: center;+ align-items: center;+}+.iconfont {+ font-size: 20px !important;+ color: #5cd9e8;+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/ScreenTopRight.vue b/frontend/src/view/largeScreen/largeScreen/ScreenTopRight.vuenew file mode 100644index 0000000..023b828--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/ScreenTopRight.vue@@ -0,0 +1,110 @@+<template>+ <div class="screen-top-right2">+ <div class="screen-top-header flex-l">+ <div class="header-left flex-c">+ <i class="iconfont icon-chart-stock" />+ </div>+ <div class="header-right flex-l">+ <span class="header-title">{{ $t('wms.stockManagement.stock') }}</span>+ <dv-decoration-3 class="dv-dec-3" />+ </div>+ </div>+ <div class="screen-top-chart">+ <dv-scroll-board class="dv-scr-board" :config="config" />+ </div>+ </div>+</template>++<script setup lang="ts">+import { reactive, onMounted } from 'vue'+import { getStockList } from '@/api/wms/stockManagement'+import { StockLocationVO } from '@/types/WMS/StockManagement'+import i18n from '@/languages/i18n'++const config = reactive({+ header: [+ i18n.global.t('wms.stockLocation.spu_code'),+ i18n.global.t('wms.stockLocation.spu_name'),+ i18n.global.t('wms.stockLocation.sku_code'),+ i18n.global.t('wms.stockLocation.qty'),+ i18n.global.t('wms.stockLocation.qty_available')+ ] as string[],+ data: [],+ rowNum: 7, // Table Rows+ headerHeight: 35,+ headerBGC: '#0f1325', // Meter header+ oddRowBGC: '#0f1325', // Odd Rows+ evenRowBGC: '#171c33', // Even rows+ index: true,+ columnWidth: [50],+ align: ['center']+})+const method = reactive({+ getStockList: async () => {+ const { data: res } = await getStockList({ total: 0, pageIndex: 1, pageSize: 99999 })+ config.data = res.data.rows.map((item: StockLocationVO) => [item.spu_code, item.spu_name, item.sku_code, item.qty, item.qty_available])+ }+})+onMounted(() => {+ method.getStockList()+ setInterval(() => {+ method.getStockList()+ }, 10 * 60 * 1000)+})+</script>++<style lang="less" scoped>+.screen-top-right2 {+ height: 405px;+ background-color: #0f1325;+ margin: 10px 10px;+ border-radius: 20px;++ .screen-top-header {+ height: 40px;++ .header-left {+ width: 30px;+ }++ .header-right {+ width: calc(100% - 30px);++ .header-title {+ color: #fff;+ font-size: 13px;+ }++ .dv-dec-3 {+ width: 100px;+ height: 20px;+ margin-left: 10px;+ }+ }+ }++ .screen-top-chart {+ .dv-scr-board {+ width: 100%;+ // width: calc(100% - 30px);+ height: 340px;+ }+ }+}+.flex-l {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+ align-items: center;+}++.flex-c {+ display: flex;+ justify-content: center;+ align-items: center;+}+.iconfont {+ font-size: 20px !important;+ color: #5cd9e8;+}+</style>diff --git a/frontend/src/view/largeScreen/largeScreen/largeScreen.vue b/frontend/src/view/largeScreen/largeScreen/largeScreen.vuenew file mode 100644index 0000000..0f92e51--- /dev/null+++ b/frontend/src/view/largeScreen/largeScreen/largeScreen.vue@@ -0,0 +1,145 @@+<template>+ <div id="container" ref="screenContainerRef" :data-screen="fullScreen" class="screen-container" :class="{ 'screen-container-full': fullScreen }">+ <div class="screenfullbtn">+ <v-btn icon variant="text" @click="toggleFullScreen">+ <v-tooltip activator="parent" location="bottom">{{ $t('system.page.fullScreen') }}</v-tooltip>+ <v-icon :icon="`mdi-arrow-${fullScreen ? 'collapse' : 'expand'}`" color="white"></v-icon>+ </v-btn>+ </div>+ <div v-if="loading" class="mask flex-c">+ <dv-loading> </dv-loading>+ </div>+ <div ref="screenRef" class="screen-content">+ <div class="header-section">+ <ScreenHeader></ScreenHeader>+ </div>+ <div :key="key_section1" class="screen-chart-section1">+ <dv-border-box-12>+ <ScreenTopLeft></ScreenTopLeft>+ </dv-border-box-12>+ <dv-border-box-8 :dur="10">+ <ScreenTopCenter></ScreenTopCenter>+ </dv-border-box-8>+ <dv-border-box-13>+ <ScreenTopRight></ScreenTopRight>+ </dv-border-box-13>+ </div>+ <div :key="key_section2" class="screen-chart-section2">+ <dv-border-box-12>+ <ScreenBottomLeft></ScreenBottomLeft>+ </dv-border-box-12>+ <dv-border-box-13>+ <ScreenBottomRight></ScreenBottomRight>+ </dv-border-box-13>+ </div>+ <div class="footer-section">+ <ScreenFooter></ScreenFooter>+ </div>+ </div>+ </div>+</template>+<script setup lang="ts">+import { onMounted, onUnmounted, ref } from 'vue'+import screenfull from 'screenfull'+import windowResize from '@/utils/largeScreenResize'+import ScreenHeader from './ScreenHeader.vue'+import ScreenTopLeft from './ScreenTopLeft.vue'+import ScreenTopCenter from './ScreenTopCenter.vue'+import ScreenTopRight from './ScreenTopRight.vue'+import ScreenBottomLeft from './ScreenBottomLeft.vue'+import ScreenBottomRight from './ScreenBottomRight.vue'+import ScreenFooter from './ScreenFooter.vue'++const { screenContainerRef, screenRef, calcRate, windowDraw, unWindowDraw } = windowResize()+const loading = ref(true)+onMounted(() => {+ // Monitor browser window size changes+ windowDraw()+ calcRate()+ setTimeout(() => {+ loading.value = false+ }, 2000)+})++onUnmounted(() => {+ unWindowDraw()+})+const fullScreen = ref(false)++const key_section1 = ref('section1')+const key_section2 = ref('section2')+const toggleFullScreen = () => {+ if (screenfull.isEnabled) {+ fullScreen.value = !fullScreen.value+ setTimeout(() => {+ const time = Date.now()+ key_section1.value = `${ time }_1`+ key_section2.value = `${ time }_2`+ setTimeout(() => {+ calcRate()+ }, 200)+ }, 0)+ }+}+</script>+<style lang="less" scoped>+.screen-container {+ width: 100%;+ height: calc(100vh - 75px);+ background-color: #020308;+ display: flex;+ justify-content: center;+ align-items: center;+ position: relative;+ .mask {+ position: absolute;+ width: 100%;+ height: 100%;+ z-index: 999;+ background-color: #020308;+ background-image: url('@/assets/img/home_bg.png');+ }+ .screenfullbtn {+ position: absolute;+ top: 10px;+ right: 10px;+ z-index: 10;+ display: flex;+ align-items: center;+ padding: 5px;+ border-radius: 4px;+ }+ .screen-content {+ flex: none;+ width: 1920px ;+ height: 1080px ;+ box-sizing: border-box;+ padding: 12px;+ background-image: url('@/assets/img/home_bg.png');+ transition: all 0.2s ease-in-out;++ .screen-chart-section1 {+ margin-top: 10px;+ display: grid;+ grid-template-columns: 2fr 3fr 2fr;+ grid-column-gap: 5px;+ }++ .screen-chart-section2 {+ margin-top: 5px;+ display: grid;+ grid-template-columns: 5fr 5fr;+ grid-column-gap: 5px;+ }+ }+}+.screen-container-full {+ z-index: 999;+ position: absolute;+ left: 0px;+ top: 0px;+ // width: 100vw;+ height: 100vh;+ overflow: hidden;+}+</style>diff --git a/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vue b/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vueindex 3eee8c6..c800236 100644--- a/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vue+++ b/frontend/src/view/statisticAnalysis/asnStatistic/asnStatistic.vue@@ -66,6 +66,8 @@<vxe-column field="shortage_qty" :title="$t('wms.stockAsnInfo.shortage_qty')"></vxe-column><vxe-column field="more_qty" :title="$t('wms.stockAsnInfo.more_qty')"></vxe-column><vxe-column field="damage_qty" :title="$t('wms.stockAsnInfo.damage_qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')"></vxe-date-column><!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vue b/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vueindex aa3ac59..fc103ef 100644--- a/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vue+++ b/frontend/src/view/statisticAnalysis/deliveryStatistic/deliveryStatistic.vue@@ -50,12 +50,15 @@<vxe-column field="customer_name" :title="$t('wms.deliveryStatistic.customer_name')"></vxe-column><vxe-column field="series_number" :title="$t('wms.deliveryStatistic.series_number')"></vxe-column><vxe-column field="delivery_qty" :title="$t('wms.deliveryStatistic.delivery_qty')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="delivery_date":title="$t('wms.deliveryStatistic.delivery_date')"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"- ></vxe-column>+ format="yyyy-MM-dd HH:mm"+ ></vxe-date-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')"></vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.stockAsnInfo.putaway_date')"></vxe-date-column></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"diff --git a/frontend/src/view/statisticAnalysis/stockageStatistic/stockageStatistic.vue b/frontend/src/view/statisticAnalysis/stockageStatistic/stockageStatistic.vuenew file mode 100644index 0000000..368a89e--- /dev/null+++ b/frontend/src/view/statisticAnalysis/stockageStatistic/stockageStatistic.vue@@ -0,0 +1,340 @@+<!-- stock age Statistic -->+<template>+ <div class="container">+ <div>+ <!-- Main Content -->+ <v-card class="mt-5">+ <v-card-text>+ <v-window v-model="data.activeTab">+ <v-window-item>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <BtnGroup :authority-list="data.authorityList" :btn-list="btnList" />+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <search-group+ ref="searchGroupRef"+ v-model="data.searchForm"+ :menu-name="data.menu_name"+ i18n-prefix="wms.stockageStatistic"+ @sure-search="method.sureSearch"+ />+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ v-if="data.currentRender === 'table'"+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '120px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <vxe-column field="warehouse_name" :title="$t('wms.stockageStatistic.warehouse_name')"></vxe-column>+ <vxe-column field="location_name" :title="$t('wms.stockageStatistic.location_name')"></vxe-column>+ <vxe-column field="spu_code" :title="$t('wms.stockageStatistic.spu_code')"></vxe-column>+ <vxe-column field="spu_name" :title="$t('wms.stockageStatistic.spu_name')"></vxe-column>+ <vxe-column field="sku_code" :title="$t('wms.stockageStatistic.sku_code')"></vxe-column>+ <vxe-column field="sku_name" :title="$t('wms.stockageStatistic.sku_name')"></vxe-column>+ <vxe-column field="goods_owner_name" :title="$t('wms.stockageStatistic.goods_owner_name')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockageStatistic.series_number')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.stockageStatistic.qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockageStatistic.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockageStatistic.expiry_date')"></vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.stockageStatistic.putaway_date')"></vxe-date-column>+ <vxe-column field="stock_age" :title="$t('wms.stockageStatistic.stock_age')"></vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ </div>+ <div+ v-else+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <div ref="chatRef" class="chat" />+ </div>+ </v-window-item>+ </v-window>+ </v-card-text>+ </v-card>+ </div>+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch, onMounted, nextTick } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import _ from 'lodash'+import * as echarts from 'echarts'+import { EChartsOption, EChartsType } from 'echarts'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { DEBOUNCE_TIME } from '@/constant/system'+import { getMenuAuthorityList } from '@/utils/common'+import { SearchObject, btnGroupItem } from '@/types/System/Form'+import i18n from '@/languages/i18n'+import customPager from '@/components/custom-pager.vue'+import { exportData } from '@/utils/exportTable'+import BtnGroup from '@/components/system/btnGroup.vue'+import { list as getStockAgeStatisticList } from '@/api/wms/stockageStatistic'+import { hookComponent } from '@/components/system'+import { StockAgeStatisticVo } from '@/types/WMS/StockAgeStatistic'+import SearchGroup from '@/components/system/search-group.vue'++const xTable = ref()+const searchGroupRef = ref()+const chatRef = ref()+let chat: EChartsType+const chartData = reactive({+ category: [] as Array<string>,+ countData: [] as Array<any>+})++const data = reactive({+ showDialog: false,+ timer: ref<any>(null),+ activeTab: null,+ searchForm: {+ spu_code: '',+ spu_name: '',+ sku_code: '',+ sku_name: '',+ warehouse_name: '',+ location_name: '',+ stock_age_from: '',+ stock_age_to: '',+ expiry_date_from: '',+ expiry_date_to: ''+ },+ tableData: ref<StockAgeStatisticVo[]>([]),+ tablePage: reactive({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: ref<Array<SearchObject>>([])+ }),+ btnList: [] as btnGroupItem[],+ // Menu operation permissions+ authorityList: getMenuAuthorityList(),+ // Local search criteria settings+ menu_name: 'stockageStatistic',+ currentRender: 'table'+})++const method = reactive({+ // Switch Chart Mode+ switchRenderMode: () => {+ if (data.currentRender === 'chart') {+ data.currentRender = 'table'+ } else {+ data.currentRender = 'chart'++ nextTick(() => {+ method.initCharts()+ })+ }+ },+ initCharts: () => {+ if (chat) chat.dispose()+ chat = echarts.init(chatRef.value)+ const option: EChartsOption = {+ tooltip: {+ trigger: 'item',+ formatter: '{b} : {c} ({d}%)'+ },+ toolbox: {+ show: true+ },+ calculable: true,+ legend: {+ orient: 'horizontal',+ icon: 'circle',+ bottom: 0,+ data: chartData.category,+ },+ series: [+ {+ type: 'pie',+ radius: '55%',+ itemStyle: {+ borderRadius: 5+ },+ data: chartData.countData,+ label: {+ show: true,+ position: 'outside',+ formatter: '{b} : {d}%',+ }+ }+ ]+ }+ chat.setOption(option)+ },+ // get data+ list: async () => {+ const searchForm = {}++ for (const item of Object.keys(data.searchForm)) {+ if (data.searchForm[item]) {+ searchForm[item] = data.searchForm[item]+ }+ }++ const { data: res } = await getStockAgeStatisticList({ ...data.tablePage, ...searchForm })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ res.data.rows.forEach((item) => {+ if (item.stock_age < 30) {+ item.category = '<30(day)'+ } else if (item.stock_age < 61) {+ item.category = '30-60(day)'+ } else if (item.stock_age < 181) {+ item.category = '61-180(day)'+ } else if (item.stock_age < 361) {+ item.category = '181-360(day)'+ } else {+ item.category = '>360(day)'+ }+ })+ const groupedData = _.groupBy(res.data.rows, 'category')+ _.forEach(groupedData, (group, key) => {+ const sumAmount = _.sumBy(group, 'qty')+ chartData.category.push(key)+ chartData.countData.push({ name: key, value: sumAmount })+ })+ },++ // Refresh data+ refresh: () => {+ method.list()+ },++ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },++ // Pagination function+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize+ method.refresh()+ }),++ // Export Table+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('router.sideBar.stockageStatistic'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },++ sureSearch: () => {+ // data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.refresh()+ },++ // Set Search+ handleSetSearch: () => {+ searchGroupRef.value.openDialog()+ }+})++const cardHeight = computed(() => computedCardHeight({ hasTab: false }))+const tableHeight = computed(() => computedTableHeight({ hasTab: false }))+const btnList = computed(() => [+ {+ name: i18n.global.t('system.page.refresh'),+ icon: 'mdi-refresh',+ code: '',+ click: method.refresh+ },+ {+ name: i18n.global.t('system.page.export'),+ icon: 'mdi-export-variant',+ code: 'export',+ click: method.exportTable+ },+ {+ name: i18n.global.t('system.page.setSearch'),+ icon: 'mdi-cog',+ code: '',+ click: method.handleSetSearch+ },+ {+ name: data.currentRender !== 'chart' ? i18n.global.t('system.page.chart') : i18n.global.t('system.page.table'),+ icon: data.currentRender !== 'chart' ? 'mdi-chart-bar' : 'mdi-table',+ code: '',+ click: method.switchRenderMode+ }+])++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)+</script>++<style scoped lang="less">+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+.chat {+ width: 100%;+ height: 100%;+}+</style>diff --git a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vueindex a85237f..c5290c5 100644--- a/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue+++ b/frontend/src/view/warehouseWorking/warehouseAdjust/warehouseAdjust.vue@@ -72,12 +72,12 @@:title="$t('wms.warehouseWorking.warehouseAdjust.handle_time')"></vxe-column> --><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseAdjust.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseAdjust.create_time')"- ></vxe-column>+ ></vxe-date-column><!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="200" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btndiff --git a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vueindex 503b4f2..875bb67 100644--- a/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue+++ b/frontend/src/view/warehouseWorking/warehouseFreeze/warehouseFreeze.vue@@ -75,13 +75,12 @@<vxe-column field="sku_code" width="150px" :title="$t('base.commodityManagement.sku_code')"></vxe-column><vxe-column field="series_number" width="150px" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseFreeze.handler')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="handle_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseFreeze.handle_time')"- >- </vxe-column>+ ></vxe-date-column><!-- <vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseFreeze.creator')"></vxe-column><vxe-columnfield="create_time"diff --git a/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vueindex 23d580c..aa61aba 100644--- a/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue+++ b/frontend/src/view/warehouseWorking/warehouseMove/add-or-update-move.vue@@ -128,6 +128,7 @@<script lang="ts" setup>import { reactive, computed, ref, watch } from 'vue'+import { log } from 'console'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addStockMove } from '@/api/wms/warehouseMove'@@ -182,7 +183,10 @@ const data = reactive({sku_name: '',series_number: '',creator: '',- create_time: ''+ create_time: '',+ price: 0,+ expiry_date: '',+ putaway_date: ''}),rules: {qty: [@@ -262,6 +266,9 @@ const method = reactive({data.form.sku_code = selectRecords[0].sku_codedata.form.sku_name = selectRecords[0].sku_namedata.form.series_number = selectRecords[0].series_number+ data.form.price = selectRecords[0].price+ data.form.expiry_date = selectRecords[0].expiry_date+ data.form.putaway_date = selectRecords[0].putaway_datedata.curAvailableQty = selectRecords[0].qty_available} catch (error) {@@ -288,7 +295,6 @@ const method = reactive({data.form.spu_name = ''data.form.sku_code = ''data.form.sku_name = ''-data.curAvailableQty = 0},diff --git a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vueindex 11c3a58..83a75d9 100644--- a/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue+++ b/frontend/src/view/warehouseWorking/warehouseMove/warehouseMove.vue@@ -85,20 +85,19 @@:title="$t('wms.warehouseWorking.warehouseMove.dest_googs_location_name')"></vxe-column><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseMove.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseMove.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseMove.handler')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="handle_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseMove.handle_time')"- >- </vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -118,7 +117,7 @@:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="!data.authorityList.includes('delete') || method.confirmMoveBtnDisabled(row)?'':errorColor"+ :icon-color="!data.authorityList.includes('delete') || method.confirmMoveBtnDisabled(row) ? '' : errorColor":disabled="!data.authorityList.includes('delete') || method.confirmMoveBtnDisabled(row)"@click="method.deleteRow(row)"></tooltip-btn>@@ -201,6 +200,9 @@ const data = reactive({spu_name: '',sku_code: '',sku_name: '',+ price: 0,+ expiry_date: '',+ putaway_date: '',series_number: '',creator: '',create_time: ''@@ -238,6 +240,9 @@ const method = reactive({spu_name: '',sku_code: '',sku_name: '',+ price: 0,+ expiry_date: '',+ putaway_date: '',series_number: '',creator: '',create_time: ''diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vueindex 334d64a..2be2ddf 100644--- a/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/add-or-update-process.vue@@ -49,7 +49,6 @@<vxe-column field="spu_code" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_code')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.warehouseWorking.warehouseProcessing.sku_code')"></vxe-column>- <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-columnfield="qty":title="$t('wms.warehouseWorking.warehouseProcessing.qty')"@@ -60,6 +59,10 @@</template></vxe-column><vxe-column field="unit" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column>+ <vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.warehouseWorking.warehouseProcessing.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.warehouseWorking.warehouseProcessing.expiry_date')"></vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.warehouseWorking.warehouseProcessing.putaway_date')"></vxe-date-column></vxe-table></div></v-col>@@ -106,6 +109,24 @@<vxe-column field="spu_code" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_code')"></vxe-column><vxe-column field="spu_name" :title="$t('wms.warehouseWorking.warehouseProcessing.spu_name')"></vxe-column><vxe-column field="sku_code" :title="$t('wms.warehouseWorking.warehouseProcessing.sku_code')"></vxe-column>+ <vxe-column+ field="expiry_date"+ :title="$t('wms.warehouseWorking.warehouseProcessing.expiry_date')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.expiry_date" type="date"></vxe-input>+ </template>+ </vxe-column>+ <!-- <vxe-column+ field="putaway_date"+ :title="$t('wms.warehouseWorking.warehouseProcessing.putaway_date')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.putaway_date" type="date"></vxe-input>+ </template>+ </vxe-column> --><vxe-columnfield="qty":title="$t('wms.warehouseWorking.warehouseProcessing.qty')"@@ -115,6 +136,16 @@<vxe-input v-model="row.qty" type="text"></vxe-input></template></vxe-column>+ <vxe-column+ field="price"+ :title="$t('wms.warehouseWorking.warehouseProcessing.price')"+ :edit-render="{ autofocus: '.vxe-input--inner' }"+ >+ <template #edit="{ row }">+ <vxe-input v-model="row.price" type="text"></vxe-input>+ </template>+ </vxe-column>+<vxe-column field="unit" width="60" :title="$t('wms.warehouseWorking.warehouseProcessing.unit')"></vxe-column><vxe-column field="location_name" :title="$t('wms.warehouseWorking.warehouseProcessing.target_location')" :edit-render="{}"><template #edit="{ row }">@@ -142,12 +173,13 @@<script lang="ts" setup>import { reactive, computed, ref, watch } from 'vue'import { VxeTablePropTypes } from 'vxe-table'+import { privateDecrypt } from 'crypto'import { WarehouseProcessingVO, WarehouseProcessingDetailVO } from '@/types/WarehouseWorking/WarehouseProcessing'import i18n from '@/languages/i18n'import { hookComponent } from '@/components/system/index'import { addStockProcess } from '@/api/wms/warehouseProcessing'import { SYSTEM_HEIGHT, errorColor } from '@/constant/style'-import { removeObjectNull } from '@/utils/common'+import { removeObjectNull, removeArrayNull } from '@/utils/common'import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorking'import commoditySelect from '@/components/select/commodity-select.vue'import locationSelect from '@/components/select/location-select.vue'@@ -155,7 +187,7 @@ import skuSelect from '@/components/select/sku-select.vue'import tooltipBtn from '@/components/tooltip-btn.vue'import customQrcode from '@/components/custom-qrcode.vue'import { exportData } from '@/utils/exportTable'-import { isInteger } from '@/utils/dataVerification/tableRule'+import { isInteger, isDecimal } from '@/utils/dataVerification/tableRule'const emit = defineEmits(['close', 'saveSuccess'])const xTableSource = ref()@@ -268,7 +300,10 @@ const method = reactive({series_number: record.series_number,unit: record.unit,is_update_stock: false,- qty_available: record.qty_available+ qty_available: record.qty_available,+ price: record.price,+ expiry_date: record.expiry_date,+ putaway_date: record.putaway_date},-1)@@ -294,7 +329,10 @@ const method = reactive({series_number: selectRecords[0].series_number,unit: selectRecords[0].unit,is_update_stock: false,- qty_available: selectRecords[0].qty_available+ qty_available: selectRecords[0].qty_available,+ price: selectRecords[0].price,+ expiry_date: selectRecords[0].expiry_date,+ putaway_date: selectRecords[0].putaway_date},-1)@@ -323,7 +361,10 @@ const method = reactive({spu_name: selectRecords[0].spu_name,sku_code: selectRecords[0].sku_code,unit: selectRecords[0].unit,- is_update_stock: false+ is_update_stock: false,+ price: 0,+ expiry_date: '',+ putaway_date: ''},-1)@@ -348,7 +389,10 @@ const method = reactive({spu_name: record.spu_name,sku_code: record.sku_code,unit: record.unit,- is_update_stock: false+ is_update_stock: false,+ price: 0,+ expiry_date: '',+ putaway_date: ''},-1)@@ -371,6 +415,7 @@ const method = reactive({submit: async () => {const validSource = await method.validSourceTable()const validTarget = await method.validTargetTable()+if (!validSource || !validTarget) {return}@@ -403,6 +448,7 @@ const method = reactive({let form = { ...data.form }form.detailList = [...tableSourceRecords, ...tableTargetRecords]form = removeObjectNull(form)+ form.detailList = removeArrayNull(form.detailList)delete form.source_detail_listdelete form.target_detail_list@@ -424,7 +470,8 @@ const method = reactive({}// 2.The properties valid.- const errMap = await $table.validate()+ const errMap = await $table.validate(true)+if (errMap) {hookComponent.$message({type: 'error',@@ -450,7 +497,8 @@ const method = reactive({}// 2.The properties valid.- const errMap = await $table.validate()+ const errMap = await $table.validate(true)+if (errMap) {hookComponent.$message({type: 'error',@@ -548,8 +596,7 @@ const data = reactive({{ required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.qty') }` },{validator: isInteger,- validNumerical: 'greaterThanZero',- trigger: 'change'+ validNumerical: 'greaterThanZero'}],location_name: [@@ -557,6 +604,15 @@ const data = reactive({required: true,message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseProcessing.target_location') }`}+ ],+ price: [+ {+ validator: isDecimal,+ validNumerical: 'nonNegative',+ length: 10,+ decimalLength: 2,+ trigger: 'change'+ }]})})diff --git a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vueindex 6a13073..d5399a7 100644--- a/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue+++ b/frontend/src/view/warehouseWorking/warehouseProcessing/warehouseProcessing.vue@@ -74,20 +74,19 @@</template></vxe-column><vxe-column field="processor" :title="$t('wms.warehouseWorking.warehouseProcessing.processor')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="process_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseProcessing.process_time')"- >- </vxe-column>+ ></vxe-date-column><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseProcessing.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseProcessing.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -114,7 +113,7 @@:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="!data.authorityList.includes('delete') || method.confirmProcessBtnDisabled(row)?'':errorColor"+ :icon-color="!data.authorityList.includes('delete') || method.confirmProcessBtnDisabled(row) ? '' : errorColor":disabled="!data.authorityList.includes('delete') || method.confirmProcessBtnDisabled(row)"@click="method.deleteRow(row)"></tooltip-btn>@@ -143,6 +142,13 @@@close="method.closeDialog"@saveSuccess="method.saveSuccess"/>+ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'stockAsnInfo-notice'">+ <template #left="{ slotData }">+ <p>{{ $t('wms.warehouseWorking.warehouseProcessing.job_code') }}:{{ slotData.job_code }}</p> + <p>{{ $t('wms.warehouseWorking.warehouseProcessing.job_type') }}:{{ formatProcessJobType(slotData.job_type) }}</p> + </template>+ </qr-code-dialog></div></div></template>@@ -159,7 +165,7 @@ import { PROCESS_JOB_COMBINE, PROCESS_JOB_SPLIT } from '@/constant/warehouseWorkimport { DEBOUNCE_TIME } from '@/constant/system'import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import { SearchObject, btnGroupItem } from '@/types/System/Form'-import { formatIsValid } from '@/utils/format/formatSystem'+import { formatIsValid, formatDate } from '@/utils/format/formatSystem'import { formatProcessJobType } from '@/utils/format/formatWarehouseWorking'import tooltipBtn from '@/components/tooltip-btn.vue'import addOrUpdateDialog from './add-or-update-process.vue'@@ -167,8 +173,10 @@ import i18n from '@/languages/i18n'import customPager from '@/components/custom-pager.vue'import { exportData } from '@/utils/exportTable'import BtnGroup from '@/components/system/btnGroup.vue'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'const xTable = ref()+const qrCodeDialogRef = ref()const data = reactive({showDialog: false,@@ -204,6 +212,24 @@ const data = reactive({})const method = reactive({+ // Print QR code+ printQrCode: () => {+ const records = xTable.value.getCheckboxRecords()++ // data.selectRowData.length === 0 ? data.selectRowData = [row] : ''+ // const records:any[] = data.selectRowData+ if (records.length > 0) {+ for (const item of records) {+ item.type = 'warehouseProcessing'+ }+ qrCodeDialogRef.value.openDialog(records)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },// Open a dialog to addadd: (jobType: boolean) => {data.processType = jobType@@ -270,7 +296,10 @@ const method = reactive({})return}-+ res.data.target_detail_list.forEach((element) => {+ element.expiry_date = formatDate(element.expiry_date, 'yyyy-MM-dd')+ element.putaway_date = formatDate(element.putaway_date, 'yyyy-MM-dd')+ })data.dialogForm = res.datadata.processType = res.data.job_type},@@ -408,6 +437,12 @@ onMounted(() => {icon: 'mdi-export-variant',code: 'export',click: method.exportTable+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: '',+ click: method.printQrCode}]})diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vueindex 632faf4..fd63df5 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/add-or-update-taking.vue@@ -72,6 +72,27 @@@click="method.openLocationSelect"@click:clear="method.clearLocation"></v-text-field>+ <v-text-field+ v-model="data.form.price"+ :label="$t('wms.warehouseWorking.warehouseTaking.price')"+ :rules="data.rules.price"+ variant="outlined"+ :disabled="isFromStock"+ ></v-text-field>+ <v-text-field+ v-model="data.form.expiry_date"+ :label="$t('wms.warehouseWorking.warehouseTaking.expiry_date')"+ variant="outlined"+ type="date"+ :disabled="isFromStock"+ ></v-text-field>+ <v-text-field+ v-model="data.form.putaway_date"+ :label="$t('wms.warehouseWorking.warehouseTaking.putaway_date')"+ variant="outlined"+ type="date"+ :disabled="isFromStock"+ ></v-text-field><v-text-fieldv-model="data.form.book_qty":label="$t('wms.warehouseWorking.warehouseTaking.book_qty')"@@ -111,6 +132,8 @@ import tooltipBtn from '@/components/tooltip-btn.vue'import locationSelect from '@/components/select/location-select.vue'import skuSelect from '@/components/select/sku-select.vue'import customQrcode from '@/components/custom-qrcode.vue'+import { IsDecimal } from '@/utils/dataVerification/formRule'+import { formatDate } from '@/utils/format/formatSystem'const formRef = ref()const emit = defineEmits(['close', 'saveSuccess'])@@ -157,7 +180,10 @@ const data = reactive({handle_time: '',adjust_status: false,creator: '',- create_time: ''+ create_time: '',+ price: 0,+ expiry_date: '',+ putaway_date: ''}),rules: {job_type: [],@@ -168,6 +194,7 @@ const data = reactive({location_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.warehouseWorking.warehouseTaking.location_name') }!`],+ price: [(val: number) => IsDecimal(val, 'nonNegative', 10, 2) === '' || IsDecimal(val, 'nonNegative', 10, 2)],spu_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_code') }!`],spu_name: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.spu_name') }!`],sku_code: [(val: string) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.commodityManagement.sku_code') }!`],@@ -182,6 +209,11 @@ const method = reactive({initForm: () => {data.form = props.form+ data.curStockID = 0+ if (data.form.expiry_date) {+ data.form.expiry_date = formatDate(data.form.expiry_date, 'yyyy-MM-dd')+ data.form.putaway_date = formatDate(data.form.putaway_date, 'yyyy-MM-dd')+ }},openCommoditySelect: () => {@@ -205,6 +237,15 @@ const method = reactive({data.form.sku_code = selectRecords[0].sku_codedata.form.series_number = selectRecords[0].series_numberdata.form.book_qty = selectRecords[0].qty_available+ data.form.price = selectRecords[0].price+ data.form.expiry_date = selectRecords[0].expiry_date+ data.form.putaway_date = selectRecords[0].putaway_date+ if (data.form.expiry_date) {+ data.form.expiry_date = formatDate(data.form.expiry_date, 'yyyy-MM-dd')+ }+ if (data.form.putaway_date) {+ data.form.putaway_date = formatDate(data.form.putaway_date, 'yyyy-MM-dd')+ }} catch (error) {// console.error(error)}diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vueindex 5fc98c7..60a96b6 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/number-input.vue@@ -65,6 +65,9 @@ const data = reactive({warehouse_name: '',location_name: '',adjust_status: false,+ price: 0,+ expiry_date: '',+ putaway_date: '',handler: '',handle_time: '',series_number: ''diff --git a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vueindex e64eca0..70107ef 100644--- a/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue+++ b/frontend/src/view/warehouseWorking/warehouseTaking/warehouseTaking.vue@@ -69,20 +69,19 @@<vxe-column field="counted_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.counted_qty')"></vxe-column><vxe-column field="difference_qty" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.difference_qty')"></vxe-column><vxe-column field="handler" width="150px" :title="$t('wms.warehouseWorking.warehouseTaking.handler')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="handle_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseTaking.handle_time')"- >- </vxe-column>+ ></vxe-date-column><vxe-column field="creator" :title="$t('wms.warehouseWorking.warehouseTaking.creator')"></vxe-column>- <vxe-column+ <vxe-date-columnfield="create_time"width="170px"- :formatter="['formatDate', 'yyyy-MM-dd HH:mm']"+ format="yyyy-MM-dd HH:mm":title="$t('wms.warehouseWorking.warehouseTaking.create_time')"- ></vxe-column>+ ></vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="250" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -109,7 +108,7 @@:flat="true"icon="mdi-delete-outline":tooltip-text="$t('system.page.delete')"- :icon-color="!data.authorityList.includes('delete') || method.isConfirmTaking(row)?'':errorColor"+ :icon-color="!data.authorityList.includes('delete') || method.isConfirmTaking(row) ? '' : errorColor":disabled="!data.authorityList.includes('delete') || method.isConfirmTaking(row)"@click="method.deleteRow(row)"></tooltip-btn>@@ -189,6 +188,9 @@ const data = reactive({location_name: '',handler: '',handle_time: '',+ price: 0,+ expiry_date: '',+ putaway_date: '',adjust_status: false,creator: '',create_time: ''@@ -229,6 +231,9 @@ const method = reactive({handler: '',handle_time: '',adjust_status: false,+ price: 0,+ expiry_date: '',+ putaway_date: '',creator: '',create_time: ''}diff --git a/frontend/src/view/wms/stockAsn/add-sorting.vue b/frontend/src/view/wms/stockAsn/add-sorting.vueindex 45f9577..fe2c122 100644--- a/frontend/src/view/wms/stockAsn/add-sorting.vue+++ b/frontend/src/view/wms/stockAsn/add-sorting.vue@@ -11,6 +11,7 @@:rules="data.rules.sorted_qty"variant="outlined"></v-text-field>+ <v-text-field v-model="data.form.expiry_date" :label="$t('wms.stockAsnInfo.expiry_date')" variant="outlined" type="date"></v-text-field><v-row v-for="(snNum, index) of data.SNList" :key="index" style="margin-top: 5px"><v-col :cols="10"><v-text-field@@ -35,17 +36,24 @@</div></v-col></v-row>- <v-btn++ <!-- <v-btnstyle="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right"color="primary":width="40"@click="method.insertSNData()">+- </v-btn>+ </v-btn> --></v-form></v-card-text><v-card-actions class="justify-end">+ <div>+ <v-checkbox v-model="data.is_auto_num" :label="$t('wms.stockAsnInfo.consecutive_number')" hide-details></v-checkbox>+ </div>+ <!-- <div>+ <v-switch v-model="data.is_auto_num" :label="$t('wms.stockAsnInfo.consecutive_number')" hide-details inset></v-switch>+ </div> --><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn><v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn></v-card-actions>@@ -71,8 +79,10 @@ const data = reactive({staticDetailQty: 1,form: ref<SortingVo>({asn_id: 0,+ expiry_date: '',sorted_qty: 0}),+ is_auto_num: false,SNList: [] as { snNum: string }[],rules: {sorted_qty: [@@ -102,6 +112,7 @@ const method = reactive({openDialog: async (id: number) => {data.form = {asn_id: id,+ expiry_date: '',sorted_qty: 0}@@ -127,8 +138,10 @@ const method = reactive({for (const item of data.SNList) {reqData.push({asn_id: data.form.asn_id,+ expiry_date: data.form.expiry_date,series_number: item.snNum,- sorted_qty: 1+ sorted_qty: 1,+ is_auto_num: data.is_auto_num})}@@ -137,8 +150,10 @@ const method = reactive({const margin = data.form.sorted_qty - data.SNList.lengthreqData.push({asn_id: data.form.asn_id,+ expiry_date: data.form.expiry_date,series_number: '',- sorted_qty: margin+ sorted_qty: margin,+ is_auto_num: data.is_auto_num})}diff --git a/frontend/src/view/wms/stockAsn/confirm-grouding.vue b/frontend/src/view/wms/stockAsn/confirm-grouding.vueindex 056cd22..c82cb21 100644--- a/frontend/src/view/wms/stockAsn/confirm-grouding.vue+++ b/frontend/src/view/wms/stockAsn/confirm-grouding.vue@@ -102,13 +102,15 @@ const data = reactive({{ required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.putaway_qty') }` },{validator: isInteger,- validNumerical: 'nonNegative',+ validNumerical: 'greaterThanZero',trigger: 'change'},{ validator: validQty, trigger: 'change' }],series_number: [],- location_name: [{ validator: validLocationName, trigger: 'change' }]+ location_name: [+ { required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('base.warehouseSetting.location_name') }` },+ { validator: validLocationName, trigger: 'change' }]} as any})diff --git a/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vueindex 96ff0fc..efb0f0a 100644--- a/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue+++ b/frontend/src/view/wms/stockAsn/new-add-or-update-notice.vue@@ -58,7 +58,7 @@<v-row v-for="(item, index) of data.form.detailList" :key="index" style="margin-top: 5px"><v-col :cols="11"><v-row>- <v-col :cols="3">+ <v-col :cols="2"><v-text-field v-model="item.spu_name" :label="$t('wms.stockAsnInfo.spu_name')" variant="outlined" readonly></v-text-field></v-col><v-col :cols="2">@@ -73,7 +73,7 @@<v-col :cols="2"><v-text-field v-model="item.sku_code" :label="$t('wms.stockAsnInfo.sku_code')" variant="outlined" readonly></v-text-field></v-col>- <v-col :cols="3">+ <v-col :cols="2"><!-- <v-selectv-model="item.supplier_name":items="data.combobox.supplier_name"@@ -112,23 +112,34 @@clearable></v-text-field></v-col>+ <v-col :cols="2">+ <v-text-field+ v-model="item.price"+ :rules="data.rules.price"+ :label="$t('wms.stockAsnInfo.price')"+ variant="outlined"+ clearable+ ></v-text-field>+ </v-col></v-row></v-col><v-col :cols="1">- <div class="detailBtnContainer">- <tooltip-btn- :flat="true"- icon="mdi-delete-outline"- :tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"- @click="method.removeItem(index, item)"- ></tooltip-btn>+ <div class="detailComtainer">+ <div class="detailchbContainer">+ <v-checkbox v-model="item.is_check"></v-checkbox>+ </div>+ <div class="detailBtnContainer">+ <tooltip-btn+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.removeItem(index, item)"+ ></tooltip-btn>+ </div></div></v-col></v-row>- <!-- <v-btn style="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right" color="primary" :width="40" @click="method.AddDetail">- +- </v-btn> --><v-btnstyle="font-size: 20px; margin-bottom: 15px; margin-top: 10px; float: right"color="primary"@@ -140,11 +151,22 @@</v-form></v-card-text><v-card-actions class="justify-end">+ <v-btn v-show="showQRPrint" color="primary" variant="text" @click="method.printQrCode">+ {{ $t('base.commodityManagement.printQrCode') }}+ </v-btn><v-btn variant="text" @click="method.closeDialog">{{ $t('system.page.close') }}</v-btn><v-btn color="primary" variant="text" @click="method.submit">{{ $t('system.page.submit') }}</v-btn></v-card-actions></v-card><skuSelect :show-dialog="data.showSkuDialogSelect" @close="method.closeDialogSelect('target')" @sureSelect="method.sureSelect" />+ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'stockAsnInfo-notice'">+ <template #left="{ slotData }">+ <p>{{ $t('wms.stockAsnInfo.num') }}:{{ slotData.asn_no }}</p>+ <p>{{ $t('wms.stockAsnInfo.spu_name') }}:{{ slotData.spu_name }}</p>+ <p>{{ $t('wms.stockAsnInfo.sku_code') }}:{{ slotData.sku_code }}</p>+ </template>+ </qr-code-dialog></template></v-dialog></template>@@ -158,7 +180,7 @@ import { addAsnNew, updateAsnNew } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import skuSelect from '@/components/select/sku-select.vue'import { CommodityDetailJoinMainVO } from '@/types/Base/CommodityManagement'-import { IsInteger, StringLength } from '@/utils/dataVerification/formRule'+import { IsInteger, IsDecimal, StringLength } from '@/utils/dataVerification/formRule'import { StockAsnVO, StockAsnDetailVO } from '@/types/WMS/StockAsn'import { getSupplierAll } from '@/api/base/supplier'import { getOwnerOfCargoAll } from '@/api/base/ownerOfCargo'@@ -166,8 +188,10 @@ import { checkDetailRepeatGetBool } from '@/utils/dataVerification/page'import { formatDate } from '@/utils/format/formatSystem'import customFilterSelect from '@/components/custom-filter-select.vue'import { removeObjectNull } from '@/utils/common'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'const formRef = ref()+const qrCodeDialogRef = ref()const emit = defineEmits(['close', 'saveSuccess'])const props = defineProps<{@@ -176,6 +200,7 @@ const props = defineProps<{}>()const isShow = computed(() => props.showDialog)+const showQRPrint = computed(() => data.form.detailList.length > 0 && (data.form?.id as number) > 0)const data = reactive({curSelectType: '',@@ -219,6 +244,7 @@ const data = reactive({(val: number) => !!val || `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.asn_qty') }!`,(val: number) => IsInteger(val, 'greaterThanZero') === '' || IsInteger(val, 'greaterThanZero')],+ price: [(val: number) => IsDecimal(val, 'nonNegative', 10, 2) === '' || IsDecimal(val, 'nonNegative', 10, 2)],asn_batch: [// (val: string) => !!val || `${i18n.global.t('system.checkText.mustInput')}${i18n.global.t('wms.stockAsnInfo.asn_batch')}!`,(val: string) => StringLength(val, 0, 64) === '' || StringLength(val, 0, 64)@@ -227,6 +253,41 @@ const data = reactive({})const method = reactive({+ // Print QR code+ printQrCode: async () => {+ const records = data.form.detailList.filter((item: StockAsnDetailVO) => item.is_check) as any[]+ // data.selectRowData.length === 0 ? data.selectRowData = [row] : ''+ // const records:any[] = data.selectRowData++ if (records.length > 0) {+ // const list = records.map((item) => item.id)+ // const { data: res } = await getPrintAsnList(list)+ // if (!res.isSuccess) {+ // hookComponent.$message({+ // type: 'error',+ // content: res.errorMessage+ // })+ // return+ // }+ const printList = records.map((item) => ({+ id: item.id,+ asn_id: item.id,+ asnmaster_id: item.asnmaster_id,+ type: 'asn',+ asn_no: data.form.asn_no,+ spu_name: item.spu_name,+ sku_code: item.sku_code,+ sku_id: item.sku_id+ }))+ // const printList = res.data.map((item) => ({ id: item.asn_id, type: 'asn', ...item }))+ qrCodeDialogRef.value.openDialog(printList)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },supplierNameChange: (dItem: StockAsnDetailVO) => {if (dItem.supplier_name) {dItem.supplier_id = data.combobox.supplier_name.filter((item) => item.label === dItem.supplier_name)[0].value@@ -275,7 +336,8 @@ const method = reactive({// length_unit: '',// volume_unit: '',// weight_unit: '',- asn_qty: 0+ asn_qty: 0,+ price: 0// actual_qty: '',// weight: '',// volume: '',@@ -357,9 +419,7 @@ const method = reactive({const { valid } = await formRef.value.validate()if (valid) {const form = removeObjectNull(data.form)- const { data: res } = form.id && form.id > 0- ? await updateAsnNew({ ...form, detailList: [...form.detailList, ...data.removeDetailList] })- : await addAsnNew(form)+ const { data: res } = form.id && form.id > 0 ? await updateAsnNew({ ...form, detailList: [...form.detailList, ...data.removeDetailList] }) : await addAsnNew(form)if (!res.isSuccess) {hookComponent.$message({type: 'error',@@ -416,13 +476,19 @@ watch(// margin-bottom: 7px;// }// }+.detailComtainer {+ margin-left: -10px;+ width: 90px;+ display: flex;+ justify-content: space-between;+}+.detailchbContainer {+ height: 40px;+}.detailBtnContainer {height: 56px;display: flex;- justify-content: center;+ justify-content: space-between;align-items: center;}-// .v-col {-// padding: 0 !important;-// }</style>diff --git a/frontend/src/view/wms/stockAsn/tabNotice.vue b/frontend/src/view/wms/stockAsn/tabNotice.vueindex 3baa8e4..af26726 100644--- a/frontend/src/view/wms/stockAsn/tabNotice.vue+++ b/frontend/src/view/wms/stockAsn/tabNotice.vue@@ -59,11 +59,7 @@<vxe-column type="seq" width="60"></vxe-column><vxe-column field="asn_no" :title="$t('wms.stockAsnInfo.asn_no')"></vxe-column><vxe-column field="asn_batch" :title="$t('wms.stockAsnInfo.asn_batch')"></vxe-column>- <vxe-column- field="estimated_arrival_time"- :formatter="['formatDate', 'yyyy-MM-dd']"- :title="$t('wms.stockAsnInfo.estimated_arrival_time')"- ></vxe-column>+ <vxe-date-column field="estimated_arrival_time" :title="$t('wms.stockAsnInfo.estimated_arrival_time')"></vxe-date-column><vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column><vxe-column field="operate" :title="$t('system.page.operate')" width="140px" :resizable="false" show-overflow><template #default="{ row }">@@ -328,13 +324,13 @@ onMounted(() => {icon: 'mdi-export-variant',code: 'notice-export',click: method.exportTable- },- {- name: i18n.global.t('base.commodityManagement.printQrCode'),- icon: 'mdi-qrcode',- code: 'notice-printQrCode',- click: method.printQrCode}+ // {+ // name: i18n.global.t('base.commodityManagement.printQrCode'),+ // icon: 'mdi-qrcode',+ // code: 'notice-printQrCode',+ // click: method.printQrCode+ // }]})diff --git a/frontend/src/view/wms/stockAsn/tabToDoArrival.vue b/frontend/src/view/wms/stockAsn/tabToDoArrival.vueindex 75402c3..ab19ea2 100644--- a/frontend/src/view/wms/stockAsn/tabToDoArrival.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoArrival.vue@@ -67,6 +67,7 @@<vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column><vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column><vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column><!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>diff --git a/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vueindex f8b3280..e1bee1e 100644--- a/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoGrounding.vue@@ -68,6 +68,7 @@<vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column><vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column><vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column><vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>@@ -108,6 +109,15 @@<!-- Listing operation box --><confirmGroudingDialog ref="confirmGroudingDialogRef" @sure="method.confirmGroudingSure" /><skuInfo :show-dialog="data.showDialogShowInfo" :form="data.dialogForm" @close="method.closeDialogShowInfo" />+ <!-- Print QR code -->+ <qr-code-dialog ref="qrCodeDialogRef" :menu="'stockAsnInfo-notice'">+ <template #left="{ slotData }">+ <p>{{ $t('wms.stockAsnInfo.num') }}:{{ slotData.asn_no }}</p>+ <p>{{ $t('wms.stockAsnInfo.spu_name') }}:{{ slotData.spu_name }}</p>+ <p>{{ $t('wms.stockAsnInfo.sku_code') }}:{{ slotData.sku_code }}</p>+ <p>SN:{{ slotData.series_number }}</p>+ </template>+ </qr-code-dialog></template><script lang="ts" setup>@@ -120,7 +130,7 @@ import { hookComponent } from '@/components/system'import { DEBOUNCE_TIME } from '@/constant/system'import { setSearchObject, getMenuAuthorityList } from '@/utils/common'import { SearchObject, btnGroupItem } from '@/types/System/Form'-import { getStockAsnList, sortedAsnCancel, revokeSorting, confirmPutaway } from '@/api/wms/stockAsn'+import { getStockAsnList, sortedAsnCancel, revokeSorting, confirmPutaway, getPrintAsnList } from '@/api/wms/stockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import i18n from '@/languages/i18n'import updateGrounding from './update-grounding.vue'@@ -130,9 +140,11 @@ import { exportData } from '@/utils/exportTable'import BtnGroup from '@/components/system/btnGroup.vue'import confirmGroudingDialog from './confirm-grouding.vue'import { httpCodeJudge } from '@/utils/http/httpCodeJudge'+import QrCodeDialog from '@/components/codeDialog/qrCodeDialog.vue'const xTableStockLocation = ref()const confirmGroudingDialogRef = ref()+const qrCodeDialogRef = ref()const data = reactive({showDialog: false,@@ -172,6 +184,31 @@ const data = reactive({})const method = reactive({+ printQrCode: async () => {+ const records = xTableStockLocation.value.getCheckboxRecords()++ // data.selectRowData.length === 0 ? data.selectRowData = [row] : ''+ // const records:any[] = data.selectRowData+ if (records.length > 0) {+ const list = records.map((item) => item.id)+ const { data: res } = await getPrintAsnList(list)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ const printList = res.data.map((item) => ({ id: item.asn_id, type: 'ground', ...item }))++ qrCodeDialogRef.value.openDialog(printList)+ } else {+ hookComponent.$message({+ type: 'error',+ content: i18n.global.t('base.userManagement.checkboxIsNull')+ })+ }+ },// Confirm listing dataconfirmGroudingSure: async (tableData: any) => {const { data: res } = await confirmPutaway(tableData)@@ -336,6 +373,12 @@ onMounted(() => {icon: 'mdi-arrow-left-top',code: 'putOnTheShelf-delete',click: method.handleRevoke+ },+ {+ name: i18n.global.t('base.commodityManagement.printQrCode'),+ icon: 'mdi-qrcode',+ code: 'putOnTheShelf-printQrCode',+ click: method.printQrCode}]})diff --git a/frontend/src/view/wms/stockAsn/tabToDoSorting.vue b/frontend/src/view/wms/stockAsn/tabToDoSorting.vueindex 3fd97bb..cf27fbd 100644--- a/frontend/src/view/wms/stockAsn/tabToDoSorting.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoSorting.vue@@ -67,6 +67,7 @@<vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column><vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column><vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column><vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')"></vxe-column>diff --git a/frontend/src/view/wms/stockAsn/tabToDoUnload.vue b/frontend/src/view/wms/stockAsn/tabToDoUnload.vueindex 9694796..7ca8cf3 100644--- a/frontend/src/view/wms/stockAsn/tabToDoUnload.vue+++ b/frontend/src/view/wms/stockAsn/tabToDoUnload.vue@@ -67,6 +67,7 @@<vxe-column field="goods_owner_name" :title="$t('wms.stockAsnInfo.goods_owner_name')"></vxe-column><vxe-column field="supplier_name" :title="$t('wms.stockAsnInfo.supplier_name')"></vxe-column><vxe-column field="asn_qty" :title="$t('wms.stockAsnInfo.asn_qty')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column><vxe-column field="weight" :title="$t('wms.stockAsnInfo.weight')"></vxe-column><vxe-column field="volume" :title="$t('wms.stockAsnInfo.volume')"></vxe-column><!-- <vxe-column field="operate" :title="$t('system.page.operate')" width="160" :resizable="false" show-overflow>diff --git a/frontend/src/view/wms/stockAsn/update-sorting.vue b/frontend/src/view/wms/stockAsn/update-sorting.vueindex 3992455..40cacf8 100644--- a/frontend/src/view/wms/stockAsn/update-sorting.vue+++ b/frontend/src/view/wms/stockAsn/update-sorting.vue@@ -20,18 +20,19 @@{{ i18n.global.t('system.page.noData') }}</template><vxe-column type="seq" width="60"></vxe-column>- <vxe-column field="series_number" :title="$t('wms.stockAsnInfo.series_number')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <vxe-column field="series_number" :title="$t('wms.stockAsnInfo.series_number')"> </vxe-column>+ <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')" :edit-render="{ autofocus: '.vxe-input--inner' }"><template #edit="{ row }">- <vxe-input v-model="row.series_number" type="text"></vxe-input>+ <vxe-input v-model="row.sorted_qty" type="text"></vxe-input></template></vxe-column>- <vxe-column field="sorted_qty" :title="$t('wms.stockAsnInfo.sorted_qty')" :edit-render="{ autofocus: '.vxe-input--inner' }">+ <vxe-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')" :edit-render="{ autofocus: '.vxe-input--inner' }"><template #edit="{ row }">- <vxe-input v-model="row.sorted_qty" type="text"></vxe-input>+ <vxe-input v-model="row.expiry_date" type="date"></vxe-input></template></vxe-column><vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"> </vxe-column>- <vxe-column field="create_time" :formatter="['formatDate', 'yyyy-MM-dd']" :title="$t('wms.deliveryManagement.create_time')"> </vxe-column>+ <vxe-date-column field="create_time" :title="$t('wms.deliveryManagement.create_time')"> </vxe-date-column><vxe-column field="operate" :title="$t('system.page.operate')" width="100" :resizable="false" show-overflow><template #default="{ row }"><tooltip-btn@@ -63,6 +64,7 @@ import { getSorting } from '@/api/wms/stockAsn'import { UpdateSortingVo } from '@/types/WMS/StockAsn'import tooltipBtn from '@/components/tooltip-btn.vue'import { isInteger } from '@/utils/dataVerification/tableRule'+import { formatDate } from '@/utils/format/formatSystem'const xTable = ref()@@ -70,7 +72,7 @@ const emit = defineEmits(['sure'])const data = reactive({showDialog: false,- tableData: [],+ tableData: [] as any[],validRules: {sorted_qty: [{ required: true, message: `${ i18n.global.t('system.checkText.mustInput') }${ i18n.global.t('wms.stockAsnInfo.sorted_qty') }` },@@ -121,6 +123,14 @@ const method = reactive({return}data.tableData = res.data++ // 240507 刘福: 处理一下操作列的日期数据+ if (data.tableData?.length > 0) {+ data.tableData = data.tableData.map((item: any) => {+ item.expiry_date = formatDate(item.expiry_date, 'yyyy-MM-dd')+ return item+ })+ }},openDialog: async (id: number) => {diff --git a/frontend/src/view/wms/stockManagement/tabStockLocation.vue b/frontend/src/view/wms/stockManagement/tabStockLocation.vueindex f531766..96405e7 100644--- a/frontend/src/view/wms/stockManagement/tabStockLocation.vue+++ b/frontend/src/view/wms/stockManagement/tabStockLocation.vue@@ -55,9 +55,12 @@<vxe-column field="sku_name" :title="$t('wms.stockLocation.sku_name')"></vxe-column><vxe-column field="series_number" :title="$t('wms.stockLocation.series_number')"></vxe-column><vxe-column field="qty" :title="$t('wms.stockLocation.qty')"></vxe-column>+ <vxe-column field="qty" :title="$t('wms.stockLocation.qty')"></vxe-column><vxe-column field="qty_available" :title="$t('wms.stockLocation.qty_available')"></vxe-column><vxe-column field="qty_locked" :title="$t('wms.stockLocation.qty_locked')"></vxe-column>- <vxe-column field="qty_frozen" :title="$t('wms.stockLocation.qty_frozen')"></vxe-column>+ <vxe-column field="price" :title="$t('wms.stockAsnInfo.price')"></vxe-column>+ <vxe-date-column field="expiry_date" :title="$t('wms.stockAsnInfo.expiry_date')"> </vxe-date-column>+ <vxe-date-column field="putaway_date" :title="$t('wms.stockAsnInfo.putaway_date')"> </vxe-date-column></vxe-table><custom-pager:current-page="data.tablePage.pageIndex"