Skip to content

W
weiqiao-vue
Commit 1c78bb71 by 王宝涛
Options

feat(ccbg): 更新车辆拆解报告模型和界面配置 

- 从CcbgModel中移除车辆颜色字段(clys)
- 在CcbgModel中新增工作时长字段(gzsc)和基础审计字段(createDate、modifyDate等)
- 定义MesCheliangBgCpModel接口用于产出物料明细
- 更新config.ts中的表单配置，替换车辆颜色字段为工作时长输入框
- 重构照片上传组件布局，使用网格组件进行分组显示
- 新增产出物料明细子表单，包含产品ID、物料名称、物料编码、数量、单位等字段
- 更新workflowPermission.ts中的字段映射关系
- 为产出物料明细添加工作流权限配置
parent db161dad
Showing with 562 additions and 128 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -8,12 +8,12 @@ export interface MesCheliangBgPageParams extends BasicPageParams { ...@@ -8,12 +8,12 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
cllx: string; cllx: string;
clys: string;
gzjssj: string; gzjssj: string;
gzxm: string; gzxm: string;
gzsc: string;
cphm: string; cphm: string;
clppxh: string; clppxh: string;
...@@ -133,6 +133,35 @@ export interface MesCheliangBgModel { ...@@ -133,6 +133,35 @@ export interface MesCheliangBgModel {
createUserId: string; createUserId: string;
modifyUserId: string; modifyUserId: string;
mesCheliangBgCpList?: MesCheliangBgCpModel;
}
/**
* @description: MesCheliangBgCp表类型
*/
export interface MesCheliangBgCpModel {
id: string;
bgId: string;
cpId: string;
cpbh: string;
cpmc: string;
dw: string;
sl: string;
createDate: string;
modifyDate: string;
createUserId: string;
modifyUserId: string;
} }
/** /**
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts
...@@ -30,12 +30,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -30,12 +30,6 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'clys',
label: '车辆颜色',
defaultValue: undefined,
component: 'Input',
},
{
field: 'gzjssj', field: 'gzjssj',
label: '工作结束时间', label: '工作结束时间',
defaultValue: undefined, defaultValue: undefined,
...@@ -81,6 +75,15 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -81,6 +75,15 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'gzsc',
label: '工作时长(h)',
defaultValue: undefined,
component: 'InputNumber',
componentProps: {
style: { width: '100%' },
},
},
{
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车牌号码',
defaultValue: undefined, defaultValue: undefined,
...@@ -978,128 +981,440 @@ export const formProps: FormProps = { ...@@ -978,128 +981,440 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'd78cc6e6b9644509924b1809c448ff38', key: 'e2a2ffd087364fc0a4433ef450222cec',
field: 'bdzp', field: '',
label: '磅单照片', label: '',
type: 'upload', type: 'grid',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: uploadApi,
span: '',
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '4029937584e34870bcf316f6b672393f',
field: 'gbswzp',
label: '过磅实物照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: '',
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '48812589532e495f82f5f2e8add877c9',
field: 'clqzp1',
label: '拆车前照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: '',
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'd17d8b44098e4a0fb92c3b4532f99327',
field: 'clqzp2',
label: '拆车前照片(车号)',
type: 'upload',
component: 'Upload',
colProps: { span: 24 }, colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 12,
list: [
{
key: 'd78cc6e6b9644509924b1809c448ff38',
field: 'bdzp',
label: '磅单照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: uploadApi,
span: 7,
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '48812589532e495f82f5f2e8add877c9',
field: 'clqzp1',
label: '拆车前照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: 7,
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'd17d8b44098e4a0fb92c3b4532f99327',
field: 'clqzp2',
label: '拆车前照片(车号)',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: 7,
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
],
},
{
span: 12,
list: [
{
key: '4029937584e34870bcf316f6b672393f',
field: 'gbswzp',
label: '过磅实物照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: 7,
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '36123594ad34404599aa134d26166d11',
field: 'clhzp1',
label: '拆车后照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
componentProps: {
api: '#{upload}#',
span: 7,
defaultValue: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true,
events: {},
listType: 'picture-card',
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
},
},
],
},
],
componentProps: { componentProps: {
api: '#{upload}#', gutter: 0,
span: '', justify: 'start',
defaultValue: '', align: 'top',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: true,
disabled: false,
required: false,
isShow: true, isShow: true,
events: {}, showBorder: false,
listType: 'picture-card', bordercolor: '#d9d9d9',
sourceType: 'album,camera', bordershowtype: [true, true, true, true],
tooltipConfig: { visible: false, title: '提示文本' }, borderwidth: 1,
padding: '10px',
margin: '10px',
}, },
}, },
{ {
key: '36123594ad34404599aa134d26166d11', key: 'a604d5bcb3db4bda885759e2047a9b4b',
field: 'clhzp1', label: '产出物料明细',
label: '拆车后照片', field: 'mesCheliangBgCpList',
type: 'upload', type: 'form',
component: 'Upload', component: 'SubForm',
required: true,
colProps: { span: 24 }, colProps: { span: 24 },
componentProps: { componentProps: {
api: '#{upload}#', mainKey: 'mesCheliangBgCpList',
span: '', columns: [
defaultValue: '', {
accept: '.jpg,.jpeg,.png,.bmp', key: '5431a82012d845199867d7aa74fb83ba',
maxNumber: 5, title: '产品id',
maxSize: 5, dataIndex: 'cpId',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入产品id',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: false,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '9dd8971a900b4338aa38fbccc2cb9f81',
title: '物料名称',
dataIndex: 'cpmc',
componentType: 'MultiplePopup',
componentProps: {
popupType: 'associate',
width: '100%',
span: '',
placeholder: '请选择物料名称',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '物料名称',
apiConfig: {
path: '/cheliang/ccwl-list',
method: 'GET',
apiId: 'aff23728d9104808ae20c19a396ecf4d',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
"var cplxCode = \"CPLX202602050001\";\r\n\r\nvar sql = \"SELECT id, cpmc AS value, cpmc AS label, cpbh, dw FROM mes_base_product_info WHERE delete_mark = '0' AND cplx LIKE CONCAT('%', (SELECT id FROM mes_base_cplx WHERE delete_mark = '0' AND bh = '\" + cplxCode + \"' LIMIT 1), '%') \";\r\nsql += \"?{keyword, AND cpmc LIKE CONCAT('%', #{keyword}, '%')}\"\r\n\r\nreturn db.select(sql);",
outputParams: [
{ name: 'label', tableTitle: '物料名称', show: true, width: 150 },
{
name: 'cpbh',
tableTitle: '物料编码',
bindField: 'cpbh',
show: true,
width: 150,
component: 'adc856a292a14e69bcc92382cf2a4026',
bindTable: 'mes_cheliang_bg_cp',
},
{
name: 'id',
tableTitle: '',
bindField: 'cpId',
show: false,
width: 150,
component: '5431a82012d845199867d7aa74fb83ba',
bindTable: 'mes_cheliang_bg_cp',
},
{
name: 'dw',
tableTitle: '',
bindField: 'dw',
show: false,
width: 150,
component: 'de3aaca902734b1eba346753ac72d945',
bindTable: 'mes_cheliang_bg_cp',
},
],
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'adc856a292a14e69bcc92382cf2a4026',
title: '物料编码',
dataIndex: 'cpbh',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入物料编码',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '18e26afd493345d6a5ec10b2a076332a',
title: '数量',
dataIndex: 'sl',
componentType: 'InputNumber',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
required: true,
subTotal: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入数量',
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: 'de3aaca902734b1eba346753ac72d945',
title: '单位',
dataIndex: 'dw',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入单位',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
],
span: '24',
preloadType: 'api',
apiConfig: {},
itemId: '',
dicOptions: [],
useSelectButton: false,
buttonName: '选择数据',
showLabel: true, showLabel: true,
multiple: true, showComponentBorder: true,
disabled: false, showBorder: false,
required: false, backgroundStyle: {
isShow: false,
bgColor: '#ffffff',
bgImgUrl: '',
fontColor: '',
borderColor: '',
},
theadStyle: {
isShow: false,
fontSize: 14,
fontColor: '#000000',
bgType: 'color',
gradientDegree: '',
gradientColors: '',
bgImageUrl: '',
bgColor: '',
bgRepeat: 'no-repeat',
},
tbodyStyle: {
isShow: false,
fontSize: 14,
fontColor: '#000000',
bgType: 'color',
gradientDegree: '',
gradientColors: '',
bgImageUrl: '',
bgColor: '',
bgRepeat: 'no-repeat',
},
bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true],
borderwidth: 1,
showIndex: false,
isShow: true, isShow: true,
multipleHeads: [],
buttonList: [],
topButtonList: [],
isExport: false,
isImport: false,
isDeleteSelected: false,
isListView: false,
viewList: [],
isShowAdd: true,
isShowDelete: true,
hasCheckedCol: false,
checkedColType: 'checkbox',
pageSize: 10,
events: {}, events: {},
listType: 'picture-card', showPagenation: true,
sourceType: 'album,camera',
tooltipConfig: { visible: false, title: '提示文本' },
}, },
}, },
], ],
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
...@@ -292,12 +292,12 @@ export const permissionList = [ ...@@ -292,12 +292,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '过磅实物照片', fieldName: '拆车前照片',
fieldId: 'gbswzp', fieldId: 'clqzp1',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'upload',
key: '4029937584e34870bcf316f6b672393f', key: '48812589532e495f82f5f2e8add877c9',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -309,12 +309,12 @@ export const permissionList = [ ...@@ -309,12 +309,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '拆车前照片', fieldName: '拆车前照片(车号)',
fieldId: 'clqzp1', fieldId: 'clqzp2',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'upload',
key: '48812589532e495f82f5f2e8add877c9', key: 'd17d8b44098e4a0fb92c3b4532f99327',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -326,12 +326,12 @@ export const permissionList = [ ...@@ -326,12 +326,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '拆车前照片(车号)', fieldName: '过磅实物照片',
fieldId: 'clqzp2', fieldId: 'gbswzp',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'upload',
key: 'd17d8b44098e4a0fb92c3b4532f99327', key: '4029937584e34870bcf316f6b672393f',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -353,4 +353,94 @@ export const permissionList = [ ...@@ -353,4 +353,94 @@ export const permissionList = [
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: true,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '产出物料明细',
fieldId: 'mesCheliangBgCpList',
type: 'form',
key: 'a604d5bcb3db4bda885759e2047a9b4b',
children: [
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '产品id',
fieldId: 'cpId',
type: 'Input',
key: '5431a82012d845199867d7aa74fb83ba',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '物料名称',
fieldId: 'cpmc',
type: 'MultiplePopup',
key: '9dd8971a900b4338aa38fbccc2cb9f81',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '物料编码',
fieldId: 'cpbh',
type: 'Input',
key: 'adc856a292a14e69bcc92382cf2a4026',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '数量',
fieldId: 'sl',
type: 'InputNumber',
key: '18e26afd493345d6a5ec10b2a076332a',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesCheliangBgCpList',
fieldName: '单位',
fieldId: 'dw',
type: 'Input',
key: 'de3aaca902734b1eba346753ac72d945',
children: [],
},
],
},
]; ];
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