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

Merge remote-tracking branch 'websoft/master'

Browse Source
This commit is contained in:
b2894lxlx
2026-09-03 03:31:34 +08:00
parent 6f0f1842cb 685a37b2df
commit 40925cb21f
6 changed files with 217 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+1 -1
View File
@@ -81,7 +81,7 @@ app.use(ElementPlus, {
});
app.use(Avue, {
axios,
calcHeight: 10,
calcHeight: -26,
crudOption: {
searchIcon: true,
searchIndex: 4,
src/page/login/index.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<div class="login-main">
<p class="login-title">
{{ $t('login.title') }}{{ website.title }}
<top-lang></top-lang>
<!-- <top-lang></top-lang>-->
</p>
<!-- 原登录方式先注释保留备用
<userLogin v-if="activeName === 'user'"></userLogin>
src/page/login/userlogin.vue
-13
View File
@@ -7,18 +7,6 @@
:model="loginForm"
label-width="0"
>
<el-form-item v-if="tenantMode" prop="tenantId">
<el-input
@keyup.enter="handleLogin"
v-model="loginForm.tenantId"
auto-complete="off"
:placeholder="$t('login.tenantId')"
>
<template #prefix>
<i class="icon-quanxian" />
</template>
</el-input>
</el-form-item>
<el-form-item prop="username">
<el-input
@keyup.enter="handleLogin"
@@ -118,7 +106,6 @@ export default {
image: 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7',
},
loginRules: {
tenantId: [{ required: false, message: '请输入租户ID', trigger: 'blur' }],
username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
password: [
{ required: true, message: '请输入密码', trigger: 'blur' },
src/views/transportCapacity/ship.vue
+8 -8
View File
@@ -160,7 +160,7 @@
<el-input v-model="shipForm.shipName" maxlength="20" show-word-limit />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="安放龙骨日期/建造完工日期" prop="keelLayingDate">
<div class="date-range-inline">
<el-date-picker
@@ -169,13 +169,13 @@
value-format="YYYY-MM-DD"
@change="validateField('keelLayingDate')"
/>
<span>至</span>
<el-date-picker
v-model="shipForm.buildCompletionDate"
type="date"
value-format="YYYY-MM-DD"
@change="validateField('keelLayingDate')"
/>
<!-- <span>至</span>-->
<!-- <el-date-picker-->
<!-- v-model="shipForm.buildCompletionDate"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- @change="validateField('keelLayingDate')"-->
<!-- />-->
</div>
</el-form-item>
</el-col>
src/views/vehicle/customer-archive.vue
+72 -28
View File
@@ -315,11 +315,20 @@
</el-col>
<el-col :span="6">
<el-form-item label="详细地址" prop="registeredDetailAddress" required>
<el-input
v-model="archiveForm.registeredDetailAddress"
maxlength="255"
placeholder="请输入详细地址"
/>
<el-tooltip
:content="archiveForm.registeredDetailAddress"
placement="top"
:disabled="!registeredDetailOverflow"
style="display: block; width: 100%"
>
<el-input
ref="registeredDetailInput"
v-model="archiveForm.registeredDetailAddress"
maxlength="255"
placeholder="请输入详细地址"
@input="checkOverflow('registeredDetailInput', 'registeredDetailOverflow')"
/>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -1006,14 +1015,22 @@
/>
</el-form-item>
<el-form-item label="详细地址" prop="registeredDetailAddress">
<el-input
v-model="invoiceForm.registeredDetailAddress"
readonly
maxlength="255"
placeholder="点击后弹出地图组件"
suffix-icon="el-icon-location"
@click="handleInvoiceRegisteredMapPick"
/>
<el-tooltip
:content="invoiceForm.registeredDetailAddress"
placement="top"
:disabled="!invoiceDetailOverflow"
style="display: block; width: 100%"
>
<el-input
ref="invoiceDetailInput"
v-model="invoiceForm.registeredDetailAddress"
readonly
maxlength="255"
placeholder="点击后弹出地图组件"
suffix-icon="el-icon-location"
@click="handleInvoiceRegisteredMapPick"
/>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1088,7 +1105,6 @@
append-to-body
v-model="scoreBox"
width="92%"
top="3vh"
class="score-detail-dialog"
@closed="resetScoreDialog"
>
@@ -1097,7 +1113,7 @@
ref="scoreForm"
:model="currentScore"
label-position="right"
label-width="88"
label-width="88px"
:disabled="readonly"
class="score-detail-form"
>
@@ -1112,12 +1128,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="拟申请总资金使用额度（万元）" required>
<el-form-item label="拟申请总资金使用额度" required>
<el-input
v-model="currentScore.applyCreditLimit"
maxlength="18"
@input="value => handleScoreDecimalInput('applyCreditLimit', value)"
/>
>
<template #suffix>万元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -1126,8 +1144,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="最大资金使用额度（万元）">
<el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled />
<el-form-item label="最大资金使用额度">
<el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled >
<template #suffix>万元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -1136,15 +1156,17 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="临时申请额度（万元）">
<el-form-item label="临时申请额度">
<el-input
v-model="currentScore.tempApplyCreditLimit"
maxlength="18"
@input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
/>
>
<template #suffix>万元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="临时额度申请使用期限">
<div class="score-detail-form__range">
<el-date-picker
@@ -1161,7 +1183,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="评分量化表" required>
<el-select
v-model="currentScore.quantificationId"
@@ -1568,6 +1590,8 @@ export default {
receiptForm: this.emptyReceiptAccount(),
invoiceIndex: -1,
invoiceForm: this.emptyInvoice(),
registeredDetailOverflow: false,
invoiceDetailOverflow: false,
qualificationFiles: [],
qualificationUploadFiles: [],
ocrQualificationUploadFiles: [],
@@ -2004,10 +2028,24 @@ export default {
return rows;
},
},
watch: {
'archiveForm.registeredDetailAddress'() {
this.$nextTick(() => this.checkOverflow('registeredDetailInput', 'registeredDetailOverflow'));
},
'invoiceForm.registeredDetailAddress'() {
this.$nextTick(() => this.checkOverflow('invoiceDetailInput', 'invoiceDetailOverflow'));
},
},
methods: {
hasPermission(code) {
return this.isAdmin || this.validData(this.permission[code], false);
},
// 检测输入框文本是否溢出，仅溢出时才允许 tooltip 显示完整地址
checkOverflow(refName, flag) {
const inst = this.$refs[refName];
const el = inst && inst.$el && inst.$el.querySelector('input');
this[flag] = !!(el && el.scrollWidth > el.clientWidth);
},
emptyArchive() {
return {
accessType: 'temporary',
@@ -3242,6 +3280,9 @@ export default {
this.invoiceIndex = index;
this.invoiceForm = row ? this.normalizeInvoice(row) : this.emptyInvoice();
this.invoiceBox = true;
this.$nextTick(() => {
this.$nextTick(() => this.checkOverflow('invoiceDetailInput', 'invoiceDetailOverflow'));
});
},
resetInvoice() {
this.invoiceIndex = -1;
@@ -4883,17 +4924,20 @@ export default {
}
:deep(.el-form-item__label) {
flex: 0 0 108px !important;
width: 108px !important;
min-width: 108px !important;
color: #70757a;
font-size: 15px;
white-space: normal;
white-space: normal !important;
word-break: break-all;
line-height: 1.4;
}
:deep(.el-input),
:deep(.el-select),
:deep(.el-date-editor) {
width: 150px;
:deep(.el-form-item__content > .el-input),
:deep(.el-form-item__content > .el-select),
:deep(.el-form-item__content > .el-date-editor) {
width: 100%;
}
}