From 6d1ead1cd739677cc3831d5624a1d4058825722b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Dec 2022 09:52:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8Fyyyy-mm-dd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/date.js | 11 +++++++++++ src/views/business/DialogcChangeNewOrder.vue | 14 ++++++++++++-- src/views/business/stockOrder.vue | 14 ++++++++++++-- src/views/business/stockOrderDelSearch.vue | 14 ++++++++++++-- src/views/business/stockOrderDelete.vue | 14 ++++++++++++-- src/views/business/stockOrderEdit.vue | 14 ++++++++++++-- src/views/business/stockOrderEditor.vue | 14 ++++++++++++-- src/views/business/stockOrderNew.vue | 14 ++++++++++++-- src/views/business/stockOrderSearch.vue | 14 ++++++++++++-- src/views/business/stockOrderWaitCheck.vue | 14 ++++++++++++-- src/views/inout/IOCheckErrorOrder.vue | 14 ++++++++++++-- src/views/inout/IOCheckWaitOrder.vue | 11 +++++++++-- src/views/inout/stockOrderChange.vue | 14 ++++++++++++-- src/views/thrsys/ThrOrdedrReceiveAdd.vue | 14 ++++++++++++-- src/views/thrsys/ThrOrdedrReceiveSearch.vue | 14 ++++++++++++-- 15 files changed, 176 insertions(+), 28 deletions(-) diff --git a/src/utils/date.js b/src/utils/date.js index f863cb9..fb06327 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -22,3 +22,14 @@ export function formatDate (date, fmt) { function padLeftZero (str) { return ('00' + str).substr(str.length); }; + + +export function convertDate(date) { + if(date!=null && date!=undefined && date.length>5){ + var time="20"+date.substring(0,2)+"-"+date.substring(2,4)+"-"+date.substring(4,6); + return time; + }else{ + return date; + } +}; + diff --git a/src/views/business/DialogcChangeNewOrder.vue b/src/views/business/DialogcChangeNewOrder.vue index 5beb2bb..7c7919c 100644 --- a/src/views/business/DialogcChangeNewOrder.vue +++ b/src/views/business/DialogcChangeNewOrder.vue @@ -195,8 +195,16 @@ - - + + + + + + @@ -225,6 +233,7 @@ import {parseTime} from "@/filtres"; import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {stockOrderChange, stockOrderDetail} from "@/api/inout/stockOrder"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "DialogcChangeNewOrder", @@ -240,6 +249,7 @@ export default { }, data() { return { + convertDateFun:convertDate, formData: { corpOrderId: "", code: "", diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 687599b..a459d95 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -167,8 +167,16 @@ - - + + + + + + @@ -372,11 +380,13 @@ import store from "../../store"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrder", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 80ae941..c3dceca 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -186,8 +186,16 @@ - - + + + + + + @@ -346,11 +354,13 @@ import {filterAllByUser} from "@/api/basic/invWarehouse"; import StockOrderEdit from "@/views/business/stockOrderEdit"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {uploadSpms} from "@/api/inout/order"; +import {convertDate} from "@/utils/date" export default { name: "stockOrderDelSearch", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue index 6fbe553..a767126 100644 --- a/src/views/business/stockOrderDelete.vue +++ b/src/views/business/stockOrderDelete.vue @@ -122,12 +122,20 @@ label="生产日期" prop="productDate" :show-overflow-tooltip="true" - > + > + + + > + + - - + + + + + + @@ -492,11 +500,13 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrderEditor", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 675b817..645b8b0 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -154,8 +154,16 @@ - - + + + + + + @@ -511,11 +519,13 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrderEditor", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index e48d965..f2e5934 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -162,8 +162,16 @@ - - + + + + + + @@ -467,11 +475,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT import {selectSysParamByKey} from "../../api/param/systemParamConfig"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrder", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index a535667..3540f50 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -170,8 +170,16 @@ - - + + + + + + @@ -495,11 +503,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import StockOrderEdit from "@/views/business/stockOrderEdit"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrderSearch", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index a44a8e1..6e539b4 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -148,8 +148,16 @@ - - + + + + + + @@ -352,11 +360,13 @@ import store from "../../store"; import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {convertDate} from "@/utils/date" export default { name: "stockOrderWaitCheck", data() { return { + convertDateFun:convertDate, query: { billType: null, corpName: null, diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 3512578..69c2e8a 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -289,13 +289,21 @@ prop="productDate" width="100" :show-overflow-tooltip="true" - > + > + + + > + + + > + + > + > + + + > + + - - + + + + + + @@ -142,10 +150,12 @@ import { } from "../../api/inout/erpOrder"; import thrOrderNew from "./thrOrderNew"; import {getReceiveOrder} from "@/api/inout/receiveOrder"; +import {convertDate} from "@/utils/date" export default { data() { return { + convertDateFun:convertDate, filterQuery: { billAction: null, billNo: "", diff --git a/src/views/thrsys/ThrOrdedrReceiveSearch.vue b/src/views/thrsys/ThrOrdedrReceiveSearch.vue index f881439..7176366 100644 --- a/src/views/thrsys/ThrOrdedrReceiveSearch.vue +++ b/src/views/thrsys/ThrOrdedrReceiveSearch.vue @@ -88,8 +88,16 @@ - - + + + + + + @@ -109,10 +117,12 @@ import { getCloudErp, } from "../../api/inout/erpOrder"; import {getReceiveOrder} from "@/api/inout/receiveOrder"; +import {convertDate} from "@/utils/date" export default { data() { return { + convertDateFun:convertDate, filterQuery: { billAction: null, billNo: "",