Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 073d2fa1d86fcb998bc27e79cdc3773da7ed8b2b

 ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue

@@ -91,42 +91,77 @@
      <template #menu="{ row, index, size }">
        <el-tooltip content="查看" placement="top" :enterable="false">
          <el-link type="primary" icon="el-icon-view" :underline="false" class="link-btn"
                   v-hasPermi="['tms:tmsDispatchOrder:query']"
            @click="$refs.crudRef.rowView(row, index)">
          </el-link>
        </el-tooltip>
        <el-tooltip content="删除" placement="top" :enterable="false">
          <el-link type="primary" icon="el-icon-delete" :underline="false" class="link-btn"
                   v-hasPermi="['tms:tmsDispatchOrder:remove']" v-if="row.status == 0"
            @click="$refs.crudRef.rowDel(row, index)">
          </el-link>
        </el-tooltip>

        <el-tooltip content="编辑" placement="top" :enterable="false">
          <el-link type="primary" icon="el-icon-edit" :underline="false" class="link-btn"
                   v-hasPermi="['tms:tmsDispatchOrder:edit']" v-if="[0, 1].includes(row.status)"
            @click="$refs.crudRef.rowEdit(row, index)">
          </el-link>
        </el-tooltip>

      </template>
      <template #menu-before="{ row }">


        <el-tooltip content="运输货品登记" placement="top">
          <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
            v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
            icon="el-icon-document-add">
          </el-link>
        <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
                 v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0,1,2].includes(row.status)"
                 :underline="false" icon="el-icon-document-add">
        </el-link>
        </el-tooltip>

        <el-tooltip content="实际运输记录" placement="top">
          <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
            v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
            icon="el-icon-set-up">
          </el-link>
        <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
                 v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0,1,2].includes(row.status)"
                 :underline="false" icon="el-icon-set-up">
        </el-link>
        </el-tooltip>
        <el-tooltip content="确定" placement="top">
        <el-link size="small" type="primary" v-if="row.status == 0" @click="handleConfirm(row)" class="link-btn"
                 v-hasPermi="['tms:tmsDispatchOrder:confirmOrder']"
                 :underline="false" icon="el-icon-pointer">
        </el-link>
        </el-tooltip>
        <el-tooltip content="作废" placement="top">
        <el-link size="small" type="primary" v-if="[0,1,2].includes(row.status)" @click="handleClose(row)" class="link-btn"
                 v-hasPermi="['tms:tmsDispatchOrder:closeOrder']"
                 :underline="false" icon="el-icon-close">
        </el-link>
        </el-tooltip>
        <el-tooltip content="复制" placement="top">
        <el-link size="small" type="primary" @click="handleCopy(row)" class="link-btn" :underline="false"
                 v-hasPermi="['tms:tmsDispatchOrder:copyOrder']"
                 icon="el-icon-connection">
        </el-link>
        </el-tooltip>
        <el-tooltip content="上传行程" placement="top">
        <el-link size="small" type="primary" v-if="[1,2].includes(row.status)" @click="handleUploadItinerary(row)"
                 v-hasPermi="['tms:tmsTrip:add']"
                 class="link-btn" :underline="false" icon="el-icon-upload">
        </el-link>
        </el-tooltip>
        <el-tooltip content="查看行程" placement="top">
        <el-link size="small" type="primary" v-if="![0,1].includes(row.status)" @click="handleLogItinerary(row)"
                 v-hasPermi="['tms:tmsTrip:list']"
                 class="link-btn" :underline="false" icon="el-icon-view">
        </el-link>
        </el-tooltip>
        <el-tooltip content="完成行程" placement="top">
        <el-link size="small" type="primary" v-if="[2].includes(row.status)" @click="handleOk(row)" class="link-btn"
                 v-hasPermi="['tms:tmsDispatchOrder:okOrder']"
                 :underline="false" icon="el-icon-circle-check">
        </el-link>
        </el-tooltip>

        <el-tooltip content="复制" placement="top">
          <el-link size="small" type="primary" @click="handleCopy(row)" class="link-btn" :underline="false"
            v-hasPermi="['tms:tmsDispatchOrder:copyOrder']" icon="el-icon-connection">
          </el-link>
        </el-tooltip>
        <el-tooltip content="日志" placement="top">
          <el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" :underline="false"
            icon="el-icon-tickets">
          </el-link>
        </el-tooltip>
      </template>

      <!-- <template #menu="{row}">
@@ -650,6 +685,7 @@
  menuType: 'icon',
  viewBtn: false, // 关闭原生查看
  editBtn: false, // 关闭原生编辑
  delBtn: false, // 关闭原生编辑

  searchIndex: 7, // 关键：折叠时显示的个数（根据你的字段数量调整）
  searchIcon: true, // 关键：显示折叠/展开按钮
@@ -3024,7 +3060,7 @@
      vehicleId: row.vehicleId,
    }
    console.log(boxForm.value);
    

  })
}
const cancelBox = () => {
@@ -4622,4 +4658,4 @@
  padding: 1px 11px;
  box-shadow: 0 0 0 1px var(--el-disabled-border-color) inset;
}
</style>
</style>