From 7ac173d18092ae25295bab13741cc8b7c2b82742 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 18 八月 2025 09:58:52 +0800
Subject: [PATCH] 1
---
代码管理/淮安PDA/pages/index/index.vue | 1 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs | 6 +++---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue | 40 +++++++++++++++++++++++++++++++++++++---
代码管理/WMS/WIDESEA_WMSClient/src/components/basic/VolUpload.vue | 3 +--
4 files changed, 41 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/components/basic/VolUpload.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/components/basic/VolUpload.vue"
index 4c7d696..c510ba1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/components/basic/VolUpload.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/components/basic/VolUpload.vue"
@@ -832,8 +832,7 @@
width: 100%;
height: 100%;
position: relative;
- .m-img {
- }
+
.mask {
position: absolute;
opacity: 0.6;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
index 4768e46..9b337e3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
@@ -30,17 +30,51 @@
sortName: "id"
});
const editFormFields = ref({
- outRule: ""
+ outRule: "",
+ code: "",
+ name: "",
+ nickName: "",
+ state: ""
+
});
const editFormOptions = ref([[
{
- title: "鍑哄叆搴撹鍒�",
+ title: "瀹㈡埛缂栫爜",
+ required: true,
+ field: "code",
+ type: "string",
+ },
+ {
+ title: "瀹㈡埛鍚嶇О",
+ required: true,
+ field: "name",
+ type: "string",
+ },
+ {
+ title: "瀹㈡埛鍏ㄧО",
+ required: true,
+ field: "nickName",
+ type: "string",
+ },
+ ],
+ [
+ {
+ title: "鍑哄叆瑙勫垯",
required: true,
field: "outRule",
type: "select",
dataKey: "customerOutRuleEnum",
data: [],
- },]
+ },
+ {
+ title: "瀹㈡埛鐘舵��",
+ required: true,
+ field: "state",
+ type: "select",
+ dataKey: "enableEnum",
+ data: [],
+ },
+ ]
]);
const searchFormFields = ref({});
const searchFormOptions = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
index 289db11..2c748dc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
@@ -36,7 +36,7 @@
Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType && x.WarehouseId == warehouseId);
if (palletTypeInfo == null)
{
- if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() && warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() && warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
+ if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString())
{
palletTypeInfo = new Dt_PalletTypeInfo()
{
@@ -274,9 +274,9 @@
List<Dt_PalletTypeInfo> palletTypeInfos = _basicRepository.PalletTypeInfoRepository.QueryData(x => x.WarehouseId == warehousId);
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehousId);
Dt_PalletTypeInfo? palletTypeInfo = palletTypeInfos.FirstOrDefault(x => x.PalletType == palletType && x.WarehouseId == warehousId);
- if (palletTypeInfo == null || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
+ if (palletTypeInfo == null)
{
- if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA60.ToString())
+ if (warehouse.WarehouseCode == WarehouseEnum.HA153.ToString() || warehouse.WarehouseCode == WarehouseEnum.HA71.ToString())
{
palletTypeInfo = new Dt_PalletTypeInfo()
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
index 4236ecb..1e54962 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/index.vue"
@@ -118,7 +118,6 @@
return this.datas.find(x => x.text == text);
},
clickCoupon(url, menuid, warehouseid, menuname) {
- // console.log("clickCoupon")
if (this.hasLogin()) {
this.$u.route({
url: url,
--
Gitblit v1.9.3