Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage-change.vue
This commit is contained in:
2026-08-25 20:47:06 +08:00
27 changed files with 816 additions and 971 deletions
+68
View File
@@ -82,3 +82,71 @@
- 实现:复用已有组件 `src/views/settlement/components/formal-settlement-table-panel.vue`(工具栏+表格+分页一体,通过 emit 事件与父通信),分别挂入"应付""应收"两个 `el-tab-pane` 内,共享父级 `rows/columns/loading/page/hasPermissionFn`,事件回连:@create→openCreate、@payment→openPaymentDialog、@sync→handleSync、@export→handleExport、@refresh→loadTable、@page-change→onPageChange、@action→onAction(分发 view/edit/delete/submit/approve/return/void/print)、@update:selection→selection 同步。切 tab 仍走 `handleSettlementTypeChange` 重载数据。 - 实现:复用已有组件 `src/views/settlement/components/formal-settlement-table-panel.vue`(工具栏+表格+分页一体,通过 emit 事件与父通信),分别挂入"应付""应收"两个 `el-tab-pane` 内,共享父级 `rows/columns/loading/page/hasPermissionFn`,事件回连:@create→openCreate、@payment→openPaymentDialog、@sync→handleSync、@export→handleExport、@refresh→loadTable、@page-change→onPageChange、@action→onAction(分发 view/edit/delete/submit/approve/return/void/print)、@update:selection→selection 同步。切 tab 仍走 `handleSettlementTypeChange` 重载数据。
- 配套改动:父页 `:has-permission``hasPermissionFn`(computed 返回箭头函数,避免方法作 prop 时 this 丢失导致权限恒为 true);`handlePrint(row)` 增加可选 row 入参;移除父页内联表格及对应 scoped 样式(.formal-page__toolbar/links/pagination);组件操作列 width 120→320(符合 AGENTS.md >3 按钮规范)。 - 配套改动:父页 `:has-permission``hasPermissionFn`(computed 返回箭头函数,避免方法作 prop 时 this 丢失导致权限恒为 true);`handlePrint(row)` 增加可选 row 入参;移除父页内联表格及对应 scoped 样式(.formal-page__toolbar/links/pagination);组件操作列 width 120→320(符合 AGENTS.md >3 按钮规范)。
- 校验:@vue/compiler-sfc parse/compileTemplate 0 错误、esbuild 脚本语法 OK`pnpm build` 因沙箱保护 dist/ 被拦截(非代码问题)。仅改 formal-settlement.vue 一个页面文件 + 组件 width。 - 校验:@vue/compiler-sfc parse/compileTemplate 0 错误、esbuild 脚本语法 OK`pnpm build` 因沙箱保护 dist/ 被拦截(非代码问题)。仅改 formal-settlement.vue 一个页面文件 + 组件 width。
## 临时额度管理附件上传按钮移至表格左下角
- 需求:用户截图反馈 `business/temporary-credit-limit` 新增弹窗中「上传附件」按钮在表格上方,要求统一放到附件表格左下角,与 project-apply 的项目材料交互一致。
- 改动文件:`src/views/business/temporary-credit-limit.vue`
- 模板:将 `vehicle-attachment-upload``temporary-credit-limit-page__attachment-head` 移除,放到 `el-table` 之后的新增 `temporary-credit-limit-page__attachment-upload` 容器内;head 内只保留「批量下载」按钮。
- 样式:`&__attachment-head``justify-content``space-between` 改为 `flex-end`;新增 `&__attachment-upload` 样式,左对齐并控制上传组件宽度自适应。
- 结论:临时额度管理附件区域现与合同管理、项目材料保持一致:批量下载在表格上方右侧,上传附件在表格下方左侧。
## 项目材料上传提示文字移到按钮右侧
- 需求:用户要求 project-apply/form「上传附件」按钮支持指定格式(pdf/bmp/jpeg/png/jpg/doc/docx/ppt/pptx/xlsx/xls/eml/msg/zip)、单文件 50M,并把提示文字放到按钮后面(右侧同一行)。
- 现状:project-apply.vue 第 537-540 行早已配置 `:file-types``:max-size="50"` 与完整 `tip` 文案,但 vehicle-attachment-upload 组件默认把提示渲染在按钮下方。
- 修复:仅改 `&__upload` 样式,用 `:deep``.vehicle-attachment-upload` 设为 `display:flex; align-items:center`,并把 `.el-upload__tip` 由默认块级(下方)改为 `display:inline-block; margin-left:12px`,使格式/大小提示与按钮同一行、位于按钮右侧。
- 结论:project-apply 附件提示现为"上传附件按钮 + 右侧灰色提示文字",未改动组件逻辑与其它页面。
## 附件格式说明三页统一(按钮右侧 30px / 500M
- 需求:用户要求「支持pdf、bmp、…、zip,单个文件不超过500M」这段说明在 project-apply / temporary-credit-limit / contract-manage 三处附件上传区统一摆放:放到「上传附件」按钮右侧、间距 30px、文字左对齐;文件限制上限由 50M 改为 500M(说明与校验一致)。
- 实现(三页一致):
- 统一 `tip` 文案:`支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M`
- `:max-size`contract-manage 为 `maxSize`)统一 500project-apply / temporary-credit-limit 由 50→500。
- 样式:用 `:deep``.vehicle-attachment-upload` 设为 `display:flex;align-items:center``.el-upload__tip``display:inline-block;margin-left:30px;color:#909399;font-size:13px;text-align:left`,使说明在按钮右侧 30px、左对齐。
- contract-manage 的 AttachmentSection render 把上传按钮从表格上方 head 移到表格下方左侧(`.contract-manage-form__attachment-upload`),head 仅保留「批量下载」;同步删除失效的 `__attachment-actions` 死样式,新增 `__attachment-upload` 样式。至此三页上传按钮均位于附件表格左下角、说明在按钮右侧。
- 校验:@vue/compiler-sfc 对三文件 parse/compileScript/compileTemplate 均 OKdev localhost:2889 HMR 已生效。
## 全站附件上传统一(vehicle-attachment-upload 组件级单一事实来源)
- 需求:把"上传附件按钮在附件表格左下角 + 按钮右侧 30px 左对齐统一说明 + 单文件 500M"方案应用到整个站点,统一风格。
- 核心做法(改 1 个组件即全站生效):`src/components/vehicle-attachment-upload/main.vue`
- 新增常量 `UNIFIED_ATTACHMENT_TIP = '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M'``tipText` 改为 `this.tip || UNIFIED_ATTACHMENT_TIP`(不再按 acceptText 拼装)。
- `maxSize` 默认值 `0``500`(说明与校验一致)。
- 模板 `v-if="showTip && ..."` 去掉 `showTip` 门控 → `v-if="tipText && !readonly"`,全站始终显示统一说明(原 `:show-tip="false"` 变为无害 no-op,未逐一清理)。
- SCSS 新增 `.vehicle-attachment-upload :deep(.el-upload){display:flex;align-items:center}``:deep(.el-upload__tip){display:inline-block;margin:0 0 0 30px;color:#909399;font-size:13px;text-align:left}`,按钮与说明内联、说明在按钮右侧 30px 左对齐。
- 表格型附件区布局对齐(上传移表格下方左侧,批量下载留表头右侧):business-crud-page.vue2 处 attachmentsJson-form / 派车明细附件)、contract-manage-change.vue、pre-settlement-editor.vue、master-order-editor.vue、payment-application-form.vue、invoice-application-form.vue;各页新增 `__attachment-upload` 左对齐样式、`__attachment-head``justify-content:flex-end`
- 大小异常值修正:bill-ledger-form / bill-payment-form 的 `:max-size="10"` → 500invoice-application-form `:max-size="50"` → 500(同时把上传从表格上方移到下方)。
- 已是下方布局无需移动(仅随组件生效):invoice-receipt / receipt-claim-record / receipt-flow / bill-ledger / bill-payment / formal-settlement-editor(独立上传无表格)/ 各 vehicle 页(独立上传无表格)。
- 校验:@vue/compiler-sfc 对 12 个改动文件(组件 + 上述各页 + 此前已改的 project-apply/temporary-credit-limit/contract-manage)全部编译通过;grep 确认全站无残留非 500M 的附件 max-size。
## master-order 附件上传"按钮 + 描述"由两行改一行
- 需求:用户截图 `/business/master-order?mode=editor` 详情附件区,"上传附件"按钮与"支持pdf…"描述文字分别居中、各占一行,要求并到同一行(与 vehicle-attachment-upload 组件默认样式一致)。
- 根因:`master-order-editor.vue` 第 1814-1824 行 scoped CSS 把 `.master-editor__attachment-upload .el-upload` 强制 `display: inline-flex` 但未显式 `flex-wrap/align-items/text-align`;而 Element Plus 全局 `.el-upload` 默认 `text-align: center`,加 inline-flex 子元素被 EP 默认行为按各自一行居中显示。
- 修复:在 `.master-editor__attachment-upload` 内用 `:deep(.el-upload)` 显式声明 `display: inline-flex; align-items: center; flex-wrap: nowrap; text-align: left`,并 `:deep(.el-upload__tip)``display: inline-block; margin: 0 0 0 8px; color:#909399; font-size:13px; line-height:1.4; white-space:normal; text-align:left`,让按钮与说明内联排成一行。
- 结论:master-order 附件区与 project-apply/temporary-credit-limit/contract-manage 风格一致(按钮左 + 描述贴右侧)。
## vehicle-attachment-upload 恢复 showTip 门控
- 根因:用户截图 feedback `customer-archive/form` 的「OCR上传识别」按钮下方仍显示统一附件说明,要求「OCR上传识别这里不用加描述」。该组件虽有 `showTip` prop,但此前「全站附件上传统一」时把模板门控 `v-if="showTip && tipText && !readonly"` 简化成了 `v-if="tipText && !readonly"`,导致 `:show-tip="false"` 失效。
- 修复:恢复 `src/components/vehicle-attachment-upload/main.vue` 第 24 行的 `showTip &&` 条件,使 `:show-tip="false"` 可正常隐藏按钮旁说明;`customer-archive.vue` 中 OCR 上传实例已配置 `:show-tip="false"`,无需额外改动。
- 影响:所有 `:show-tip="false"` 的调用点(annual-inspection/maintenance/accident/violation/tire/customer-archive 等)现在会按预期隐藏提示;未配置 `show-tip``:show-tip="true"` 的实例继续显示 `UNIFIED_ATTACHMENT_TIP`
## customer-archive 客商材料上传按钮左、描述右、间距 30px
- 需求:用户第三轮明确「客商材料」表格下"上传附件"按钮与「支持pdf…」描述需并排、按钮左、描述右、间距严格 30px。
- 定位:`src/views/vehicle/customer-archive.vue` 第 4637-4666 行 `.qualification-upload-bar`grid 1fr auto 1fr 改 flex 的二次修正)。
- 修复:保留 flex 容器,按钮区 `.vehicle-attachment-upload > :deep(.el-upload)` `flex: 0 0 auto` 贴左固定;描述 `:deep(.el-upload__tip)` `margin-left: 30px + white-space: nowrap + overflow:hidden + text-overflow:ellipsis + text-align:left`,与按钮同行紧贴、间距固定 30px、超长文案省略号。
- 结论:布局"「上传附件」按钮 ←30px→ 「支持pdf…」描述",单行两端对齐。
## sidebar 子路由高亮回退(方案B)
- 需求:用户反馈点「客商档案」菜单后,再点新增/编辑/查看(跳子路由 /vehicle/customer-archive/form),左侧菜单选中灰底消失。
- 根因:sidebar `activeMenu` getter 在无 `meta.activeMenu` 时退到 `route.path`(即子路由 /vehicle/customer-archive/form),与菜单 path /vehicle/customer-archive 不匹配,`<el-menu :default-active>` 找不到项 → 高亮丢失。同因还影响 /business/contract-manage/change 等独立子路由。
- 修复(方案B,通用兜底,改 1 文件):`src/page/index/sidebar/index.vue`
- 新增 `menuPaths` computed:递归收集全站菜单 `website.menu``path` 字段进 Set。
- `activeMenu``return path` 前加分支:当 `path` 不在 menuPaths 时,过滤出所有 `path.startsWith(p + '/')` 的菜单路径,按长度降序取最长前缀匹配者作为高亮项(即 /vehicle/customer-archive/form → /vehicle/customer-archive)。
- 原有 `meta.activeMenu``menuIndexes`(带参菜单精确匹配)分支保持不变;路径完全相同的路由仍精确匹配,不受影响。
- 结论:一次改动全站受益,所有"父菜单 + 独立子表单页"场景(customer-archive/form、contract-manage/change 等)自动保持父菜单高亮,无需逐路由配 activeMenu。HMR 已生效。
## master-order-dispatch 运费单位 select 撑爆 append 槽
- 需求:用户截图 dispatch 页"任务信息"块下"数量 → 吨"与"单价 → 元/吨"两个 select 宽度比左侧 input 还宽,红框标记要求改小。
- 根因:`src/views/business/components/master-order-dispatch.vue` 第 702 行 `.dispatch-form` 全局规则 `:deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; }` 把整个 dispatch 表单内**所有** el-select 强制 100% 宽;这两个 select 处于 `el-input``#append` slot 内,被强制撑开 append 容器,append 又把整个 `el-col :span="6"` 列占满。第 707 行 `.freight-form { :deep(.freight-unit-select) { width: 92px; } }` 想兜底 92px,但因 specificity 与覆盖时机问题未生效。
- 修复(最小改动,2 处):
- 行 702 末尾追加 `:deep(.el-input-group__append .el-select) { width: auto; }`,使 append 内的 select 退回内容自适应宽度(避免被 100% 拉伸)。
- 行 707 强化兜底:`.freight-unit-select``flex: 0 0 92px; min-width: 0;`,固定 92px 防止 append flex 拉伸。
- 结论:单位 select(吨/元/吨)宽度由内容决定(≈92px),不再撑爆 append 与列;其它顶层 select(承运商/币种等)仍维持 100% 宽,行为不变。
@@ -75,6 +75,9 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
import { baseUrl } from '@/config/env'; import { baseUrl } from '@/config/env';
import { getUploadHeaders } from '@/utils/upload'; import { getUploadHeaders } from '@/utils/upload';
const UNIFIED_ATTACHMENT_TIP =
'支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M';
const MIME_MAP = { const MIME_MAP = {
jpg: 'image/jpeg', jpg: 'image/jpeg',
jpeg: 'image/jpeg', jpeg: 'image/jpeg',
@@ -143,7 +146,7 @@ export default {
}, },
maxSize: { maxSize: {
type: Number, type: Number,
default: 0, default: 500,
}, },
readonly: { readonly: {
type: Boolean, type: Boolean,
@@ -212,10 +215,7 @@ export default {
return this.acceptedList.join(','); return this.acceptedList.join(',');
}, },
tipText() { tipText() {
if (this.tip) return this.tip; return this.tip || UNIFIED_ATTACHMENT_TIP;
const typeText = this.acceptText || '所有类型';
const sizeText = this.maxSize > 0 ? `,单文件不超过 ${this.maxSize}MB` : '';
return `支持上传 ${typeText}${sizeText}`;
}, },
uploadingCount() { uploadingCount() {
return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length; return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length;
@@ -372,6 +372,27 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.vehicle-attachment-upload { .vehicle-attachment-upload {
width: 100%; width: 100%;
div{
display: flex;
flex-direction: row;
align-items: center;
}
:deep(.el-upload) {
display: flex;
align-items: center;
flex-wrap: nowrap;
}
:deep(.el-upload__tip) {
display: inline-block;
margin: 0 0 0 30px;
color: #909399;
font-size: 13px;
line-height: 1.4;
white-space: normal;
text-align: left;
}
:deep(.el-upload-list__item-name) { :deep(.el-upload-list__item-name) {
cursor: pointer; cursor: pointer;
+22
View File
@@ -44,6 +44,19 @@ export default {
collect(this.menu); collect(this.menu);
return indexes; return indexes;
}, },
// 全站菜单路径集合,用于子路由(如 /vehicle/customer-archive/form)回退高亮父菜单
menuPaths() {
const props = website.menu;
const set = new Set();
const collect = list => {
(list || []).forEach(item => {
if (item[props.path]) set.add(item[props.path]);
collect(item[props.children]);
});
};
collect(this.menu);
return set;
},
activeMenu() { activeMenu() {
const route = this.$route; const route = this.$route;
const { meta, path } = route; const { meta, path } = route;
@@ -55,6 +68,15 @@ export default {
if (fullPath !== path && this.menuIndexes.has(fullPath)) { if (fullPath !== path && this.menuIndexes.has(fullPath)) {
return fullPath; return fullPath;
} }
// 子路由(如 /vehicle/customer-archive/form)自动回退高亮最长前缀匹配的父菜单
if (!this.menuPaths.has(path)) {
const matched = [...this.menuPaths]
.filter(p => path.startsWith(p + '/'))
.sort((a, b) => b.length - a.length);
if (matched.length) {
return matched[0];
}
}
return path; return path;
}, },
}, },
@@ -321,8 +321,9 @@
</el-input> </el-input>
<el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top"> <el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button <el-button
class="business-crud-page__address-pick-btn"
type="primary" type="primary"
:icon="List" :icon="OfficeBuilding"
link link
:disabled="transportAddressSelectDisabled" :disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('departure')" @click="openTransportAddressPicker('departure')"
@@ -336,14 +337,16 @@
/> />
<span class="business-crud-page__route-label">联系方式</span> <span class="business-crud-page__route-label">联系方式</span>
<el-input v-model="form.departurePhone" placeholder="请输入" :disabled="dialogReadonly" /> <el-input v-model="form.departurePhone" placeholder="请输入" :disabled="dialogReadonly" />
<el-link <el-tooltip v-if="isShippingTemplatePage" content="选择常用地址" placement="top">
v-if="isShippingTemplatePage" <el-button
type="primary" class="business-crud-page__address-pick-btn"
:disabled="transportAddressSelectDisabled" type="primary"
@click="openTransportAddressPicker('departure')" :icon="OfficeBuilding"
> link
选择 :disabled="transportAddressSelectDisabled"
</el-link> @click="openTransportAddressPicker('departure')"
/>
</el-tooltip>
</div> </div>
</template> </template>
@@ -389,8 +392,9 @@
</el-input> </el-input>
<el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top"> <el-tooltip v-if="!isShippingTemplatePage" content="选择常用地址" placement="top">
<el-button <el-button
class="business-crud-page__address-pick-btn"
type="primary" type="primary"
:icon="List" :icon="OfficeBuilding"
link link
:disabled="transportAddressSelectDisabled" :disabled="transportAddressSelectDisabled"
@click="openTransportAddressPicker('arrival')" @click="openTransportAddressPicker('arrival')"
@@ -400,14 +404,16 @@
<el-input v-model="form.arrivalContact" placeholder="请输入" :disabled="dialogReadonly" /> <el-input v-model="form.arrivalContact" placeholder="请输入" :disabled="dialogReadonly" />
<span class="business-crud-page__route-label">联系方式</span> <span class="business-crud-page__route-label">联系方式</span>
<el-input v-model="form.arrivalPhone" placeholder="请输入" :disabled="dialogReadonly" /> <el-input v-model="form.arrivalPhone" placeholder="请输入" :disabled="dialogReadonly" />
<el-link <el-tooltip v-if="isShippingTemplatePage" content="选择常用地址" placement="top">
v-if="isShippingTemplatePage" <el-button
type="primary" class="business-crud-page__address-pick-btn"
:disabled="transportAddressSelectDisabled" type="primary"
@click="openTransportAddressPicker('arrival')" :icon="OfficeBuilding"
> link
选择 :disabled="transportAddressSelectDisabled"
</el-link> @click="openTransportAddressPicker('arrival')"
/>
</el-tooltip>
</div> </div>
</template> </template>
@@ -869,11 +875,12 @@
> >
<el-input <el-input
v-model="form.taskRemark" v-model="form.taskRemark"
placeholder="请输入,200字以内" type="textarea"
clearable :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:disabled="dialogReadonly" :disabled="dialogReadonly"
placeholder="请输入,200字以内"
/> />
</el-form-item> </el-form-item>
</div> </div>
@@ -990,11 +997,12 @@
> >
<el-input <el-input
v-model="form.taskRemark" v-model="form.taskRemark"
placeholder="请输入,200字以内" type="textarea"
clearable :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:disabled="dialogReadonly" :disabled="dialogReadonly"
placeholder="请输入,200字以内"
/> />
</el-form-item> </el-form-item>
</div> </div>
@@ -1058,12 +1066,13 @@
class="business-crud-page__task-note business-crud-page__task-span-4" class="business-crud-page__task-note business-crud-page__task-span-4"
> >
<el-input <el-input
v-model="form.taskRemark" v-model="form.remark"
placeholder="请输入,200字以内" type="textarea"
clearable :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:disabled="dialogReadonly" :disabled="dialogReadonly"
placeholder="请输入,200字以内"
/> />
</el-form-item> </el-form-item>
</div> </div>
@@ -1981,16 +1990,6 @@
<template #attachmentsJson-form> <template #attachmentsJson-form>
<div class="business-crud-page__attachment"> <div class="business-crud-page__attachment">
<div class="business-crud-page__attachment-head"> <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 <el-button
type="primary" type="primary"
:disabled="!attachmentRows.length" :disabled="!attachmentRows.length"
@@ -2043,6 +2042,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> </div>
</template> </template>
@@ -2856,7 +2866,7 @@
<el-input <el-input
v-model="waybillRouteChangeRemark" v-model="waybillRouteChangeRemark"
type="textarea" type="textarea"
:rows="1" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
@@ -3517,8 +3527,16 @@
<el-input <el-input
v-model="dispatchItemForm.departureAddress" v-model="dispatchItemForm.departureAddress"
:placeholder="dispatchAddressDetailPlaceholder" :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> <span class="business-crud-page__route-label">联系人</span>
<el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" /> <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
<span class="business-crud-page__route-label">联系方式</span> <span class="business-crud-page__route-label">联系方式</span>
@@ -3535,8 +3553,16 @@
<el-input <el-input
v-model="dispatchItemForm.arrivalAddress" v-model="dispatchItemForm.arrivalAddress"
:placeholder="dispatchAddressDetailPlaceholder" :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> <span class="business-crud-page__route-label">联系人</span>
<el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" /> <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
<span class="business-crud-page__route-label">联系方式</span> <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-form-item label="备注" class="business-crud-page__dispatch-item-span-3">
<el-input <el-input
v-model="dispatchItemForm.remark" v-model="dispatchItemForm.remark"
type="textarea"
:rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:disabled="dialogReadonly"
placeholder="请输入,200字以内" placeholder="请输入,200字以内"
/> />
</el-form-item> </el-form-item>
@@ -4116,6 +4145,7 @@
:rows="2" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:disabled="dialogReadonly"
placeholder="请输入,200字以内" placeholder="请输入,200字以内"
/> />
</el-form-item> </el-form-item>
@@ -4124,15 +4154,6 @@
<div class="dialog-section-title">附件</div> <div class="dialog-section-title">附件</div>
<div class="business-crud-page__attachment"> <div class="business-crud-page__attachment">
<div class="business-crud-page__attachment-head"> <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 <el-button
type="primary" type="primary"
:disabled="!dispatchItemAttachmentRows.length" :disabled="!dispatchItemAttachmentRows.length"
@@ -4178,6 +4199,16 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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> </div>
</el-form> </el-form>
<template #footer> <template #footer>
@@ -5130,7 +5161,7 @@ import { openImportDialog } from '@/utils/import-excel';
import { applyTableMenuWidth } from '@/utils/table-menu'; import { applyTableMenuWidth } from '@/utils/table-menu';
import { downloadFileByUrl, downloadXls } from '@/utils/util'; import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { isMobile } from '@/utils/validate'; 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 { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue'; import { OpenFileViewer } from '@open-file-viewer/vue';
import { import {
@@ -5424,8 +5455,8 @@ export default {
}, },
data() { data() {
return { return {
List,
Location, Location,
OfficeBuilding,
Search, Search,
form: {}, form: {},
suppressTransportTypeClear: false, suppressTransportTypeClear: false,
@@ -13043,7 +13074,16 @@ export default {
} }
&__task-remark { &__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 { &__task-note {
@@ -13113,8 +13153,16 @@ export default {
} }
&__append-select--wide { &__append-select--wide {
width: 108px; width: 96px;
min-width: 108px; 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) { :deep(.business-crud-page__goods-info-cell .cell) {
@@ -13168,13 +13216,25 @@ export default {
padding: 0; 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 { &--shipping-template {
grid-template-columns: grid-template-columns:
220px minmax(220px, 1fr) 58px minmax(220px, 280px) 72px minmax(220px, 280px) 220px minmax(220px, 1fr) 58px minmax(220px, 280px) 72px minmax(220px, 280px)
40px; 40px;
}
.business-crud-page__map-suffix { .business-crud-page__address-pick-btn {
color: #409eff; :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 { &__dispatch-shipping-form &__route-address-row {
grid-template-columns: 260px minmax(280px, 1fr) 58px minmax(160px, 220px) 72px minmax( grid-template-columns: 260px minmax(280px, 1fr) 58px minmax(160px, 220px) 72px minmax(
160px, 160px,
@@ -13222,6 +13292,7 @@ export default {
&__map-suffix { &__map-suffix {
cursor: pointer; cursor: pointer;
color: #909399; color: #909399;
font-size: 18px;
&:hover { &:hover {
color: #409eff; color: #409eff;
@@ -14258,10 +14329,24 @@ export default {
&__attachment-head { &__attachment-head {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: flex-end;
margin-bottom: 16px; 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 { &__attachment-table {
width: 100%; width: 100%;
min-width: 0; min-width: 0;
@@ -15277,4 +15362,7 @@ export default {
top: 92px !important; top: 92px !important;
left: 0 !important; left: 0 !important;
} }
.el-input__icon {
color: #1e90ff !important;
}
</style> </style>
@@ -697,12 +697,12 @@ export default {
.route-overview__line { flex: 0 1 56px; min-width: 24px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; } .route-overview__line { flex: 0 1 56px; min-width: 24px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; }
.segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } } .segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } }
.segment-content { padding: 16px 24px; } .segment-content { padding: 16px 24px; }
.dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } } .dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
.transport-type-field :deep(.el-input) { width: 240px; } .transport-type-field :deep(.el-input) { width: 240px; }
.goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } } .goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
.freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } } .freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } } .goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
.freight-form { :deep(.freight-unit-select) { width: 92px; } } .freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
.carrier-type-form { margin-top: 16px; } .carrier-type-form { margin-top: 16px; }
.carrier-form { padding-top: 8px; } .carrier-form { padding-top: 8px; }
.segment-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 4px; } .segment-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 4px; }
@@ -63,7 +63,7 @@
<div class="route-node-form"> <div class="route-node-form">
<el-form-item label="发货地址" required class="route-address-form-item" <el-form-item label="发货地址" required class="route-address-form-item"
><div class="route-address-inputs" ><div class="route-address-inputs"
><el-cascader v-model="addressRegionPaths.departure" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('departure', value)" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly placeholder="请输入详细地址" @click="openAddressMap('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" @click="openCommonAddress('departure')" /></el-tooltip></div ><el-cascader v-model="addressRegionPaths.departure" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('departure', value)" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly placeholder="请输入详细地址" @click="openAddressMap('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" @click="openCommonAddress('departure')" /></el-tooltip></div
></el-form-item> ></el-form-item>
<el-form-item label="联系人" <el-form-item label="联系人"
><el-input v-model="form.departureContact" placeholder="请输入" ><el-input v-model="form.departureContact" placeholder="请输入"
@@ -90,7 +90,7 @@
<div class="route-node-form"> <div class="route-node-form">
<el-form-item label="途经地" required class="route-address-form-item" <el-form-item label="途经地" required class="route-address-form-item"
><div class="route-address-inputs" ><div class="route-address-inputs"
><el-cascader v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!route.transportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange(`route-${index}`, value)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="!route.transportType || !isRoadTransportType(route.transportType)" placeholder="请先选择运输方式" @click="openAddressMap(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div ><el-cascader v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!route.transportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange(`route-${index}`, value)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="!route.transportType || !isRoadTransportType(route.transportType)" placeholder="请先选择运输方式" @click="openAddressMap(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="!route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div
></el-form-item> ></el-form-item>
<el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item> <el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item>
<el-form-item label="联系方式"><div class="route-contact-actions"><el-input v-model="route.departurePhone" placeholder="请输入" /><el-tooltip v-if="index === form.routes.length - 1" content="新增途经点" placement="top"><el-button class="route-action-button" type="primary" link @click="addRoute"><el-icon><CirclePlus /></el-icon></el-button></el-tooltip><el-tooltip content="删除途经点" placement="top"><el-button class="route-action-button" type="danger" link @click="removeRoute(index)"><el-icon><Remove /></el-icon></el-button></el-tooltip></div></el-form-item> <el-form-item label="联系方式"><div class="route-contact-actions"><el-input v-model="route.departurePhone" placeholder="请输入" /><el-tooltip v-if="index === form.routes.length - 1" content="新增途经点" placement="top"><el-button class="route-action-button" type="primary" link @click="addRoute"><el-icon><CirclePlus /></el-icon></el-button></el-tooltip><el-tooltip content="删除途经点" placement="top"><el-button class="route-action-button" type="danger" link @click="removeRoute(index)"><el-icon><Remove /></el-icon></el-button></el-tooltip></div></el-form-item>
@@ -104,7 +104,7 @@
<div class="route-node-form"> <div class="route-node-form">
<el-form-item label="收货地址" required class="route-address-form-item" <el-form-item label="收货地址" required class="route-address-form-item"
><div class="route-address-inputs" ><div class="route-address-inputs"
><el-cascader v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!form.finalTransportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('arrival', value)" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="!form.finalTransportType || !isRoadTransportType(form.finalTransportType)" placeholder="请选择省市区" @click="openAddressMap('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div ><el-cascader v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!form.finalTransportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('arrival', value)" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="!form.finalTransportType || !isRoadTransportType(form.finalTransportType)" placeholder="请选择省市区" @click="openAddressMap('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="!form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div
></el-form-item> ></el-form-item>
<el-form-item label="联系人" <el-form-item label="联系人"
><el-input v-model="form.arrivalContact" placeholder="请输入" /></el-form-item> ><el-input v-model="form.arrivalContact" placeholder="请输入" /></el-form-item>
@@ -217,15 +217,6 @@
<h3>附件</h3> <h3>附件</h3>
<div class="master-editor__attachment"> <div class="master-editor__attachment">
<div class="master-editor__attachment-head"> <div class="master-editor__attachment-head">
<vehicle-attachment-upload
v-model="attachmentRows"
:file-types="attachmentFileTypes"
:max-size="500"
:show-tip="false"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
<el-button <el-button
type="primary" type="primary"
:disabled="!attachmentRows.length" :disabled="!attachmentRows.length"
@@ -261,6 +252,16 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="master-editor__attachment-upload">
<vehicle-attachment-upload
v-model="attachmentRows"
:file-types="attachmentFileTypes"
:max-size="500"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
</div>
</div> </div>
</section> </section>
<el-dialog <el-dialog
@@ -548,7 +549,7 @@ import { getLazyTree as getRegionLazyTree } from '@/api/base/region';
import { getList as getCommonCargoList } from '@/api/business/common-cargo'; import { getList as getCommonCargoList } from '@/api/business/common-cargo';
import { exportBlob, importBlob } from '@/api/common'; import { exportBlob, importBlob } from '@/api/common';
import { downloadFileByUrl, downloadXls } from '@/utils/util'; import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { List, Search } from '@element-plus/icons-vue'; import { OfficeBuilding, Search } from '@element-plus/icons-vue';
import { ElImageViewer } from 'element-plus'; import { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue'; import { OpenFileViewer } from '@open-file-viewer/vue';
import { fallbackPlugin, imagePlugin, officePlugin, pdfPlugin, textPlugin } from '@open-file-viewer/core'; import { fallbackPlugin, imagePlugin, officePlugin, pdfPlugin, textPlugin } from '@open-file-viewer/core';
@@ -580,7 +581,7 @@ export default {
emits: ['back', 'dispatch'], emits: ['back', 'dispatch'],
data() { data() {
return { return {
List, OfficeBuilding,
Search, Search,
loading: false, loading: false,
projects: [], projects: [],
@@ -1807,9 +1808,33 @@ export default {
.master-editor__attachment-head { .master-editor__attachment-head {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: flex-end;
margin-bottom: 16px; margin-bottom: 16px;
} }
.master-editor__attachment-upload {
display: flex;
justify-content: flex-start;
align-items: center;
margin-top: 12px;
:deep(.el-upload) {
display: inline-flex;
align-items: center;
flex-wrap: nowrap;
text-align: left;
}
:deep(.el-upload__tip) {
display: inline-block;
margin: 0 0 0 8px;
color: #909399;
font-size: 13px;
line-height: 1.4;
white-space: normal;
text-align: left;
}
}
.master-editor__attachment-upload .vehicle-attachment-upload {
width: auto;
}
.master-editor__attachment-table { .master-editor__attachment-table {
width: 100%; width: 100%;
:deep(.el-table__header th) { :deep(.el-table__header th) {
@@ -1940,6 +1965,10 @@ export default {
} }
.address-picker-button { .address-picker-button {
flex: 0 0 auto; flex: 0 0 auto;
:deep(.el-icon) {
font-size: 22px;
}
} }
} }
.route-step-title { .route-step-title {
+89 -731
View File
@@ -4,176 +4,40 @@
<section class="change-section"> <section class="change-section">
<div class="dialog-section-title">基本信息</div> <div class="dialog-section-title">基本信息</div>
<el-row :gutter="28"> <el-row :gutter="28">
<el-col :span="24" <el-col :span="24"><el-form-item label="变更类型"><el-radio-group v-model="form.changeType"><el-radio label="合同信息变更" /><el-radio label="终止合同" /></el-radio-group></el-form-item></el-col>
><el-form-item label="变更类型" <el-col :span="6"><el-form-item label="合同编号"><el-input v-model="form.contractNo" disabled /></el-form-item></el-col>
><el-radio-group v-model="form.changeType" <el-col :span="6"><el-form-item label="合同名称" prop="contractName"><el-input v-model="form.contractName" /></el-form-item></el-col>
><el-radio label="合同信息变更" /><el-radio <el-col :span="6"><el-form-item label="合同类型"><el-select v-model="form.contractCategory" disabled><el-option label="客户合同" value="客户合同" /><el-option label="承运商合同" value="承运商合同" /></el-select></el-form-item></el-col>
label="终止合同" /></el-radio-group></el-form-item <el-col :span="6"><el-form-item label="甲方"><el-input v-model="form.partyA" disabled /></el-form-item></el-col>
></el-col> <el-col :span="6"><el-form-item label="乙方"><el-input v-model="form.partyB" disabled /></el-form-item></el-col>
<el-col :span="6" <el-col :span="6"><el-form-item label="所属项目"><el-input v-model="form.projectName" disabled /></el-form-item></el-col>
><el-form-item label="合同编号" <el-col :span="6"><el-form-item label="合同期限"><el-date-picker v-model="period" type="daterange" value-format="YYYY-MM-DD" range-separator="至" /></el-form-item></el-col>
><el-input v-model="form.contractNo" disabled /></el-form-item <el-col :span="6"><el-form-item label="所属组织"><el-input v-model="form.organizationName" disabled /></el-form-item></el-col>
></el-col> <el-col :span="6"><el-form-item label="签订日期"><el-date-picker v-model="form.signDate" type="date" value-format="YYYY-MM-DD" disabled /></el-form-item></el-col>
<el-col :span="6" <el-col :span="6"><el-form-item label="合同格式"><el-select v-model="form.contractFormat"><el-option label="电子合同" value="电子合同" /><el-option label="纸质合同" value="纸质合同" /></el-select></el-form-item></el-col>
><el-form-item label="合同名称" prop="contractName" <el-col :span="6"><el-form-item label="结算方式"><el-input v-model="form.settlementMode" /></el-form-item></el-col>
><el-input v-model="form.contractName" /></el-form-item <el-col :span="6"><el-form-item label="是否需要加盖法人章"><el-select v-model="form.legalSealFlag"><el-option label="是" :value="1" /><el-option label="否" :value="0" /></el-select></el-form-item></el-col>
></el-col> <el-col :span="6"><el-form-item label="一式(份)"><div class="inline-field"><el-input-number v-model="form.copyCount" :min="1" controls-position="right" /></div></el-form-item></el-col>
<el-col :span="6" <el-col :span="6"><el-form-item label="回款账期(天)"><el-input-number v-model="form.paymentDays" :min="0" controls-position="right" /></el-form-item></el-col>
><el-form-item label="合同类型" <el-col :span="24"><el-form-item label="备注"><el-input v-model="form.remark" type="textarea" maxlength="2000" show-word-limit /></el-form-item></el-col>
><el-select v-model="form.contractCategory" disabled
><el-option label="客户合同" value="客户合同" /><el-option
label="承运商合同"
value="承运商合同" /></el-select></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="甲方"><el-input v-model="form.partyA" disabled /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="乙方"><el-input v-model="form.partyB" disabled /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="所属项目"
><el-input v-model="form.projectName" disabled /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="合同期限"
><el-date-picker
v-model="period"
type="daterange"
value-format="YYYY-MM-DD"
range-separator="" /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="所属组织"
><el-input v-model="form.organizationName" disabled /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="签订日期"
><el-date-picker
v-model="form.signDate"
type="date"
value-format="YYYY-MM-DD"
disabled /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="合同格式"
><el-select v-model="form.contractFormat"
><el-option label="电子合同" value="电子合同" /><el-option
label="纸质合同"
value="纸质合同" /></el-select></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="结算方式"><el-input v-model="form.settlementMode" /></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="是否需要加盖法人章"
><el-select v-model="form.legalSealFlag"
><el-option label="是" :value="1" /><el-option
label="否"
:value="0" /></el-select></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="一式(份)"
><div class="inline-field">
<el-input-number
v-model="form.copyCount"
:min="1"
controls-position="right"
/></div></el-form-item
></el-col>
<el-col :span="6"
><el-form-item label="回款账期(天)"
><el-input-number
v-model="form.paymentDays"
:min="0"
controls-position="right" /></el-form-item
></el-col>
<el-col :span="24"
><el-form-item label="备注"
><el-input
v-model="form.remark"
type="textarea"
maxlength="2000"
show-word-limit /></el-form-item
></el-col>
</el-row> </el-row>
</section> </section>
<section class="change-section"> <section class="change-section">
<div class="dialog-section-title">合同文件</div> <div class="dialog-section-title">合同文件</div>
<div class="attachment-head"> <div class="attachment-head">
<vehicle-attachment-upload <el-button type="primary" :disabled="!contractFileRows.length" @click="handleContractFileBatchDownload">批量下载</el-button>
v-model="contractFileRows" </div>
:readonly="false" <el-table :data="contractFileRows" border class="change-table" @selection-change="selectedContractFiles = $event"><el-table-column type="selection" width="55" /><el-table-column type="index" label="序号" width="70" /><el-table-column label="文件名" min-width="240"><template #default="{ row }"><el-link type="primary" @click="previewAttachment(row, contractFileRows)">{{ row.originalName || row.name }}</el-link></template></el-table-column><el-table-column label="文件大小" width="120"><template #default="{ row }">{{ formatFileSize(row.size) }}</template></el-table-column><el-table-column prop="uploadUserName" label="上传人" width="140" /><el-table-column prop="uploadTime" label="上传时间" width="170" /><el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="removeContractFile($index)">删除</el-link></template></el-table-column></el-table>
:file-types="attachmentFileTypes" <div class="attachment-upload">
:max-size="500" <vehicle-attachment-upload v-model="contractFileRows" :readonly="false" :file-types="attachmentFileTypes" :max-size="500" :show-file-list="false" button-text="上传附件" @change="handleContractFileChange" />
:show-tip="false"
:show-file-list="false"
button-text="上传附件"
@change="handleContractFileChange"
/><el-button
type="primary"
:disabled="!contractFileRows.length"
@click="handleContractFileBatchDownload"
>批量下载</el-button
>
</div> </div>
<el-table
:data="contractFileRows"
border
class="change-table"
@selection-change="selectedContractFiles = $event"
><el-table-column type="selection" width="55" /><el-table-column
type="index"
label="序号"
width="70"
/><el-table-column label="文件名" min-width="240"
><template #default="{ row }"
><el-link type="primary" @click="previewAttachment(row, contractFileRows)">{{
row.originalName || row.name
}}</el-link></template
></el-table-column
><el-table-column label="文件大小" width="120"
><template #default="{ row }">{{ formatFileSize(row.size) }}</template></el-table-column
><el-table-column prop="uploadUserName" label="上传人" width="140" /><el-table-column
prop="uploadTime"
label="上传时间"
width="170"
/><el-table-column label="操作" width="100"
><template #default="{ $index }"
><el-link type="danger" @click="removeContractFile($index)">删除</el-link></template
></el-table-column
></el-table
>
</section> </section>
<section class="change-section"> <section class="change-section">
<div class="section-head"> <div class="section-head"><div class="dialog-section-title">计费信息</div><el-button type="primary" plain @click="addPlan">添加</el-button></div>
<div class="dialog-section-title">计费信息</div> <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">手动生成</el-radio></el-radio-group>
<el-button type="primary" plain @click="addPlan">添加</el-button> <el-table :data="plans" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column prop="planName" label="方案名称" min-width="220" /><el-table-column label="默认方案" min-width="120"><template #default="{ row }">{{ row.defaultPlan ? '是' : '否' }}</template></el-table-column><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column label="操作" width="180"><template #default="{ row, $index }"><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
</div>
<el-radio-group v-model="feeGenerationMode"
><el-radio label="system">系统生成</el-radio
><el-radio label="manual">手动生成</el-radio></el-radio-group
>
<el-table :data="plans" border class="change-table"
><el-table-column type="index" label="序号" width="70" /><el-table-column
prop="planName"
label="方案名称"
min-width="220"
/><el-table-column label="默认方案" min-width="120"
><template #default="{ row }">{{
row.defaultPlan ? '是' : '否'
}}</template></el-table-column
><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
label="操作"
width="180"
><template #default="{ row, $index }"
><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
></el-table-column
></el-table
>
</section> </section>
<section class="change-section"> <section class="change-section">
@@ -182,66 +46,13 @@
<el-tab-pane label="预结算配置" name="pre" /> <el-tab-pane label="预结算配置" name="pre" />
<el-tab-pane label="正式结算配置" name="formal" /> <el-tab-pane label="正式结算配置" name="formal" />
</el-tabs> </el-tabs>
<div class="settlement-switch"> <div class="settlement-switch"><span>自动生成结算单</span><el-radio-group v-model="settlementRule.autoGenerate"><el-radio :label="1">开启</el-radio><el-radio :label="0">关闭</el-radio></el-radio-group></div>
<span>自动生成结算单</span <el-form v-if="settlementRule.autoGenerate === 1" :model="settlementRule" label-position="right" label-width="auto" class="settlement-form">
><el-radio-group v-model="settlementRule.autoGenerate" <el-form-item label="账单起始日期" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
><el-radio :label="1">开启</el-radio <el-form-item label="结算类型" required><el-select v-model="settlementRule.settlementType" placeholder="请选择结算类型" @change="handleSettlementTypeChange"><el-option v-for="item in settlementTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
><el-radio :label="0">关闭</el-radio></el-radio-group <el-form-item v-if="showSettlementBillCycleType" label="账单周期类型" required><el-select v-model="settlementRule.billCycleType" placeholder="请选择账单周期类型" @change="handleCycleTypeChange"><el-option v-for="item in billCycleTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
> <el-form-item v-if="showSettlementBillCutoffDay" label="账单截单日" required><el-select v-model="settlementRule.billCutoffDay" placeholder="请选择账单截单日"><el-option v-for="item in billCutoffDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
</div> <el-form-item v-if="showSettlementCycleDays" label="周期天数" required><el-select v-model="settlementRule.cycleDays" placeholder="请选择周期天数"><el-option v-for="item in cycleDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
<el-form
v-if="settlementRule.autoGenerate === 1"
:model="settlementRule"
label-position="right"
label-width="auto"
class="settlement-form"
>
<el-form-item label="账单起始日期" required
><el-date-picker
v-model="settlementRule.billStartDate"
type="date"
placeholder="请选择账单起始日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/></el-form-item>
<el-form-item label="结算类型" required
><el-select
v-model="settlementRule.settlementType"
placeholder="请选择结算类型"
@change="handleSettlementTypeChange"
><el-option
v-for="item in settlementTypeOptions"
:key="item"
:label="item"
:value="item" /></el-select
></el-form-item>
<el-form-item v-if="showSettlementBillCycleType" label="账单周期类型" required
><el-select
v-model="settlementRule.billCycleType"
placeholder="请选择账单周期类型"
@change="handleCycleTypeChange"
><el-option
v-for="item in billCycleTypeOptions"
:key="item"
:label="item"
:value="item" /></el-select
></el-form-item>
<el-form-item v-if="showSettlementBillCutoffDay" label="账单截单日" required
><el-select v-model="settlementRule.billCutoffDay" placeholder="请选择账单截单日"
><el-option
v-for="item in billCutoffDayOptions"
:key="item.value"
:label="item.label"
:value="item.value" /></el-select
></el-form-item>
<el-form-item v-if="showSettlementCycleDays" label="周期天数" required
><el-select v-model="settlementRule.cycleDays" placeholder="请选择周期天数"
><el-option
v-for="item in cycleDayOptions"
:key="item.value"
:label="item.label"
:value="item.value" /></el-select
></el-form-item>
</el-form> </el-form>
</section> </section>
@@ -250,135 +61,29 @@
<el-table :data="paymentRatioRows" border class="change-table"> <el-table :data="paymentRatioRows" border class="change-table">
<el-table-column type="index" label="序号" width="70" /> <el-table-column type="index" label="序号" width="70" />
<el-table-column prop="paymentTerm" label="付款笔数" min-width="180" /> <el-table-column prop="paymentTerm" label="付款笔数" min-width="180" />
<el-table-column label="付款比例上限" min-width="220" <el-table-column label="付款比例上限%" min-width="220"><template #default="{ row }"><el-input-number v-model="row.ratioLimit" :min="0" :max="100" :precision="2" controls-position="right" /></template></el-table-column>
><template #default="{ row }" <el-table-column label="备注" min-width="220"><template #default="{ row }"><el-input v-model="row.remark" maxlength="200" /></template></el-table-column>
><el-input <el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="paymentRatioRows.splice($index, 1)">删除</el-link></template></el-table-column>
v-model="row.ratioLimit"
placeholder="请输入"
@input="value => ratioInput(row, value)"
><template #append>%</template></el-input
></template
></el-table-column
>
<el-table-column label="备注" min-width="220"
><template #default="{ row }"
><el-input v-model="row.remark" maxlength="200" /></template
></el-table-column>
<el-table-column label="操作" width="100"
><template #default="{ $index }"
><el-link type="danger" @click="paymentRatioRows.splice($index, 1)"
>删除</el-link
></template
></el-table-column
>
</el-table> </el-table>
<el-button type="primary" plain @click="addPaymentRatioRow">添加</el-button> <el-button type="primary" plain @click="addPaymentRatioRow">添加</el-button>
</section> </section>
<billing-plan-editor <billing-plan-editor v-model="planDialogVisible" :value="planEditor" :index="planEditorIndex" @save="savePlan" />
v-model="planDialogVisible"
:value="planEditor"
:index="planEditorIndex"
@save="savePlan"
/>
<section class="change-section attachment-section"> <section class="change-section attachment-section">
<div class="section-head"> <div class="section-head"><div class="dialog-section-title">其它附件</div><el-button type="primary" plain>批量下载</el-button></div>
<div class="dialog-section-title">其它附件</div> <el-table :data="attachments" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column label="文件名" min-width="240"><template #default="{ row }"><el-link type="primary" @click="previewAttachment(row, attachments)">{{ row.originalName || row.name }}</el-link></template></el-table-column><el-table-column prop="description" label="附件描述" min-width="240" /><el-table-column prop="size" label="文件大小" width="120" /><el-table-column prop="userName" label="上传人" width="140" /><el-table-column prop="uploadTime" label="上传时间" width="180" /><el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="attachments.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
<el-button type="primary" plain>批量下载</el-button> <el-upload action="#" :auto-upload="false" multiple :show-file-list="false" @change="handleAttachment"><el-button plain>上传附件</el-button></el-upload>
</div>
<el-table :data="attachments" border class="change-table"
><el-table-column type="index" label="序号" width="70" /><el-table-column
label="文件名"
min-width="240"
><template #default="{ row }"
><el-link type="primary" @click="previewAttachment(row, attachments)">{{
row.originalName || row.name
}}</el-link></template
></el-table-column
><el-table-column prop="description" label="附件描述" min-width="240" /><el-table-column
prop="size"
label="文件大小"
width="120"
/><el-table-column prop="userName" label="上传人" width="140" /><el-table-column
prop="uploadTime"
label="上传时间"
width="180"
/><el-table-column label="操作" width="100"
><template #default="{ $index }"
><el-link type="danger" @click="attachments.splice($index, 1)"
>删除</el-link
></template
></el-table-column
></el-table
>
<el-upload
action="#"
:auto-upload="false"
multiple
:show-file-list="false"
@change="handleAttachment"
><el-button plain>上传附件</el-button></el-upload
>
</section> </section>
<section class="change-section change-reason-section"> <section class="change-section change-reason-section"><div class="dialog-section-title">变更原因</div><el-form-item prop="changeReason"><el-input v-model="form.changeReason" type="textarea" :rows="2" maxlength="2000" show-word-limit placeholder="请输入变更原因" /></el-form-item><div class="dialog-section-title">变更材料</div><el-upload action="#" :auto-upload="false" multiple :show-file-list="false" @change="handleChangeMaterial"><el-button plain>上传变更材料</el-button></el-upload></section>
<div class="dialog-section-title">变更原因</div> <div class="page-footer"><el-button type="primary" @click="submit">提交</el-button><el-button @click="$router.back()">关闭</el-button></div>
<el-form-item prop="changeReason"
><el-input
v-model="form.changeReason"
type="textarea"
:rows="4"
maxlength="2000"
show-word-limit
placeholder="请输入变更原因"
/></el-form-item>
<div class="dialog-section-title">变更材料</div>
<el-upload
action="#"
:auto-upload="false"
multiple
:show-file-list="false"
@change="handleChangeMaterial"
><el-button plain>上传变更材料</el-button></el-upload
>
</section>
<div class="page-footer">
<el-button type="primary" @click="submit">提交</el-button
><el-button @click="$router.back()">关闭</el-button>
</div>
</el-form> </el-form>
<el-dialog <el-dialog v-model="documentPreviewVisible" :title="previewFile.name || '附件预览'" append-to-body destroy-on-close width="90%" top="4vh">
v-model="documentPreviewVisible" <open-file-viewer v-if="documentPreviewVisible && previewFile.url" :file="previewFile.url" :file-name="previewFile.name" :mime-type="previewFile.mimeType" width="100%" height="72vh" fit="contain" theme="auto" locale="zh-CN" :toolbar="viewerToolbar" :plugins="viewerPlugins" @unsupported="handlePreviewUnsupported" @error="handlePreviewError" />
:title="previewFile.name || '附件预览'"
append-to-body
destroy-on-close
width="90%"
top="4vh"
>
<open-file-viewer
v-if="documentPreviewVisible && previewFile.url"
:file="previewFile.url"
:file-name="previewFile.name"
:mime-type="previewFile.mimeType"
width="100%"
height="72vh"
fit="contain"
theme="auto"
locale="zh-CN"
:toolbar="viewerToolbar"
:plugins="viewerPlugins"
@unsupported="handlePreviewUnsupported"
@error="handlePreviewError"
/>
</el-dialog> </el-dialog>
<el-image-viewer <el-image-viewer v-if="imagePreviewVisible" :url-list="imagePreviewUrls" :initial-index="imagePreviewIndex" @close="imagePreviewVisible = false" />
v-if="imagePreviewVisible"
:url-list="imagePreviewUrls"
:initial-index="imagePreviewIndex"
@close="imagePreviewVisible = false"
/>
</basic-container> </basic-container>
</template> </template>
@@ -387,13 +92,7 @@ import * as api from '@/api/business/contract-manage';
import BillingPlanEditor from './components/billing-plan-editor.vue'; import BillingPlanEditor from './components/billing-plan-editor.vue';
import { ElImageViewer } from 'element-plus'; import { ElImageViewer } from 'element-plus';
import { OpenFileViewer } from '@open-file-viewer/vue'; import { OpenFileViewer } from '@open-file-viewer/vue';
import { import { fallbackPlugin, imagePlugin, officePlugin, pdfPlugin, textPlugin } from '@open-file-viewer/core';
fallbackPlugin,
imagePlugin,
officePlugin,
pdfPlugin,
textPlugin,
} from '@open-file-viewer/core';
import '@open-file-viewer/core/style.css'; import '@open-file-viewer/core/style.css';
import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url'; import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
@@ -407,396 +106,55 @@ const viewerPlugins = [
export default { export default {
components: { BillingPlanEditor, ElImageViewer, OpenFileViewer }, components: { BillingPlanEditor, ElImageViewer, OpenFileViewer },
data() { data() { return { form: {}, period: [], plans: [], attachments: [], contractFiles: [], contractFileRows: [], selectedContractFiles: [], paymentRatioRows: [], settlementConfigTab: 'pre', changeMaterials: [], imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { zoom: true, rotate: true, download: true, fullscreen: true }, feeGenerationMode: 'system', settlementRule: { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: '' }, preSettlementConfig: {}, formalSettlementConfig: {}, settlementTypeOptions: ['月结','日结','周结','半月结','固定天数周期结算'], billCycleTypeOptions: ['固定截单日','自然月'], billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({ label: `${index + 1}`, value: index + 1 })), cycleDayOptions: [7,15,30,60].map(value => ({ label: `${value}`, value })), planDialogVisible: false, planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] }, planEditorIndex: -1, billingElements: ['按重量','按体积','按车辆','按里程','按吨·公里','固定金额(整单一口价)','按数量'], attachmentFileTypes: ['pdf','bmp','jpeg','png','jpg','doc','docx','ppt','pptx','xlsx','xls','eml','msg','zip'], rules: { contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }], changeReason: [{ required: true, message: '请输入变更原因', trigger: 'blur' }] } }; },
return { computed: { showSettlementBillCycleType() { return this.settlementRule.settlementType === '月结'; }, showSettlementBillCutoffDay() { return this.showSettlementBillCycleType && this.settlementRule.billCycleType === '固定截单日'; }, showSettlementCycleDays() { return this.settlementRule.settlementType === '固定天数周期结算'; } },
form: {}, mounted() { this.load(); },
period: [], watch: { settlementConfigTab(tab, oldTab) { if (tab === oldTab) return; if (oldTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; this.settlementRule = { ...(tab === 'pre' ? this.preSettlementConfig : this.formalSettlementConfig) }; } },
plans: [],
attachments: [],
contractFiles: [],
contractFileRows: [],
selectedContractFiles: [],
paymentRatioRows: [],
settlementConfigTab: 'pre',
changeMaterials: [],
imagePreviewVisible: false,
imagePreviewUrls: [],
imagePreviewIndex: 0,
documentPreviewVisible: false,
previewFile: {},
viewerPlugins,
viewerToolbar: { zoom: true, rotate: true, download: true, fullscreen: true },
feeGenerationMode: 'system',
settlementRule: {
autoGenerate: 1,
settlementType: '月结',
billCycleType: '固定截单日',
billCutoffDay: 25,
cycleDays: '',
},
preSettlementConfig: {},
formalSettlementConfig: {},
settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
billCycleTypeOptions: ['固定截单日', '自然月'],
billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({
label: `${index + 1}`,
value: index + 1,
})),
cycleDayOptions: [7, 15, 30, 60].map(value => ({ label: `${value}`, value })),
planDialogVisible: false,
planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
planEditorIndex: -1,
billingElements: [
'按重量',
'按体积',
'按车辆',
'按里程',
'按吨·公里',
'固定金额(整单一口价)',
'按数量',
],
attachmentFileTypes: [
'pdf',
'bmp',
'jpeg',
'png',
'jpg',
'doc',
'docx',
'ppt',
'pptx',
'xlsx',
'xls',
'eml',
'msg',
'zip',
],
rules: {
contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
changeReason: [{ required: true, message: '请输入变更原因', trigger: 'blur' }],
},
};
},
computed: {
showSettlementBillCycleType() {
return this.settlementRule.settlementType === '月结';
},
showSettlementBillCutoffDay() {
return this.showSettlementBillCycleType && this.settlementRule.billCycleType === '固定截单日';
},
showSettlementCycleDays() {
return this.settlementRule.settlementType === '固定天数周期结算';
},
},
mounted() {
this.load();
},
watch: {
settlementConfigTab(tab, oldTab) {
if (tab === oldTab) return;
if (oldTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
else this.formalSettlementConfig = { ...this.settlementRule };
this.settlementRule = {
...(tab === 'pre' ? this.preSettlementConfig : this.formalSettlementConfig),
};
},
},
methods: { methods: {
async load() { async load() { const id = this.$route.query.id; if (!id) return; const res = await api.getDetail(id); const data = res.data?.data || res.data || {}; this.form = { ...data, changeType: '合同信息变更' }; this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : []; this.plans = this.parse(data.billingPlanJson); this.attachments = this.parse(data.attachmentsJson); this.contractFileRows = this.parse(data.contractFileJson); const rules = this.parseObject(data.settlementRuleJson); const pre = this.parseObject(data.preSettlementConfigJson); const formal = this.parseObject(data.formalSettlementConfigJson); const legacy = Object.keys(rules).some(key => !['preSettlementConfig', 'formalSettlementConfig'].includes(key)) ? rules : {}; this.preSettlementConfig = rules.preSettlementConfig || (Object.keys(pre).length ? pre : legacy); this.formalSettlementConfig = rules.formalSettlementConfig || (Object.keys(formal).length ? formal : legacy); this.settlementRule = { ...this.preSettlementConfig }; this.feeGenerationMode = data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system'); this.paymentRatioRows = this.parse(data.paymentRatioJson); },
const id = this.$route.query.id; parse(value) { try { const result = JSON.parse(value || '[]'); return Array.isArray(result) ? result : []; } catch { return []; } },
if (!id) return; parseObject(value) { try { return { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: 15, ...(JSON.parse(value || '{}') || {}) }; } catch { return { autoGenerate: 1, settlementType: '月结', billCycleType: '固定截单日', billCutoffDay: 25, cycleDays: 15 }; } },
const res = await api.getDetail(id); addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
const data = res.data?.data || res.data || {}; editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
this.form = { ...data, changeType: '合同信息变更' }; toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : []; savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
this.plans = this.parse(data.billingPlanJson); handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; } else if (!this.settlementRule.billCycleType) this.settlementRule.billCycleType = '固定截单日'; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
this.attachments = this.parse(data.attachmentsJson); handleCycleTypeChange(value) { if (value === '固定截单日' && !this.settlementRule.billCutoffDay) this.settlementRule.billCutoffDay = 25; if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; },
this.contractFileRows = this.parse(data.contractFileJson); handleAttachment(event) { const raw = event.raw; if (raw) this.attachments.push({ name: raw.name, size: `${Math.ceil(raw.size / 1024)}KB`, uploadTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss') }); },
const rules = this.parseObject(data.settlementRuleJson); handleContractFileChange(list) { this.contractFileRows = (list || []).map(item => ({ ...item, uploadTime: item.uploadTime || this.$dayjs().format('YYYY-MM-DD HH:mm:ss') })); },
const pre = this.parseObject(data.preSettlementConfigJson); attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
const formal = this.parseObject(data.formalSettlementConfigJson); attachmentName(row = {}) { return row.originalName || row.name || row.fileName || '附件'; },
const legacy = Object.keys(rules).some( attachmentExtension(row = {}) { const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0]; const index = source.lastIndexOf('.'); return index > -1 ? source.slice(index + 1).toLowerCase() : ''; },
key => !['preSettlementConfig', 'formalSettlementConfig'].includes(key) isAttachmentImage(row) { return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row)); },
) previewAttachment(row, rows = this.attachments) { const url = this.attachmentUrl(row); if (!url) { this.$message.warning('附件地址为空,无法预览'); return; } if (this.isAttachmentImage(row)) { this.imagePreviewUrls = (rows || []).filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item)).map(item => this.attachmentUrl(item)); this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0); this.imagePreviewVisible = true; return; } this.previewFile = { name: this.attachmentName(row), url, mimeType: row.mimeType || row.contentType || '' }; this.documentPreviewVisible = true; },
? rules handlePreviewUnsupported() { this.$message.warning('当前文件暂不支持在线预览'); },
: {}; handlePreviewError() { this.$message.error('附件预览失败'); },
this.preSettlementConfig = removeContractFile(index) { this.contractFileRows.splice(index, 1); },
rules.preSettlementConfig || (Object.keys(pre).length ? pre : legacy); handleContractFileBatchDownload() { (this.selectedContractFiles.length ? this.selectedContractFiles : this.contractFileRows).forEach(row => { if (row.url) window.open(row.url, '_blank'); }); },
this.formalSettlementConfig = formatFileSize(value) { const size = Number(value || 0); return size > 1024 * 1024 ? `${(size / 1024 / 1024).toFixed(2)}MB` : `${Math.max(1, Math.ceil(size / 1024))}KB`; },
rules.formalSettlementConfig || (Object.keys(formal).length ? formal : legacy); handleChangeMaterial(event) { if (event.raw) this.changeMaterials.push(event.raw); },
this.settlementRule = { ...this.preSettlementConfig }; addPaymentRatioRow() { this.paymentRatioRows.push({ paymentTerm: `${this.paymentRatioRows.length + 1}`, ratioLimit: '', remark: '' }); },
this.feeGenerationMode = async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeReason, changeReason: this.form.changeReason }); this.$message.success('变更已提交'); this.$router.back(); },
data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
this.paymentRatioRows = this.parse(data.paymentRatioJson);
},
parse(value) {
try {
const result = JSON.parse(value || '[]');
return Array.isArray(result) ? result : [];
} catch {
return [];
}
},
parseObject(value) {
try {
return {
autoGenerate: 1,
settlementType: '月结',
billCycleType: '固定截单日',
billCutoffDay: 25,
cycleDays: 15,
...(JSON.parse(value || '{}') || {}),
};
} catch {
return {
autoGenerate: 1,
settlementType: '月结',
billCycleType: '固定截单日',
billCutoffDay: 25,
cycleDays: 15,
};
}
},
addPlan() {
this.planEditorIndex = -1;
this.planEditor = {
planName: `计费方案${this.plans.length + 1}`,
defaultPlan: !this.plans.length,
remark: '',
rules: [{}],
};
this.planDialogVisible = true;
},
editPlan(row, index) {
this.planEditorIndex = index;
this.planEditor = JSON.parse(JSON.stringify(row));
this.planDialogVisible = true;
},
toggleDefaultPlan(value) {
if (value)
this.plans.forEach(item => {
item.defaultPlan = false;
});
},
savePlan(value, index) {
if (index < 0) this.plans.push(value);
else this.plans.splice(index, 1, value);
if (value.defaultPlan)
this.plans.forEach((item, current) => {
if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false;
});
},
handleSettlementTypeChange(value) {
if (value !== '月结') {
this.settlementRule.billCycleType = '';
this.settlementRule.billCutoffDay = '';
} else if (!this.settlementRule.billCycleType)
this.settlementRule.billCycleType = '固定截单日';
if (value !== '固定天数周期结算') this.settlementRule.cycleDays = '';
},
handleCycleTypeChange(value) {
if (value === '固定截单日' && !this.settlementRule.billCutoffDay)
this.settlementRule.billCutoffDay = 25;
if (value !== '固定截单日') this.settlementRule.billCutoffDay = '';
},
handleAttachment(event) {
const raw = event.raw;
if (raw)
this.attachments.push({
name: raw.name,
size: `${Math.ceil(raw.size / 1024)}KB`,
uploadTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
});
},
handleContractFileChange(list) {
this.contractFileRows = (list || []).map(item => ({
...item,
uploadTime: item.uploadTime || this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
}));
},
attachmentUrl(row = {}) {
return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || '';
},
attachmentName(row = {}) {
return row.originalName || row.name || row.fileName || '附件';
},
attachmentExtension(row = {}) {
const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0];
const index = source.lastIndexOf('.');
return index > -1 ? source.slice(index + 1).toLowerCase() : '';
},
isAttachmentImage(row) {
return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row));
},
previewAttachment(row, rows = this.attachments) {
const url = this.attachmentUrl(row);
if (!url) {
this.$message.warning('附件地址为空,无法预览');
return;
}
if (this.isAttachmentImage(row)) {
this.imagePreviewUrls = (rows || [])
.filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item))
.map(item => this.attachmentUrl(item));
this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0);
this.imagePreviewVisible = true;
return;
}
this.previewFile = {
name: this.attachmentName(row),
url,
mimeType: row.mimeType || row.contentType || '',
};
this.documentPreviewVisible = true;
},
handlePreviewUnsupported() {
this.$message.warning('当前文件暂不支持在线预览');
},
handlePreviewError() {
this.$message.error('附件预览失败');
},
removeContractFile(index) {
this.contractFileRows.splice(index, 1);
},
handleContractFileBatchDownload() {
(this.selectedContractFiles.length
? this.selectedContractFiles
: this.contractFileRows
).forEach(row => {
if (row.url) window.open(row.url, '_blank');
});
},
formatFileSize(value) {
const size = Number(value || 0);
return size > 1024 * 1024
? `${(size / 1024 / 1024).toFixed(2)}MB`
: `${Math.max(1, Math.ceil(size / 1024))}KB`;
},
handleChangeMaterial(event) {
if (event.raw) this.changeMaterials.push(event.raw);
},
addPaymentRatioRow() {
this.paymentRatioRows.push({
paymentTerm: `${this.paymentRatioRows.length + 1}`,
ratioLimit: '',
remark: '',
});
},
ratioInput(row, value) {
let nextValue = String(value ?? '').replace(/[^\d.]/g, '');
const parts = nextValue.split('.');
if (parts.length > 2) nextValue = `${parts.shift()}.${parts.join('')}`;
const [integerPart, decimalPart] = nextValue.split('.');
nextValue =
decimalPart === undefined ? integerPart : `${integerPart}.${decimalPart.slice(0, 2)}`;
if (Number(nextValue) > 100) nextValue = '100';
row.ratioLimit = nextValue;
},
async submit() {
await this.$refs.formRef.validate();
const total = this.paymentRatioRows.reduce(
(sum, row) => sum + Number(row.ratioLimit || 0),
0
);
if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) {
this.$message.warning('付款比例上限合计必须等于100%');
return;
}
const settlementRule = {
preSettlementConfig: this.preSettlementConfig,
formalSettlementConfig: this.formalSettlementConfig,
};
await api.submitChange({
...this.form,
startDate: this.period[0],
endDate: this.period[1],
feeGenerationMode: this.feeGenerationMode,
billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
billingPlanJson: JSON.stringify(this.plans),
settlementRuleJson: JSON.stringify(settlementRule),
preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
paymentRatioJson: JSON.stringify(this.paymentRatioRows),
contractFileJson: JSON.stringify(this.contractFileRows),
attachmentsJson: JSON.stringify(this.attachments),
changeContent: this.form.changeReason,
changeReason: this.form.changeReason,
});
this.$message.success('变更已提交');
this.$router.back();
},
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.contract-change-page { .contract-change-page { min-height: 100%; background: #fff; }
min-height: 100%; .change-section { padding: 20px 24px; border-bottom: 1px solid #eff1f7; }
background: #fff; .dialog-section-title { margin-bottom: 18px; font-size: 16px; font-weight: 600; }
} .dialog-section-title::before { display: inline-block; width: 4px; height: 16px; margin-right: 8px; vertical-align: -2px; background: #409eff; content: ''; }
.change-section { .section-head { display: flex; align-items: center; justify-content: space-between; }
padding: 20px 24px; .change-table { margin: 16px 0; }
border-bottom: 1px solid #eff1f7; .ratio-tip { margin-bottom: 8px; color: #f56c6c; }
} .unit { margin-left: 8px; }
.dialog-section-title { .inline-field { display: flex; align-items: center; gap: 8px; }
margin-bottom: 18px; .attachment-head { display: flex; align-items: center; justify-content: flex-end; margin-bottom: 12px; }
font-size: 16px; .attachment-upload { display: flex; justify-content: flex-start; margin-top: 12px; }
font-weight: 600; .attachment-upload .vehicle-attachment-upload { width: auto; }
} .attachment-upload .el-upload { display: inline-flex; }
.dialog-section-title::before { .settlement-switch { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; }
display: inline-block; .settlement-form { display: grid; grid-template-columns: repeat(3, minmax(240px, 1fr)); gap: 8px 28px; }
width: 4px; .change-reason-section { border: 1px dashed #ff8f9a; margin: 20px 16px; }
height: 16px; .page-footer { display: flex; gap: 16px; padding: 20px 40px; border-top: 1px solid #eff1f7; }
margin-right: 8px;
vertical-align: -2px;
background: #409eff;
content: '';
}
.section-head {
display: flex;
align-items: center;
justify-content: space-between;
}
.change-table {
margin: 16px 0;
}
.ratio-tip {
margin-bottom: 8px;
color: #f56c6c;
}
.unit {
margin-left: 8px;
}
.inline-field {
display: flex;
align-items: center;
gap: 8px;
}
.attachment-head {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 12px;
}
.settlement-switch {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 16px;
}
.settlement-form {
display: grid;
grid-template-columns: repeat(3, minmax(240px, 1fr));
gap: 8px 28px;
}
.change-reason-section {
border: 1px dashed #ff8f9a;
margin: 20px 16px;
}
.page-footer {
display: flex;
gap: 16px;
padding: 20px 40px;
border-top: 1px solid #eff1f7;
}
</style> </style>
+60 -73
View File
@@ -275,32 +275,26 @@
<el-option label="" :value="1" /> <el-option label="" :value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="一式"> <el-form-item label="一式">
<div class="contract-manage-form__inline-number"> <el-input
<el-input v-model="form.copyCount"
v-model="form.copyCount" placeholder="请输入"
placeholder="请输入" @input="value => integerInput('copyCount', value)"
@input="value => integerInput('copyCount', value)" />
/>
<span>份</span>
</div>
</el-form-item> </el-form-item>
<el-form-item label="回款账期"> <el-form-item label="回款账期">
<div class="contract-manage-form__inline-number"> <el-input
<el-input v-model="form.paymentDays"
v-model="form.paymentDays" placeholder="请输入"
placeholder="请输入" @input="value => integerInput('paymentDays', value)"
@input="value => integerInput('paymentDays', value)" />
/>
<span>天</span>
</div>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="备注" prop="remark" class="contract-manage-form__remark"> <el-form-item label="备注" prop="remark" class="contract-manage-form__remark">
<el-input <el-input
v-model="form.remark" v-model="form.remark"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入备注" placeholder="请输入备注"
@@ -1047,27 +1041,11 @@ const AttachmentSection = defineComponent({
[ [
h('div', { class: 'dialog-section-title' }, this.title), h('div', { class: 'dialog-section-title' }, this.title),
h('div', { class: 'contract-manage-form__attachment-head' }, [ h('div', { class: 'contract-manage-form__attachment-head' }, [
h('div', { class: 'contract-manage-form__attachment-actions' }, [ h(
...(!this.readonly ElButton,
? [ { type: 'primary', disabled: !this.rows.length, onClick: this.batchDownload },
h(VehicleAttachmentUpload, { () => '批量下载'
modelValue: this.rows, ),
fileTypes: this.attachmentFileTypes,
maxSize: 500,
showTip: false,
showFileList: false,
buttonText: '上传附件',
'onUpdate:modelValue': this.handleChange,
onChange: this.handleChange,
}),
]
: []),
h(
ElButton,
{ type: 'primary', disabled: !this.rows.length, onClick: this.batchDownload },
() => '批量下载'
),
]),
]), ]),
h( h(
ElTable, ElTable,
@@ -1081,6 +1059,23 @@ const AttachmentSection = defineComponent({
}, },
() => columns () => columns
), ),
...(!this.readonly
? [
h('div', { class: 'contract-manage-form__attachment-upload' }, [
h(VehicleAttachmentUpload, {
modelValue: this.rows,
fileTypes: this.attachmentFileTypes,
maxSize: 500,
showTip: true,
tip: '支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M',
showFileList: false,
buttonText: '上传附件',
'onUpdate:modelValue': this.handleChange,
onChange: this.handleChange,
}),
]),
]
: []),
] ]
); );
}, },
@@ -2197,25 +2192,6 @@ export default {
} }
} }
&__inline-number {
display: flex;
align-items: center;
gap: 8px;
width: 360px;
max-width: 100%;
:deep(.el-input) {
flex: 1;
width: auto;
min-width: 0;
}
span {
flex: none;
color: #606266;
}
}
&__billing-head, &__billing-head,
&__attachment-head { &__attachment-head {
display: flex; display: flex;
@@ -2318,22 +2294,29 @@ export default {
margin-bottom: 16px; margin-bottom: 16px;
} }
:deep(.contract-manage-form__attachment-actions) { :deep(.contract-manage-form__attachment-upload) {
display: inline-flex; display: flex;
align-items: center; justify-content: flex-start;
justify-content: flex-end; margin-top: 12px;
flex-wrap: nowrap;
gap: 8px;
white-space: nowrap;
}
:deep(.contract-manage-form__attachment-actions .vehicle-attachment-upload) { :deep(.vehicle-attachment-upload) {
flex: 0 0 auto; display: flex;
width: auto !important; align-items: center;
} width: auto;
}
:deep(.contract-manage-form__attachment-actions .el-upload) { :deep(.el-upload) {
display: inline-flex; display: inline-flex;
}
:deep(.el-upload__tip) {
display: inline-block;
margin: 0 0 0 30px;
color: #909399;
font-size: 13px;
line-height: 1.4;
text-align: left;
}
} }
.contract-manage-detail { .contract-manage-detail {
@@ -2383,4 +2366,8 @@ export default {
white-space: normal; white-space: normal;
line-height: 1.2; line-height: 1.2;
} }
.contract-manage-form__tip {
color: #ff0000 !important;
font-size: 12px;
}
</style> </style>
+5 -2
View File
@@ -901,7 +901,7 @@
<el-input <el-input
v-model="dialogForm.taskRemark" v-model="dialogForm.taskRemark"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
placeholder="请输入500字以内" placeholder="请输入500字以内"
@@ -957,7 +957,7 @@
</el-table> </el-table>
</section-card> </section-card>
<section-card title="路线编辑"><template #extra><span class="loading-route-change-dialog__hint">拖拽调整顺序</span></template><div v-if="routeChangeNodes.length" class="loading-route-change-dialog__route-list"><div v-for="(node, index) in routeChangeNodes" :key="node.key || index" class="loading-route-change-dialog__route-item" draggable="true" @dragstart="handleRouteChangeDragStart(index)" @dragover.prevent @drop="handleRouteChangeDrop(index)"><span :class="['loading-route-change-dialog__route-type', `loading-route-change-dialog__route-type--${routeChangeTypeClass(index)}`]">{{ routeChangeTypeText(index) }}</span><span>{{ node.address }}</span><span class="loading-route-change-dialog__tags"><el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag></span><el-icon><Rank /></el-icon></div></div><el-empty v-else description="暂无路线" :image-size="60" /></section-card> <section-card title="路线编辑"><template #extra><span class="loading-route-change-dialog__hint">拖拽调整顺序</span></template><div v-if="routeChangeNodes.length" class="loading-route-change-dialog__route-list"><div v-for="(node, index) in routeChangeNodes" :key="node.key || index" class="loading-route-change-dialog__route-item" draggable="true" @dragstart="handleRouteChangeDragStart(index)" @dragover.prevent @drop="handleRouteChangeDrop(index)"><span :class="['loading-route-change-dialog__route-type', `loading-route-change-dialog__route-type--${routeChangeTypeClass(index)}`]">{{ routeChangeTypeText(index) }}</span><span>{{ node.address }}</span><span class="loading-route-change-dialog__tags"><el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag></span><el-icon><Rank /></el-icon></div></div><el-empty v-else description="暂无路线" :image-size="60" /></section-card>
<el-form label-width="auto"><el-form-item label="变更备注"><el-input v-model="routeChangeRemark" type="textarea" :rows="1" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-form> <el-form label-width="auto"><el-form-item label="变更备注"><el-input v-model="routeChangeRemark" type="textarea" :rows="2" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="变更记录" name="records"><el-table :data="routeChangeRecords" border><el-table-column prop="changeTime" label="变更时间" min-width="170"/><el-table-column prop="changeUser" label="变更人" min-width="120"/><el-table-column prop="content" label="变更内容" min-width="360"><template #default="{ row }"><div class="loading-route-change-dialog__record-content">{{ row.content || '-' }}</div></template></el-table-column><el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip/></el-table><el-empty v-if="!routeChangeRecords.length" description="暂无变更记录" :image-size="60"/></el-tab-pane> <el-tab-pane label="变更记录" name="records"><el-table :data="routeChangeRecords" border><el-table-column prop="changeTime" label="变更时间" min-width="170"/><el-table-column prop="changeUser" label="变更人" min-width="120"/><el-table-column prop="content" label="变更内容" min-width="360"><template #default="{ row }"><div class="loading-route-change-dialog__record-content">{{ row.content || '-' }}</div></template></el-table-column><el-table-column prop="remark" label="备注" min-width="200" show-overflow-tooltip/></el-table><el-empty v-if="!routeChangeRecords.length" description="暂无变更记录" :image-size="60"/></el-tab-pane>
</el-tabs> </el-tabs>
@@ -2631,6 +2631,9 @@ export default {
gap: 16px; gap: 16px;
align-items: start; align-items: start;
//margin-bottom: 12px; //margin-bottom: 12px;
.section-card {
min-height: 257px;
}
} }
.loading-manage-dialog__candidate-actions, .loading-manage-dialog__candidate-actions,
+2 -2
View File
@@ -105,7 +105,7 @@
:title="dialogReadonly ? '查看过程配置' : form.id ? '编辑过程配置' : '新建过程配置'" :title="dialogReadonly ? '查看过程配置' : form.id ? '编辑过程配置' : '新建过程配置'"
append-to-body append-to-body
v-model="configBox" v-model="configBox"
width="96%" width="90%"
top="4vh" top="4vh"
class="process-config-dialog" class="process-config-dialog"
:close-on-click-modal="false" :close-on-click-modal="false"
@@ -170,7 +170,7 @@
<el-input <el-input
v-model="form.remark" v-model="form.remark"
type="textarea" type="textarea"
:rows="4" :rows="2"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
+25 -8
View File
@@ -428,7 +428,7 @@
<el-input <el-input
v-model="form.projectIntro" v-model="form.projectIntro"
type="textarea" type="textarea"
:rows="4" :rows="2"
placeholder="请填写备注信息" placeholder="请填写备注信息"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
@@ -438,7 +438,7 @@
<el-input <el-input
v-model="form.profitRemark" v-model="form.profitRemark"
type="textarea" type="textarea"
:rows="4" :rows="2"
placeholder="请填写备注信息" placeholder="请填写备注信息"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
@@ -448,7 +448,7 @@
<el-input <el-input
v-model="form.riskPoint" v-model="form.riskPoint"
type="textarea" type="textarea"
:rows="4" :rows="2"
placeholder="请填写备注信息" placeholder="请填写备注信息"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
@@ -458,7 +458,7 @@
<el-input <el-input
v-model="form.emergencyPlan" v-model="form.emergencyPlan"
type="textarea" type="textarea"
:rows="4" :rows="2"
placeholder="请填写备注信息" placeholder="请填写备注信息"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
@@ -535,9 +535,9 @@
class="project-apply-form__upload" class="project-apply-form__upload"
:readonly="dialogReadonly" :readonly="dialogReadonly"
:file-types="attachmentFileTypes" :file-types="attachmentFileTypes"
:max-size="50" :max-size="500"
button-text="上传附件" button-text="上传附件"
tip="支持pdfbmpjpegpngjpgdocdocxpptpptxxlsxxlsemlmsgzip的文件格式单个文件大小限制50M" tip="支持pdfbmpjpegpngjpgdocdocxpptpptxxlsxxlsemlmsgzip的文件格式单个文件不超过500M"
@change="handleAttachmentChange" @change="handleAttachmentChange"
/> />
</div> </div>
@@ -585,7 +585,7 @@
<el-input <el-input
v-model="form.changeContent" v-model="form.changeContent"
type="textarea" type="textarea"
:rows="5" :rows="2"
placeholder="2000字以内" placeholder="2000字以内"
maxlength="2000" maxlength="2000"
show-word-limit show-word-limit
@@ -596,7 +596,7 @@
<el-input <el-input
v-model="form.changeReason" v-model="form.changeReason"
type="textarea" type="textarea"
:rows="5" :rows="2"
placeholder="2000字以内" placeholder="2000字以内"
maxlength="2000" maxlength="2000"
show-word-limit show-word-limit
@@ -2075,6 +2075,23 @@ export default {
border-radius: 6px; border-radius: 6px;
padding: 12px 0; padding: 12px 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.vehicle-attachment-upload) {
display: flex;
align-items: center;
}
:deep(.el-upload) {
display: inline-flex;
}
:deep(.el-upload__tip) {
display: inline-block;
margin: 0 0 0 30px;
color: #909399;
font-size: 13px;
line-height: 1.4;
}
} }
&__change-textarea { &__change-textarea {
+42 -10
View File
@@ -84,15 +84,6 @@
<template #attachmentsJson-form> <template #attachmentsJson-form>
<div class="temporary-credit-limit-page__attachment"> <div class="temporary-credit-limit-page__attachment">
<div class="temporary-credit-limit-page__attachment-head"> <div class="temporary-credit-limit-page__attachment-head">
<vehicle-attachment-upload
v-model="attachmentRows"
:readonly="dialogReadonly"
:file-types="attachmentFileTypes"
:max-size="50"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
<el-button type="primary" :disabled="!attachmentRows.length" @click="batchDownload"> <el-button type="primary" :disabled="!attachmentRows.length" @click="batchDownload">
批量下载 批量下载
</el-button> </el-button>
@@ -121,6 +112,18 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="temporary-credit-limit-page__attachment-upload">
<vehicle-attachment-upload
v-model="attachmentRows"
:readonly="dialogReadonly"
:file-types="attachmentFileTypes"
:max-size="500"
:show-file-list="false"
button-text="上传附件"
tip="支持pdfbmpjpegpngjpgdocdocxpptpptxxlsxxlsemlmsgzip的文件格式单个文件不超过500M"
@change="handleAttachmentChange"
/>
</div>
</div> </div>
</template> </template>
@@ -639,10 +642,35 @@ export default {
&__attachment-head { &__attachment-head {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: flex-end;
margin-bottom: 12px; margin-bottom: 12px;
} }
&__attachment-upload {
display: flex;
justify-content: flex-start;
margin-top: 12px;
:deep(.vehicle-attachment-upload) {
display: flex;
align-items: center;
width: auto;
}
:deep(.el-upload) {
display: inline-flex;
}
:deep(.el-upload__tip) {
display: inline-block;
margin: 0 0 0 30px;
color: #909399;
font-size: 13px;
line-height: 1.4;
text-align: left;
}
}
&__flow { &__flow {
width: 100%; width: 100%;
height: calc(100vh - 150px); height: calc(100vh - 150px);
@@ -670,4 +698,8 @@ export default {
.temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label { .temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
width: 180px !important; width: 180px !important;
} }
.el-form-item--default .el-form-item__label {
min-height: 30px;
height: auto !important;
}
</style> </style>
+2 -2
View File
@@ -231,7 +231,7 @@
class="bill-ledger-form-page__uploader" class="bill-ledger-form-page__uploader"
:multiple="true" :multiple="true"
:limit="20" :limit="20"
:max-size="10" :max-size="500"
:file-types="attachmentFileTypes" :file-types="attachmentFileTypes"
:show-file-list="false" :show-file-list="false"
button-text="上传" button-text="上传"
@@ -244,7 +244,7 @@
<el-input <el-input
v-model="form.remark" v-model="form.remark"
type="textarea" type="textarea"
:rows="4" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
+2 -2
View File
@@ -63,7 +63,7 @@
v-model="form.remark" v-model="form.remark"
:disabled="readonly" :disabled="readonly"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
@@ -113,7 +113,7 @@
class="bill-payment-form-page__uploader" class="bill-payment-form-page__uploader"
:multiple="true" :multiple="true"
:limit="20" :limit="20"
:max-size="10" :max-size="500"
:file-types="attachmentFileTypes" :file-types="attachmentFileTypes"
:show-file-list="false" :show-file-list="false"
button-text="上传" button-text="上传"
+25 -12
View File
@@ -366,17 +366,6 @@
</section-card> </section-card>
<section-card title="附件信息"> <section-card title="附件信息">
<vehicle-attachment-upload
v-model="form.attachments"
:readonly="readonly"
:multiple="true"
:limit="20"
:max-size="50"
:file-types="attachmentFileTypes"
:show-file-list="false"
button-text="上传"
@change="normalizeAttachments"
/>
<el-table :data="form.attachments" border> <el-table :data="form.attachments" border>
<el-table-column type="index" label="序号" width="64" align="center" /> <el-table-column type="index" label="序号" width="64" align="center" />
<el-table-column prop="originalName" label="文件名" min-width="220" /> <el-table-column prop="originalName" label="文件名" min-width="220" />
@@ -399,6 +388,19 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="invoice-form-page__attachment-upload">
<vehicle-attachment-upload
v-model="form.attachments"
:readonly="readonly"
:multiple="true"
:limit="20"
:max-size="500"
:file-types="attachmentFileTypes"
:show-file-list="false"
button-text="上传"
@change="normalizeAttachments"
/>
</div>
</section-card> </section-card>
<section-card title="备注"> <section-card title="备注">
@@ -407,7 +409,7 @@
v-model="form.remark" v-model="form.remark"
:disabled="readonly" :disabled="readonly"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
/> />
@@ -970,6 +972,17 @@ export default {
gap: 8px; gap: 8px;
padding: 16px 0 8px; padding: 16px 0 8px;
} }
.invoice-form-page__attachment-upload {
display: flex;
justify-content: flex-start;
margin-top: 12px;
}
.invoice-form-page__attachment-upload .vehicle-attachment-upload {
width: auto;
}
.invoice-form-page__attachment-upload .el-upload {
display: inline-flex;
}
.invoice-form-page__dialog-search { .invoice-form-page__dialog-search {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
+1 -1
View File
@@ -232,7 +232,7 @@
v-model="form.remark" v-model="form.remark"
:disabled="readonly" :disabled="readonly"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
/> />
+25 -11
View File
@@ -245,17 +245,7 @@
/></el-table> /></el-table>
</section-card> </section-card>
<section-card title="附件"> <section-card title="附件">
<vehicle-attachment-upload <el-table :data="form.attachments" border
v-model="form.attachments"
:readonly="readonly"
:multiple="true"
:limit="20"
:max-size="500"
:file-types="attachmentFileTypes"
:show-file-list="false"
button-text="上传附件"
@change="normalizeAttachments"
/><el-table :data="form.attachments" border
><el-table-column type="index" label="序号" width="70" /><el-table-column ><el-table-column type="index" label="序号" width="70" /><el-table-column
label="附件类型" label="附件类型"
width="160" width="160"
@@ -291,6 +281,19 @@
></el-table-column ></el-table-column
></el-table ></el-table
> >
<div class="payment-form-page__attachment-upload">
<vehicle-attachment-upload
v-model="form.attachments"
:readonly="readonly"
:multiple="true"
:limit="20"
:max-size="500"
:file-types="attachmentFileTypes"
:show-file-list="false"
button-text="上传附件"
@change="normalizeAttachments"
/>
</div>
</section-card> </section-card>
<div class="payment-form-page__actions"> <div class="payment-form-page__actions">
<el-button @click="goBack">返回</el-button <el-button @click="goBack">返回</el-button
@@ -810,6 +813,17 @@ export default {
justify-content: flex-end; justify-content: flex-end;
margin-bottom: 8px; margin-bottom: 8px;
} }
.payment-form-page__attachment-upload {
display: flex;
justify-content: flex-start;
margin-top: 12px;
}
.payment-form-page__attachment-upload .vehicle-attachment-upload {
width: auto;
}
.payment-form-page__attachment-upload .el-upload {
display: inline-flex;
}
.payment-form-page :deep(.el-form-item) { .payment-form-page :deep(.el-form-item) {
margin-bottom: 16px; margin-bottom: 16px;
} }
@@ -145,7 +145,7 @@
</section-card> </section-card>
<section-card title="备注"> <section-card title="备注">
<el-input v-model="form.remark" type="textarea" :rows="3" maxlength="200" disabled /> <el-input v-model="form.remark" type="textarea" :rows="2" maxlength="200" disabled />
</section-card> </section-card>
<div class="claim-record-form-page__actions"> <div class="claim-record-form-page__actions">
+1 -1
View File
@@ -159,7 +159,7 @@
><el-input ><el-input
v-model="form.remark" v-model="form.remark"
type="textarea" type="textarea"
:rows="3" :rows="2"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
/></el-form-item> /></el-form-item>
@@ -292,19 +292,6 @@
<section-card title="附件"> <section-card title="附件">
<div class="pre-settlement-editor__attachment"> <div class="pre-settlement-editor__attachment">
<div class="pre-settlement-editor__attachment-actions"> <div class="pre-settlement-editor__attachment-actions">
<vehicle-attachment-upload
ref="attachmentUploadRef"
v-model="attachments"
:readonly="!editable"
:multiple="true"
:limit="20"
:max-size="500"
:file-types="attachmentFileTypes"
:show-tip="false"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
<el-button type="primary" :disabled="!attachments.length" @click="downloadAttachments"> <el-button type="primary" :disabled="!attachments.length" @click="downloadAttachments">
批量下载 批量下载
</el-button> </el-button>
@@ -341,6 +328,20 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pre-settlement-editor__attachment-upload">
<vehicle-attachment-upload
ref="attachmentUploadRef"
v-model="attachments"
:readonly="!editable"
:multiple="true"
:limit="20"
:max-size="500"
:file-types="attachmentFileTypes"
:show-file-list="false"
button-text="上传附件"
@change="handleAttachmentChange"
/>
</div>
</div> </div>
</section-card> </section-card>
@@ -1559,10 +1560,25 @@ export default {
&__attachment-actions { &__attachment-actions {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end;
gap: 8px; gap: 8px;
margin-bottom: 12px; margin-bottom: 12px;
} }
&__attachment-upload {
display: flex;
justify-content: flex-start;
margin-top: 12px;
:deep(.vehicle-attachment-upload) {
width: auto;
}
:deep(.el-upload) {
display: inline-flex;
}
}
&__summary-total { &__summary-total {
padding: 12px 16px 0; padding: 12px 16px 0;
text-align: right; text-align: right;
+2 -2
View File
@@ -88,7 +88,7 @@
<el-input <el-input
v-model="lockUserForm.lockReason" v-model="lockUserForm.lockReason"
type="textarea" type="textarea"
:rows="3" :rows="2"
placeholder="请输入锁定原因" placeholder="请输入锁定原因"
/> />
</el-form-item> </el-form-item>
@@ -144,7 +144,7 @@
<el-input <el-input
v-model="unlockReasonForm.unlockReason" v-model="unlockReasonForm.unlockReason"
type="textarea" type="textarea"
:rows="3" :rows="2"
placeholder="请输入解锁原因(可选)" placeholder="请输入解锁原因(可选)"
/> />
</el-form-item> </el-form-item>
+1 -1
View File
@@ -200,7 +200,7 @@
<el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col> <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
<el-col :span="18"><el-form-item label="数据权限范围"><el-radio-group v-model="form.dataScopeRange"><el-radio :value="1">仅所属组织</el-radio><el-radio :value="2">全部组织</el-radio><el-radio :value="3">自定义</el-radio></el-radio-group></el-form-item></el-col> <el-col :span="18"><el-form-item label="数据权限范围"><el-radio-group v-model="form.dataScopeRange"><el-radio :value="1">仅所属组织</el-radio><el-radio :value="2">全部组织</el-radio><el-radio :value="3">自定义</el-radio></el-radio-group></el-form-item></el-col>
<el-col :span="18" :offset="6"><el-form-item label="数据层级范围"><el-radio-group v-model="form.dataLevelRange"><el-radio :value="1">包含下级</el-radio><el-radio :value="2">仅本级</el-radio></el-radio-group></el-form-item></el-col> <el-col :span="18" :offset="6"><el-form-item label="数据层级范围"><el-radio-group v-model="form.dataLevelRange"><el-radio :value="1">包含下级</el-radio><el-radio :value="2">仅本级</el-radio></el-radio-group></el-form-item></el-col>
<el-col :span="24"><el-form-item label="备注"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="200" show-word-limit /></el-form-item></el-col> <el-col :span="24"><el-form-item label="备注"><el-input v-model="form.remark" type="textarea" :rows="2" maxlength="200" show-word-limit /></el-form-item></el-col>
</el-row> </el-row>
</el-form> </el-form>
</section-card> </section-card>
+1 -1
View File
@@ -200,7 +200,7 @@
type="textarea" type="textarea"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
:rows="4" :rows="2"
placeholder="请输入" placeholder="请输入"
/> />
</el-form-item> </el-form-item>
+1 -1
View File
@@ -158,7 +158,7 @@
v-model="disposeForm.disposalRemark" v-model="disposeForm.disposalRemark"
type="textarea" type="textarea"
maxlength="500" maxlength="500"
:rows="4" :rows="2"
:disabled="dialog.readonly" :disabled="dialog.readonly"
/> />
</el-form-item> </el-form-item>
@@ -105,7 +105,7 @@
<el-input <el-input
v-model="configForm.remark" v-model="configForm.remark"
type="textarea" type="textarea"
:rows="1" :rows="2"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
/> />
+36 -17
View File
@@ -606,7 +606,6 @@
v-model="ocrQualificationUploadFiles" v-model="ocrQualificationUploadFiles"
:multiple="true" :multiple="true"
:limit="20" :limit="20"
accept=".pdf,.bmp,.jpeg,.png,.jpg,.doc,.docx,.ppt,.pptx,.xlsx,.xls,.eml,.msg,.zip"
:max-size="500" :max-size="500"
button-text="OCR上传识别" button-text="OCR上传识别"
:show-tip="false" :show-tip="false"
@@ -689,14 +688,10 @@
accept=".pdf,.bmp,.jpeg,.png,.jpg,.doc,.docx,.ppt,.pptx,.xlsx,.xls,.eml,.msg,.zip" accept=".pdf,.bmp,.jpeg,.png,.jpg,.doc,.docx,.ppt,.pptx,.xlsx,.xls,.eml,.msg,.zip"
:max-size="500" :max-size="500"
button-text="上传附件" button-text="上传附件"
:show-tip="false"
:show-file-list="false" :show-file-list="false"
:show-uploading="true" :show-uploading="true"
@success="handleQualificationUploadSuccess" @success="handleQualificationUploadSuccess"
/> />
<span class="qualification-upload-bar__tip">
支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip,单个文件不超过500M
</span>
</div> </div>
</section-card> </section-card>
@@ -859,7 +854,13 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark" class="contact-form__compact-field"> <el-form-item label="备注" prop="remark" class="contact-form__compact-field">
<el-input v-model="contactForm.remark" maxlength="200" /> <el-input
v-model="contactForm.remark"
type="textarea"
:rows="2"
maxlength="500"
show-word-limit
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</section-card> </section-card>
@@ -951,7 +952,13 @@
<el-input v-model="receiptForm.bankAccount" maxlength="50" /> <el-input v-model="receiptForm.bankAccount" maxlength="50" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="receiptForm.remark" maxlength="200" /> <el-input
v-model="receiptForm.remark"
type="textarea"
:rows="2"
maxlength="500"
show-word-limit
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</section-card> </section-card>
@@ -4559,7 +4566,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
width: 97%; width: 100%;
} }
.business-term-field { .business-term-field {
@@ -4650,21 +4657,33 @@ export default {
} }
.qualification-upload-bar { .qualification-upload-bar {
display: grid; display: flex;
grid-template-columns: 1fr auto 1fr;
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
margin-bottom: 6px; margin-bottom: 6px;
:deep(.vehicle-attachment-upload) { :deep(.vehicle-attachment-upload) {
width: auto; flex: 1;
} display: flex;
align-items: center;
min-width: 0;
&__tip { :deep(.el-upload) {
grid-column: 2; flex: 0 0 auto;
color: #909399; display: inline-flex;
font-size: 13px; align-items: center;
text-align: center; }
:deep(.el-upload__tip) {
margin-left: 30px;
color: #909399;
font-size: 13px;
line-height: 1.4;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
} }
File diff suppressed because one or more lines are too long