From f4c82d5bb8535b635251424924be07cdec73d52d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 18 Dec 2023 15:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/arrivalInspectionStrategy/AddForm.vue | 9 ++++++++- .../strategySetting/strategy/batchStrategy/AddForm.vue | 9 ++++++++- .../strategy/downShelfStrategy/AddForm.vue | 9 ++++++++- .../strategy/manageAccuracyStrategy/AddForm.vue | 9 ++++++++- .../strategy/purchaseReceiptStrategy/AddForm.vue | 9 ++++++++- .../strategy/repairMaterialStrategy/AddForm.vue | 9 ++++++++- .../strategy/storageCapacityStrategy/AddForm.vue | 9 ++++++++- .../strategy/supplieDeliveryStrategy/AddForm.vue | 9 ++++++++- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 9 ++++++++- .../strategy/utensilCapacityStrategy/AddForm.vue | 9 ++++++++- 10 files changed, 80 insertions(+), 10 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index e338a7536..e19abf544 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -152,6 +152,7 @@ defineOptions({ name: 'SupplieDeliveryStrategyAddForm' }) import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { getSupplierList } from '@/api/wms/supplier' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -343,10 +344,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index 40c5c76a5..2dbc5fe0e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -261,6 +261,7 @@ defineOptions({ name: 'UpShelfStrategyAddForm' }) import { getSupplierList } from '@/api/wms/supplier' import { getCustomerList } from '@/api/wms/customer' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' @@ -463,10 +464,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 73fb4d470..1fc5a4ead 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -557,6 +557,7 @@ import { getLocationgroupList } from '@/api/wms/locationgroup' import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' const { t } = useI18n() // 国际化 @@ -875,10 +876,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index b9d84d233..8734dc6c1 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -316,6 +316,7 @@ import { getAreaList } from '@/api/wms/areabasic' import { getLocationgroupList } from '@/api/wms/locationgroup' import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' @@ -573,10 +574,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index b26e49f26..6c3baccb2 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -160,6 +160,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { getSupplierList } from '@/api/wms/supplier' import * as RuleApi from '@/api/wms/rule' import { object } from 'vue-types' +import { isString } from '@/utils/is' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -356,10 +357,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index e2b5eaf85..213d6c827 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -285,6 +285,7 @@ import { getAreaList } from '@/api/wms/areabasic' import { getLocationgroupList } from '@/api/wms/locationgroup' import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' @@ -515,10 +516,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index c4b51f046..da1fe5725 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -283,6 +283,7 @@ import { getAreaList } from '@/api/wms/areabasic' import { getLocationgroupList } from '@/api/wms/locationgroup' import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' @@ -514,10 +515,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index dc567dfec..8802a7638 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -252,6 +252,7 @@ import { getWarehouseList } from '@/api/wms/warehouse' import { getDockList } from '@/api/wms/dock' import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -472,10 +473,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index fc6e121d1..0b2cee5d7 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -508,6 +508,7 @@ import { getLocationList } from '@/api/wms/location' import * as RuleApi from '@/api/wms/rule' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { isString } from '@/utils/is' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -815,10 +816,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index 93d6712ef..76745dc4e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -208,6 +208,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' defineOptions({ name: 'UpShelfStrategyAddForm' }) import * as RuleApi from '@/api/wms/rule' +import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' @@ -368,10 +369,16 @@ const submitForm = async () => { formLoading.value = true try { const arr = formData.value.condition.map(item=> { - let str = item.Value + let str = item.Value + if(isString(item.Value)){ + if(item.Value.indexOf('，'>-1)){ + str = item.Value.split('，').join(',') + } + } if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { str = item.Value.join(',') } + return { ParamCode:item.ParamCode, Operator:item.Operator,