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
@@ -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: '车船类型',