Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-04-24 18:09:04 +08:00
parent 4e4e05bacb 1c19b82296
commit 69afd2b2bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-24 16:40:24 * @LastEditTime : 2022-04-24 17:51:09
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -30,7 +30,7 @@ module.exports = {
// }, // },
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

2
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -335,7 +335,7 @@ export class SupplyManagementBulkComponent implements OnInit {
{ {
text: '二维码', text: '二维码',
click: _record => this.assignedQrcode(_record), 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: '修改单价', text: '修改单价',