meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2020-04-23 12:06:29 +08:00
parent e3c1eceb13
commit 6bb56595b2
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/MarketingCenter/BidBond.js
View File

@@ -23,7 +23,7 @@ export function selectBidBond() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '投标保证金管理_投标保证金查询',
name: '投标保证金管理_投标保证金查询_新',
param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9],
Pagination: arguments[10] + '&' + arguments[11]
}
@@ -37,7 +37,7 @@ export function selectBidBond_excel() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '投标保证金管理_投标保证金查询',
name: '投标保证金管理_投标保证金查询_新',
param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
}
})

2
src/api/WorkshopProcurement/PurchaseContractRequestFund1.js
View File

@@ -81,7 +81,7 @@ export function searchPurchaseContract(check, num) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_采购合同_查询数据_请款',
param: `供应商流水号_check=${check}&供应商流水号=${num}`
param: `供应商流水号_check=${check}&供应商流水号=${num}&供应商名称_check=0`
}
})
}

5
src/views/Inventory/MaterialOut/index.vue
View File

@@ -88,7 +88,7 @@
</el-table-column>
<el-table-column label="库存" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
{{ scope.row.货位存量1 ? scope.row.货位存量1 : 0 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="50">
@@ -735,7 +735,8 @@ export default {
background: #D8DDE6 !important;
}
.el-table .weilingwan-row {
background: #E9F0F9 !important;
background: #4395D0 !important;
color: white;
}
</style>

2
src/views/Inventory/PickingListApproval/index.vue
View File

@@ -87,7 +87,7 @@
</el-table-column>
<el-table-column label="已领数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100">

2
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -701,6 +701,6 @@ export default {
background: #9bd7fc !important;
}
.disCompleteColor{
background: rgb(233,240,250) !important;
background: #C6D7B3 !important;
}
</style>

1
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -314,6 +314,7 @@ export default {
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
this.supplierValue ? check2 = 1 : check2 = 0
searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue).then(response => {
console.log(response, 111)
this.tableData1 = response.data.rows
this.total1 = response.data.total
})