Skip to content

W
weiqiao-vue
Commit 67c6395a by 张珈源
Options

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

parents 41f87c0a 8c074dd6
Showing with 188 additions and 73 deletions
xjrsoft-vue3/src/views/scgl/gdgl/components/config.ts
...@@ -1203,37 +1203,7 @@ export const formProps: FormProps = { ...@@ -1203,37 +1203,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, 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: '8b197117182e456184210b4de17e6c55',
title: '合金',
dataIndex: 'hj',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1248,17 +1218,47 @@ export const formProps: FormProps = { ...@@ -1248,17 +1218,47 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
}, },
}, },
// {
// key: '8b197117182e456184210b4de17e6c55',
// title: '合金',
// dataIndex: 'hj',
// componentType: 'Input',
// defaultValue: '',
// componentProps: {
// width: '100%',
// span: '',
// defaultValue: '',
// placeholder: '',
// prefix: '',
// suffix: '',
// addonBefore: '',
// addonAfter: '',
// disabled: false,
// allowClear: false,
// showLabel: true,
// required: false,
// rules: [],
// events: {},
// listStyle: '',
// isSave: false,
// isShow: true,
// scan: false,
// bordered: true,
// isShowAi: false,
// tooltipConfig: { visible: false, title: '提示文本' },
// },
// },
{ {
key: 'ecc71641608a45338b75896b3d74d281', key: 'ecc71641608a45338b75896b3d74d281',
title: '完工数', title: '报工数量',
dataIndex: 'wgs', dataIndex: 'bgsl',
componentType: 'InputNumber', componentType: 'InputNumber',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: '', span: '',
min: 0, min: 0,
step: 0.01, step: 0.01,
disabled: false, disabled: true,
showLabel: true, showLabel: true,
controls: true, controls: true,
required: false, required: false,
...@@ -1280,7 +1280,7 @@ export const formProps: FormProps = { ...@@ -1280,7 +1280,7 @@ export const formProps: FormProps = {
span: '', span: '',
min: 0, min: 0,
step: 0.01, step: 0.01,
disabled: false, disabled: true,
showLabel: true, showLabel: true,
controls: true, controls: true,
required: false, required: false,
...@@ -1306,7 +1306,7 @@ export const formProps: FormProps = { ...@@ -1306,7 +1306,7 @@ export const formProps: FormProps = {
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
allowClear: true, allowClear: true,
disabled: false, disabled: true,
required: false, required: false,
isShow: true, isShow: true,
rules: [], rules: [],
...@@ -1331,7 +1331,7 @@ export const formProps: FormProps = { ...@@ -1331,7 +1331,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1361,7 +1361,7 @@ export const formProps: FormProps = { ...@@ -1361,7 +1361,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1391,7 +1391,7 @@ export const formProps: FormProps = { ...@@ -1391,7 +1391,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1421,7 +1421,7 @@ export const formProps: FormProps = { ...@@ -1421,7 +1421,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1681,7 +1681,7 @@ export const formProps: FormProps = { ...@@ -1681,7 +1681,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1711,7 +1711,7 @@ export const formProps: FormProps = { ...@@ -1711,7 +1711,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1741,7 +1741,7 @@ export const formProps: FormProps = { ...@@ -1741,7 +1741,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
...@@ -1758,7 +1758,7 @@ export const formProps: FormProps = { ...@@ -1758,7 +1758,7 @@ export const formProps: FormProps = {
}, },
{ {
key: 'c6d641ee7dfc4336ae157553c1a4e4e9', key: 'c6d641ee7dfc4336ae157553c1a4e4e9',
title: '质检信息', title: '质检时间',
dataIndex: 'zjsj', dataIndex: 'zjsj',
componentType: 'DatePicker', componentType: 'DatePicker',
defaultValue: '', defaultValue: '',
...@@ -1770,7 +1770,7 @@ export const formProps: FormProps = { ...@@ -1770,7 +1770,7 @@ export const formProps: FormProps = {
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
allowClear: true, allowClear: true,
disabled: false, disabled: true,
required: false, required: false,
isShow: true, isShow: true,
rules: [], rules: [],
...@@ -1781,6 +1781,36 @@ export const formProps: FormProps = { ...@@ -1781,6 +1781,36 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'sfsefew342342',
title: '质检状态',
dataIndex: 'zt',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
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: '3b9215b704c74d9bad707adf6c04f50f', key: '3b9215b704c74d9bad707adf6c04f50f',
title: '备注', title: '备注',
dataIndex: 'bz', dataIndex: 'bz',
...@@ -1795,7 +1825,7 @@ export const formProps: FormProps = { ...@@ -1795,7 +1825,7 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false, disabled: true,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
......
xjrsoft-vue3/src/views/scgl/gdgl/components/workflowPermission.ts
...@@ -414,7 +414,7 @@ export const permissionList = [ ...@@ -414,7 +414,7 @@ export const permissionList = [
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: true,
isSubTable: false, isSubTable: false,
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
...@@ -425,32 +425,32 @@ export const permissionList = [ ...@@ -425,32 +425,32 @@ export const permissionList = [
key: '52c0cefc838d49559f893c5f0df5c415', key: '52c0cefc838d49559f893c5f0df5c415',
children: [], children: [],
}, },
// {
// required: true,
// view: true,
// edit: true,
// disabled: false,
// isSubTable: false,
// isSaveTable: false,
// showChildren: false,
// tableName: 'mesGongdanReportList',
// fieldName: '合金',
// fieldId: 'hj',
// type: 'Input',
// key: '8b197117182e456184210b4de17e6c55',
// children: [],
// },
{ {
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: true,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesGongdanReportList',
fieldName: '合金',
fieldId: 'hj',
type: 'Input',
key: '8b197117182e456184210b4de17e6c55',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false, isSubTable: false,
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesGongdanReportList', tableName: 'mesGongdanReportList',
fieldName: '完工数', fieldName: '报工数量',
fieldId: 'wgs', fieldId: 'bgsl',
type: 'InputNumber', type: 'InputNumber',
key: 'ecc71641608a45338b75896b3d74d281', key: 'ecc71641608a45338b75896b3d74d281',
children: [], children: [],
...@@ -689,7 +689,7 @@ export const permissionList = [ ...@@ -689,7 +689,7 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesGongdanQualityInspectionList', tableName: 'mesGongdanQualityInspectionList',
fieldName: '质检信息', fieldName: '质检时间',
fieldId: 'zjsj', fieldId: 'zjsj',
type: 'DatePicker', type: 'DatePicker',
key: 'c6d641ee7dfc4336ae157553c1a4e4e9', key: 'c6d641ee7dfc4336ae157553c1a4e4e9',
...@@ -704,6 +704,21 @@ export const permissionList = [ ...@@ -704,6 +704,21 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesGongdanQualityInspectionList', tableName: 'mesGongdanQualityInspectionList',
fieldName: '质检状态',
fieldId: 'zt',
type: 'Input',
key: 'sfsefew342342',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesGongdanQualityInspectionList',
fieldName: '备注', fieldName: '备注',
fieldId: 'bz', fieldId: 'bz',
type: 'Input', type: 'Input',
......
xjrsoft-vue3/src/views/scgl/gdgl/index.vue
...@@ -241,7 +241,16 @@ ...@@ -241,7 +241,16 @@
if (res !== null) { if (res !== null) {
return; return;
} }
} }
// const hasNonDraft = selectedRowsData.value.some((item) => item.zt !== '草稿');
// if (hasNonDraft) {
// Modal.warning({
// title: '提示',
// content: '当前任务无法编辑',
// });
// return;
// }
let info = { let info = {
id: record[field], id: record[field],
...@@ -382,4 +391,4 @@ ...@@ -382,4 +391,4 @@
</style> </style>
\ No newline at end of file
xjrsoft-vue3/src/views/scgl/scjh/components/config.ts
...@@ -16,7 +16,7 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -16,7 +16,7 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'ssgs', field: 'ywzz',
label: '业务组织', label: '业务组织',
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'XjrSelect',
...@@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [ ...@@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ssgs', dataIndex: 'ywzz',
title: '业务组织', title: '业务组织',
componentType: 'select', componentType: 'select',
...@@ -434,7 +434,7 @@ export const formProps: FormProps = { ...@@ -434,7 +434,7 @@ export const formProps: FormProps = {
}, },
{ {
key: '6833bea0c42c432b83e6946695f2d723', key: '6833bea0c42c432b83e6946695f2d723',
field: 'ssgs', field: 'ywzz',
label: '业务组织', label: '业务组织',
type: 'select', type: 'select',
component: 'XjrSelect', component: 'XjrSelect',
......
xjrsoft-vue3/src/views/scgl/scjh/components/workflowPermission.ts
...@@ -124,7 +124,7 @@ export const permissionList = [ ...@@ -124,7 +124,7 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '业务组织', fieldName: '业务组织',
fieldId: 'ssgs', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'select',
......
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
...@@ -110,6 +110,18 @@ export const columns: BasicColumn[] = [ ...@@ -110,6 +110,18 @@ export const columns: BasicColumn[] = [
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'zt',
title: '状态',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{ {
resizable: true, resizable: true,
...@@ -515,6 +527,39 @@ export const formProps: FormProps = { ...@@ -515,6 +527,39 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '312djfjdjd',
field: 'zt',
label: '状态',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: { change: '' },
listStyle: '',
isSave: false,
isShow: false,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '427fc55accd744d0a6359faf80e45a1b', key: '427fc55accd744d0a6359faf80e45a1b',
field: 'sccx', field: 'sccx',
label: '产线', label: '产线',
......
xjrsoft-vue3/src/views/scgl/scrw/components/workflowPermission.ts
...@@ -237,6 +237,23 @@ export const permissionList = [ ...@@ -237,6 +237,23 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '状态',
fieldId: 'zt',
isSubTable: false,
showChildren: true,
type: 'input',
key: '312djfjdjd',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '优先级', fieldName: '优先级',
fieldId: 'yxj', fieldId: 'yxj',
isSubTable: false, isSubTable: 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