Skip to content

W
weiqiao-vue
Commit c7cbd6c0 by 宋春膨
Options

Merge remote-tracking branch 'origin/weiqiao-vue3' into weiqiao-vue3

parents 9ad58bbe b2e5cfc8
Showing with 34 additions and 169 deletions
xjrsoft-vue3/src/api/scgl/scrw/model/ScrwModel.ts
...@@ -17,15 +17,13 @@ export interface MesProductionTaskPageModel { ...@@ -17,15 +17,13 @@ export interface MesProductionTaskPageModel {
jhbh: string; jhbh: string;
rwbh: string;
cpid: string; cpid: string;
rch: string; rch: string;
zch: string; zch: string;
zl: string; sfnbdd: string;
jhksrq: string; jhksrq: string;
......
xjrsoft-vue3/src/views/scgl/scrw/components/workflowPermission.ts
...@@ -88,6 +88,23 @@ export const permissionList = [ ...@@ -88,6 +88,23 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '是否内部订单',
fieldId: 'sfnbdd',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'd66e5ebfa5d64b829fde596c82155158',
children: [],
options: {},
defaultValue: '2',
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '计划编号', fieldName: '计划编号',
fieldId: 'jhbh', fieldId: 'jhbh',
isSubTable: false, isSubTable: false,
...@@ -222,15 +239,15 @@ export const permissionList = [ ...@@ -222,15 +239,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '任务日期', fieldName: '计划开始时间',
fieldId: 'jhksrq,jhjsrq', fieldId: 'jhksrq',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date-range', type: 'date',
key: 'e35543642daf4df5b48c636ce8bb3f4c', key: 'c522ec15933c4d448a448e4d67897aa0',
children: [], children: [],
options: {}, options: {},
defaultValue: [], defaultValue: '2026-01-07 17:00:09',
}, },
{ {
required: false, required: false,
...@@ -307,15 +324,15 @@ export const permissionList = [ ...@@ -307,15 +324,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '是否内部订单', fieldName: '计划结束时间',
fieldId: 'sfnbdd', fieldId: 'jhjsrq',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'radio', type: 'date',
key: 'd66e5ebfa5d64b829fde596c82155158', key: 'dbff4c30b51e45a0abda869b986c2af2',
children: [], children: [],
options: {}, options: {},
defaultValue: '2', defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -496,156 +513,6 @@ export const permissionList = [ ...@@ -496,156 +513,6 @@ export const permissionList = [
key: '16fd1699db7744379edd01b6eb5653f9', key: '16fd1699db7744379edd01b6eb5653f9',
children: [], children: [],
}, },
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'zzl',
fieldId: 'zzl',
type: 'Input',
key: 'b0a0abbf874c4059a646b9d454eaaae2',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'sl',
fieldId: 'sl',
type: 'InputNumber',
key: '97877128b5014becb5cd6295ead760ff',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'zl',
fieldId: 'zl',
type: 'InputNumber',
key: 'db65c51ffaa7433896ecae60648cca9a',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'gg',
fieldId: 'gg',
type: 'Input',
key: 'd1597b263c85496190e47c5e399f414f',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'zxbz',
fieldId: 'zxbz',
type: 'Input',
key: 'c1c1e89a76574351b454defc1fe8d1f6',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'sccj',
fieldId: 'sccj',
type: 'Input',
key: '99b87e4da6584d199204a47cd1a0243d',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'sccx',
fieldId: 'sccx',
type: 'Input',
key: '5f622be3883e4d1eafe68d9e82e5d25d',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'jsyq',
fieldId: 'jsyq',
type: 'Input',
key: '12382799a03d462587e0f1552eaea581',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'sfnbdd',
fieldId: 'sfnbdd',
type: 'Input',
key: 'dee34a8120874c6e90992c42bdb9f021',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionGongdanList',
fieldName: 'zt',
fieldId: 'zt',
type: 'Input',
key: '4947868d8b55470192988b50e680114f',
children: [],
},
], ],
}, },
]; ];
xjrsoft-vue3/src/views/scgl/scrw/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":"sclld","icon":"ant-design:file-text-outlined","isDefault":false,"setting":[],"showType":"top","buttonType":"primary"},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2008813468518432768","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2008813468518432769","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2008813468518432770","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2008813468518432771","name":"生成领料单","code":"sclld","icon":"ant-design:file-text-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"},{"buttonId":"2008813468518432772","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
......
xjrsoft-vue3/src/views/zlgl/zhijianfangan/components/config.ts
...@@ -269,7 +269,7 @@ export const formProps: FormProps = { ...@@ -269,7 +269,7 @@ export const formProps: FormProps = {
addonAfter: '', addonAfter: '',
showLabel: true, showLabel: true,
autoCodeRule: 'ZJFA', autoCodeRule: 'ZJFA',
required: false, required: true,
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
...@@ -361,7 +361,7 @@ export const formProps: FormProps = { ...@@ -361,7 +361,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: true,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
...@@ -406,7 +406,7 @@ export const formProps: FormProps = { ...@@ -406,7 +406,7 @@ export const formProps: FormProps = {
apiId: '93d735dcb7364a0f8102188ec4d77ac7', apiId: '93d735dcb7364a0f8102188ec4d77ac7',
}, },
dicOptions: [], dicOptions: [],
required: false, required: true,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
...@@ -452,7 +452,7 @@ export const formProps: FormProps = { ...@@ -452,7 +452,7 @@ export const formProps: FormProps = {
apiId: '93d735dcb7364a0f8102188ec4d77ac7', apiId: '93d735dcb7364a0f8102188ec4d77ac7',
}, },
dicOptions: [], dicOptions: [],
required: false, required: true,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
...@@ -493,7 +493,7 @@ export const formProps: FormProps = { ...@@ -493,7 +493,7 @@ export const formProps: FormProps = {
apiId: '93d735dcb7364a0f8102188ec4d77ac7', apiId: '93d735dcb7364a0f8102188ec4d77ac7',
}, },
dicOptions: [], dicOptions: [],
required: false, required: true,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: 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