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 3 months ago
parent ca5e2ad560 c6fb743a27
commit 495d14fbd8
18 changed files with 1642 additions and 1334 deletions
Show Stats Download Patch File Download Diff File

8
src/components/Form/src/Ds/components/DEdit.vue
Unescape Escape View File

@ -11,6 +11,7 @@
import { useAttrs } from '/@/hooks/core/useAttrs'
import { useI18n } from '/@/hooks/web/useI18n'
import { useAppStore } from '/@/store/modules/app'
import dayjs from 'dayjs'
const appStore = useAppStore()
type OptionsItem = { label: string; value: string; disabled?: boolean }
export default defineComponent({
@ -50,7 +51,9 @@
const attrs = useAttrs()
const { t } = useI18n()
const [state] = useRuleFormItem(props, 'value', 'change')
function isDate(value) {
return value instanceof Date || Object.prototype.toString.call(value) === '[object Date]'
}
function GetState() {
let RData: any = null
if (state.value) {
@ -78,6 +81,8 @@
RData = item[props.labelField]
}
})
} else if (state.value.$d && state.value.$isDayjsObject) {
RData = dayjs(state.value.$d).format('YYYY-MM-DD')
} else {
if (props.label == '来源明细') {
appStore.getSourceData.forEach((item) => {
@ -105,6 +110,7 @@
function CilckEdit() {
emit('edit')
}
return { attrs, t, showTooltip, props, state, CilckEdit, GetState }
},
})

95
src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
Unescape Escape View File

@ -279,69 +279,60 @@
})
}
async function MakeFee() {
if (rowId.value) {
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
await handleSave(false)
MakeFee()
}
await handleSave(false)
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/BuyCtn/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

95
src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
Unescape Escape View File

@ -290,69 +290,60 @@
})
}
async function MakeFee() {
if (rowId.value) {
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
await handleSave(false)
MakeFee()
}
await handleSave(false)
ApiMakeFee({ id: rowId.value }).then((res) => {
emit('success')
notification.success({ message: res.message, duration: 3 })
})
}
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/CtnScrap/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

95
src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
Unescape Escape View File

@ -292,69 +292,60 @@
})
}
async function MakeFee() {
if (rowId.value) {
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
await handleSave(false)
MakeFee()
}
await handleSave(false)
ApiMakeFee({ id: rowId.value }).then((res) => {
emit('success')
notification.success({ message: res.message, duration: 3 })
})
}
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/RentIn/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

82
src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
Unescape Escape View File

@ -286,59 +286,53 @@
// })
// }
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/RentOneWay/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

95
src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
Unescape Escape View File

@ -310,69 +310,60 @@
})
}
async function MakeFee() {
if (rowId.value) {
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
await handleSave(false)
MakeFee()
}
await handleSave(false)
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach(async (e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach(async (e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/RentOut/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

95
src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
Unescape Escape View File

@ -290,69 +290,60 @@
})
}
async function MakeFee() {
if (rowId.value) {
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
await handleSave(false)
MakeFee()
}
await handleSave(false)
ApiMakeFee({ id: rowId.value }).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
}
async function Confirm() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiConfirm(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Confirm()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function Cancel() {
if (rowId.value) {
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
await handleSave(false)
let type: boolean = true
let ApiData: any = {
id: rowId.value,
ids: [],
}
list.value.forEach((e: any, i) => {
if (e.selected) {
if (e.id) {
ApiData.ids.push(e.id)
} else {
type = false
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
})
} else {
notification.success({ message: '请先保存明细表', duration: 3 })
}
})
if (type) {
ApiCancel(ApiData).then((res) => {
notification.success({ message: res.message, duration: 3 })
emit('success')
})
} else {
await handleSave(false)
Cancel()
notification.success({ message: '请先保存明细表', duration: 3 })
}
}
async function handleSave(exit) {

2
src/views/ContainerManagement/SellCtn/index.vue
Unescape Escape View File

@ -113,6 +113,7 @@
})
}
ApiConfirm(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}
@ -131,6 +132,7 @@
})
}
ApiCancel(ApiData).then((res) => {
reload()
notification.success({ message: res.message, duration: 3 })
})
}

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

@ -180,23 +180,6 @@ export const EditformSchema: FormSchema[] = [
}
},
},
{
field: 'ediCode',
label: 'EDI代码',
component: 'DEdit',
defaultValue: '',
colProps: { span: 4 },
componentProps: (e) => {
return {
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
},
}
},
},
{
field: 'organizationCode',
label: '社会信用代码',
@ -243,46 +226,13 @@ export const EditformSchema: FormSchema[] = [
},
},
{
field: 'pcorpName',
label: '所属集团名称',
component: 'DEdit',
defaultValue: '',
show: false,
},
{
field: 'pcorpId',
label: '所属集团',
field: 'ediCode',
label: 'EDI代码',
component: 'DEdit',
defaultValue: '',
colProps: { span: 4 },
componentProps: (e) => {
const { formModel } = e
return {
treeData: OrgTree,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e) => {
if (e) {
const ForTree = (data, key, callback) => {
for (let i = 0; i < data.length; i++) {
if (data[i].value == key) {
return callback(data[i], i, data)
}
if (data[i].children) {
ForTree(data[i].children, key, callback)
}
}
}
let obj: any = {}
ForTree(OrgTree, e, (item, index, arr) => {
obj = item
})
formModel.pcorpName = obj.title
}
},
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
@ -290,6 +240,7 @@ export const EditformSchema: FormSchema[] = [
}
},
},
{
field: 'Divider1',
component: 'Divider',
@ -482,22 +433,22 @@ export const EditformSchema: FormSchema[] = [
},
},
{
label: '操作人Name',
field: 'operatorName',
label: '客服Name',
field: 'customerServiceName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'operatorId',
label: '操作人',
field: 'customerService',
label: '客服',
component: 'DEdit',
colProps: { span: 4 },
defaultValue: '',
componentProps: (e) => {
const { formModel } = e
return {
options: OperatorUserList,
options: CustomerServiceList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -505,12 +456,12 @@ export const EditformSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.operatorId = obj.value
formModel.operatorName = obj.label
formModel.customerService = obj.value
formModel.customerServiceName = obj.label
}
if (!e && !obj) {
formModel.operatorId = ''
formModel.operatorName = ''
formModel.customerService = ''
formModel.customerServiceName = ''
}
},
onEdit: () => {
@ -521,22 +472,22 @@ export const EditformSchema: FormSchema[] = [
},
},
{
label: '单证Name',
field: 'docName',
label: '操作人Name',
field: 'operatorName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'doc',
label: '单证',
field: 'operatorId',
label: '操作人',
component: 'DEdit',
colProps: { span: 4 },
defaultValue: '',
componentProps: (e) => {
const { formModel } = e
return {
options: VouchingClerkList,
options: OperatorUserList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -544,12 +495,12 @@ export const EditformSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.doc = obj.value
formModel.docName = obj.label
formModel.operatorId = obj.value
formModel.operatorName = obj.label
}
if (!e && !obj) {
formModel.doc = ''
formModel.docName = ''
formModel.operatorId = ''
formModel.operatorName = ''
}
},
onEdit: () => {
@ -560,22 +511,22 @@ export const EditformSchema: FormSchema[] = [
},
},
{
label: '客服Name',
field: 'customerServiceName',
label: '单证Name',
field: 'docName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'customerService',
label: '客服',
field: 'doc',
label: '单证',
component: 'DEdit',
colProps: { span: 4 },
defaultValue: '',
componentProps: (e) => {
const { formModel } = e
return {
options: CustomerServiceList,
options: VouchingClerkList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -583,12 +534,12 @@ export const EditformSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.customerService = obj.value
formModel.customerServiceName = obj.label
formModel.doc = obj.value
formModel.docName = obj.label
}
if (!e && !obj) {
formModel.customerService = ''
formModel.customerServiceName = ''
formModel.doc = ''
formModel.docName = ''
}
},
onEdit: () => {
@ -598,6 +549,7 @@ export const EditformSchema: FormSchema[] = [
}
},
},
{
field: 'commissionUserId',
label: '提成参与人',
@ -707,21 +659,21 @@ export const EditformSchema: FormSchema[] = [
}
},
},
{
field: 'unitPrice',
label: '冷藏费率',
component: 'DEdit',
defaultValue: '',
colProps: { span: 4 },
componentProps: (e) => {
return {
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
},
}
},
},
// {
// field: 'unitPrice',
// label: '冷藏费率',
// component: 'DEdit',
// defaultValue: '',
// colProps: { span: 4 },
// componentProps: (e) => {
// return {
// onEdit: () => {
// const { formActionType } = e
// formActionType ? formActionType.linkageForm(e) : null
// },
// }
// },
// },
{
field: 'commissionRate',
label: '提成比例',
@ -813,4 +765,52 @@ export const EditformSchema: FormSchema[] = [
}
},
},
{
field: 'pcorpName',
label: '所属集团名称',
component: 'DEdit',
defaultValue: '',
show: false,
},
{
field: 'pcorpId',
label: '所属集团',
component: 'DEdit',
defaultValue: '',
colProps: { span: 4 },
componentProps: (e) => {
const { formModel } = e
return {
treeData: OrgTree,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e) => {
if (e) {
const ForTree = (data, key, callback) => {
for (let i = 0; i < data.length; i++) {
if (data[i].value == key) {
return callback(data[i], i, data)
}
if (data[i].children) {
ForTree(data[i].children, key, callback)
}
}
}
let obj: any = {}
ForTree(OrgTree, e, (item, index, arr) => {
obj = item
})
formModel.pcorpName = obj.title
}
},
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
},
}
},
},
]

4
src/views/baseinfo/infoclient/TenantAuditStepModal.vue
Unescape Escape View File

@ -262,7 +262,7 @@
}
})
if (item.field == 'overdueDays') {
if (item.field == 'pcorpId') {
appendSchemaByField(
{
field: 'Divider5',
@ -273,7 +273,7 @@
class: 'infoclientDivider',
},
},
'overdueDays',
'pcorpId',
)
}
}

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

@ -174,8 +174,8 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '所属分部',
dataIndex: 'saleOrgIdList',
title: '分公司',
dataIndex: 'saleOrgId',
sorter: true,
width: 150,
customRender: ({ text }) => {
@ -433,12 +433,6 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
colProps: { span: 4 },
},
{
field: 'orderNo',
label: '财务序号',
component: 'Input',
colProps: { span: 4 },
},
{
field: 'registrationNo',
@ -527,15 +521,6 @@ export const formSchema: FormSchema[] = [
},
colProps: { span: 4 },
},
{
field: 'ediCode',
label: 'EDI代码',
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'organizationCode',
label: '社会信用代码',
@ -558,40 +543,13 @@ export const formSchema: FormSchema[] = [
colProps: { span: 4 },
},
{
field: 'pcorpName',
label: '所属集团名称',
field: 'ediCode',
label: 'EDI代码',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'pcorpId',
label: '所属集团',
defaultValue: '',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: GetAllClientList,
labelField: 'shortName',
valueField: 'id',
resultField: 'data',
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e, obj) => {
if (e && obj) {
formModel.pcorpId = obj.value
formModel.pcorpName = obj.label
}
if (!e && !obj) {
formModel.pcorpId = ''
formModel.pcorpName = ''
}
},
}
},
},
// {
// field: 'pcorpId',
// label: '所属集团',
@ -762,21 +720,21 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '操作人Name',
field: 'operatorName',
label: '',
field: 'customerServiceName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'operatorId',
label: '操作人',
field: 'customerService',
label: '客服',
component: 'Select',
colProps: { span: 4 },
defaultValue: '',
componentProps: ({ formModel }) => {
return {
options: OperatorUserList,
options: CustomerServiceList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -784,33 +742,33 @@ export const formSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.operatorId = obj.value
formModel.operatorName = obj.label
formModel.customerService = obj.value
formModel.customerServiceName = obj.label
}
if (!e && !obj) {
formModel.operatorId = ''
formModel.operatorName = ''
formModel.customerService = ''
formModel.customerServiceName = ''
}
},
}
},
},
{
label: '',
field: 'docName',
label: '操作人Name',
field: 'operatorName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'doc',
label: '单证',
field: 'operatorId',
label: '操作人',
component: 'Select',
colProps: { span: 4 },
defaultValue: '',
componentProps: ({ formModel }) => {
return {
options: VouchingClerkList,
options: OperatorUserList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -818,12 +776,12 @@ export const formSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.doc = obj.value
formModel.docName = obj.label
formModel.operatorId = obj.value
formModel.operatorName = obj.label
}
if (!e && !obj) {
formModel.doc = ''
formModel.docName = ''
formModel.operatorId = ''
formModel.operatorName = ''
}
},
}
@ -831,20 +789,20 @@ export const formSchema: FormSchema[] = [
},
{
label: '',
field: 'customerServiceName',
field: 'docName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'customerService',
label: '客服',
field: 'doc',
label: '单证',
component: 'Select',
colProps: { span: 4 },
defaultValue: '',
componentProps: ({ formModel }) => {
return {
options: CustomerServiceList,
options: VouchingClerkList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
@ -852,17 +810,18 @@ export const formSchema: FormSchema[] = [
},
onChange: (e, obj) => {
if (e && obj) {
formModel.customerService = obj.value
formModel.customerServiceName = obj.label
formModel.doc = obj.value
formModel.docName = obj.label
}
if (!e && !obj) {
formModel.customerService = ''
formModel.customerServiceName = ''
formModel.doc = ''
formModel.docName = ''
}
},
}
},
},
{
field: 'commissionUserId',
label: '提成参与人',
@ -991,13 +950,13 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'unitPrice',
label: '冷藏费率',
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
// {
// field: 'unitPrice',
// label: '冷藏费率',
// component: 'Input',
// defaultValue: '',
// colProps: { span: 4 },
// },
{
field: 'commissionRate',
label: '提成比例',
@ -1085,6 +1044,41 @@ export const formSchema: FormSchema[] = [
return !values.isOverdueDeduction
},
},
{
field: 'pcorpName',
label: '所属集团名称',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'pcorpId',
label: '所属集团',
defaultValue: '',
component: 'ApiSelect',
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
api: GetAllClientList,
labelField: 'shortName',
valueField: 'id',
resultField: 'data',
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e, obj) => {
if (e && obj) {
formModel.pcorpId = obj.value
formModel.pcorpName = obj.label
}
if (!e && !obj) {
formModel.pcorpId = ''
formModel.pcorpName = ''
}
},
}
},
},
// {
// field: 'auditStatus',
// label: '审批状态',
@ -1174,7 +1168,7 @@ export const formSchema: FormSchema[] = [
},
{
field: 'saleOrgId',
label: '所属分部',
label: '分公司',
component: 'Select',
colProps: { span: 8 },
componentProps: ({ formModel }) => {
@ -1275,13 +1269,6 @@ export const formSchema2: FormSchema[] = [
defaultValue: '',
colProps: { span: 8 },
},
{
field: 'orderNo',
label: '财务序号',
component: 'Input',
defaultValue: '',
colProps: { span: 8 },
},
]
export const form3columns: BasicColumn[] = [
@ -1316,12 +1303,12 @@ export const form3columns: BasicColumn[] = [
width: 200,
},
{
title: '账期类型',
title: '账期',
dataIndex: 'accountType',
width: 200,
},
{
title: '账期标准',
title: '账期起算标准',
dataIndex: 'accountStartDate',
width: 200,
},

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

@ -27,7 +27,7 @@ if (FnbusinessType.length) {
ListData.businessType.push({ label: e.name, value: e.value })
})
}
// 账期类型 字典
// 账期 字典
const accountTypeList = await getDictOption('infoclient_business_accountType')
function RaccountTypeLabel(values) {
let RData = ''
@ -39,7 +39,7 @@ function RaccountTypeLabel(values) {
return RData
}
// 账期标准 字典
// 账期起算标准 字典
const accountStartDateList = await getDictOption('infoclient_business_accountStartDate')
export const columns: BasicColumn[] = [
{
@ -95,7 +95,7 @@ export const columns: BasicColumn[] = [
},
},
{
title: '账期类型',
title: '账期',
dataIndex: 'accountType',
width: 200,
customRender: ({ text }) => {
@ -109,7 +109,7 @@ export const columns: BasicColumn[] = [
},
},
{
title: '账期标准',
title: '账期起算标准',
dataIndex: 'accountStartDate',
width: 200,
customRender: ({ text }) => {
@ -188,6 +188,14 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
show: false,
},
{
field: 'contractId',
label: '合同Id',
component: 'Input',
colProps: { span: 12 },
defaultValue: '',
show: false,
},
{
field: 'businessType',
label: '业务类型',
@ -256,33 +264,10 @@ export const formSchema: FormSchema[] = [
style: 'width:100%',
},
},
{
field: 'accountType',
label: '账期类型',
required: true,
component: 'Select',
colProps: { span: 12 },
defaultValue: '',
componentProps: ({ formModel }) => {
return {
options: accountTypeList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: () => {
formModel.accountMonth = 1
formModel.accountDays = 1
formModel.accountFirstHalf = 1
formModel.accountSecondHalf = 16
},
}
},
},
{
field: 'accountStartDate',
label: '账期标准',
label: '账期起算标准',
component: 'Select',
colProps: { span: 12 },
defaultValue: '',
@ -310,7 +295,62 @@ export const formSchema: FormSchema[] = [
colProps: { span: 12 },
defaultValue: '',
},
{
field: 'note',
label: '备注',
component: 'Input',
colProps: { span: 24 },
componentProps: {
rows: 2,
},
},
{
field: 'isSpecial',
label: '特批放单客户',
component: 'Switch',
colProps: { span: 12 },
componentProps: {
checkedChildren: '是',
unCheckedChildren: '否',
},
},
{
field: 'status',
label: '是否可用',
component: 'Switch',
defaultValue: 0,
colProps: { span: 12 },
componentProps: {
checkedChildren: '是',
checkedValue: 0,
unCheckedChildren: '否',
unCheckedValue: 1,
},
},
{
field: 'accountType',
label: '账期',
required: true,
component: 'Select',
colProps: { span: 12 },
defaultValue: '',
componentProps: ({ formModel }) => {
return {
options: accountTypeList,
allowClear: true,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: () => {
formModel.accountMonth = 1
formModel.accountDays = 1
formModel.accountFirstHalf = 1
formModel.accountSecondHalf = 16
},
}
},
},
{
field: 'accountMonth',
label: '间隔月份',
@ -385,44 +425,4 @@ export const formSchema: FormSchema[] = [
max: 31,
},
},
{
field: 'contractId',
label: '合同Id',
component: 'Input',
colProps: { span: 12 },
defaultValue: '',
show: false,
},
{
field: 'note',
label: '备注',
component: 'Input',
colProps: { span: 12 },
componentProps: {
rows: 2,
},
},
{
field: 'isSpecial',
label: '特批放单客户',
component: 'Switch',
colProps: { span: 12 },
componentProps: {
checkedChildren: '是',
unCheckedChildren: '否',
},
},
{
field: 'status',
label: '是否可用',
component: 'Switch',
defaultValue: 0,
colProps: { span: 12 },
componentProps: {
checkedChildren: '是',
checkedValue: 0,
unCheckedChildren: '否',
unCheckedValue: 1,
},
},
]

1900
src/views/operation/invoiceApply/detail/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save