lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

Browse Source
szh-new
lijingjia 2 months ago
parent 00e7bcbc9f ded02164c9
commit 48203ef087
9 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File

3
src/components/Tinymce/src/Editor.vue
Unescape Escape View File

@ -163,6 +163,9 @@
auto_focus: true,
skin: skinName.value,
skin_url: publicPath + 'resource/tinymce/skins/ui/' + skinName.value,
font_formats:
'Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;微软雅黑=Microsoft YaHei,sans-serif;黑体=SimHei,sans-serif;新宋体=NSimSun,sans-serif;仿宋=FangSong,sans-serif;仿宋_GB2312=FangSong_GB2312,sans-serif;微软正黑体=Microsoft JhengHei,sans-serif;隶书=LiSu,sans-serif;新宋体-宋体=NSimSun-SimSun,sans-serif',
content_css:
publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css',
...options,

15
src/views/ContainerManagement/CtnScrap/columns.tsx
Unescape Escape View File

@ -189,12 +189,6 @@ export const formSearchBoxSchema: FormSchema[] = [
}
},
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'ctnreleaseno',
label: '放箱单号',
@ -205,6 +199,13 @@ export const formSearchBoxSchema: FormSchema[] = [
field: 'remark',
label: '备注',
component: 'Input',
colProps: { span: 6 },
colProps: { span: 12 },
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
placeholder: '可以逗号隔开，查询多个箱号。',
colProps: { span: 18 },
},
]

9
src/views/ContainerManagement/CurrentState/columns.tsx
Unescape Escape View File

@ -755,6 +755,15 @@ export const formSchema: FormSchema[] = [
component: 'InputNumber',
colProps: { span: 6 },
},
{
field: 'remark',
label: '备注',
component: 'InputTextArea',
colProps: { span: 18 },
componentProps: {
rows: 2,
},
},
]
export const InfoColumns: BasicColumn[] = [

21
src/views/ContainerManagement/RentIn/columns.tsx
Unescape Escape View File

@ -491,7 +491,7 @@ export const formSearchBoxSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
colProps: { span: 6 },
componentProps: ({ formModel }) => {
return {
allowClear: true,
@ -515,7 +515,7 @@ export const formSearchBoxSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
colProps: { span: 6 },
componentProps: () => {
return {
allowClear: true,
@ -533,22 +533,23 @@ export const formSearchBoxSchema: FormSchema[] = [
}
},
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'ctnreleaseno',
label: '放箱单号',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 6 },
},
{
field: 'remark',
label: '备注',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 6 },
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
placeholder: '可以逗号隔开，查询多个箱号。',
colProps: { span: 18 },
},
]

21
src/views/ContainerManagement/RentOut/columns.tsx
Unescape Escape View File

@ -499,7 +499,7 @@ export const formSearchBoxSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
colProps: { span: 6 },
// api: GetClientListByCode({ code: 'leasing' }),
componentProps: ({ formModel }) => {
return {
@ -524,7 +524,7 @@ export const formSearchBoxSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
colProps: { span: 6 },
componentProps: () => {
return {
allowClear: true,
@ -548,7 +548,7 @@ export const formSearchBoxSchema: FormSchema[] = [
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
colProps: { span: 6 },
componentProps: () => {
return {
api: GetClientPortSelectList,
@ -561,21 +561,22 @@ export const formSearchBoxSchema: FormSchema[] = [
},
},
{
field: 'cntrno',
label: '箱号',
field: 'ctnreleaseno',
label: '放箱单号',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 6 },
},
{
field: 'ctnreleaseno',
label: '放箱单号',
field: 'cntrno',
label: '箱号',
component: 'Input',
colProps: { span: 4 },
placeholder: '可以逗号隔开，查询多个箱号。',
colProps: { span: 18 },
},
{
field: 'remark',
label: '备注',
component: 'Input',
colProps: { span: 4 },
colProps: { span: 6 },
},
]

15
src/views/ContainerManagement/SellCtn/columns.tsx
Unescape Escape View File

@ -277,12 +277,6 @@ export const formSearchBoxSchema: FormSchema[] = [
}
},
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'ctnreleaseno',
label: '放箱单号',
@ -293,6 +287,13 @@ export const formSearchBoxSchema: FormSchema[] = [
field: 'remark',
label: '备注',
component: 'Input',
colProps: { span: 6 },
colProps: { span: 12 },
},
{
field: 'cntrno',
label: '箱号',
component: 'Input',
placeholder: '可以逗号隔开，查询多个箱号。',
colProps: { span: 18 },
},
]

7
src/views/baseinfo/infoclient/EditColumns.tsx
Unescape Escape View File

@ -392,14 +392,19 @@ export const EditformSchema: FormSchema[] = [
valueField: 'userName',
immediate: false,
resultField: 'data',
onChange: async (e, obj) => {
onChange: (e, obj) => {
if (e && obj) {
formModel.saleId = obj.id
formModel.sale = obj.pinYinCode
formModel.saleOrgId = obj.defaultOrgId
formModel.saleOrgName = obj.defaultOrgName
console.log(e, obj)
}
if (!e && !obj) {
formModel.saleId = ''
formModel.sale = ''
formModel.saleOrgId = ''
formModel.saleOrgName = ''
}
},
onEdit: () => {

7
src/views/baseinfo/infoclient/columns.tsx
Unescape Escape View File

@ -731,14 +731,19 @@ export const formSchema: FormSchema[] = [
showName: 'userName',
valueField: 'userName',
resultField: 'data',
onChange: async (e, obj) => {
onChange: (e, obj) => {
if (e && obj) {
formModel.saleId = obj.id
formModel.sale = obj.pinYinCode
formModel.saleOrgId = obj.defaultOrgId
formModel.saleOrgName = obj.defaultOrgName
console.log(e, obj)
}
if (!e && !obj) {
formModel.saleId = ''
formModel.sale = ''
formModel.saleOrgId = ''
formModel.saleOrgName = ''
}
},
}

9
src/views/baseinfo/infoclient/tabs3/columns.tsx
Unescape Escape View File

@ -28,7 +28,14 @@ if (FnbusinessType.length) {
})
}
// 账期 字典
const accountTypeList = await getDictOption('infoclient_business_accountType')
let accountTypeList: any = []
const res9: any = await getDictOption('infoclient_business_accountType')
// if (res9.succeeded) {
accountTypeList = []
res9.forEach((e) => {
accountTypeList.push({ ...e, value: e.name })
})
// }
function RaccountTypeLabel(values) {
let RData = ''
accountTypeList.forEach((item) => {

Write Preview
Loading…
Cancel
Save