From 0b0899370f271793f7156144b4b912438aebdf73 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 24 十一月 2025 08:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/stock/stockView.js | 116 ++++++++++++++++++++++++++++------------------------------
1 files changed, 56 insertions(+), 60 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
index 92ad623..047c354 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/stock/stockView.js"
@@ -1,8 +1,4 @@
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-import { el } from "element-plus/es/locales.mjs";
-
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
@@ -35,65 +31,65 @@
// });
// }
// }
- this.columns.forEach(column => {
- if (column.field == 'materielCode') {
- column.formatter = (row) => {
- var str = '';
- var list = row.materielCode.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "绌虹" : str;
- }
- }
- if (column.field == 'batchNo') {
- column.formatter = (row) => {
- var str = '';
- var list = row.batchNo.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "鏃�" : str;
- }
- }
- if (column.field == 'materielInfo') {
- const today = new Date()
- column.formatter = (row) => {
- if (row.details.length > 0) {
- const today = new Date();
- const closestDate = row.details
- .map(x => {
- const date = new Date(x.effectiveDate);
- const diffInDays = Math.ceil(Math.abs((today - date) / (1000 * 60 * 60 * 24)));
- return { date, diffInDays };
- })
- .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
- .date;
+ // this.columns.forEach(column => {
+ // if (column.field == 'materielCode') {
+ // column.formatter = (row) => {
+ // var str = '';
+ // var list = row.materielCode.split(',');
+ // for (let index = 0; index < list.length; index++) {
+ // str += list[index] + '<br>';
+ // }
+ // return str = list[0] == "" ? "绌虹" : str;
+ // }
+ // }
+ // if (column.field == 'batchNo') {
+ // column.formatter = (row) => {
+ // var str = '';
+ // var list = row.batchNo.split(',');
+ // for (let index = 0; index < list.length; index++) {
+ // str += list[index] + '<br>';
+ // }
+ // return str = list[0] == "" ? "鏃�" : str;
+ // }
+ // }
+ // if (column.field == 'materielInfo') {
+ // const today = new Date()
+ // column.formatter = (row) => {
+ // if (row.details.length > 0) {
+ // const today = new Date();
+ // const closestDate = row.details
+ // .map(x => {
+ // const date = new Date(x.effectiveDate);
+ // const diffInDays = Math.ceil(Math.abs((today - date) / (1000 * 60 * 60 * 24)));
+ // return { date, diffInDays };
+ // })
+ // .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
+ // .date;
- const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
- return '<span style="color: #F56C6C">' + daysSinceClosest + "澶�" + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "鏃犱繚璐ㄦ湡" + '</span>';
- }
+ // const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
+ // return '<span style="color: #F56C6C">' + daysSinceClosest + "澶�" + '</span>';
+ // } else {
+ // return '<span style="color: #F56C6C">' + "鏃犱繚璐ㄦ湡" + '</span>';
+ // }
- }
- }
- if (column.field == 'sumStock') {
- column.formatter = (row) => {
- if (row.details.length > 0) {
- var sum = 0;
- const closestDate = row.details
- .map(x => {
- sum += (x.stockQuantity)
- })
- return '<span style="color: #F56C6C">' + sum + row.details[0].unit + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
- }
+ // }
+ // }
+ // if (column.field == 'sumStock') {
+ // column.formatter = (row) => {
+ // if (row.details.length > 0) {
+ // var sum = 0;
+ // const closestDate = row.details
+ // .map(x => {
+ // sum += (x.stockQuantity)
+ // })
+ // return '<span style="color: #F56C6C">' + sum + row.details[0].unit + '</span>';
+ // } else {
+ // return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
+ // }
- }
- }
- })
+ // }
+ // }
+ // })
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
--
Gitblit v1.9.3