diff --git a/proxy.conf.js b/proxy.conf.js index 688f3a27..a3308533 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-24 16:40:24 + * @LastEditTime : 2022-04-24 17:51:09 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 894d5a0c..1975e2f3 100644 --- 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: '修改单价',