Skip to content

W
weiqiao-vue
Commit ca063ce4 by 王宝涛
Options

refactor(ccbg): 调整车辆拆解表单字段配置 

- 移除班组相关字段 (banzu)
- 重新排列工作开始时间和结束时间字段顺序
- 将物料状态字段调整为拆解辆数，并修改组件类型为数字输入框
- 添加工作项目关联弹窗组件配置
- 调整字段映射时间范围配置顺序
- 更新工作流权限配置中的字段对应关系
- 重新排序多个业务字段的显示顺序
parent 592f830c
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';
* @description: MesCheliangBg分页参数 模型
*/
export interface MesCheliangBgPageParams extends BasicPageParams {
banzu: string;
cphm: string;
clys: string;
gzjssj: string;
gzr: string;
gzkssj: string;
cllx: string;
wlzt: string;
clls: string;
gzxm: string;
clppxh: string;
gzjssj: string;
gzkssj: string;
wlzt: string;
clppxh: string;
}
/**
......@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
gzsc: string;
wlzt: string;
banzu: string;
}
/**
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue
......@@ -135,3 +135,4 @@
</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';
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',
label: '车牌号码',
defaultValue: undefined,
......@@ -91,25 +76,25 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
field: 'gzjssj',
label: '工作结束时间',
field: 'gzr',
label: '工作人',
defaultValue: undefined,
component: 'RangePicker',
component: 'User',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
},
},
{
field: 'gzr',
label: '工作人',
field: 'gzkssj',
label: '工作开始时间',
defaultValue: undefined,
component: 'User',
component: 'RangePicker',
componentProps: {
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
......@@ -129,18 +114,12 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'wlzt',
label: '物料状态',
field: 'clls',
label: '拆解辆数',
defaultValue: undefined,
component: 'XjrSelect',
component: 'InputNumber',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2019657322189856770' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
style: { width: '100%' },
},
},
{
......@@ -177,14 +156,8 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'clppxh',
label: '车辆品牌型号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'gzkssj',
label: '工作开始时间',
field: 'gzjssj',
label: '工作结束时间',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
......@@ -193,6 +166,28 @@ export const searchFormSchema: FormSchema[] = [
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[] = [
......@@ -364,19 +359,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'banzu',
title: '班组',
componentType: 'radio',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -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',
field: 'cphm',
label: '车牌号码',
......@@ -643,9 +589,35 @@ export const formProps: FormProps = {
},
},
{
key: 'a349e957579e47cb90727cdfa8c9d21f',
field: 'gzjssj',
label: '工作结束时间',
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: '4da55e5ac2c04a2dacd2cd58470b6820',
field: 'gzkssj',
label: '工作开始时间',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
......@@ -654,7 +626,7 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
width: '100%',
placeholder: '请选择工作结束时间',
placeholder: '请选择工作开始时间',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
allowClear: true,
......@@ -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',
field: 'cllx',
label: '车辆类型',
......@@ -802,57 +748,74 @@ export const formProps: FormProps = {
},
},
{
key: '5bd116e5f35344cb8780f747370cee8d',
field: 'bdsl',
label: '磅单数量',
type: 'number',
component: 'InputNumber',
key: '0d265387754f487886c4b77058fd49a0',
field: 'gzxm',
label: '工作项目',
type: 'associate-popup',
component: 'MultiplePopup',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
popupType: 'associate',
width: '100%',
span: 7,
defaultValue: '',
min: 0,
max: 100,
step: 1,
disabled: false,
placeholder: '请选择工作项目',
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,
subTotal: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入磅单数量',
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'ae4a15e58ffe4710b337560f7d3b0703',
field: 'gzsc',
label: '工作时长(h)',
type: 'number',
component: 'InputNumber',
key: 'a349e957579e47cb90727cdfa8c9d21f',
field: 'gzjssj',
label: '工作结束时间',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
min: 0,
step: 1,
disabled: false,
width: '100%',
placeholder: '请选择工作结束时间',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
controls: true,
allowClear: true,
disabled: false,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入工作时长(h)',
isGetCurrent: false,
tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' },
},
},
......@@ -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',
field: 'clzl',
label: '车辆重量(kg)',
......@@ -1007,29 +925,57 @@ export const formProps: FormProps = {
},
},
{
key: '4da55e5ac2c04a2dacd2cd58470b6820',
field: 'gzkssj',
label: '工作开始时间',
type: 'date',
component: 'DatePicker',
key: '5bd116e5f35344cb8780f747370cee8d',
field: 'bdsl',
label: '磅单数量',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
width: '100%',
placeholder: '请选择工作开始时间',
format: 'YYYY-MM-DD HH:mm:ss',
min: 0,
max: 100,
step: 1,
disabled: false,
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,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
isGetCurrent: false,
placeholder: '请输入工作时长(h)',
tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' },
},
},
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
......@@ -23,22 +23,6 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
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: '车牌号码',
fieldId: 'cphm',
isSubTable: false,
......@@ -72,12 +56,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
fieldName: '工作人',
fieldId: 'gzr',
isSubTable: false,
showChildren: true,
type: 'date',
key: 'a349e957579e47cb90727cdfa8c9d21f',
type: 'user',
key: '21906e99fb08459ea4318c04707797ca',
children: [],
options: {},
defaultValue: '',
......@@ -89,12 +73,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆id',
fieldId: 'cheliangId',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'e1221f5840d7486588dd2c1e086af59d',
type: 'date',
key: '4da55e5ac2c04a2dacd2cd58470b6820',
children: [],
options: {},
defaultValue: '',
......@@ -106,12 +90,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作人',
fieldId: 'gzr',
fieldName: '车辆id',
fieldId: 'cheliangId',
isSubTable: false,
showChildren: true,
type: 'user',
key: '21906e99fb08459ea4318c04707797ca',
type: 'input',
key: 'e1221f5840d7486588dd2c1e086af59d',
children: [],
options: {},
defaultValue: '',
......@@ -156,15 +140,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '磅单数量',
fieldId: 'bdsl',
fieldName: '工作项目',
fieldId: 'gzxm',
isSubTable: false,
showChildren: true,
type: 'number',
key: '5bd116e5f35344cb8780f747370cee8d',
type: 'associate-popup',
key: '0d265387754f487886c4b77058fd49a0',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -173,12 +156,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作时长(h)',
fieldId: 'gzsc',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'ae4a15e58ffe4710b337560f7d3b0703',
type: 'date',
key: 'a349e957579e47cb90727cdfa8c9d21f',
children: [],
options: {},
defaultValue: '',
......@@ -206,14 +189,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作项目',
fieldId: 'gzxm',
fieldName: '车辆重量(kg)',
fieldId: 'clzl',
isSubTable: false,
showChildren: true,
type: 'associate-popup',
key: '0d265387754f487886c4b77058fd49a0',
type: 'number',
key: '059de967d74b44bba170351aff279c63',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -222,12 +206,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆重量(kg)',
fieldId: 'clzl',
fieldName: '车辆品牌型号',
fieldId: 'clppxh',
isSubTable: false,
showChildren: true,
type: 'number',
key: '059de967d74b44bba170351aff279c63',
type: 'input',
key: '45b440505abc47e2a61e9a0a459c67b2',
children: [],
options: {},
defaultValue: '',
......@@ -239,12 +223,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆品牌型号',
fieldId: 'clppxh',
fieldName: '磅单数量',
fieldId: 'bdsl',
isSubTable: false,
showChildren: true,
type: 'input',
key: '45b440505abc47e2a61e9a0a459c67b2',
type: 'number',
key: '5bd116e5f35344cb8780f747370cee8d',
children: [],
options: {},
defaultValue: '',
......@@ -256,12 +240,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
fieldName: '工作时长(h)',
fieldId: 'gzsc',
isSubTable: false,
showChildren: true,
type: 'date',
key: '4da55e5ac2c04a2dacd2cd58470b6820',
type: 'number',
key: 'ae4a15e58ffe4710b337560f7d3b0703',
children: [],
options: {},
defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
......@@ -82,9 +82,9 @@
import { useModal } from '/@/components/Modal';
import CcbgModal from './components/CcbgModal.vue';
import InWarehouse from './components/InWarehouse.vue';
......@@ -163,11 +163,11 @@
const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal();
......@@ -182,8 +182,8 @@
formConfig: {
labelWidth: 100,
schemas: searchFormSchema,
fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false,
},
bordered:false,
......@@ -324,7 +324,7 @@
function handleInWarehouseCancel() {
showInWarehouse.value = false;
}
function handleView(record: Recordable) {
let info={
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