From b0530fb999f5aa77aaf6be34d4206cdf1bad2604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Fri, 10 Nov 2023 09:34:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain/index.vue | 13 ++++ .../productscrapRequestMain.data.ts | 69 +++++++++++-------- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 77b14ddcb..cacabb896 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -104,6 +104,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] + row['containerNumber'] = val[0]['containerNumber'] + row['itemCode'] = val[0]['itemCode'] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['uom'] = val[0]['uom'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] } else { const setV = {} setV[formField] = val[0][searchField] @@ -116,6 +123,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + setV['itemCode'] = val[0]['itemCode'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['uom'] = val[0]['uom'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] formRef.setValues(setV) }) } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index a7f8272da..005672495 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' const { t } = useI18n() // 国际化 @@ -105,6 +105,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -135,6 +136,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -156,6 +158,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -208,6 +211,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -371,8 +375,25 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -381,8 +402,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '批次', @@ -391,6 +413,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '从库位代码', @@ -399,8 +424,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '库存状态', @@ -412,8 +438,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, - isTableForm: false, + tableForm: { + disabled: true + } }, { label: '原因', @@ -516,6 +543,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -555,24 +583,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage - } + tableForm: { + disabled: true } }, { @@ -597,6 +609,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', From eec570afe6bed6de0b687f53e1af56cf11ab254e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Fri, 10 Nov 2023 10:51:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain/index.vue | 23 ++++- .../productdismantleRequestMain.data.ts | 85 ++++++++++++------- .../productreceiptRequestMain/index.vue | 12 --- .../productreceiptRequestMain.data.ts | 52 +++++++++--- 4 files changed, 118 insertions(+), 54 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index c3383b6b4..cfd1478ee 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -104,7 +104,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] + if(formField == 'packingNumber'){ + row['containerNumber'] = val[0]['containerNumber'] + row['itemCode'] = val[0]['itemCode'] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['uom'] = val[0]['uom'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] + row['produceDate'] = val[0]['produceDate'] + row['expireDate'] = val[0]['expireDate'] + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} setV[formField] = val[0][searchField] @@ -117,6 +129,15 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + setV['containerNumber'] = val[0]['containerNumber'] + setV['itemCode'] = val[0]['itemCode'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['uom'] = val[0]['uom'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] + setV['produceDate'] = val[0]['produceDate'] + setV['expireDate'] = val[0]['expireDate'] formRef.setValues(setV) }) } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index b501f87e8..60ea400a4 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -20,8 +20,8 @@ import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data' import * as TeamApi from '@/api/wms/team' import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' const { t } = useI18n() // 国际化 @@ -518,8 +518,25 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index db20899e7..842801905 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1,21 +1,30 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as WorkshopApi from '@/api/wms/workshop' import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' + import * as ShiftApi from '@/api/wms/shift' import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data' + import * as TeamApi from '@/api/wms/team' import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data' + import * as WorkstationApi from '@/api/wms/workstation' import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data' + import * as ProcessApi from '@/api/wms/process' import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data' + import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as ProductionlineApi from '@/api/wms/productionline' +import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -438,8 +447,25 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage + } + } }, { label: '工位代码', @@ -522,6 +548,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '生产日期', @@ -609,6 +637,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, }, isTableForm: false, isForm: false @@ -670,10 +702,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive componentProps: { isSearchList: true, searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage + searchField: 'code', + searchTitle: '物品基础信息信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage } } }, @@ -846,9 +878,9 @@ export const ProductreceiptRequestDetailRules = reactive({ // packingNumber: [ // { required: true, message: '请输入包装号', trigger: 'change' } // ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], // produceDate: [ // { required: true, message: '请选择生产日期', trigger: 'change' } // ], From d869654779aff83ecae7499147eda646c7856d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Fri, 10 Nov 2023 11:20:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepairRequestMain/index.vue | 19 ++++- .../productrepairRequestMain.data.ts | 71 +++++++++++-------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 09226e211..f4d3d0ce3 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -103,7 +103,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] + if(formField == 'packingNumber'){ + row['containerNumber'] = val[0]['containerNumber'] + row['itemCode'] = val[0]['itemCode'] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['uom'] = val[0]['uom'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} setV[formField] = val[0][searchField] @@ -116,6 +126,13 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + setV['containerNumber'] = val[0]['containerNumber'] + setV['itemCode'] = val[0]['itemCode'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['uom'] = val[0]['uom'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] formRef.setValues(setV) }) } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 17b24c777..7c4f6fad7 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -20,8 +20,8 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta import * as ProcessApi from '@/api/wms/process' import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data' -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' const { t } = useI18n() // 国际化 @@ -180,6 +180,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -210,6 +211,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -231,6 +233,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -283,6 +286,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -524,8 +528,25 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -534,8 +555,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + } }, { label: '批次', @@ -544,6 +566,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '从库位代码', @@ -552,8 +577,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + } }, { label: '库存状态', @@ -565,8 +591,10 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true, + type: 'Select' + } }, { label: '单据号', @@ -589,25 +617,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物品基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物品基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法 - } + tableForm: { + disabled: true } }, { @@ -632,6 +643,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -738,6 +750,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: { width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x',