diff --git a/src/option/base/cargo-type.js b/src/option/base/cargo-type.js index ede95c6..a63d67f 100644 --- a/src/option/base/cargo-type.js +++ b/src/option/base/cargo-type.js @@ -172,7 +172,7 @@ export const getCargoTypeOption = ctx => ({ label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, placeholder: '请输入', diff --git a/src/option/base/common-address.js b/src/option/base/common-address.js index 4f431ca..7583124 100644 --- a/src/option/base/common-address.js +++ b/src/option/base/common-address.js @@ -137,7 +137,7 @@ export const createOption = () => ({ label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 160, overHidden: true, diff --git a/src/option/business/common-cargo.js b/src/option/business/common-cargo.js index 644f316..f64fb66 100644 --- a/src/option/business/common-cargo.js +++ b/src/option/business/common-cargo.js @@ -254,7 +254,7 @@ export const option = createCrudOption([ label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, maxlength: 200, showWordLimit: true, diff --git a/src/option/business/common-route.js b/src/option/business/common-route.js index e7e8a59..47db3de 100644 --- a/src/option/business/common-route.js +++ b/src/option/business/common-route.js @@ -127,7 +127,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, maxlength: 500, diff --git a/src/option/business/process-config.js b/src/option/business/process-config.js index 912a57d..f5aa1e9 100644 --- a/src/option/business/process-config.js +++ b/src/option/business/process-config.js @@ -101,7 +101,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, addDisplay: false, diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js index 54e27a8..2d776d1 100644 --- a/src/option/business/transport-plan.js +++ b/src/option/business/transport-plan.js @@ -362,7 +362,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, order: 330, minWidth: 180, diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js index b0e617a..2507845 100644 --- a/src/option/business/waybill-manage.js +++ b/src/option/business/waybill-manage.js @@ -500,7 +500,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, order: 810, minWidth: 180, @@ -640,7 +640,7 @@ export const option = { label: '承运信息', prop: 'carrierJson', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, display: false, @@ -652,7 +652,7 @@ export const option = { label: '过程配置', prop: 'processJson', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, display: false, @@ -664,7 +664,7 @@ export const option = { label: '运费信息', prop: 'freightJson', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, display: false, diff --git a/src/option/vehicle/accident-record.js b/src/option/vehicle/accident-record.js index 51c4d22..3be4f35 100644 --- a/src/option/vehicle/accident-record.js +++ b/src/option/vehicle/accident-record.js @@ -147,7 +147,7 @@ export const option = { label: '事故原因及损坏情况', prop: 'accidentReasonDamage', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, search: true, minWidth: 220, diff --git a/src/option/vehicle/etc-record.js b/src/option/vehicle/etc-record.js index 981a29e..1fb16a4 100644 --- a/src/option/vehicle/etc-record.js +++ b/src/option/vehicle/etc-record.js @@ -137,7 +137,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/option/vehicle/mileage-record.js b/src/option/vehicle/mileage-record.js index 3e0b981..419be77 100644 --- a/src/option/vehicle/mileage-record.js +++ b/src/option/vehicle/mileage-record.js @@ -118,7 +118,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/option/vehicle/oil-electric-record.js b/src/option/vehicle/oil-electric-record.js index 052e164..49c8f07 100644 --- a/src/option/vehicle/oil-electric-record.js +++ b/src/option/vehicle/oil-electric-record.js @@ -155,7 +155,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/option/vehicle/other-expense-record.js b/src/option/vehicle/other-expense-record.js index 0046dfd..03f43fd 100644 --- a/src/option/vehicle/other-expense-record.js +++ b/src/option/vehicle/other-expense-record.js @@ -127,7 +127,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/option/vehicle/tire-replacement-record.js b/src/option/vehicle/tire-replacement-record.js index 9b50753..88dfe5a 100644 --- a/src/option/vehicle/tire-replacement-record.js +++ b/src/option/vehicle/tire-replacement-record.js @@ -123,7 +123,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/option/vehicle/transport-change-record.js b/src/option/vehicle/transport-change-record.js index 8db7894..cf949d5 100644 --- a/src/option/vehicle/transport-change-record.js +++ b/src/option/vehicle/transport-change-record.js @@ -65,7 +65,7 @@ export const option = { label: '变更内容', prop: 'changeContent', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, search: true, minWidth: 260, @@ -79,7 +79,7 @@ export const option = { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, minWidth: 180, overHidden: true, diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 91a70ef..42c2eb4 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -315,7 +315,6 @@ background: #fff; border-radius: 6px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06); - margin-bottom: 8px; overflow: hidden; &:last-child { @@ -758,3 +757,7 @@ opacity: 0.55; } } + +.avue-crud__dialog .avue-dialog__footer{ + border-top: 0 !important; +} diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue index 8c44c70..54499bb 100644 --- a/src/views/base/airport-master.vue +++ b/src/views/base/airport-master.vue @@ -429,7 +429,7 @@ export default { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, maxlength: 200, diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue index 91f30c7..11d32a0 100644 --- a/src/views/base/currency.vue +++ b/src/views/base/currency.vue @@ -271,7 +271,7 @@ export default { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, maxlength: 200, diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue index a7ee154..c07fdf6 100644 --- a/src/views/base/port-terminal.vue +++ b/src/views/base/port-terminal.vue @@ -75,6 +75,7 @@ filterable :disabled="isParentRegionLocked" :placeholder="isParentRegionLocked ? '自动带出' : '请选择国家'" + autocomplete="off" style="width: 100%" @change="handleCountryChange" > @@ -390,7 +391,7 @@ export default { option: { height: 'auto', calcHeight: 32, - dialogWidth: 980, + dialogWidth: 900, dialogCustomClass: 'port-terminal-edit-dialog', labelPosition: 'right', labelWidth: 'auto', @@ -1233,6 +1234,7 @@ export default { this.handleCategoryChange(this.form.category, false); this.syncTerminalCode(); done(); + setTimeout(() => this.disableDialogAutocomplete(), 50); }); }); return; @@ -1256,8 +1258,21 @@ export default { this.handleDistrictChange(this.form.districtCode); } done(); + setTimeout(() => this.disableDialogAutocomplete(), 50); }); }, + disableDialogAutocomplete() { + this.$nextTick(() => { + const dialog = document.querySelector('.port-terminal-edit-dialog'); + if (!dialog) return; + dialog.querySelectorAll('input, textarea').forEach(el => { + el.setAttribute('autocomplete', 'off'); + el.setAttribute('autocorrect', 'off'); + el.setAttribute('autocapitalize', 'off'); + el.setAttribute('spellcheck', 'false'); + }); + }); + }, searchReset() { this.query = {}; this.setCityOptions([]); @@ -1374,9 +1389,9 @@ export default { //.detail-address-input { // width: 81% !important; //} - /* 备注宽度 80% */ + /* 备注宽度 83% */ .remark-input { - width: 80% !important; + width: 85% !important; } } diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue index fb24d5e..cf11f64 100644 --- a/src/views/base/railway-station.vue +++ b/src/views/base/railway-station.vue @@ -202,8 +202,9 @@ export default { height: 'auto', calcHeight: 32, dialogWidth: 980, + dialogCustomClass: 'railway-station-edit-dialog', labelPosition: 'right', - labelWidth: 'auto', + labelWidth: '108px', tip: false, searchShow: true, searchMenuSpan: 24, @@ -339,7 +340,7 @@ export default { label: '详细地址', prop: 'detailAddress', type: 'textarea', - minRows: 3, + minRows: 2, span: 24, minWidth: 220, overHidden: false, @@ -393,7 +394,7 @@ export default { label: '备注', prop: 'remark', type: 'textarea', - minRows: 4, + minRows: 2, span: 24, hide: true, maxlength: 200, @@ -892,5 +893,16 @@ export default { :deep(.el-table td .cell) { white-space: nowrap; } + +} + + + + diff --git a/src/views/desk/notice-composition.vue b/src/views/desk/notice-composition.vue index 4c16ca6..7840a74 100644 --- a/src/views/desk/notice-composition.vue +++ b/src/views/desk/notice-composition.vue @@ -153,7 +153,7 @@ const option = reactive({ url: 'link', }, hide: true, - minRows: 4, + minRows: 2, span: 24, }, ], diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index ad64558..133b590 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -155,7 +155,7 @@ export default { url: 'link', }, hide: true, - minRows: 4, + minRows: 2, span: 24, },