1

wangxinhui

5 天以前 7ac173d18092ae25295bab13741cc8b7c2b82742

1

 ´úÂë¹ÜÀí/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;

 ´úÂë¹ÜÀí/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([

 ´úÂë¹ÜÀí/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()
                    {

 ´úÂë¹ÜÀí/»´°²PDA/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,