diff --git a/sgzb-ui/src/components/pageHeader/index.vue b/sgzb-ui/src/components/pageHeader/index.vue index e69de29b..491e2870 100644 --- a/sgzb-ui/src/components/pageHeader/index.vue +++ b/sgzb-ui/src/components/pageHeader/index.vue @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index f835d158..f692df30 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -180,7 +180,7 @@ v-if=" scope.row.purchasingStatus != '已入库' && scope.row.purchasingStatus != '已审核' && - scope.row.purchasingStatus != '已验收合格' && + scope.row.purchasingStatus != '验收合格' && scope.row.purchasingStatus != '待审核' && scope.row.purchasingStatus != '验收不通过' && scope.row.purchasingStatus != '驳回' @@ -194,9 +194,8 @@ type="text" icon="el-icon-edit" v-if=" - (scope.row.purchasingStatus == '已验收合格' || - scope.row.purchasingStatus == '待审核') && - scope.row.manageType != '1' + scope.row.purchasingId == 26 && + scope.row.manageType == 0 " @click="handleCode(scope.row)" v-hasPermi="['newPurchase:tools:coding']" @@ -207,10 +206,8 @@ type="text" icon="el-icon-edit" v-if=" - scope.row.purchasingStatus == '已验收合格' || - scope.row.purchasingStatus == '已入库' || - scope.row.purchasingStatus == '已审核' || - scope.row.purchasingStatus == '待审核' + scope.row.purchasingId == 26 || + scope.row.purchasingId == 28 " @click="handlePrint(scope.row)" >验收单删除 -
+