Skip to content

W
weiqiao-vue
Commit 88d1980f by 金民
Options

feat(sbgl): 添加设备管理功能的完整字段配置 

- 新增工作中心、规格型号、建档号、当前位置、注册代码等搜索字段
- 添加建档人、设备类别、负责人、使用证编号、厂家等筛选条件
- 集成公司选择下拉框和整机编号输入功能
- 实现生产日期范围选择器组件
- 完善表格列配置包括工作中心、建档号、当前位置等新字段
- 添加用户自定义节点配置和流程事件处理
- 优化表单验证规则和组件属性设置
- 更新API参数模型以支持新增查询字段
- 配置工作流权限中的设备二维码字段ID
parent d344eeca
Showing with 140 additions and 6 deletions
xjrsoft-vue3/src/api/sbgl/shebeigl/model/ShebeiglModel.ts
...@@ -6,9 +6,35 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,9 +6,35 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesEquipmentPageParams extends BasicPageParams { export interface MesEquipmentPageParams extends BasicPageParams {
name: string; name: string;
workCenterId: string;
specification: string;
archivesCode: string;
code: string; code: string;
location: string;
registerCode: string;
createArchivesUserId: string;
categoryId: string;
userId: string;
usePermitCode: string;
manufacturer: string;
eState: string; eState: string;
companyId: string;
indexCode: string;
manufactureDate: string;
} }
/** /**
...@@ -30,6 +56,24 @@ export interface MesEquipmentPageModel { ...@@ -30,6 +56,24 @@ export interface MesEquipmentPageModel {
eState: string; eState: string;
companyId: string; companyId: string;
workCenterId: string;
archivesCode: string;
location: string;
registerCode: string;
createArchivesUserId: string;
usePermitCode: string;
manufacturer: string;
indexCode: string;
manufactureDate: string;
} }
/** /**
......
xjrsoft-vue3/src/components/Designer/src/types/index.ts
...@@ -22,6 +22,19 @@ export interface WidgetForm { ...@@ -22,6 +22,19 @@ export interface WidgetForm {
}; };
formWidth: number; formWidth: number;
formHeight?: number; formHeight?: number;
formStyle?: {
background: {
isShow: boolean;
bgColor: string;
bgImgUrl: string;
fontColor: string;
borderColor: string;
bgType: string;
gradientAngle?: number | null;
gradientColors?: string;
repeat?: string;
};
};
}; };
hiddenComponent: HiddenComponentInfo[]; hiddenComponent: HiddenComponentInfo[];
buttonList: buttonListInfo[]; buttonList: buttonListInfo[];
...@@ -40,6 +53,20 @@ export const widgetForm: WidgetForm = { ...@@ -40,6 +53,20 @@ export const widgetForm: WidgetForm = {
}, },
formWidth: 900, formWidth: 900,
formHeight: 500, formHeight: 500,
// 背景样式
formStyle: {
background: {
isShow: false,
bgColor: '',
bgImgUrl: '',
fontColor: '',
borderColor: '',
bgType: '',
gradientAngle: null,
gradientColors: '',
repeat: '',
},
},
}, },
hiddenComponent: [], hiddenComponent: [],
buttonList: [], buttonList: [],
...@@ -130,7 +157,7 @@ export const basicComponents = [ ...@@ -130,7 +157,7 @@ export const basicComponents = [
options: { options: {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: 0, defaultValue: '',
min: 0, min: 0,
max: 100, max: 100,
step: 1, step: 1,
...@@ -143,6 +170,7 @@ export const basicComponents = [ ...@@ -143,6 +170,7 @@ export const basicComponents = [
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
placeholder: '请输入计数组件',
tooltipConfig: defaultTooltipConfig, tooltipConfig: defaultTooltipConfig,
}, },
}, },
...@@ -1128,6 +1156,36 @@ export const layoutComponents = [ ...@@ -1128,6 +1156,36 @@ export const layoutComponents = [
showLabel: true, showLabel: true,
showComponentBorder: true, showComponentBorder: true,
showBorder: false, showBorder: 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', bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true], bordershowtype: [true, true, true, true],
borderwidth: 1, borderwidth: 1,
...@@ -1144,6 +1202,8 @@ export const layoutComponents = [ ...@@ -1144,6 +1202,8 @@ export const layoutComponents = [
isShowAdd: true, isShowAdd: true,
isShowDelete: true, isShowDelete: true,
hasCheckedCol: false, hasCheckedCol: false,
checkedColType: 'checkbox',
pageSize: 10,
events: {}, events: {},
}, },
}, },
...@@ -1193,6 +1253,34 @@ export const layoutComponents = [ ...@@ -1193,6 +1253,34 @@ export const layoutComponents = [
events: {}, events: {},
defaultValue: '', defaultValue: '',
multiple: true, multiple: true,
// 背景样式
backgroundStyle: {
isShow: false,
bgColor: '#ffffff',
bgImgUrl: '',
fontColor: '',
borderColor: '',
},
backgroundTheadStyle: {
isShow: false,
bgType: 'color',
fontColor: '',
fontSize: 14,
bgImgUrl: '',
gradientDegree: '',
gradientColors: '',
bgRepeat: 'no-repeat',
},
backgroundTbodyStyle: {
isShow: false,
bgType: 'color',
fontColor: '',
fontSize: 14,
bgImgUrl: '',
gradientDegree: '',
gradientColors: '',
bgRepeat: 'no-repeat',
},
}, },
}, },
{ {
...@@ -1305,11 +1393,13 @@ export const layoutComponents = [ ...@@ -1305,11 +1393,13 @@ export const layoutComponents = [
isShow: false, isShow: false,
bgColor: '#ffffff', bgColor: '#ffffff',
bgImgUrl: '', bgImgUrl: '',
bgRepeat: 'no-repeat',
}, },
content: { content: {
isShow: false, isShow: false,
bgColor: '#ffffff', bgColor: '#ffffff',
bgImgUrl: '', bgImgUrl: '',
bgRepeat: 'no-repeat',
}, },
divider: { divider: {
isShow: true, isShow: true,
...@@ -1731,7 +1821,7 @@ export const noHaveTableAndField = [ ...@@ -1731,7 +1821,7 @@ export const noHaveTableAndField = [
'title', 'title',
'button', 'button',
'opinion', 'opinion',
'qrcode', // 'qrcode',
'iframe', 'iframe',
'table-layout', 'table-layout',
'text', 'text',
...@@ -1754,7 +1844,7 @@ export const noHaveField = [ ...@@ -1754,7 +1844,7 @@ export const noHaveField = [
'form', 'form',
'time-range', 'time-range',
'date-range', 'date-range',
'qrcode', // 'qrcode',
'iframe', 'iframe',
'table-layout', 'table-layout',
'text', 'text',
......
xjrsoft-vue3/src/views/sbgl/shebeigl/components/workflowPermission.ts
...@@ -275,7 +275,7 @@ export const permissionList = [ ...@@ -275,7 +275,7 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '设备二维码', fieldName: '设备二维码',
fieldId: '', fieldId: 'p10',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'qrcode', type: 'qrcode',
......
xjrsoft-vue3/src/views/sbgl/shebeigl/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2013864545785094144","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2013864545789288448","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2013864545789288449","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013864545789288450","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['manufactureDate', ['manufactureDateStart', 'manufactureDateEnd'], 'YYYY-MM-DD ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
......
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