策略参数数组改成字符串

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -296,6 +296,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -337,6 +342,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -345,7 +361,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@@ -420,6 +420,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -457,6 +462,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -465,7 +481,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -807,6 +807,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -869,6 +874,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -877,7 +893,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@@ -519,6 +519,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -566,6 +572,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -574,7 +591,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -309,6 +309,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -350,6 +355,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+      let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -358,7 +374,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@@ -467,6 +467,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
+        console.log(formData.value.condition)
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -508,6 +514,18 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
+    console.log(arr)
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -516,7 +534,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@@ -467,6 +467,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -508,6 +513,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -516,7 +532,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -422,7 +422,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formData.value.status = data.status == 0 ? true : false
       if (formData.value.priority == 0) {
         Butttondata.value = [
-          defaultButtons.formSaveBtn({disabled:true}), // 保存
+          defaultButtons.formSaveBtn({ disabled: true }), // 保存
           defaultButtons.formCloseBtn(null) // 关闭
         ]
       } else {
@@ -433,6 +433,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -458,14 +463,25 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
-  
-  if(formData.value.priority == 0){
+
+  if (formData.value.priority == 0) {
     message.error('优先级不可以为0')
     return
   }
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -474,7 +490,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -747,6 +747,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -809,6 +814,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -817,7 +833,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue

@@ -332,6 +332,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
+        formData.value.condition.forEach((item, index) => {
+          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+            item.Value = item.Value.split(',')
+          }
+        })
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -362,6 +367,17 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    const arr = formData.value.condition.map(item=> {
+       let str =  item.Value
+      if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
+        str = item.Value.join(',')
+      }
+      return {
+        ParamCode:item.ParamCode,
+        Operator:item.Operator,
+        Value:str
+      }
+    })
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -370,7 +386,7 @@ const submitForm = async () => {
       priority: formData.value.priority, //优先级
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
-      condition: JSON.stringify(formData.value.condition),
+      condition: JSON.stringify(arr),
       configuration: JSON.stringify(formData.value.configuration)
     }
     if (formType.value === 'create') {

src/views/wms/countManage/count/countRequestMain/index.vue

@@ -261,7 +261,7 @@ const isShowReCountMainButton = (row, val) => {
 }
 // 根据状态返回该按钮是否显示
 const isShowGenerateMainButton = (row, val) => {
-  if (row.countAdjustStatus == 2) {
+  if (val.indexOf(row.countAdjustStatus) > -1) {
     return false
   } else {
     return true
@@ -310,7 +310,7 @@ const butttondata = (row) => {
       hasPermi: 'wms:count-request-main:supervise'
     }), // 监盘
     defaultButtons.mainCountAdjustRequesttBtn({
-      hide: isShowGenerateMainButton(row, ['1']),
+      hide: isShowGenerateMainButton(row, ['2']),
       hasPermi: 'wms:count-request-main:generate'
     }) // 生成盘点调整
   ]

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -187,7 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (item.field == 'remark') {
               item.tableForm.disabled = false
             }
-            if (item.field == 'failedReason') {
+            if (item.field == 'reason') {
               item.tableForm.disabled = false
             }
             if (item.field == 'itemCode') {
@@ -432,15 +432,12 @@ const handleAddTable = () => {
     if (item.field == 'remark') {
       item.tableForm.disabled = false
     }
-    if (item.field == 'failedReason') {
+    if (item.field == 'reason') {
       item.tableForm.disabled = false
     }
     if (item.field == 'qty') {
       item.tableForm.disabled = false
     }
-    if (item.field == 'reason') {
-      item.tableForm.disabled = false
-    }
     if (item.field == 'itemCode') {
               item.tableForm.isInpuFocusShow = true
             }