Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

2022-04-24 18:09:04 +08:00
parent 4e4e05bacb 1c19b82296
commit 69afd2b2bd
2 changed files with 3 additions and 3 deletions
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@ -335,7 +335,7 @@ export class SupplyManagementBulkComponent implements OnInit {
          {
            text: '二维码',
            click: _record => this.assignedQrcode(_record),
-            iif: item => item.resourceStatus == 1 && item.serviceType === '1'
+            iif: item => item.resourceStatus == 1 && item.serviceType === '1' && !(item.resourceType === '2' && item.serviceType === '2')
          },
          {
            text: '修改单价',