Skip to content

W
weiqiao-vue
Commit 84e5177d by 董晓奇
Options

Merge branch 'weiqiao-vue3' of https://git.rokedata.com/jinmin/weiqiao-vue into weiqiao-vue3

parents b7206207 65cb2c3e
Showing with 89 additions and 40 deletions
xjrsoft-vue3/src/api/ckgl/scrk/model/ScrkModel.ts
...@@ -29,10 +29,6 @@ export interface MesWarehouseProductPageModel { ...@@ -29,10 +29,6 @@ export interface MesWarehouseProductPageModel {
crklx: string; crklx: string;
kgy: string;
scbm: string;
ck: string; ck: string;
pch: string; pch: string;
...@@ -42,6 +38,8 @@ export interface MesWarehouseProductPageModel { ...@@ -42,6 +38,8 @@ export interface MesWarehouseProductPageModel {
djzt: string; djzt: string;
bz: string; bz: string;
kgy: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/kczb/components/config.ts
...@@ -292,34 +292,87 @@ export const formProps: FormProps = { ...@@ -292,34 +292,87 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '5a82773c288f4bb49914109c9f112f9e', key: '1339633e12984e499ca9ceb44a89b739',
field: 'cpbh', field: 'cpbh',
label: '产品编号', label: '产品编号',
type: 'input', type: 'associate-popup',
component: 'Input', component: 'MultiplePopup',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
popupType: 'associate',
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择产品编号',
placeholder: '请输入产品编号',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '产品信息',
apiConfig: {
path: '/jcxx/wlbhList',
method: 'GET',
apiId: '588543bf8c6045fd89f63b8337f5aec6',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql ="select *,cpbh as value,cpbh as label from mes_base_product_info where delete_mark = 0"+\r\n\' ?{keyword, AND cpmc LIKE CONCAT("%", #{keyword}, "%")}\';\r\nreturn db.select(sql);',
outputParams: [
{ name: 'label', tableTitle: '产品编码', show: true, width: 150 },
{
name: 'cpmc',
tableTitle: '产品名称',
bindField: 'cpmc',
show: true,
width: 150,
component: '464846c54eb54238b89b5b87fca84e3b',
},
{
name: 'gg',
tableTitle: '规格',
bindField: 'gg',
show: true,
width: 150,
component: '55216a96a79245c2894a1e7ed60537aa',
},
{
name: 'xh',
tableTitle: '型号',
bindField: 'xh',
show: true,
width: 150,
component: 'afdf24cf5fe14e898257fe820d398723',
},
],
},
dicOptions: [],
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
......
xjrsoft-vue3/src/views/ckgl/kczb/components/workflowPermission.ts
...@@ -10,11 +10,10 @@ export const permissionList = [ ...@@ -10,11 +10,10 @@ export const permissionList = [
fieldId: 'cpbh', fieldId: 'cpbh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'associate-popup',
key: '5a82773c288f4bb49914109c9f112f9e', key: '1339633e12984e499ca9ceb44a89b739',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
......
xjrsoft-vue3/src/views/ckgl/scrk/components/config.ts
...@@ -25,12 +25,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -25,12 +25,6 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'scbm',
label: '生产部门',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ywzz', field: 'ywzz',
label: '业务组织', label: '业务组织',
defaultValue: undefined, defaultValue: undefined,
...@@ -494,13 +488,14 @@ export const formProps: FormProps = { ...@@ -494,13 +488,14 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{ {
span: 8, span: 8,
list: [ list: [
{ {
key: '4974e34247094ea5bce99f66f4169b27', key: 'ec89abed664a4341acd26ac8509d311a',
field: 'scbm', field: 'pch',
label: '生产部门', label: '批次号',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -509,7 +504,7 @@ export const formProps: FormProps = { ...@@ -509,7 +504,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入生产部门', placeholder: '请输入批次号',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -532,6 +527,8 @@ export const formProps: FormProps = { ...@@ -532,6 +527,8 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{ {
span: 8, span: 8,
list: [ list: [
...@@ -623,13 +620,14 @@ export const formProps: FormProps = { ...@@ -623,13 +620,14 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{ {
span: 8, span: 8,
list: [ list: [
{ {
key: 'ec89abed664a4341acd26ac8509d311a', key: '4974e34247094ea5bce99f66f4169b27',
field: 'pch', field: 'scbm',
label: '批次号', label: '生产部门',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -638,7 +636,7 @@ export const formProps: FormProps = { ...@@ -638,7 +636,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入生产部门',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -651,7 +649,7 @@ export const formProps: FormProps = { ...@@ -651,7 +649,7 @@ export const formProps: FormProps = {
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: false, isSave: false,
isShow: true, isShow: false,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
...@@ -661,6 +659,7 @@ export const formProps: FormProps = { ...@@ -661,6 +659,7 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{ {
span: 24, span: 24,
list: [ list: [
......
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
...@@ -817,7 +817,7 @@ export const formProps: FormProps = { ...@@ -817,7 +817,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: true,
rules: [], rules: [],
events: { change: '' }, events: { change: '' },
listStyle: '', listStyle: '',
......
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