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

Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

Browse Source
This commit is contained in:
lixin
2018-12-26 18:58:24 +08:00
parent 25cbc6f25a 7e182b8cf4
commit c4f02263aa
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/WorkshopProcurement/ReceiptConnectionSheet.js
View File

@@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) {
} }
}) })
} }
// 传送人接收人初始化 采购科改16 // 传送人接收人初始化
export function initPerson() { export function initPerson() {
return request({ return request({
url: '', url: '',
@@ -57,7 +57,7 @@ export function initPerson() {
data: { data: {
type: '1', type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=16' param: '考核部门编号=9'
} }
}) })
} }

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

@@ -554,7 +554,7 @@ export default {
background-color: transparent; background-color: transparent;
border: 0px solid white; border: 0px solid white;
} }
.green{ .lightgreen{
background-color: lightgreen; background-color: lightgreen;
border: 1px solid #1f2d3d; border: 1px solid #1f2d3d;
} }

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

@@ -724,7 +724,7 @@ export default {
background-color: transparent; background-color: transparent;
border: 0px solid white; border: 0px solid white;
} }
.green{ .lightgreen{
background-color: lightgreen; background-color: lightgreen;
border: 1px solid #1f2d3d; border: 1px solid #1f2d3d;
} }

2
src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
View File

@@ -73,7 +73,7 @@
<el-progress <el-progress
:text-inside="true" :text-inside="true"
:stroke-width="18" :stroke-width="18"
:percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))" :percentage="(parseInt(10000*(scope.row.合同物料到货总数)/scope.row.合同物料采购总数)) / 100"
status="success"/> status="success"/>
</template> </template>
</el-table-column> </el-table-column>

3
src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
View File

@@ -56,7 +56,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="到票情况" min-width="200px"> <el-table-column align="center" label="到票情况" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.剩余总金额).toFixed(2)" status="success"/> <el-progress :text-inside="true" :stroke-width="18" :percentage="(parseInt(10000*(scope.row.到票总金额)/scope.row.剩余总金额)) / 100" status="success"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -178,6 +178,7 @@ export default {
}) })
}, },
searchTable1() { searchTable1() {
this.tableData2 = []
this.contractNum ? this.check1 = 1 : this.check1 = 0 this.contractNum ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0
searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => { searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {