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
zth
lijingjia 3 weeks ago
parent 886f1185a1 3942c17303
commit 20b5e12e1b
7 changed files with 122 additions and 80 deletions
Show Stats Download Patch File Download Diff File

23
src/views/finance/feeSettlement/columns.tsx
Unescape Escape View File

@ -1250,7 +1250,7 @@ export const freeSearchFormSchema: FormSchema[] = [
},
{
label: '船名',
field: 'vesselId',
field: 'vessel',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
@ -1260,7 +1260,7 @@ export const freeSearchFormSchema: FormSchema[] = [
api: GetVesselSelectList,
immediate: false,
labelField: 'vesselName',
valueField: 'id',
valueField: 'vesselName',
resultField: 'data'
}
}
@ -1272,22 +1272,19 @@ export const freeSearchFormSchema: FormSchema[] = [
component: 'Input'
},
{
label: '核算单位',
field: 'enterprise',
field: 'saleDeptId',
label: '所属分部',
component: 'ApiSelect',
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: () => {
return {
api: GetClientListByCode,
labelField: 'pinYinCode',
showName: 'shortName',
valueField: 'id',
api: GetOrgList,
resultField: 'data',
immediate: false
}
labelField: 'label',
valueField: 'id',
}
},
},
]
export const freeTableDetailColums: BasicColumn[] = [
@ -1466,12 +1463,12 @@ export const freeColum: BasicColumn[] = [
},
{
title: '船名',
dataIndex: 'changeOrder',
dataIndex: 'vesselName',
width: 100,
},
{
title: '航次',
dataIndex: 'vesselName',
dataIndex: 'voyno',
width: 100,
},
{

49
src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx
Unescape Escape View File

@ -988,18 +988,18 @@ export const freeTableColums: BasicColumn[] = [
width: 100,
},
{
title: 'RMB未收',
dataIndex: 'unchargedRMB',
title: 'RMB未付',
dataIndex: 'unpaidRMB',
width: 100,
},
{
title: 'USD未收',
dataIndex: 'unchargedUSD',
title: 'USD未付',
dataIndex: 'unpaidUSD',
width: 100,
},
{
title: '其他未收',
dataIndex: 'unchargedOther',
title: '其他未付',
dataIndex: 'unpaidOther',
width: 100,
},
{
@ -1013,18 +1013,18 @@ export const freeTableColums: BasicColumn[] = [
width: 100,
},
{
title: 'RMB未付',
dataIndex: 'unpaidRMB',
title: 'RMB未收',
dataIndex: 'unchargedRMB',
width: 100,
},
{
title: 'USD未付',
dataIndex: 'unpaidUSD',
title: 'USD未收',
dataIndex: 'unchargedUSD',
width: 100,
},
{
title: '其他未付',
dataIndex: 'unpaidOther',
title: '其他未收',
dataIndex: 'unchargedOther',
width: 100,
},
{
@ -1250,7 +1250,7 @@ export const freeSearchFormSchema: FormSchema[] = [
},
{
label: '船名',
field: 'vesselId',
field: 'vessel',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
@ -1260,7 +1260,7 @@ export const freeSearchFormSchema: FormSchema[] = [
api: GetVesselSelectList,
immediate: false,
labelField: 'vesselName',
valueField: 'id',
valueField: 'vesselName',
resultField: 'data'
}
}
@ -1271,23 +1271,6 @@ export const freeSearchFormSchema: FormSchema[] = [
colProps: { span: 4 },
component: 'Input'
},
{
label: '核算单位',
field: 'enterprise',
component: 'ApiSelect',
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: () => {
return {
api: GetClientListByCode,
labelField: 'pinYinCode',
showName: 'shortName',
valueField: 'id',
resultField: 'data',
immediate: false
}
}
},
]
export const freeTableDetailColums: BasicColumn[] = [
@ -1466,12 +1449,12 @@ export const freeColum: BasicColumn[] = [
},
{
title: '船名',
dataIndex: 'changeOrder',
dataIndex: 'vesselName',
width: 100,
},
{
title: '航次',
dataIndex: 'vesselName',
dataIndex: 'voyno',
width: 100,
},
{

2
src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue
Unescape Escape View File

@ -5,7 +5,7 @@
-->
<template>
<div>
<a-modal width="1500px" @cancel="openFlag = false" :visible="openFlag" title="添加收费结算明细" :footer="null">
<a-modal width="1500px" @cancel="openFlag = false" :visible="openFlag" title="添加付费结算明细" :footer="null">
<div style="padding-bottom: 25px;">
<a-spin :spinning="loading">
<BasicTable class="ds-table" @register="registerTable" @row-click="onRowClick">

62
src/views/operation/bill/columns.tsx
Unescape Escape View File

@ -6,7 +6,7 @@ export const billTypeData = [
{ value: 2, label: '已审核' },
]
import {
GetVouchingClerkList,GetIssueTypeSelectList,GetControllerClientList,GetVesselSelectList
GetVouchingClerkList,GetIssueTypeSelectList,GetControllerClientList,GetVesselSelectList,GetSaleList,GetCustomerServiceList
} from '/@/views/operation/seaexport/api/BookingLedger'
export const searchFormSchema: FormSchema[] = [
{
@ -57,6 +57,54 @@ export const searchFormSchema: FormSchema[] = [
}
},
},
{
label: '操作',
field: 'operator',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: GetCustomerServiceList,
labelField: 'pinYinCode',
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data',
onChange: (e, obj) => {
if (e && obj) {
}
if (!e && !obj) {
}
},
}
},
},
{
label: '销售',
field: 'sale',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: GetSaleList,
labelField: 'pinYinCode',
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data',
onChange: (e, obj) => {
if (e && obj) {
}
if (!e && !obj) {
}
},
}
},
},
{
field: 'issueType',
label: '签单方式',
@ -245,6 +293,12 @@ export const columns: BasicColumn[] = [
width: 100,
align: 'left',
},
{
title: '委托编号',
dataIndex: 'customerNo',
width: 100,
align: 'left',
},
{
title: '主单分单',
dataIndex: 'masterHBillName',
@ -269,6 +323,12 @@ export const columns: BasicColumn[] = [
width: 100,
align: 'left',
},
{
title: '操作',
dataIndex: 'operatorName',
width: 100,
align: 'left',
},
{
title: '结算方式',
dataIndex: 'stlName',

48
src/views/operation/invoiceApply/columns.tsx
Unescape Escape View File

@ -531,39 +531,41 @@ export const detailSearchFormSchema: FormSchema[] = [
{
field: 'saleDeptId',
label: '所属分部',
defaultValue: '',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: () => {
return {
api: GetOrgList,
resultField: 'data',
labelField: 'label',
valueField: 'id',
}
},
},
{
label: '操作',
field: 'operator',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: GetCustomerServiceList,
labelField: 'pinYinCode',
valueField: 'userName',
showName: 'userName',
allowClear: true,
showSearch: true,
immediate: false,
resultField: 'data',
onChange: (e, obj) => {
// {
// label: '操作',
// field: 'operator',
// component: 'ApiSelect',
// required: false,
// dynamicDisabled: false,
// colProps: { span: 4 },
// componentProps: ({ formModel }) => {
// return {
// api: GetCustomerServiceList,
// labelField: 'pinYinCode',
// valueField: 'userName',
// showName: 'userName',
// allowClear: true,
// showSearch: true,
// immediate: false,
// resultField: 'data',
// onChange: (e, obj) => {
// }
// }
// },
// },
}
}
},
},
]

2
src/views/operation/invoiceApply/detail/feeTable.vue
Unescape Escape View File

@ -12,7 +12,7 @@
添加发票明细
</a-button>
<a-popconfirm title="确定要删除勾选的数据?" ok-text="确定" cancel-text="取消" @confirm="deleteRow">
<a-button style="margin: 0 10px;" type="link">
<a-button v-if="resData.status!=2 && resData.status!=4" style="margin: 0 10px;" type="link">
<span class="iconfont icon-shanchu1"></span>
删除发票明细
</a-button>

16
src/views/operation/invoiceIssue/columns.tsx
Unescape Escape View File

@ -28,19 +28,19 @@ const FeeRangeList = [
]
export const searchFormSchema: FormSchema[] = [
{
field: 'applicationNO',
field: 'mblno:hblno:bookingNO:customerNo',
label: '编号检索',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'applicationNO',
field: 'InvoiceHeader',
label: '购方抬头',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'createByName',
field: 'orgName',
label: '销方公司',
component: 'Input',
colProps: { span: 4 },
@ -548,7 +548,7 @@ export const applySearch: FormSchema[] = [
colProps: { span: 4 },
},
{
field: 'applicationNO',
field: 'mblno:hblno:bookingNO:customerNo',
label: '编号',
component: 'Input',
colProps: { span: 4 },
@ -603,16 +603,14 @@ export const applySearch: FormSchema[] = [
{
label: '申请人',
component: 'Input',
field: 'feeType',
field: 'createByName',
colProps: { span: 4 },
width: 100,
},
{
label: '申请类型',
component: 'Input',
colProps: { span: 4 },
field: 'feeType',
width: 100,
},
]
@ -957,7 +955,7 @@ export const freeSearch: FormSchema[] = [
},
},
{
field: 'debitNo',
field: 'mblno:hblno:bookingNO:customerNo',
label: '编号检索',
component: 'Input',
show: true,
@ -1040,6 +1038,8 @@ export const freeSearch: FormSchema[] = [
return {
api: GetOrgList,
resultField: 'data',
labelField: 'label',
valueField: 'id',
}
},
},

Write Preview
Loading…
Cancel
Save