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
feature-JimuReport-1106-yjl
lijingjia 4 weeks ago
parent 5f3ac5831e 99c8af5a42
commit d4a617c485
21 changed files with 1174 additions and 809 deletions
Show Stats Download Patch File Download Diff File

2
index.html
Unescape Escape View File

@ -10,7 +10,7 @@
/>
<title><%= title %></title>
<link rel="icon" href="/favicon.ico" />
<link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_4lfn8xzlqbu.css" />
<link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_f5o40ewkj8b.css" />
</head>
<body>
<script>

73
src/components/File/index.vue
Unescape Escape View File

@ -15,21 +15,28 @@
ref="RefsUpload"
:file-list="upFileList"
:before-upload="beforeUpload"
:maxCount="maxCount"
:maxCount="1"
accept=".xlsm,.xlsx,.xls,.pdf,.txt,.pms,.jpeg,.png"
:rules="[{ required: true, message: '请上传文件！' }]"
@remove="handleRemove"
@change="ChangeUpload"
:showUploadList="false"
>
<a-button :disabled="props.id ? false : true">
<!-- <a-button :disabled="props.id ? false : true">
<span
class="iconfont icon-shujushangchuan-shixin"
:style="{ fontSize: '12px', marginRight: '5px' }"
></span>
选择文件
</a-button>
<p class="UploadText" v-if="props.id ? false : true">请先保存,再进行文件上传。</p> -->
<a-button>
<span
class="iconfont icon-shujushangchuan-shixin"
:style="{ fontSize: '12px', marginRight: '5px' }"
></span>
选择文件
</a-button>
<p class="UploadText" v-if="props.id ? false : true">请先保存,再进行文件上传。</p>
</a-upload>
</a-form-item>
</a-form>
@ -215,33 +222,37 @@
newFileList.splice(index, 1)
upFileList.value = newFileList
}
function ChangeUpload(e) {
const postData = new FormData()
const list = unref(upFileList)
list.forEach((item) => {
postData.append('formCollection[]', item)
})
postData.append('linkId', props.id)
postData.append('typeCode', formData.typeCode)
postData.append('typeName', formData.typeName)
loading.value = true
AddMultiFiles(postData)
.then((res) => {
loading.value = false
visible.value = false
upFileList.value = []
if (props.showFileList) {
dsFileList.value.init()
emits('handleSuccess', { id: res.data })
} else {
emits('handleSuccess')
}
createMessage.success('上传成功！')
})
.catch((res) => {
loading.value = false
createMessage.error('上传失败！')
})
async function ChangeUpload() {
let FnUp = (id) => {
const postData = new FormData()
const list = unref(upFileList)
// list.forEach((item) => {
// postData.append('formCollection[]', item)
// })
postData.append('formCollection', list[list.length - 1])
postData.append('linkId', id)
postData.append('typeCode', formData.typeCode)
postData.append('typeName', formData.typeName)
loading.value = true
AddMultiFiles(postData)
.then((res) => {
loading.value = false
visible.value = false
upFileList.value = []
if (props.showFileList) {
dsFileList.value.init()
emits('handleSuccess', { id: res.data })
} else {
emits('handleSuccess')
}
createMessage.success('上传成功！')
})
.catch((res) => {
loading.value = false
createMessage.error('上传失败！')
})
}
emits('FnUpload', FnUp)
}
function beforeUpload(file) {
// 判断文件大小
@ -282,7 +293,7 @@
// 附件列表组件
const dsFileList = ref(null)
const emits = defineEmits(['handleSuccess', 'FnTriggerSave'])
const emits = defineEmits(['handleSuccess', 'FnTriggerSave', 'FnUpload'])
// 提交上传
const handleOk = async () => {
const res = await fileForm.value.validateFields()

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

@ -86,12 +86,26 @@
</div> -->
</a-tab-pane>
<a-tab-pane key="2" tab="电子文档">
<!-- <DsFile
ref="dsFile"
fileType="infoclient"
:TriggerSave="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
:SetSelect="{
show: true,
}"
/> -->
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -356,12 +370,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_BuyCtn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -374,9 +410,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -91,9 +91,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -418,12 +422,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentIn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -436,9 +462,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -90,9 +90,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -355,12 +359,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOneWay',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false)
@ -374,9 +400,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

34
src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
Unescape Escape View File

@ -55,9 +55,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -301,12 +305,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOneWay',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false)
@ -319,9 +345,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -92,9 +92,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -430,12 +434,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false, true)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_RentOut',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -448,9 +474,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

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

@ -90,9 +90,13 @@
<DsFile
ref="dsFile"
fileType="infoclient"
:dynamicDisabled="3"
:TriggerSave="true"
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
}"
@ -406,12 +410,34 @@
}
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false, true)
if (rowId.value) {
dsFile.value.openFileModel()
}
}
function handleSuccess(data) {
const id = data.id.split('.')[0]
let ApiData: any = {
id: unref(rowId),
formName: 'CM_SellCtn',
tableName: '',
fileId: id,
}
ApiDealExcel(ApiData).then((res) => {
if (res.succeeded) {
activeKey.value = '1'
refresh(true)
notification.success({ message: res.message, duration: 3 })
}
})
}
async function DealExcel() {
if (!rowId.value) {
await handleSave(false, false)
@ -424,9 +450,11 @@
fileId: dsFile.value.dsFileList.SelectId,
}
ApiDealExcel(ApiData).then((res) => {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
if (res.succeeded) {
activeKey.value = '1'
refresh()
notification.success({ message: res.message, duration: 3 })
}
})
} else {
notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 })

7
src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
Unescape Escape View File

@ -64,6 +64,7 @@
:succinct="true"
:id="rowId"
@FnTriggerSave="FnTriggerSave"
@FnUpload="FnUpload"
@handleSuccess="handleSuccess"
:SetSelect="{
show: true,
@ -234,6 +235,12 @@
}
const dsFile = ref()
async function FnUpload(FnUp) {
if (!rowId.value) {
await handleSave(false)
}
FnUp(rowId.value)
}
async function FnTriggerSave() {
await handleSave(false)
if (rowId.value) {

20
src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue
Unescape Escape View File

@ -149,13 +149,13 @@
})
}
})
const AuditTypeList = ref<any>([])
GetTaskTypeConstList().then((res) => {
AuditTypeList.value.splice(0)
res.data.forEach((item) => {
AuditTypeList.value.push(item)
})
})
// const AuditTypeList = ref<any>([])
// GetTaskTypeConstList().then((res) => {
// AuditTypeList.value.splice(0)
// res.data.forEach((item) => {
// AuditTypeList.value.push(item)
// })
// })
watch(
() => node.users,
(newVal, oldVal) => {
@ -244,12 +244,12 @@
<el-radio label="single">或签（其中一名审批人通过或驳回即可）</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="method" label="执行人变更回调地址">
<!-- <el-form-item prop="method" label="执行人变更回调地址">
<el-input
type="textarea"
:rows="6"
placeholder="请输入内容"
v-model="node.MakerNotifyURL"
v-model="node.markerNotifyURL"
>
</el-input>
</el-form-item>
@ -266,7 +266,7 @@
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item prop="nobody" label="审批人为空">
<el-radio-group v-model="node.nobody">
<el-radio label="pass">自动通过</el-radio>

15
src/views/baseinfo/clientflowtemplate/TenantAuditStepModal.vue
Unescape Escape View File

@ -98,6 +98,9 @@
content: '',
permissionId: '',
columnView: '',
auditType: '',
markerNotifyURL: '',
callbackURL: '',
id: '',
})
const state = reactive({
@ -113,6 +116,9 @@
// await setFieldsValue(res.data)
ApiData.name = res.data.name
ApiData.note = res.data.note
ApiData.auditType = res.data.auditType.toString()
ApiData.markerNotifyURL = res.data.markerNotifyURL
ApiData.callbackURL = res.data.callbackURL
ApiData.content = res.data.content
ApiData.permissionId = res.data.permissionId
ApiData.columnView = res.data.columnView
@ -215,6 +221,9 @@
ApiData.name = ''
ApiData.note = ''
ApiData.auditType = ''
ApiData.markerNotifyURL = ''
ApiData.callbackURL = ''
ApiData.content = ''
ApiData.permissionId = ''
ApiData.columnView = ''
@ -256,6 +265,9 @@
ApiData.name = step1Values.name
ApiData.note = step1Values.note
ApiData.columnView = step1Values.columnView
ApiData.auditType = step1Values.auditType
ApiData.markerNotifyURL = step1Values.markerNotifyURL
ApiData.callbackURL = step1Values.callbackURL
if (step1Values.id) {
ApiData.id = step1Values.id
}
@ -377,6 +389,9 @@
notification.success({ message: res.message, duration: 3 })
ApiData.name = ''
ApiData.note = ''
ApiData.auditType = ''
ApiData.markerNotifyURL = ''
ApiData.callbackURL = ''
ApiData.content = ''
ApiData.permissionId = ''
ApiData.columnView = ''

102
src/views/baseinfo/clientflowtemplate/columns.tsx
Unescape Escape View File

@ -1,6 +1,6 @@
import { BasicColumn, FormSchema } from '/@/components/Table'
import { Tag } from 'ant-design-vue'
import { GetTablesByClient } from './api'
import { GetTablesByClient, GetTaskTypeConstList } from './api'
export const columns: BasicColumn[] = [
// {
@ -63,12 +63,12 @@ export const searchFormSchema: FormSchema[] = [
},
]
export const formSchema: FormSchema[] = [
{
field: 'divider-selects',
component: 'Divider',
label: '基本信息',
colProps: { span: 24 },
},
// {
// field: 'divider-selects',
// component: 'Divider',
// label: '基本信息',
// colProps: { span: 24 },
// },
{
label: '',
field: 'id',
@ -80,34 +80,21 @@ export const formSchema: FormSchema[] = [
field: 'name',
label: '模板名称',
component: 'Input',
colProps: { span: 12 },
colProps: { span: 5 },
},
{
field: 'orderNo',
label: '排序号',
component: 'InputNumber',
defaultValue: 0,
colProps: { span: 12 },
},
{
field: 'status',
label: '是否启用',
component: 'Switch',
colProps: { span: 6 },
defaultValue: 0,
componentProps: {
checkedChildren: '启用',
checkedValue: 0,
unCheckedChildren: '禁用',
unCheckedValue: 1,
},
colProps: { span: 5 },
},
{
field: 'columnView',
label: '关联表',
component: 'ApiSelect',
required: true,
colProps: { span: 12 },
colProps: { span: 5 },
componentProps: () => {
return {
allowClear: true,
@ -122,11 +109,78 @@ export const formSchema: FormSchema[] = [
}
},
},
{
field: 'status',
label: '是否启用',
component: 'Switch',
colProps: { span: 4 },
defaultValue: 0,
componentProps: {
checkedChildren: '启用',
checkedValue: 0,
unCheckedChildren: '禁用',
unCheckedValue: 1,
},
},
{
label: '审批类型',
field: 'auditType',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
colProps: { span: 5 },
componentProps: ({ formModel }) => {
return {
api: GetTaskTypeConstList,
labelField: 'key',
showName: 'key',
valueField: 'value',
resultField: 'data',
}
},
},
{
field: 'markerNotifyURL',
label: '执行人变更回调地址',
component: 'InputTextArea',
colProps: { span: 8 },
componentProps: {
rows: 3,
},
},
{
field: 'callbackURL',
label: '回调地址',
component: 'InputTextArea',
colProps: { span: 8 },
componentProps: {
rows: 3,
},
},
{
field: 'note',
label: '备注',
component: 'InputTextArea',
colProps: { span: 20 },
colProps: { span: 8 },
componentProps: {
rows: 3,
},
},
{
label: '',
field: 'Space1',
component: 'Space',
colProps: {
span: 24,
},
},
{
label: '',
field: 'Space2',
component: 'Space',
colProps: {
span: 24,
},
},
]
export const permissionFormSchema: FormSchema[] = [

8
src/views/bookingcabin/CabinManagement/api.ts
Unescape Escape View File

@ -188,4 +188,12 @@ export function SaveRolling(parameter) {
method: 'post',
data: parameter
})
}
export function GetRollingList(parameter) {
return request<DataResult>({
url: '/opApi/BookingSlotService/GetRollingList',
method: 'get',
params: parameter
})
}

8
src/views/bookingcabin/CabinManagement/detail/index.vue
Unescape Escape View File

@ -294,7 +294,7 @@ import { GetCtnSelectList, GetClientListByCode } from '/@/api/common'
import DsFile from '/@/components/File/index.vue'
import { ref, nextTick, onMounted, watch } from 'vue'
import {
BookingSlotSave, BookingSlotDetail, SaveRolling
BookingSlotSave, BookingSlotDetail, SaveRolling,GetRollingList
} from '../api'
import {
GetCustomerServiceList, GetSaleList, GetVouchingClerkList
@ -740,6 +740,11 @@ function getDetail() {
}
loading.value = false
})
GetRollingList({ slotId: id.value }).then(res=>{
if(res.succeeded){
setTableData(res.data)
}
})
}
const rollLoad = ref(false)
function handleSaveRoll(){
@ -932,6 +937,7 @@ function handleClick(item) {
item.ctnNum = 1
})
}
// 比较对象
function compareObjects(oldObj, newObj) {
const differences = {};

2
src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
Unescape Escape View File

@ -139,7 +139,7 @@
const calcSelectedAmount = computed(() => {
let totalAmount = 0
totalAmount = [...props.hasSelectedRows, ...getSelectRows()].reduce((pre, cur) => {
return plus(pre + Number(cur?.totalAmount || 0))
return plus(pre + Number(cur?.totalWithTax || 0))
}, 0)
return numberThousandFormat(totalAmount)
})

7
src/views/financialTax/expenseAccount/detail/index.vue
Unescape Escape View File

@ -154,7 +154,7 @@
const calcSumAmount = computed(() => {
return billTableData.value?.reduce((acc, cur) => {
return plus(acc, cur?.amount || 0)
return plus(acc, cur?.totalWithTax || 0)
}, 0)
})
@ -218,9 +218,12 @@
// 获取额外Query参数
const getActionExtraQuery = (index) => {
const obj = appStore.getIdsData
console.log('expenseAccount', obj['expenseAccount'])
console.log('index', index)
if (obj && obj['expenseAccount']) {
const preData = obj['expenseAccount'][index]
const pageType = [0, 2, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW'
const pageType = [0, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW'
return {
type: pageType,

4
src/views/financialTax/expenseAccount/index.vue
Unescape Escape View File

@ -119,7 +119,7 @@
}
const getActionOptList = (record: BillItem): ActionItem[] => {
const canEditable = [0, 2, 4].includes(record.reimbursementType)
const canEditable = [0, 4].includes(record.reimbursementType)
return [
{
customIcon: h('i', {
@ -173,7 +173,7 @@
})
}
function GoDetailed(row: BillItem) {
const pageType = [0, 2, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW'
const pageType = [0, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW'
go({
path: '/expenseAccountDetail',
query: {

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

@ -215,6 +215,12 @@ export const columns: BasicColumn[] = [
width: 100,
align: 'left',
},
{
title: '分单号',
dataIndex: 'hblNo',
width: 100,
align: 'left',
},
{
title: '提单签发状态',
dataIndex: 'statusName',
@ -222,11 +228,29 @@ export const columns: BasicColumn[] = [
align: 'left',
},
{
title: '签单方式',
title: '提单类型',
dataIndex: 'blTypeName',
width: 100,
align: 'left',
},
{
title: '业务类型',
dataIndex: 'busiTypeName',
width: 100,
align: 'left',
},
{
title: '签单方式',
dataIndex: 'issueType',
width: 100,
align: 'left',
},
{
title: '主单分单',
dataIndex: 'masterHBillName',
width: 100,
align: 'left',
},
{
title: '最近操作人',
dataIndex: 'updateUserName',
@ -247,7 +271,7 @@ export const columns: BasicColumn[] = [
},
{
title: '结算方式',
dataIndex: 'createByName',
dataIndex: 'stlName',
width: 100,
align: 'left',
},
@ -299,12 +323,6 @@ export const columns: BasicColumn[] = [
width: 100,
align: 'left',
},
{
title: '业务类型',
dataIndex: 'busiTypeName',
width: 100,
align: 'left',
},
{
title: '起运港',
dataIndex: 'loadPort',
@ -397,31 +415,31 @@ export const detailColumns: BasicColumn[] = [
{
title: '操作人',
dataIndex: 'createUserName',
width: 100,
width: 80,
align: 'left',
},
{
title: '操作时间',
dataIndex: 'createTime',
width: 120,
width: 130,
align: 'left',
},
{
title: '动作',
dataIndex: 'actionName',
width: 100,
width: 80,
align: 'left',
},
{
title: '结果',
dataIndex: 'result',
width: 50,
width: 45,
align: 'left',
},
{
title: '备注',
dataIndex: 'note',
width: 100,
width: 90,
align: 'left',
},
]
@ -435,17 +453,17 @@ export const feeColumns: BasicColumn[] = [
{
title: 'RMB应收欠费(超期)',
dataIndex: 'noPayAmountCNY',
width: 140,
width: 130,
},
{
title: 'USD应收欠费(超期)',
dataIndex: 'noPayAmountUSD',
width: 140,
width: 130,
},
{
title: '合计应收欠费(超期)',
dataIndex: 'noPayAmountTotal',
width: 140,
width: 130,
},

1402
src/views/operation/bill/index.vue
View File

File diff suppressed because it is too large Load Diff

48
src/views/system/org/columns.tsx
Unescape Escape View File

@ -491,8 +491,8 @@ export const BankColumns: BasicColumn[] = [
align: 'left',
},
{
title: '银行名称2',
dataIndex: 'bankName2',
title: '英文银行名称',
dataIndex: 'bankEnName',
width: 230,
align: 'left',
},
@ -508,6 +508,12 @@ export const BankColumns: BasicColumn[] = [
width: 230,
align: 'left',
},
{
title: '英文银行地址',
dataIndex: 'bankEnAddress',
width: 230,
align: 'left',
},
{
title: 'ABA代码',
dataIndex: 'aba',
@ -520,6 +526,12 @@ export const BankColumns: BasicColumn[] = [
width: 230,
align: 'left',
},
{
title: '英文户头名称',
dataIndex: 'accountEnName',
width: 230,
align: 'left',
},
{
title: '科目代码',
dataIndex: 'subjectCode',
@ -629,6 +641,15 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
{
label: '英文银行名称',
field: 'bankEnName',
component: 'Input',
defaultValue: '',
colProps: {
span: 12,
},
},
{
label: '银行账户',
field: 'bankAccountNo',
@ -638,6 +659,16 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
{
label: 'ABA代码',
field: 'aba',
component: 'Input',
defaultValue: '',
colProps: {
span: 12,
},
},
{
label: '银行地址',
field: 'bankAddress',
@ -648,8 +679,8 @@ export const BankformSchema: FormSchema[] = [
},
},
{
label: 'ABA代码',
field: 'aba',
label: '英文银行地址',
field: 'bankEnAddress',
component: 'Input',
defaultValue: '',
colProps: {
@ -665,6 +696,15 @@ export const BankformSchema: FormSchema[] = [
span: 12,
},
},
{
label: '英文户头名称',
field: 'accountEnName',
component: 'Input',
defaultValue: '',
colProps: {
span: 12,
},
},
{
label: '科目代码',
field: 'subjectCode',

21
src/views/taskmanage/index.vue
Unescape Escape View File

@ -1593,7 +1593,7 @@ function laraRecordFun() {
function expandIcon(props) {
if (props.record.childTaskCount > 0) {
return h('div', { class: 'expDiv', onClick: (e) => props.onExpand(props.record, e) },
[h('i', { class: 'iconfont icon-piliangxiaxian iconExp' }),
[h('i', { class: 'iconfont icon-zirenwu iconExp' }),
h('div', { class: 'expNum' }, props.record.childTaskCount)])
}
}
@ -1636,8 +1636,21 @@ function handleClickTree(row, index) {
item.active = false
})
taskType.value = ''
console.log(arr1)
setColumns(arr1)
const arr = [] as any
columsAll.value.forEach((item) => {
if (item.taskTypeCode === 'BASIC') {
JSON.parse(item.content).forEach((item) => {
if (item.checked) {
arr.push(item)
}
})
}
})
if (arr.length == 0) {
setColumns(columns)
} else {
setColumns(arr)
}
}
reload()
@ -1987,7 +2000,7 @@ function handleClickTree(row, index) {
width: 15px;
}
:deep(.ant-table-tbody .ant-table-row td){
:deep(.ant-table-tbody .ant-table-row td) {
border-right: 1px solid #f0f0f0 !important;
text-align: center;
}

Write Preview
Loading…
Cancel
Save