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

引入优化

Browse Source
zth
lijingjia 2 weeks ago
parent fee1f34290 c5f24f145e
commit 9fed2fcd3c
7 changed files with 499 additions and 615 deletions
Show Stats Download Patch File Download Diff File

2
src/components/Cropper/src/CropperAvatar.vue
Unescape Escape View File

@ -145,7 +145,7 @@
cursor: pointer;
transition: opacity 0.4s;
::v-deep(svg) {
:deep(svg) {
margin: auto;
}
}

2
src/layouts/default/header/components/notify/NoticeList.vue
Unescape Escape View File

@ -144,7 +144,7 @@
display: none;
}
::v-deep(.ant-pagination-disabled) {
:deep(.ant-pagination-disabled) {
display: inline-block !important;
}

12
src/views/bookingcabin/CabinInventory/index.vue
Unescape Escape View File

@ -19,18 +19,10 @@
<span>{{ record.totalOrders - record.useNum }}</span>
</template>
<template v-if="column.dataIndex == 'isRecvBC'">
<BulbFilled
style="color: green; font-size: 16px"
:title="record.lstRecvBCDate"
v-if="record.isRecvBC"
/>
<BulbFilled style="color: green; font-size: 16px" :title="record.lstRecvBCDate" v-if="record.isRecvBC" />
</template>
<template v-if="column.dataIndex == 'isRecvBKCancel'">
<BulbFilled
style="color: red; font-size: 16px"
:title="record.lstRecvBCDate"
v-if="record.isRecvBKCancel"
/>
<BulbFilled style="color: red; font-size: 16px" :title="record.lstRecvBCDate" v-if="record.isRecvBKCancel" />
</template>
<template v-if="column.dataIndex == 'isShipperOwned'">
<CheckCircleFilled v-if="record.isShipperOwned" style="color: green; font-size: 16px" />

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

@ -10,17 +10,12 @@
<span class="iconfont icon-shujuyingshe"></span>
合票
</a-button>
<a-upload
:customRequest="customRequest"
:multiple="false"
<a-upload :customRequest="customRequest" :multiple="false"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
:showUploadList="false"
name="file"
>
:showUploadList="false" name="file">
<a-button size="mini" type="link">
<span class="iconfont icon-a-17Fdaoru"></span>
导入</a-button
>
导入</a-button>
</a-upload>
<a-button type="link" @click="handleSuport" :loading="loadingExport" size="mini">
<span class="iconfont icon-jiantouxia"></span>
@ -36,12 +31,7 @@
<span class="iconfont icon-jiahao2fill"></span>
新增
</a-button>
<a-popconfirm
title="确定删除吗?"
ok-text="确定"
cancel-text="取消"
@confirm="handleDeleteAll"
>
<a-popconfirm title="确定删除吗?" ok-text="确定" cancel-text="取消" @confirm="handleDeleteAll">
<a-button type="link" size="mini">
<span class="iconfont icon-shanchu2"></span>
删除
@ -67,44 +57,27 @@
<span>{{ record.shipRateTotalCurrency }} {{ record.shipRateTotalAmount }}</span>
</template>
<template v-if="column.dataIndex == 'iS_CANCELLATION'">
<BulbOutlined
v-if="record.iS_CANCELLATION"
style="color: red; font-size: 16px"
:title="record.cancellatioN_DATE"
/>
<BulbOutlined v-if="record.iS_CANCELLATION" style="color: red; font-size: 16px"
:title="record.cancellatioN_DATE" />
</template>
<template v-if="column.dataIndex == 'isRecvBC'">
<BulbFilled
style="color: green; font-size: 16px"
:title="record.lstRecvBCDate"
v-if="record.isRecvBC"
/>
<BulbFilled style="color: green; font-size: 16px" :title="record.lstRecvBCDate" v-if="record.isRecvBC" />
</template>
<template v-if="column.dataIndex == 'labelList'">
<div @click="handleLabelBind(record)" style="min-width: 200px; min-height: 15px">
<a-tag
style="color: black !important; font-weight: bold; cursor: pointer"
:color="item.color"
@click="handleLabelBind(record)"
v-for="(item, index) in record.labelList"
:key="index"
>{{ item.name }}</a-tag
>
<a-tag style="color: black !important; font-weight: bold; cursor: pointer" :color="item.color"
@click="handleLabelBind(record)" v-for="(item, index) in record.labelList" :key="index">{{ item.name
}}</a-tag>
</div>
</template>
<template v-if="column.dataIndex == 'isRecvBKCancel'">
<BulbFilled
style="color: red; font-size: 16px"
:title="record.lstRecvBCDate"
v-if="record.isRecvBKCancel"
/>
<BulbFilled style="color: red; font-size: 16px" :title="record.lstRecvBCDate" v-if="record.isRecvBKCancel" />
</template>
<template v-if="column.dataIndex == 'isShipperOwned'">
<CheckCircleFilled v-if="record.isShipperOwned" style="color: green; font-size: 16px" />
</template>
<template v-if="column.key === 'action'">
<TableAction
:actions="[
<TableAction :actions="[
{
icon: 'clarity:note-edit-line',
tooltip: '编辑',
@ -129,40 +102,22 @@
handleOpenSlot(record)
},
},
]"
/>
]" />
</template>
</template>
</BasicTable>
<a-modal
width="800px"
@ok="handleSubmitLabel"
:visible="visible"
title="分配标签"
@cancel="visible = false"
>
<a-modal width="800px" @ok="handleSubmitLabel" :visible="visible" title="分配标签" @cancel="visible = false">
<a-spin :spinning="labelLoad">
<div class="content">
<div
class="items"
v-for="(serive, sindex) in labelList"
:key="sindex"
@click="handleClickLable(sindex)"
:class="{ active: serive.isActive }"
>
<div class="items" v-for="(serive, sindex) in labelList" :key="sindex" @click="handleClickLable(sindex)"
:class="{ active: serive.isActive }">
{{ serive.name }}
</div>
</div>
</a-spin>
</a-modal>
<generationModal ref="generation" @register="registerModal"> </generationModal>
<a-modal
title="多提单号查询"
:width="400"
:visible="moreFlag"
@ok="moreNumSubmit"
@cancel="moreFlag = false"
>
<a-modal title="多提单号查询" :width="400" :visible="moreFlag" @ok="moreNumSubmit" @cancel="moreFlag = false">
<div>
<a-textarea v-model:value="moreNumVal" style="height: 200px" />
</div>
@ -490,66 +445,6 @@
padding-bottom: 0px !important;
}
.table-operator {
margin-bottom: 18px;
}
.Close {
height: 45px;
overflow: hidden;
}
.vxe-table--render-default .vxe-body--row.row--stripe {
background: #f5f9fe;
}
.ant-card-body {
padding-top: 10px;
}
.inline {
position: relative;
}
.inline-right {
position: absolute;
top: 6px;
right: 25px;
}
.change {
display: flex;
justify-content: center;
margin-top: 25px;
div {
width: 120px;
height: 50px;
background-color: rgb(247, 249, 250);
border: 1px solid rgb(247, 249, 250);
color: rgb(105, 102, 102);
line-height: 50px;
text-align: center;
cursor: pointer;
transition: box-shadow 0.3s, background-color 0.3s;
margin-right: 10px;
}
div:hover {
border: 1px solid #d1cfcf;
}
}
.content {
max-height: 300px;
overflow-y: auto;
overflow-x: hidden;
width: 100%;
&::-webkit-scrollbar {
width: 0 !important;
}
.items {
display: inline-block;
height: 28px;
@ -597,11 +492,8 @@
}
}
&.active {
background: @primary-color;
border: 1px dashed @primary-color;
color: #fff;
}
:deep(.vben-basic-table-action button) {
padding: 0 3px !important;
}
}

2
src/views/bookingcabin/cabinBooking/detail.vue
Unescape Escape View File

@ -1349,7 +1349,7 @@ function getContractnoList() {
margin-bottom: 10px !important;
}
:deep(deep.ant-form-item-label>label) {
:deep(.ant-form-item-label>label) {
height: 25px !important;
}
:deep(.ant-form-item-control-input-content) {

Write Preview
Loading…
Cancel
Save