Merge remote-tracking branch 'origin/master'

src/views/base/airport-master.vue

@@ -60,22 +60,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('airport_master_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('airport_master_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #districtCode-form>
         <el-select
@@ -544,8 +542,10 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
-    findColumn(prop) {
-      return this.option.column.find(item => item.prop === prop);
+    findColumn(columns, prop) {
+      const targetColumns = Array.isArray(columns) ? columns : this.option.column;
+      const targetProp = Array.isArray(columns) ? prop : columns;
+      return targetColumns.find(item => item.prop === targetProp) || null;
     },
     loadProvinceOptions() {
       getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {

src/views/base/cargo-type.vue

@@ -81,25 +81,23 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.cargo_type_view"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="permission.cargo_type_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button type="primary" text v-if="permission.cargo_type_delete" @click="rowDel(row)">
+        </el-link>
+        <el-link type="primary" v-if="permission.cargo_type_delete" @click="rowDel(row)">
           删除
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 

src/views/base/common-address.vue

@@ -54,30 +54,27 @@
       </template>
 
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_view')"
           @click="$refs.crud.rowView(row, index)"
         >
           查看
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_edit') && !row.readonly"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('common_address_delete') && !row.readonly"
           @click="rowDel(row)"
         >
           删除
-        </el-button>
+        </el-link>
       </template>
 
       <template #addressType-form>
@@ -462,7 +459,9 @@ export default {
         status: 1,
       })
         .then(res => {
-          this.terminalOptions = this.normalizeSourceOptions(this.getRecords(res));
+          this.terminalOptions = this.normalizeSourceOptions(this.getRecords(res)).filter(item =>
+            this.sameId(item.parentId, this.form.portId)
+          );
         })
         .finally(() => {
           this.terminalLoading = false;

src/views/base/currency.vue

@@ -68,22 +68,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.currency_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="permission.currency_status"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 

src/views/base/customer-type.vue

@@ -36,22 +36,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.customer_type_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="permission.customer_type_status"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
     <empty-pagination

src/views/base/fee-item.vue

@@ -65,17 +65,16 @@
         </el-input>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="permission.fee_item_edit"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button type="primary" text v-if="permission.fee_item_status" @click="handleStatus(row)">
+        </el-link>
+        <el-link type="primary" v-if="permission.fee_item_status" @click="handleStatus(row)">
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
     </avue-crud>
 

src/views/base/port-terminal.vue

@@ -113,22 +113,20 @@
         </div>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('port_terminal_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('port_terminal_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #cityCode-form>
         <el-select

src/views/base/railway-station.vue

@@ -60,22 +60,20 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-button
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('railway_station_edit')"
           @click="$refs.crud.rowEdit(row, index)"
         >
           编辑
-        </el-button>
-        <el-button
+        </el-link>
+        <el-link
           type="primary"
-          text
           v-if="hasPermission('railway_station_status')"
           @click="handleStatus(row)"
         >
           {{ row.status === 1 ? '停用' : '启用' }}
-        </el-button>
+        </el-link>
       </template>
       <template #districtCode-form>
         <el-select
@@ -507,8 +505,10 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
-    findColumn(prop) {
-      return this.option.column.find(item => item.prop === prop);
+    findColumn(columns, prop) {
+      const targetColumns = Array.isArray(columns) ? columns : this.option.column;
+      const targetProp = Array.isArray(columns) ? prop : columns;
+      return targetColumns.find(item => item.prop === targetProp) || null;
     },
     loadProvinceOptions() {
       getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {