Skip to content

W
weiqiao-vue
Commit bc65f91b by 金民
Options

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

parents 5c689b0c d9092c94
Showing with 222 additions and 121 deletions
xjrsoft-vue3/src/api/ckgl/scll/model/ScllModel.ts
......@@ -9,6 +9,8 @@ export interface MesWarehousePromaterialPageParams extends BasicPageParams {
lldw: string;
llr: string;
ywzz: string;
}
/**
......@@ -25,10 +27,12 @@ export interface MesWarehousePromaterialPageModel {
llr: string;
llkczz: string;
kgy: string;
ywzz: string;
zt: string;
bz: string;
}
......@@ -48,10 +52,12 @@ export interface MesWarehousePromaterialModel {
llr: string;
llkczz: string;
ywzz: string;
kgy: string;
zt: string;
bz: string;
fj: string;
......@@ -147,11 +153,9 @@ export interface MesWarehousePromaterialInfoModel {
dw: string;
sl: string;
hwh: string;
yfsl: string;
sl: string;
sfsl: string;
......@@ -224,6 +228,8 @@ export interface MesWarehousePromaterialInfoModel {
modifyDate: string;
modifyUserId: string;
pch: string;
}
/**
......
xjrsoft-vue3/src/api/ckgl/scrk/model/ScrkModel.ts
......@@ -4,13 +4,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseProduct分页参数 模型
*/
export interface MesWarehouseProductPageParams extends BasicPageParams {
kczz: string;
djbh: string;
ck: string;
kgy: string;
scbm: string;
ywzz: string;
djzt: string;
}
/**
......@@ -19,12 +21,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
export interface MesWarehouseProductPageModel {
id: string;
kczz: string;
djrq: string;
ck: string;
crklx: string;
kgy: string;
......@@ -33,7 +31,13 @@ export interface MesWarehouseProductPageModel {
djbh: string;
ck: string;
ywzz: string;
djzt: string;
bz: string;
}
/**
......@@ -44,7 +48,7 @@ export interface MesWarehouseProductModel {
deleteMark: string;
kczz: string;
ywzz: string;
djrq: string;
......@@ -186,6 +190,8 @@ export interface MesWarehouseProductInfoModel {
modifyDate: string;
modifyUserId: string;
rkdh: string;
}
/**
......
xjrsoft-vue3/src/views/ckgl/scll/components/config.ts
......@@ -29,6 +29,13 @@ export const searchFormSchema: FormSchema[] = [
placeholder: '请选择',
},
},
{
field: 'ywzz',
label: '业务组织',
defaultValue: undefined,
component: 'Input',
},
];
export const columns: BasicColumn[] = [
......@@ -86,8 +93,8 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'llkczz',
title: '领料库存组织',
dataIndex: 'kgy',
title: '库管员',
componentType: 'input',
fixed: false,
......@@ -99,8 +106,8 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'kgy',
title: '库管员',
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'input',
fixed: false,
......@@ -112,6 +119,19 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'zt',
title: '单据状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'input',
......@@ -325,8 +345,8 @@ export const formProps: FormProps = {
list: [
{
key: 'cc6c68d8b8f740e0a4d16f334508e0c3',
field: 'llkczz',
label: '领料库存组织',
field: 'ywzz',
label: '业务组织',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......@@ -335,7 +355,7 @@ export const formProps: FormProps = {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入领料库存组织',
placeholder: '请输入业务组织',
prefix: '',
suffix: '',
addonBefore: '',
......@@ -397,38 +417,46 @@ export const formProps: FormProps = {
],
},
{
span: 24,
span: 8,
list: [
{
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
field: 'bz',
label: '备注',
type: 'input',
component: 'Input',
key: '9cdba668d8b348e8a581859ade8585b2',
field: 'zt',
label: '单据状态',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 2,
defaultValue: '',
placeholder: '请输入备注',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
span: 7,
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2016321281785163777' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2016321281785163777',
style: { width: '100%' },
},
},
......@@ -464,6 +492,44 @@ export const formProps: FormProps = {
},
],
},
{
span: 24,
list: [
{
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
field: 'bz',
label: '备注',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 2,
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: '提示文本' },
style: { width: '100%' },
},
},
],
},
],
componentProps: {
gutter: 16,
......@@ -610,30 +676,6 @@ export const formProps: FormProps = {
},
},
{
key: '1026628c881d477b890e57ffd408b77a',
title: '数量',
dataIndex: 'sl',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
step: 1,
disabled: false,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '6561cde6f9ee4fd6a898ed3e3618eaca',
title: '货位号',
dataIndex: 'hwh',
......@@ -664,9 +706,9 @@ export const formProps: FormProps = {
},
},
{
key: 'c90814d02b6f420f93d397202c8803fd',
title: '应发数量',
dataIndex: 'yfsl',
key: '1026628c881d477b890e57ffd408b77a',
title: '数量',
dataIndex: 'sl',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
......@@ -712,6 +754,36 @@ export const formProps: FormProps = {
},
},
{
key: 'ee29558be5e24c4ca2a706ebfae5fd7a',
title: '批次号',
dataIndex: 'pch',
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: '8e0d25fb158a46c9a482d0f957cb88ae',
title: '备注',
dataIndex: 'bz',
......
xjrsoft-vue3/src/views/ckgl/scll/components/workflowPermission.ts
......@@ -72,8 +72,8 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '领料库存组织',
fieldId: 'llkczz',
fieldName: '业务组织',
fieldId: 'ywzz',
isSubTable: false,
showChildren: true,
type: 'input',
......@@ -106,15 +106,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '备注',
fieldId: 'bz',
fieldName: '单据状态',
fieldId: 'zt',
isSubTable: false,
showChildren: true,
type: 'input',
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
type: 'select',
key: '9cdba668d8b348e8a581859ade8585b2',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -134,6 +133,23 @@ export const permissionList = [
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '备注',
fieldId: 'bz',
isSubTable: false,
showChildren: true,
type: 'input',
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
view: true,
edit: true,
......@@ -215,10 +231,10 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehousePromaterialInfoList',
fieldName: '数量',
fieldId: 'sl',
type: 'InputNumber',
key: '1026628c881d477b890e57ffd408b77a',
fieldName: '货位号',
fieldId: 'hwh',
type: 'Input',
key: '6561cde6f9ee4fd6a898ed3e3618eaca',
children: [],
},
{
......@@ -230,10 +246,10 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehousePromaterialInfoList',
fieldName: '货位号',
fieldId: 'hwh',
type: 'Input',
key: '6561cde6f9ee4fd6a898ed3e3618eaca',
fieldName: '数量',
fieldId: 'sl',
type: 'InputNumber',
key: '1026628c881d477b890e57ffd408b77a',
children: [],
},
{
......@@ -245,10 +261,10 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehousePromaterialInfoList',
fieldName: '应发数量',
fieldId: 'yfsl',
fieldName: '实发数量',
fieldId: 'sfsl',
type: 'InputNumber',
key: 'c90814d02b6f420f93d397202c8803fd',
key: 'aed6a337f7a447538e0eb2faec5f9f06',
children: [],
},
{
......@@ -260,10 +276,10 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehousePromaterialInfoList',
fieldName: '实发数量',
fieldId: 'sfsl',
type: 'InputNumber',
key: 'aed6a337f7a447538e0eb2faec5f9f06',
fieldName: '批次号',
fieldId: 'pch',
type: 'Input',
key: 'ee29558be5e24c4ca2a706ebfae5fd7a',
children: [],
},
{
......
xjrsoft-vue3/src/views/ckgl/scll/index.vue
......@@ -134,7 +134,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{
const list = [{"buttonId":"2010557152968171520","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365824","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013779484670955520","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365825","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
const list = [{"buttonId":"2010557152968171520","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152968171521","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365824","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013779484670955520","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365825","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list);
})
......@@ -146,7 +146,7 @@
return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
});
const btnEvent = {view : handleView,edit : handleEdit,print : handlePrint,delete : handleDelete,}
const btnEvent = {view : handleView,add : handleAdd,edit : handleEdit,print : handlePrint,delete : handleDelete,}
const { currentRoute } = useRouter();
......@@ -222,6 +222,13 @@
}
function handleAdd() {
openModal(true, { isUpdate: false, });
}
async function handleEdit(record: Recordable) {
let field = 'id';
......@@ -388,4 +395,4 @@
</style>
\ No newline at end of file
</style>
xjrsoft-vue3/src/views/ckgl/scrk/components/workflowPermission.ts
export const permissionList = [
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '库存组织',
fieldId: 'kczz',
fieldName: '单据编号',
fieldId: 'djbh',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'b7fc1a99eb11469fbffd723f8ce0629f',
type: 'auto-code',
key: '783643292ed9482fae0d3a37d2ebef65',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -44,11 +43,10 @@ export const permissionList = [
fieldId: 'ck',
isSubTable: false,
showChildren: true,
type: 'input',
key: '0f17a0106f2348bbbc3d19889815b9c7',
type: 'select',
key: '7a643e99ca7242c9a606dc550981d6af',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -108,15 +106,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '单据编号',
fieldId: 'djbh',
fieldName: '业务组织',
fieldId: 'ywzz',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'd5e600afe891410882c273a7bc1b2ca2',
type: 'select',
key: 'b4b870255bc248e3adb580c6dbcbaac1',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -129,11 +126,10 @@ export const permissionList = [
fieldId: 'djzt',
isSubTable: false,
showChildren: true,
type: 'input',
key: '320589395feb4544a4c0b9ff283e3b2f',
type: 'select',
key: '16ad4aafe99c4797966fc6e01bc63e90',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......
xjrsoft-vue3/src/views/ckgl/scrk/index.vue
......@@ -133,7 +133,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
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":"2010538548100980736","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010538548100980737","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010538548100980738","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010538548100980739","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list);
})
......@@ -382,4 +382,4 @@
</style>
\ No newline at end of file
</style>
xjrsoft-vue3/src/views/jcsj/wlqd/components/config.ts
......@@ -829,7 +829,7 @@ export const formProps: FormProps = {
controls: true,
required: false,
subTotal: false,
isShow: true,
isShow: false,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
......@@ -904,7 +904,7 @@ export const formProps: FormProps = {
showLabel: true,
disabled: false,
events: {},
isShow: true,
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: '',
},
......
xjrsoft-vue3/src/views/zlgl/cgzjd/components/config.ts
......@@ -770,7 +770,7 @@ export const formProps: FormProps = {
{
key: '9ac1e63ebbcd433bb4b2ec76621ab12d',
field: 'lch',
label: '炉批号',
label: '炉次号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......
xjrsoft-vue3/src/views/zlgl/cgzjd/components/workflowPermission.ts
......@@ -205,7 +205,7 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '炉批号',
fieldName: '炉次号',
fieldId: 'lch',
isSubTable: false,
showChildren: 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