From 791e62c07826986d326aac48f5bdeef88d71f072 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 30 十二月 2025 10:06:02 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 297 ++++++++++++++++++++---------------------
项目代码/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue | 9 -
项目代码/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 43 ++----
项目代码/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue | 17 -
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue | 11 +
项目代码/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 2
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue | 9
项目代码/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 2
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 8 -
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 1
10 files changed, 185 insertions(+), 214 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 6237c87..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: "璐т綅缂栧彿",
@@ -136,7 +121,7 @@
type: "string",
width: 120,
align: "left",
- bind:{key: "locationTypeEnum", data: []}
+ bind: { key: "locationTypeEnum", data: [] }
},
{
field: "locationStatus",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
index bb374b8..4cd1893 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.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/materielCodeInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -136,6 +128,7 @@
width: 90,
align: "left",
bind: { key: "areainfo", data: [] },
+ hidden: true,
},
{
field: "purchaseOrderNo",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 79d4523..6467f90 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -143,6 +143,7 @@
width: 150,
align: "left",
bind: { key: "businessType", data: [] },
+ hidden: true,
},
{
field: "orderStatus",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
index 2a9ad08..b1d5300 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
@@ -152,6 +152,7 @@
width: 150,
align: "left",
bind: { key: "businessType", data: [] },
+ hidden: true,
},
{
field: "orderStatus",
@@ -199,13 +200,6 @@
hidden: true
},
{
- field: "departmentName",
- title: "閮ㄩ棬鍚嶇О",
- type: "string",
- width: 160,
- align: "left",
- },
- {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
@@ -239,6 +233,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true,
},
]);
const detail = ref({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 5db27f5..d6ff1fb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -214,13 +214,6 @@
hidden: true
},
{
- field: "departmentName",
- title: "閮ㄩ棬鍚嶇О",
- type: "string",
- width: 160,
- align: "left",
- },
- {
field: "operator",
title: "鎿嶄綔浜�",
type: "string",
@@ -233,6 +226,7 @@
type: "string",
width: 90,
align: "left",
+ hidden: true,
},
{
field: "createDate",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 8d1282f..288ffb0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -1,155 +1,148 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
- </template>
- <script>
- import extend from "@/extension/stock/stockInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "搴撳瓨淇℃伅",
- name: "stockInfo",
- url: "/StockInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string'},
- {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
- ]
- ]);
- const searchFormFields = ref({
- palletCode: "",
- locationCode: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鎵樼洏缂栧彿", field: "palletCode" ,type:'like'},
- { title: "璐т綅缂栧彿", field: "locationCode" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "palletType",
- title: "鎵樼洏绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "palletType", data: [] },
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "select",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- hidden:true
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- // hidden:true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- // hidden:true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/stock/stockInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "搴撳瓨淇℃伅",
+ name: "stockInfo",
+ url: "/StockInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+ deviceCode: "",
+ deviceName: "",
+ deviceType: "",
+ deviceStatus: "",
+ deviceIp: "",
+ devicePort: "",
+ devicePlcType: "",
+ deviceRemark: "",
+ });
+ const editFormOptions = ref([
+ [
+ { field: 'palletCode', title: '鎵樼洏缂栧彿', type: 'string' },
+ { field: 'locationCode', title: '璐т綅缂栧彿', type: 'string' },
+ ]
+ ]);
+ const searchFormFields = ref({
+ palletCode: "",
+ locationCode: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type: 'like' },
+ { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+ { title: "鎵樼洏绫诲瀷", field: "palletType", type: "select", dataKey: "palletType", data: [] },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "palletCode",
+ title: "鎵樼洏缂栧彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "palletType",
+ title: "鎵樼洏绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "palletType", data: [] },
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "select",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ hidden: true
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ // hidden:true
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ // hidden:true
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden: true
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
index 1d73a86..1969c39 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
@@ -75,6 +75,7 @@
],
[
{ title: "搴撳瓨鐘舵��", field: "status", type: 'select', dataKey: "stockStatusEmun", data: [] },
+ { title: "浠撳簱", field: "warehouseCode", type: 'select', dataKey: "wareHouse", data: [] },
],
]);
const columns = ref([
@@ -99,7 +100,7 @@
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
{
@@ -157,8 +158,9 @@
field: "warehouseCode",
title: "浠撳簱鍙�",
type: "string",
- width: 120,
+ width: 160,
align: "left",
+ bind: { key: "wareHouse", data: [] },
},
{
field: "barcode",
@@ -171,15 +173,16 @@
field: "stockQuantity",
title: "搴撳瓨鏁伴噺",
type: "string",
- width: 200,
+ width: 110,
align: "left",
},
{
field: "outboundQuantity",
title: "鍑哄簱鏁伴噺",
type: "string",
- width: 120,
+ width: 110,
align: "left",
+ hidden: true,
},
{
field: "status",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
index 9106f80..dfab069 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
@@ -69,8 +69,10 @@
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: 'like' },
{ title: "鎵规鍙�", field: "batchNo", type: 'like' },
{ title: "渚涘簲鍟嗙紪鍙�", field: "supplyCode", type: 'like' },
- { title: "浠撳簱鍙�", field: "warehouseCode", type: 'like' },
],
+ [
+ { title: "浠撳簱", field: "warehouseCode", type: 'select', dataKey: "wareHouse", data: [] },
+ ]
]);
const columns = ref([
{
@@ -87,7 +89,7 @@
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
{
@@ -102,7 +104,7 @@
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
@@ -118,6 +120,7 @@
type: "string",
width: 120,
align: "left",
+ bind: { key: "wareHouse", data: [] },
},
{
field: "stockQuantity",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index 4785cf7..66e574e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -139,6 +139,7 @@
type: "int",
width: 80,
align: "left",
+ hidden: true,
},
{
field: "depth",
@@ -146,6 +147,7 @@
type: "int",
width: 80,
align: "left",
+ hidden: true,
},
{
field: "dispatchertime",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index 93aa854..6c04214 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -141,6 +141,7 @@
type: "int",
width: 80,
align: "left",
+ hidden: true,
},
{
field: "depth",
@@ -148,6 +149,7 @@
type: "int",
width: 80,
align: "left",
+ hidden: true,
},
{
field: "dispatchertime",
--
Gitblit v1.9.3