Skip to content

W
weiqiao-vue
Commit a3067df6 by 金民
Options

Merge remote-tracking branch 'origin/hongshun' into hongshun

parents 0cc7187d ca063ce4
Showing with 208 additions and 278 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesCheliangBg分页参数 模型 * @description: MesCheliangBg分页参数 模型
*/ */
export interface MesCheliangBgPageParams extends BasicPageParams { export interface MesCheliangBgPageParams extends BasicPageParams {
banzu: string;
cphm: string; cphm: string;
clys: string; clys: string;
gzjssj: string;
gzr: string; gzr: string;
gzkssj: string;
cllx: string; cllx: string;
wlzt: string; clls: string;
gzxm: string; gzxm: string;
clppxh: string; gzjssj: string;
gzkssj: string; wlzt: string;
clppxh: string;
} }
/** /**
...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel { ...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
gzsc: string; gzsc: string;
wlzt: string; wlzt: string;
banzu: string;
} }
/** /**
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue
...@@ -135,3 +135,4 @@ ...@@ -135,3 +135,4 @@
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts
...@@ -4,21 +4,6 @@ import { uploadApi } from '/@/api/sys/upload'; ...@@ -4,21 +4,6 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'banzu',
label: '班组',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2021042614763266049' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车牌号码',
defaultValue: undefined, defaultValue: undefined,
...@@ -91,25 +76,25 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -91,25 +76,25 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'gzjssj', field: 'gzr',
label: '工作结束时间', label: '工作人',
defaultValue: undefined, defaultValue: undefined,
component: 'RangePicker', component: 'User',
componentProps: { componentProps: {
format: 'YYYY-MM-DD HH:mm:ss', suffix: 'ant-design:setting-outlined',
style: { width: '100%' }, placeholder: '请选择',
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'gzr', field: 'gzkssj',
label: '工作人', label: '工作开始时间',
defaultValue: undefined, defaultValue: undefined,
component: 'User', component: 'RangePicker',
componentProps: { componentProps: {
suffix: 'ant-design:setting-outlined', format: 'YYYY-MM-DD HH:mm:ss',
placeholder: '请选择', style: { width: '100%' },
getPopupContainer: () => document.body,
}, },
}, },
...@@ -129,18 +114,12 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -129,18 +114,12 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'wlzt', field: 'clls',
label: '物料状态', label: '拆解辆数',
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'InputNumber',
componentProps: { componentProps: {
datasourceType: 'dic', style: { width: '100%' },
params: { itemId: '2019657322189856770' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
}, },
{ {
...@@ -177,14 +156,8 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -177,14 +156,8 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'clppxh', field: 'gzjssj',
label: '车辆品牌型号', label: '工作结束时间',
defaultValue: undefined,
component: 'Input',
},
{
field: 'gzkssj',
label: '工作开始时间',
defaultValue: undefined, defaultValue: undefined,
component: 'RangePicker', component: 'RangePicker',
componentProps: { componentProps: {
...@@ -193,6 +166,28 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -193,6 +166,28 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
}, },
}, },
{
field: 'wlzt',
label: '物料状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2019657322189856770' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'clppxh',
label: '车辆品牌型号',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -364,19 +359,6 @@ export const columns: BasicColumn[] = [ ...@@ -364,19 +359,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'banzu',
title: '班组',
componentType: 'radio',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -494,42 +476,6 @@ export const formProps: FormProps = { ...@@ -494,42 +476,6 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'fdb254d1c2dc4370a1905ffd85148370',
field: 'banzu',
label: '班组',
type: 'radio',
component: 'ApiRadioGroup',
colProps: { span: 24 },
componentProps: {
span: 7,
showLabel: true,
disabled: false,
optionType: 'default',
staticOptions: [
{ key: 1, label: 'option 1', value: 'option 1' },
{ key: 2, label: 'option 2', value: 'option 2' },
{ key: 3, label: 'option 3', value: 'option 3' },
],
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2021042614763266049' },
itemId: '2021042614763266049',
style: {},
},
},
{
key: 'f89a9cedaa7a4f98958d46860ac84ad6', key: 'f89a9cedaa7a4f98958d46860ac84ad6',
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车牌号码',
...@@ -643,9 +589,35 @@ export const formProps: FormProps = { ...@@ -643,9 +589,35 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'a349e957579e47cb90727cdfa8c9d21f', key: '21906e99fb08459ea4318c04707797ca',
field: 'gzjssj', field: 'gzr',
label: '工作结束时间', label: '工作人',
type: 'user',
component: 'User',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: 7,
width: '100%',
defaultValue: '',
placeholder: '请选择工作人',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
disabled: false,
required: false,
multiple: true,
isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '4da55e5ac2c04a2dacd2cd58470b6820',
field: 'gzkssj',
label: '工作开始时间',
type: 'date', type: 'date',
component: 'DatePicker', component: 'DatePicker',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -654,7 +626,7 @@ export const formProps: FormProps = { ...@@ -654,7 +626,7 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
width: '100%', width: '100%',
placeholder: '请选择工作结束时间', placeholder: '请选择工作开始时间',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
allowClear: true, allowClear: true,
...@@ -708,32 +680,6 @@ export const formProps: FormProps = { ...@@ -708,32 +680,6 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '21906e99fb08459ea4318c04707797ca',
field: 'gzr',
label: '工作人',
type: 'user',
component: 'User',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: 7,
width: '100%',
defaultValue: '',
placeholder: '请选择工作人',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
disabled: false,
required: false,
multiple: true,
isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'e17f3687f30f4a2995ea2b07348150b5', key: 'e17f3687f30f4a2995ea2b07348150b5',
field: 'cllx', field: 'cllx',
label: '车辆类型', label: '车辆类型',
...@@ -802,57 +748,74 @@ export const formProps: FormProps = { ...@@ -802,57 +748,74 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '5bd116e5f35344cb8780f747370cee8d', key: '0d265387754f487886c4b77058fd49a0',
field: 'bdsl', field: 'gzxm',
label: '磅单数量', label: '工作项目',
type: 'number', type: 'associate-popup',
component: 'InputNumber', component: 'MultiplePopup',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
popupType: 'associate',
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择工作项目',
min: 0,
max: 100,
step: 1,
disabled: false,
showLabel: true, showLabel: true,
controls: true, disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '工作项目',
apiConfig: {
path: '/cheliang/gzx',
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }],
},
dicOptions: [],
required: false, required: false,
subTotal: false,
isShow: true,
rules: [], rules: [],
events: {}, events: {},
placeholder: '请输入磅单数量', isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
{ {
key: 'ae4a15e58ffe4710b337560f7d3b0703', key: 'a349e957579e47cb90727cdfa8c9d21f',
field: 'gzsc', field: 'gzjssj',
label: '工作时长(h)', label: '工作结束时间',
type: 'number', type: 'date',
component: 'InputNumber', component: 'DatePicker',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
min: 0, width: '100%',
step: 1, placeholder: '请选择工作结束时间',
disabled: false, format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
controls: true, allowClear: true,
disabled: false,
required: false, required: false,
subTotal: false,
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
placeholder: '请输入工作时长(h)', isGetCurrent: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -902,51 +865,6 @@ export const formProps: FormProps = { ...@@ -902,51 +865,6 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '0d265387754f487886c4b77058fd49a0',
field: 'gzxm',
label: '工作项目',
type: 'associate-popup',
component: 'MultiplePopup',
colProps: { span: 24 },
componentProps: {
popupType: 'associate',
width: '100%',
span: 7,
placeholder: '请选择工作项目',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '工作项目',
apiConfig: {
path: '/cheliang/gzx',
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }],
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '059de967d74b44bba170351aff279c63', key: '059de967d74b44bba170351aff279c63',
field: 'clzl', field: 'clzl',
label: '车辆重量(kg)', label: '车辆重量(kg)',
...@@ -1007,29 +925,57 @@ export const formProps: FormProps = { ...@@ -1007,29 +925,57 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '4da55e5ac2c04a2dacd2cd58470b6820', key: '5bd116e5f35344cb8780f747370cee8d',
field: 'gzkssj', field: 'bdsl',
label: '工作开始时间', label: '磅单数量',
type: 'date', type: 'number',
component: 'DatePicker', component: 'InputNumber',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
width: '100%', min: 0,
placeholder: '请选择工作开始时间', max: 100,
format: 'YYYY-MM-DD HH:mm:ss', step: 1,
disabled: false,
showLabel: true, showLabel: true,
allowClear: true, controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入磅单数量',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'ae4a15e58ffe4710b337560f7d3b0703',
field: 'gzsc',
label: '工作时长(h)',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
min: 0,
step: 1,
disabled: false, disabled: false,
showLabel: true,
controls: true,
required: false, required: false,
subTotal: false,
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
isGetCurrent: false, placeholder: '请输入工作时长(h)',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
...@@ -23,22 +23,6 @@ export const permissionList = [ ...@@ -23,22 +23,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '班组',
fieldId: 'banzu',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'fdb254d1c2dc4370a1905ffd85148370',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车牌号码', fieldName: '车牌号码',
fieldId: 'cphm', fieldId: 'cphm',
isSubTable: false, isSubTable: false,
...@@ -72,12 +56,12 @@ export const permissionList = [ ...@@ -72,12 +56,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作结束时间', fieldName: '工作人',
fieldId: 'gzjssj', fieldId: 'gzr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'user',
key: 'a349e957579e47cb90727cdfa8c9d21f', key: '21906e99fb08459ea4318c04707797ca',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -89,12 +73,12 @@ export const permissionList = [ ...@@ -89,12 +73,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆id', fieldName: '工作开始时间',
fieldId: 'cheliangId', fieldId: 'gzkssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'date',
key: 'e1221f5840d7486588dd2c1e086af59d', key: '4da55e5ac2c04a2dacd2cd58470b6820',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -106,12 +90,12 @@ export const permissionList = [ ...@@ -106,12 +90,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作人', fieldName: '车辆id',
fieldId: 'gzr', fieldId: 'cheliangId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'input',
key: '21906e99fb08459ea4318c04707797ca', key: 'e1221f5840d7486588dd2c1e086af59d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -156,15 +140,14 @@ export const permissionList = [ ...@@ -156,15 +140,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '磅单数量', fieldName: '工作项目',
fieldId: 'bdsl', fieldId: 'gzxm',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'associate-popup',
key: '5bd116e5f35344cb8780f747370cee8d', key: '0d265387754f487886c4b77058fd49a0',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -173,12 +156,12 @@ export const permissionList = [ ...@@ -173,12 +156,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作时长(h)', fieldName: '工作结束时间',
fieldId: 'gzsc', fieldId: 'gzjssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'date',
key: 'ae4a15e58ffe4710b337560f7d3b0703', key: 'a349e957579e47cb90727cdfa8c9d21f',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -206,14 +189,15 @@ export const permissionList = [ ...@@ -206,14 +189,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作项目', fieldName: '车辆重量(kg)',
fieldId: 'gzxm', fieldId: 'clzl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'number',
key: '0d265387754f487886c4b77058fd49a0', key: '059de967d74b44bba170351aff279c63',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -222,12 +206,12 @@ export const permissionList = [ ...@@ -222,12 +206,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆重量(kg)', fieldName: '车辆品牌型号',
fieldId: 'clzl', fieldId: 'clppxh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'input',
key: '059de967d74b44bba170351aff279c63', key: '45b440505abc47e2a61e9a0a459c67b2',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -239,12 +223,12 @@ export const permissionList = [ ...@@ -239,12 +223,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆品牌型号', fieldName: '磅单数量',
fieldId: 'clppxh', fieldId: 'bdsl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: '45b440505abc47e2a61e9a0a459c67b2', key: '5bd116e5f35344cb8780f747370cee8d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -256,12 +240,12 @@ export const permissionList = [ ...@@ -256,12 +240,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作开始时间', fieldName: '工作时长(h)',
fieldId: 'gzkssj', fieldId: 'gzsc',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'number',
key: '4da55e5ac2c04a2dacd2cd58470b6820', key: 'ae4a15e58ffe4710b337560f7d3b0703',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
...@@ -82,9 +82,9 @@ ...@@ -82,9 +82,9 @@
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import CcbgModal from './components/CcbgModal.vue'; import CcbgModal from './components/CcbgModal.vue';
import InWarehouse from './components/InWarehouse.vue'; import InWarehouse from './components/InWarehouse.vue';
...@@ -163,11 +163,11 @@ ...@@ -163,11 +163,11 @@
const selectedKeys = ref<string[]>([]); const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]); const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true], fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],], ['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
function handleInWarehouseCancel() { function handleInWarehouseCancel() {
showInWarehouse.value = false; showInWarehouse.value = false;
} }
function handleView(record: Recordable) { function handleView(record: Recordable) {
let info={ let info={
isView: true, isView: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment