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

Merge branch 'master' of ssh://123.56.95.229:29418/高精

Browse Source
This commit is contained in:
liulujia
2020-04-25 10:45:52 +08:00
parent a7c9870526 a9fa3746db
commit f8810e49bb
14 changed files with 110 additions and 57 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/PurchasingCenter/InvoiceSettlementApproveSearch.js
View File

@@ -11,7 +11,7 @@ export function searchTable1(...group) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_发票结算申请单_查询数据',
name: '采购管理_发票结算申请单_查询数据_查询',
param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
Pagination: group[3] + '&' + group[4]
}

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`
}
})
}

4
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -201,9 +201,9 @@
</template>
</template>
</el-table-column>
<el-table-column label="质检时间" align="center" width="100px">
<el-table-column label="质检时间" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
{{ scope.row.操作时间 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="140px" show-overflow-tooltip>

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>

45
src/views/Inventory/MaterialOut/index2.vue
View File

@@ -1,17 +1,23 @@
<template>
<div class="app-container">
<div style="margin-top: 2px;margin-bottom: 2px">
<el-input v-model="pickingListNumber" placeholder="图号或型号" clearable size="small" style="width:200px" />
<el-input v-model="pickingListNumber" placeholder="名称或图号或型号或规格" clearable size="small" style="width:200px" />
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
<el-button size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
<el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
<el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1015px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column label="领料单编号" show-overflow-tooltip prop="名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="110" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
@@ -136,7 +142,8 @@ export default {
rules3: {
password: [{ required: true, message: '请输入' }],
outTypeValue: [{ required: true, message: '请选择' }]
}
},
multipleSelection1: []
}
},
methods: {
@@ -215,10 +222,7 @@ export default {
},
// 多选
handleSelectionChange(val) {
this.multipleSelection1 = []
val.map(v => {
this.multipleSelection1.push(v.领料单明细流水号)
})
this.multipleSelection1 = val
},
// 领料确认
inputPassword() {
@@ -251,18 +255,17 @@ export default {
this.machineValue = []
this.offlineNum = []
this.outNumber = []
for (let i = 0; i < this.pickListTable2.length; i++) {
console.log(this.pickListTable2[i].出库数量, 1233)
if (this.pickListTable2[i].出库数量 !== 0) {
this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
this.basePartNum.push(this.pickListTable2[i].基本件流水号)
this.materialNum.push(this.pickListTable2[i].物料流水号)
this.parchasePartNum.push(this.pickListTable2[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.pickListTable2[i].请购单明细流水号)
this.groupNumValue.push(this.pickListTable2[i].组件流水号)
this.machineValue.push(this.pickListTable2[i].机床流水号)
this.offlineNum.push(this.pickListTable2[i].离线采购件流水号)
this.outNumber.push(this.pickListTable2[i].出库数量)
for (let i = 0; i < this.multipleSelection1.length; i++) {
if (this.multipleSelection1[i].出库数量 !== 0) {
this.multipleSelection.push(this.multipleSelection1[i].领料单明细流水号)
this.basePartNum.push(this.multipleSelection1[i].基本件流水号)
this.materialNum.push(this.multipleSelection1[i].物料流水号)
this.parchasePartNum.push(this.multipleSelection1[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.multipleSelection1[i].请购单明细流水号)
this.groupNumValue.push(this.multipleSelection1[i].组件流水号)
this.machineValue.push(this.multipleSelection1[i].机床流水号)
this.offlineNum.push(this.multipleSelection1[i].离线采购件流水号)
this.outNumber.push(this.multipleSelection1[i].出库数量)
}
}
if (Number(this.form3.password) === Number(this.form3.DirectNote)) {

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>

37
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -46,12 +46,12 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额(元)" align="center" min-width="60">
<el-table-column label="请款金额(元)" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="提交时间" align="center" min-width="60">
<el-table-column label="提交时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '' }}
</template>
@@ -61,19 +61,19 @@
{{ scope.row.审核人姓名 }}
</template>
</el-table-column>
<el-table-column label="审核时间" align="center" min-width="60">
<el-table-column label="审核时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审核时间 ? scope.row.审核时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="审核结果" align="center" min-width="60">
<el-table-column label="审核结果" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审核情况内容 }}
</template>
</el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<el-table-column label="未过原因" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 }}
{{ scope.row.未通过审核原因 === '通过' ? '' : scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批人" align="center" width="90">
@@ -81,31 +81,41 @@
{{ scope.row.审批人姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="60">
<el-table-column label="审批时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="审批结果" align="center" min-width="60">
<el-table-column label="审批结果" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审批情况内容 }}
</template>
</el-table-column>
<el-table-column label="财务审批" align="center" min-width="60">
<el-table-column label="未过原因" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.付款人 }}
{{ scope.row.未通过审批原因 === '通过' ? '' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="财务审批时间" align="center" min-width="60">
<el-table-column label="财务审批" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.付款人姓名 }}
</template>
</el-table-column>
<el-table-column label="财务审批时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="财务审批结果" align="center" min-width="60">
<el-table-column label="财务审批结果" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.付款情况内容 }}
</template>
</el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="90px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -276,6 +286,9 @@ export default {
</script>
<style scoped>
.app-container{
width: 1400px;
}
.el-card{
margin-bottom: 0px;
}

15
src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
View File

@@ -86,6 +86,21 @@
{{ scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款人" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.付款人姓名 }}
</template>
</el-table-column>
<el-table-column label="付款情况" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.付款情况内容 }}
</template>
</el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="90px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">

6
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column label="采购审批" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.审批人1结果 }}
{{ scope.row.审批人1姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -85,7 +85,7 @@
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.审批人4结果 }}
{{ scope.row.审批人4姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -95,7 +95,7 @@
</el-table-column>
<el-table-column label="财务审批" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.审批人3结果 }}
{{ scope.row.审批人3姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">

33
src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
View File

@@ -48,7 +48,7 @@
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
<el-table-column label="供应商" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -58,12 +58,12 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="到票金额(元)" align="center" min-width="100">
<el-table-column label="到票金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.发票金额 }}
</template>
</el-table-column>
<el-table-column label="申请人" align="center" min-width="75">
<el-table-column label="申请人" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
@@ -73,9 +73,9 @@
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="采购审批" align="center" min-width="70">
<el-table-column label="采购审批" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审批人1结果 }}
{{ scope.row.审批人1姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -83,9 +83,14 @@
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="90">
<el-table-column label="未过原因" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.审批人4结果 }}
{{ scope.row.审批1未过原因 }}
</template>
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.审批人4姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -93,9 +98,14 @@
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="财务审批" align="center" min-width="70">
<el-table-column label="未过原因" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.审批人3结果 }}
{{ scope.row.审批4未过原因 }}
</template>
</el-table-column>
<el-table-column label="财务审批" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审批人3姓名 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -103,6 +113,11 @@
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="未过原因" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.审批2未过原因 }}
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->

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
})

9
src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue
View File

@@ -88,7 +88,7 @@
</el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 }}
{{ scope.row.未通过审批原因 === '通过' ? '' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款人" align="center" min-width="60">
@@ -106,6 +106,11 @@
{{ scope.row.付款情况内容 }}
</template>
</el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '' : scope.row.未付款原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="90px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
@@ -218,7 +223,7 @@ export default {
this.supplierValue ? check1 = 1 : check1 = 0
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
searchTable1(this.radio, check1, this.supplierValue, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
console.log(response.data)
console.log(response.data, 123)
this.loading1 = false
this.tableData1 = response.data.rows
this.total1 = response.data.total