From 677cdf1dcb7a0f5f9f1b08e384e5727e22378647 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 21 一月 2026 19:34:44 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index b6a588f..7d76d57 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -1,19 +1,11 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/basic/locationInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -28,10 +20,11 @@
});
const editFormFields = ref({
locationStatus: "",
+ warehouseId: "",
});
const editFormOptions = ref([
[
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "select",dataKey: "locationStatusEnum",data: [],},
+ { title: "璐т綅鐘舵��", field: "locationStatus", type: "select", dataKey: "locationStatusEnum", data: [], },
],
]);
const searchFormFields = ref({
@@ -47,15 +40,15 @@
const searchFormOptions = ref([
[
{ title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
- { title: "宸烽亾缂栧彿", field: "roadwayNo",type:"like" },
- { title: "璐т綅绫诲瀷", field: "locationType",type: "select",dataKey: "locationTypeEnum",data: [], },
- { title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "enableStatusEnum",data: [],},
+ { title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
+ { title: "璐т綅鍖哄煙", field: "locationType", type: "select", dataKey: "locationTypeEnum", data: [], },
+ { title: "绂佺敤鐘舵��", field: "enableStatus", type: "select", dataKey: "enableStatusEnum", data: [], },
],
[
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
- { title: "琛�", field: "row" ,type: "int"},
- { title: "鍒�", field: "column" ,type: "int"},
- { title: "灞�", field: "layer" ,type: "int"}
+ { title: "璐т綅鐘舵��", field: "locationStatus", type: "selectList", dataKey: "locationStatusEnum", data: [], },
+ { title: "琛�", field: "row", type: "int" },
+ { title: "鍒�", field: "column", type: "int" },
+ { title: "灞�", field: "layer", type: "int" }
],
]);
const columns = ref([
@@ -69,14 +62,6 @@
require: true,
align: "left",
},
- // {
- // field: "areaId",
- // title: "鍖哄煙涓婚敭",
- // type: "string",
- // width: 90,
- // align: "left",
- // bind: {key: "areainfo",data: []}
- // },
{
field: "locationCode",
title: "璐т綅缂栧彿",
@@ -132,11 +117,11 @@
},
{
field: "locationType",
- title: "璐т綅绫诲瀷",
+ title: "璐т綅鍖哄煙",
type: "string",
width: 120,
align: "left",
- bind:{key: "locationTypeEnum", data: []}
+ bind: { key: "locationTypeEnum", data: [] }
},
{
field: "locationStatus",
--
Gitblit v1.9.3