Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/option/transportCapacity/transport-ship.js
#	src/option/transportCapacity/transport-vehicle.js
This commit is contained in:
2026-08-07 08:28:42 +08:00
24 changed files with 300 additions and 137 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ export const createOption = () => ({
addBtn: false,
dialogClickModal: false,
menuFixed: 'right',
menuWidth: 220,
menuWidth: 180,
column: [
{
label: '地址名称',
+3 -3
View File
@@ -6,7 +6,6 @@ import {
selectRule,
textRule,
} from './common';
import { applyTableMenuWidth } from '@/utils/table-menu';
export const config = {
title: '过程配置',
@@ -20,7 +19,7 @@ export const config = {
deleteStatus: [0, 2],
};
export const option = applyTableMenuWidth({
export const option = {
...createCrudOption([
{
label: '',
@@ -179,4 +178,5 @@ export const option = applyTableMenuWidth({
updateBtnText: '保存',
dialogTop: '10px',
dialogWidth: '96%',
}, 5);
menuWidth: 200,
};
+1 -1
View File
@@ -16,7 +16,7 @@ export const option = {
editBtn: false,
delBtn: false,
viewBtn: false,
menuWidth: 220,
menuWidth: 180,
dialogClickModal: false,
column: [
{
+1 -1
View File
@@ -53,7 +53,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',
@@ -52,7 +52,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',
+1 -1
View File
@@ -42,7 +42,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{
+1 -1
View File
@@ -50,7 +50,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',
+1 -1
View File
@@ -38,7 +38,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{
+1 -1
View File
@@ -39,7 +39,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{
+1 -1
View File
@@ -50,7 +50,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{
@@ -43,7 +43,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车牌号',
@@ -30,7 +30,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{
+1 -1
View File
@@ -53,7 +53,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',