diff --git a/src/utils/date.js b/src/utils/date.js index f863cb9..a2e6d88 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -22,3 +22,12 @@ 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 5e50d36..ebe0af2 100644 --- a/src/views/business/DialogcChangeNewOrder.vue +++ b/src/views/business/DialogcChangeNewOrder.vue @@ -158,8 +158,16 @@ - - + + + + + + @@ -188,6 +196,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", @@ -203,6 +212,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 5ff30cf..b9372ac 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -167,8 +167,16 @@ - - + + + + + + @@ -370,11 +378,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/stockOrderEdit.vue b/src/views/business/stockOrderEdit.vue index 2ec00f3..4ce5a57 100644 --- a/src/views/business/stockOrderEdit.vue +++ b/src/views/business/stockOrderEdit.vue @@ -154,8 +154,16 @@ - - + + + + + + @@ -489,11 +497,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/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" - > + > + + + > + + + > + + > + > + + + > + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 确定 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + {{ item }} + + + +
+ 确 定 + 取 消 +
+ + +
+ + + + + diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue index 972a6b2..ba30aa2 100644 --- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue +++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue @@ -104,8 +104,16 @@ - - + + + + + + @@ -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: "",