Skip to content

W
weiqiao-vue
Commit 713a778a by 张恒
Options

feat(gxgl): 添加编码字段

parent b5c09c01
Showing with 62 additions and 38 deletions
xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts
...@@ -4,13 +4,13 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,13 +4,13 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: RokeProcess分页参数 模型 * @description: RokeProcess分页参数 模型
*/ */
export interface RokeProcessPageParams extends BasicPageParams { export interface RokeProcessPageParams extends BasicPageParams {
code: string;
name: string; name: string;
categoryId: string; categoryId: string;
collectionSchemeId: string; collectionSchemeId: string;
note: string;
} }
/** /**
...@@ -19,15 +19,13 @@ export interface RokeProcessPageParams extends BasicPageParams { ...@@ -19,15 +19,13 @@ export interface RokeProcessPageParams extends BasicPageParams {
export interface RokeProcessPageModel { export interface RokeProcessPageModel {
id: string; id: string;
code: string;
name: string; name: string;
categoryId: string; categoryId: string;
collectionSchemeId: string; collectionSchemeId: string;
note: string;
ratedWorkingHours: string;
} }
/** /**
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
...@@ -4,6 +4,12 @@ import { uploadApi } from '/@/api/sys/upload'; ...@@ -4,6 +4,12 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'code',
label: '编码',
defaultValue: undefined,
component: 'Input',
},
{
field: 'name', field: 'name',
label: '名称', label: '名称',
defaultValue: undefined, defaultValue: undefined,
...@@ -50,33 +56,14 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -50,33 +56,14 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
}, },
}, },
{
field: 'note',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'name', dataIndex: 'code',
title: '名称', title: '编码',
componentType: 'input', componentType: 'auto-code',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'categoryId',
title: '工序类别',
componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -87,22 +74,22 @@ export const columns: BasicColumn[] = [ ...@@ -87,22 +74,22 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'collectionSchemeId', dataIndex: 'name',
title: '采集方案', title: '名称',
componentType: 'associate-select', componentType: 'input',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: '',
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'note', dataIndex: 'categoryId',
title: '备注', title: '工序类别',
componentType: 'textarea', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -113,9 +100,9 @@ export const columns: BasicColumn[] = [ ...@@ -113,9 +100,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ratedWorkingHours', dataIndex: 'collectionSchemeId',
title: '额定工时', title: '采集方案',
componentType: 'number', componentType: 'associate-select',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -207,6 +194,29 @@ export const formProps: FormProps = { ...@@ -207,6 +194,29 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'e0f5ab09b1e541d3bff26b82ad0ccf53',
field: 'code',
label: '编码',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请输入编码组件组件',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
showLabel: true,
autoCodeRule: 'GX',
required: false,
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '60af544637c442bcb20cdbf2cd71a2c2', key: '60af544637c442bcb20cdbf2cd71a2c2',
field: 'name', field: 'name',
label: '名称', label: '名称',
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
export const permissionList = [ export const permissionList = [
{ {
required: false,
view: true,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '编码',
fieldId: 'code',
isSubTable: false,
showChildren: true,
type: 'auto-code',
key: 'e0f5ab09b1e541d3bff26b82ad0ccf53',
children: [],
options: {},
},
{
required: true, required: true,
view: true, view: true,
edit: true, edit: 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