b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source 
# Conflicts:
#	src/views/business/contract-manage-change.vue
This commit is contained in:
b2894lxlx
2026-08-25 20:47:06 +08:00
parent 335e45c3f1 325e708ef1
commit cb98355715
27 changed files with 816 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/business/components/business-crud-page.vue
+145 -57
View File
@@ -321,8 +321,9 @@
</el-input>
<el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button
class="business-crud-page__address-pick-btn"
type="primary"
:icon="List"
:icon="OfficeBuilding"
link
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('departure')"
@@ -336,14 +337,16 @@
/>
<span class="business-crud-page__route-label">联系方式</span>
<el-input v-model="form.departurePhone" placeholder="请输入" :disabled="dialogReadonly" />
<el-link
v-if="isShippingTemplatePage"
type="primary"
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('departure')"
>
选择
</el-link>
<el-tooltip v-if="isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button
class="business-crud-page__address-pick-btn"
type="primary"
:icon="OfficeBuilding"
link
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('departure')"
/>
</el-tooltip>
</div>
</template>
@@ -389,8 +392,9 @@
</el-input>
<el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button
class="business-crud-page__address-pick-btn"
type="primary"
:icon="List"
:icon="OfficeBuilding"
link
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('arrival')"
@@ -400,14 +404,16 @@
<el-input v-model="form.arrivalContact" placeholder="请输入" :disabled="dialogReadonly" />
<span class="business-crud-page__route-label">联系方式</span>
<el-input v-model="form.arrivalPhone" placeholder="请输入" :disabled="dialogReadonly" />
<el-link
v-if="isShippingTemplatePage"
type="primary"
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('arrival')"
>
选择
</el-link>
<el-tooltip v-if="isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button
class="business-crud-page__address-pick-btn"
type="primary"
:icon="OfficeBuilding"
link
:disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('arrival')"
/>
</el-tooltip>
</div>
</template>
@@ -869,11 +875,12 @@
>
<el-input
v-model="form.taskRemark"
placeholder="请输入，200字以内"
clearable
type="textarea"
:rows="2"
maxlength="200"
show-word-limit
:disabled="dialogReadonly"
placeholder="请输入，200字以内"
/>
</el-form-item>
</div>
@@ -990,11 +997,12 @@
>
<el-input
v-model="form.taskRemark"
placeholder="请输入，200字以内"
clearable
type="textarea"
:rows="2"
maxlength="200"
show-word-limit
:disabled="dialogReadonly"
placeholder="请输入，200字以内"
/>
</el-form-item>
</div>
@@ -1058,12 +1066,13 @@
class="business-crud-page__task-note business-crud-page__task-span-4"
>
<el-input
v-model="form.taskRemark"
placeholder="请输入，200字以内"
clearable
v-model="form.remark"
type="textarea"
:rows="2"
maxlength="200"
show-word-limit
:disabled="dialogReadonly"
placeholder="请输入，200字以内"
/>
</el-form-item>
</div>
@@ -1981,16 +1990,6 @@
<template #attachmentsJson-form>
<div class="business-crud-page__attachment">
<div class="business-crud-page__attachment-head">
<vehicle-attachment-upload
v-model="attachmentRows"
:readonly="dialogReadonly"
:file-types="attachmentFileTypes"
:max-size="500"
:show-tip="false"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
<el-button
type="primary"
:disabled="!attachmentRows.length"
@@ -2043,6 +2042,17 @@
</template>
</el-table-column>
</el-table>
<div class="business-crud-page__attachment-upload">
<vehicle-attachment-upload
v-model="attachmentRows"
:readonly="dialogReadonly"
:file-types="attachmentFileTypes"
:max-size="500"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
</div>
</div>
</template>
@@ -2856,7 +2866,7 @@
<el-input
v-model="waybillRouteChangeRemark"
type="textarea"
:rows="1"
:rows="2"
maxlength="200"
show-word-limit
placeholder="请输入"
@@ -3517,8 +3527,16 @@
<el-input
v-model="dispatchItemForm.departureAddress"
:placeholder="dispatchAddressDetailPlaceholder"
:suffix-icon="dispatchStationMode ? undefined : Location"
/>
>
<template v-if="!dispatchStationMode" #suffix>
<el-link
type="primary"
:underline="false"
class="business-crud-page__address-choose-link"
>选择</el-link
>
</template>
</el-input>
<span class="business-crud-page__route-label">联系人</span>
<el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
<span class="business-crud-page__route-label">联系方式</span>
@@ -3535,8 +3553,16 @@
<el-input
v-model="dispatchItemForm.arrivalAddress"
:placeholder="dispatchAddressDetailPlaceholder"
:suffix-icon="dispatchStationMode ? undefined : Location"
/>
>
<template v-if="!dispatchStationMode" #suffix>
<el-link
type="primary"
:underline="false"
class="business-crud-page__address-choose-link"
>选择</el-link
>
</template>
</el-input>
<span class="business-crud-page__route-label">联系人</span>
<el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
<span class="business-crud-page__route-label">联系方式</span>
@@ -3973,8 +3999,11 @@
<el-form-item label="备注" class="business-crud-page__dispatch-item-span-3">
<el-input
v-model="dispatchItemForm.remark"
type="textarea"
:rows="2"
maxlength="200"
show-word-limit
:disabled="dialogReadonly"
placeholder="请输入，200字以内"
/>
</el-form-item>
@@ -4116,6 +4145,7 @@
:rows="2"
maxlength="200"
show-word-limit
:disabled="dialogReadonly"
placeholder="请输入，200字以内"
/>
</el-form-item>
@@ -4124,15 +4154,6 @@
<div class="dialog-section-title">附件</div>
<div class="business-crud-page__attachment">
<div class="business-crud-page__attachment-head">
<vehicle-attachment-upload
v-model="dispatchItemAttachmentRows"
:file-types="attachmentFileTypes"
:max-size="500"
:show-tip="false"
:show-file-list="false"
button-text="上传附件"
@change="handleDispatchItemAttachmentChange"
/>
<el-button
type="primary"
:disabled="!dispatchItemAttachmentRows.length"
@@ -4178,6 +4199,16 @@
</template>
</el-table-column>
</el-table>
<div class="business-crud-page__attachment-upload">
<vehicle-attachment-upload
v-model="dispatchItemAttachmentRows"
:file-types="attachmentFileTypes"
:max-size="500"
:show-file-list="false"
button-text="上传附件"
@change="handleDispatchItemAttachmentChange"
/>
</div>
</div>
</el-form>
<template #footer>
@@ -5130,7 +5161,7 @@ import { openImportDialog } from '@/utils/import-excel';
import { applyTableMenuWidth } from '@/utils/table-menu';
import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { isMobile } from '@/utils/validate';
import { List, Location, Rank, Search } from '@element-plus/icons-vue';
import { Location, OfficeBuilding, Rank, Search } from '@element-plus/icons-vue';
import { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue';
import {
@@ -5424,8 +5455,8 @@ export default {
},
data() {
return {
List,
Location,
OfficeBuilding,
Search,
form: {},
suppressTransportTypeClear: false,
@@ -13043,7 +13074,16 @@ export default {
}
&__task-remark {
grid-column: span 3;
grid-column: 1 / -1;
:deep(.el-form-item__content) {
width: 100%;
}
:deep(.el-input),
:deep(.el-textarea) {
width: 100%;
}
}
&__task-note {
@@ -13113,8 +13153,16 @@ export default {
}
&__append-select--wide {
width: 108px;
min-width: 108px;
width: 96px;
min-width: 96px;
// 仅这两个窄 append 内的 placeholder 文字水平居中
:deep(.el-select__placeholder) {
left: 50% !important;
transform: translateY(-50%) translateX(-50%) !important;
text-align: center;
width: auto;
}
}
:deep(.business-crud-page__goods-info-cell .cell) {
@@ -13168,13 +13216,25 @@ export default {
padding: 0;
}
.business-crud-page__map-suffix {
color: #409eff;
font-size: 18px;
}
:deep(.el-input .el-input__icon) {
color: #409eff;
font-size: 18px;
}
&--shipping-template {
grid-template-columns:
220px minmax(220px, 1fr) 58px minmax(220px, 280px) 72px minmax(220px, 280px)
40px;
}
.business-crud-page__map-suffix {
color: #409eff;
.business-crud-page__address-pick-btn {
:deep(.el-icon) {
font-size: 22px;
}
}
}
@@ -13185,6 +13245,16 @@ export default {
}
}
&__address-choose-link {
display: inline-flex;
align-items: center;
height: 100%;
padding: 0 4px;
font-size: 13px;
line-height: 1;
cursor: pointer;
}
&__dispatch-shipping-form &__route-address-row {
grid-template-columns: 260px minmax(280px, 1fr) 58px minmax(160px, 220px) 72px minmax(
160px,
@@ -13222,6 +13292,7 @@ export default {
&__map-suffix {
cursor: pointer;
color: #909399;
font-size: 18px;
&:hover {
color: #409eff;
@@ -14258,10 +14329,24 @@ export default {
&__attachment-head {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: flex-end;
margin-bottom: 16px;
}
&__attachment-upload {
display: flex;
justify-content: flex-start;
margin-top: 12px;
:deep(.vehicle-attachment-upload) {
width: auto;
}
:deep(.el-upload) {
display: inline-flex;
}
}
&__attachment-table {
width: 100%;
min-width: 0;
@@ -15277,4 +15362,7 @@ export default {
top: 92px !important;
left: 0 !important;
}
.el-input__icon {
color: #1e90ff !important;
}
</style>