Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

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

@@ -54,7 +54,7 @@
           <el-row key="规则条件row" :gutter="10">
             <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择物料类型 -->
-              <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
+              <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 0">
                 <el-select key="物料类型"
                            v-model="item.ParamCode"
                            placeholder=""
@@ -177,7 +177,7 @@
                 />
               </el-form-item>
               <!-- 选择供应商和客户 -->
-              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">
+              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 1">
                 <el-select key="供应商和客户"
                   v-model="item.ParamCode"
                   placeholder=""
@@ -523,7 +523,7 @@ const formData = ref({
     // 物料类型/物料分组/物料/abc类/项目/
     { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
     // 供应商
-    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
+    { ParamCode: 'CustomerCode', Operator: 'IN', Value: '' },
     // 重量/体积/面积
     { ParamCode: 'Weight', Operator: '>', Value: [] },
     // 库存状态
@@ -691,7 +691,7 @@ const changeSupplierCustomer = (e) => {
 getFormSupplierList()
 // 选择物料类型/物料分组/abc类/物料/项目
 const changeItemsType = () => {
-  formData.value.condition[1].Value = ''
+  formData.value.condition[0].Value = ''
 }
 // 选择重量/体积/面积
 const changeCalculation = () => {
@@ -994,7 +994,12 @@ const open = async (type: string, strategyCode: string, id?: number) => {
           if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
             item.Value = item.Value.split(',')
           }
+          if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus' || item.ParamCode == 'CustomerCode' ) {
+            console.log(item.Value)
+            item.Value = item.Value.split(',')
+          }
         })
+        
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
@@ -1115,10 +1120,10 @@ const resetForm = () => {
     status: true, //状态
     //规则条件集合
     condition: [
-      // 供应商
-      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
       // 物料类型/物料分组/物料/abc类/项目/
       { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
+      // 供应商
+      { ParamCode: 'CustomerCode', Operator: 'IN', Value: '' },
       // /重量/体积/面积
       { ParamCode: 'Weight', Operator: '>', Value: [] },
       // 库存状态

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

@@ -1174,6 +1174,11 @@ const open = async (type: string, strategyCode: string, id?: number) => {
             console.log(item.Value)
             item.Value = item.Value.split(',')
           }
+          if (item.ParamCode == 'ItemType'||item.ParamCode == 'AbcClass' ||item.ParamCode == 'ItemGroup' ||item.ParamCode == 'ItemStatus') {
+            console.log(item.Value)
+            item.Value = item.Value.split(',')
+          }
+          
         })
       }
       console.log(formData.value.condition)

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@@ -487,13 +487,13 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3'])}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1'])}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除
     ]
 }