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

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -425,6 +425,13 @@ const getSearchTableData = async (number,formField,searchField)=>{
 
   // 根据状态返回该按钮是否显示
   const isShowMainButton = (row, val) => {
+   if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+const isShowMainButton1 = (row, val) => {
   if (row.type == 'DISCRETE') {
     return true
   } else {
@@ -450,7 +457,7 @@ const isShowMainButton = (row, val) => {
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
       defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
       defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
-      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
       {
         label: t('ts.创建供应商发货申请'),