UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化页面时间类型

Browse Source
busUser
郑明梁 2 years ago
parent 6ee6f1f94f
commit db9c347758
17 changed files with 195 additions and 34 deletions
Show Stats Download Patch File Download Diff File

14
src/utils/date.js
Unescape Escape View File

@ -23,9 +23,15 @@ function padLeftZero (str) {
return ('00' + str).substr(str.length);
};
export function convertDate(date) {
var time="20"+date.substring(0,2)+"-"+date.substring(2,4)+"-"+date.substring(4,6);
return time;
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;
}
};

14
src/views/thrsys/ThrOrdedrReceiveAdd.vue
Unescape Escape View File

@ -101,8 +101,16 @@
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
</el-table>
</el-card>
@ -139,10 +147,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: "",

14
src/views/thrsys/ThrOrdedrReceiveSearch.vue
Unescape Escape View File

@ -88,8 +88,16 @@
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" prop="reCount"></el-table-column>
<el-table-column label="实际数量" prop="count"></el-table-column>
</el-table>
@ -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: "",

15
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -195,8 +195,16 @@
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -227,9 +235,11 @@ import {submitOrderWeb} from "@/api/warehouse/order";
import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {convertDate} from "@/utils/date"
export default {
name: "DialogcChangeNewOrder",
props: {
closeDialog: {
type: Function,
@ -242,6 +252,7 @@ export default {
},
data() {
return {
convertDateFun:convertDate,
formData: {
corpOrderId: "",
code: "",

14
src/views/warehouse/IOCheckErrOrder.vue
Unescape Escape View File

@ -249,13 +249,21 @@
prop="productDate"
width="100"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -461,6 +469,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
const formJson = {
site_id: "",
@ -478,6 +487,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
query: {
page: 1,
limit: 20,

15
src/views/warehouse/IOSearchOrder.vue
Unescape Escape View File

@ -206,12 +206,20 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -358,6 +366,8 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
const formJson = {
site_id: "",
@ -375,6 +385,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
query: {
page: 1,
limit: 20,

11
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -218,12 +218,17 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
><template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
> <template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template></el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -371,6 +376,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
const formJson = {
site_id: "",
@ -388,6 +394,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
query: {
page: 1,
limit: 10,

10
src/views/warehouse/code.vue
Unescape Escape View File

@ -25,12 +25,16 @@
label="生产日期"
prop="produceDate"
show-overflow-tooltip
></el-table-column>
><template slot-scope="scope">
<span>{{ convertDateFun(scope.row.produceDate) }}</span>
</template></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
show-overflow-tooltip
></el-table-column>
><template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
@ -70,6 +74,7 @@
import {orderList, codeList} from "../../api/warehouse/order";
import draggable from "vuedraggable";
import {saveAs} from "file-saver";
import {convertDate} from "@/utils/date"
export default {
name: "idQuery",
@ -81,6 +86,7 @@ export default {
},
data() {
return {
convertDateFun:convertDate,
query: {
code: "",
corpOrderId: "",

14
src/views/warehouse/stockOrder.vue
Unescape Escape View File

@ -159,8 +159,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -365,11 +373,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrder",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

14
src/views/warehouse/stockOrderChange.vue
Unescape Escape View File

@ -114,12 +114,20 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
prop="erpCount"
@ -223,11 +231,13 @@ import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import codeReplace from "./codeReplace";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderDelete",
data() {
return {
convertDateFun:convertDate,
query: {
billNo: "",
page: 1,

11
src/views/warehouse/stockOrderDelSearch.vue
Unescape Escape View File

@ -186,8 +186,15 @@
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
@ -345,11 +352,13 @@ import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderDelSearch",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

12
src/views/warehouse/stockOrderDelete.vue
Unescape Escape View File

@ -123,12 +123,19 @@
label="生产日期"
prop="productDate"
:show-overflow-tooltip="true"
></el-table-column>
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column
label="单据数量"
@ -232,10 +239,13 @@ import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import codeReplace from "./codeReplace";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date";
export default {
name: "stockOrderDelete",
data() {
return {
convertDateFun:convertDate,
query: {
billNo: "",
page: 1,

15
src/views/warehouse/stockOrderEdit.vue
Unescape Escape View File

@ -23,8 +23,16 @@
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -143,6 +151,7 @@
<script>
import {stockOrderDetail, updateStockOrderDetail} from "@/api/warehouse/stockOrder";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderEdit",
@ -154,6 +163,7 @@ export default {
},
data() {
return {
convertDateFun:convertDate,
detailQuery: {
orderIdFk: "",
page: 1,
@ -193,6 +203,7 @@ export default {
_this.multipId.push(item.id);
})
},
batchSetParams(flag, type) {
if (flag == '1' && type == 'salesListNo') {

14
src/views/warehouse/stockOrderEditor.vue
Unescape Escape View File

@ -154,8 +154,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -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,

14
src/views/warehouse/stockOrderNew.vue
Unescape Escape View File

@ -160,8 +160,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<!-- <el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>-->
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -462,11 +470,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,

14
src/views/warehouse/stockOrderSearch.vue
Unescape Escape View File

@ -171,8 +171,16 @@
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="120" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="120" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="单据数量" width="100" prop="count"></el-table-column>
<el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
<el-table-column label="价格" width="120" prop="price"></el-table-column>
@ -503,11 +511,13 @@ import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderSearch",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

14
src/views/warehouse/stockOrderWaitCheck.vue
Unescape Escape View File

@ -145,8 +145,16 @@
<el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate"></el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate"></el-table-column>
<el-table-column label="生产日期" width="150" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" width="150" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" width="150" prop="reCount"></el-table-column>
<el-table-column label="单据数量" width="150" prop="count"></el-table-column>
<el-table-column label="价格" width="150" prop="price"></el-table-column>
@ -349,11 +357,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
export default {
name: "stockOrderWaitCheck",
data() {
return {
convertDateFun:convertDate,
query: {
billType: null,
corpName: null,

Write Preview
Loading…
Cancel
Save