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-03-14 09:21:10 +08:00
parent 39f0eb1525
commit fb25d5036c
5 changed files with 145 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
View File

@@ -123,12 +123,12 @@
{{ scope.row.操作者 }}
</template>
</el-table-column>
<el-table-column align="center" label="扫码开始" width="160">
<el-table-column align="center" label="加工开始" width="160">
<template slot-scope="scope">
{{ scope.row.加工开始时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="160">
<el-table-column align="center" label="加工结束" width="160">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
</template>
@@ -191,27 +191,15 @@ export default {
timestamp: '制造部：计划员',
type: '',
size: 'large'
}, {
id: 4,
content: '工艺制定',
timestamp: '工艺部：工艺员',
type: '',
size: 'large'
}, {
id: 5,
content: '定额制定',
content: '工艺定额',
timestamp: '工艺部：工艺员',
type: '',
size: 'large'
}, {
id: 6,
content: '生产能力平衡',
timestamp: '制造部：计划员',
type: '',
size: 'large'
}, {
id: 7,
content: '加工',
content: '生产加工',
timestamp: '金工车间：操作工',
type: '',
size: 'large'

59
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -38,7 +38,7 @@
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="77">
<el-table-column align="center" label="付款方式" width="80">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
@@ -48,6 +48,61 @@
{{ Number(scope.row.合同总金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="到账金额(万元)" width="124">
<template slot-scope="scope">
{{ Number(scope.row.已支付).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额(万元)" width="124">
<template slot-scope="scope">
{{ Number(scope.row.开票总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="合同未收款(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.合同总金额).toFixed(2) - Number(scope.row.已支付).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="投标保证金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.投标保证金金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未回投标金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.未收投标保证金).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="项目履约金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.履约保证金总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未收履约金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.履约保证金未收金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="项目安全金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.安全保证金金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="扣款金额(万元)" width="124">
<template slot-scope="scope">
{{ Number(scope.row.安全保证金扣款金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未收安全金(万元)" width="135">
<template slot-scope="scope">
{{ Number(scope.row.安全保证金未收金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="未收保证金合计(万元)" width="165">
<template slot-scope="scope">
{{ (Number(scope.row.未收投标保证金) + Number(scope.row.安全保证金未收金额) + Number(scope.row.履约保证金未收金额)).toFixed(2) }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="已付(万元)" width="95">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.已支付).toFixed(2) }}-->
@@ -116,7 +171,7 @@
</el-table-column>
<el-table-column label="发货时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.发出时间.split(' ')[2] + '/' + scope.row.发出时间.split(' ')[0] + '/' + scope.row.发出时间.split(' ')[1] }}
{{ scope.row.发出时间? scope.row.发出时间.split(' ')[2] + '/' + scope.row.发出时间.split(' ')[0] + '/' + scope.row.发出时间.split(' ')[1] : '-' }}
</template>
</el-table-column>
</el-table>

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

@@ -502,7 +502,7 @@ export default {
},
methods: {
getCurrentTime() {
this.dateRange = [this.getTime1(70), this.getTime0(0)]
this.dateRange = [this.getTime1(70), this.getTime0(1)]
},
getTime0(num) {
var date0 = new Date()

57
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -119,7 +119,7 @@
<el-button :disabled="disable === '1'" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="取消关联" placement="top">
<el-tooltip :open-delay="200" effect="dark" content="取消关联" placement="top">
<div style="display: inline-block">
<el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-top" @click="deleteArrivalMX(scope.row)"/>
</div>
@@ -267,7 +267,7 @@
</el-form-item>
</el-row>
<el-row style="height: 50px">
<el-form-item label="数量" prop="数量">
<el-form-item label="重量" prop="数量">
<el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
</el-form-item>
</el-row>
@@ -283,7 +283,7 @@
</el-row>
<el-row style="height: 50px">
<el-form-item label="金额(元)" prop="金额">
<el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium"/>
<el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium" disabled/>
</el-form-item>
</el-row>
</div>
@@ -292,7 +292,19 @@
</div>
</div>
<div style="width: 79%;float: left;margin-left: 10px">
<el-table :row-key="getRowKeys" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="350px" size="mini" @selection-change="handleSelectionChange">
<el-table
ref="multipleTable"
:row-key="getRowKeys"
:summary-method="getSummaries2"
:data="tableData20"
border
show-summary
highlight-current-row
stripe
style="margin: 3px 0"
height="350px"
size="mini"
@selection-change="handleSelectionChange">
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<el-table-column label="采购单号" align="center" width="120">
<template slot-scope="scope">
@@ -419,8 +431,8 @@
<span>零件图号</span>
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<el-table :row-key="getRowKeys" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<el-table :row-key="getRowKeys" :row-selection="{selectedRowKeys: selectedRowKeys}" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
<el-table-column label="采购单号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.采购单号 }}
@@ -492,6 +504,7 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
mark: false,
check1: 0,
check2: 0,
dateRange: '',
@@ -526,6 +539,8 @@ export default {
excle_row: [],
supplierNameValue: '',
supplierName: [], // 供应商
selectedRowKeys: [],
selectedRow: [],
partNumber: '',
purchasingOrder: '',
ArrivalOrderNumber: '',
@@ -655,7 +670,7 @@ export default {
},
methods: {
getCurrentTime() {
this.dateRange = [this.getTime1(30), this.getTime0(0)]
this.dateRange = [this.getTime1(30), this.getTime0(1)]
},
getTime0(num) {
var date0 = new Date()
@@ -852,6 +867,32 @@ export default {
})
return sums
},
getSummaries2(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 7) {
sums[index] = '总重量：'
return
} else if (index === 8) {
const values = data.map(item => Number(item['到货重量']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (parseInt((Number(prev) + Number(curr)) * 100) / 100).toFixed(2)
} else {
return (parseInt(Number(prev) * 100) / 100).toFixed(2)
}
}, 0)
sums[index] += ' KG'
} else {
sums[index] = 'N/A'
}
}
})
return sums
},
// 查询到货单
searchTable4() {
this.tableData5 = []
@@ -1012,6 +1053,7 @@ export default {
AddArrivalOrderMX(this.ArrivalOrderNumber, this.form10.CailiaoValue, this.form10.数量, this.form10.单位, this.form10.单价, this.form10.金额, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新增到货材料成功')
this.$refs.multipleTable.clearSelection()
this.form10.CailiaoValue = ''
this.form10.数量 = ''
this.form10.单价 = ''
@@ -1113,6 +1155,7 @@ export default {
this.searchTable20()
},
handleSelectionChange(val) {
console.log(val, 111)
this.arrest = val
},
// 选入

91
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -2,21 +2,23 @@
<div class="app-container">
<div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1545px">
<el-card style="width: 1663px">
<el-col>
<el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
<span>请款时间段:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin-left: 10px"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
<el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
<el-button
type="primary"
@@ -30,7 +32,7 @@
<el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
<el-button type="success" plain class="el-icon-download" size="small" style="margin: 10px 0 10px 130px" @click="exportExcel">导出</el-button>
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-col>
</el-card>
@@ -40,14 +42,13 @@
:data="tableData1"
:row-key="getRowKeys"
:expand-row-keys="expands"
:summary-method="getSummaries1"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
show-summary
border
stripe
style="margin-top: 3px;"
height="600px"
size="mini"
show-summary
highlight-current-row
@row-click="searchTable02">
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
@@ -65,7 +66,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额(元)" align="center" min-width="90" width="90" prop="请款金额">
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
@@ -74,10 +75,10 @@
<template slot-scope="scope">
<span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
<span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
<span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">未通过</span>
<span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
</template>
</el-table-column>
<el-table-column label="未通过原因" width="120" align="center">
<el-table-column label="未通过审批原因" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
@@ -85,8 +86,8 @@
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
<span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
<span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已付</span>
<span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">未付</span>
<span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
<span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
@@ -116,27 +117,22 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card style="margin-left: 0px;width:405px; margin-left: 1px; display: inline-block;vertical-align: top">
<el-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
<el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column width="120" align="center" label="发票号">
<el-table-column min-width="120" align="center" label="发票号">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<!--<el-table-column width="170" align="center" label="供应商" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供应商名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="到票金额(元)" width="120px" prop="到票金额">
<el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.开票金额.toFixed(2) }}
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="到票时间" align="center" width="90">
<el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票时间 | formatTime }}
{{ scope.row.开票金额.toFixed(2) }}
</template>
</el-table-column>
</el-table>
@@ -162,12 +158,12 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="到票金额(元)" align="center" min-width="90">
<el-table-column label="开票金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
{{ Number(scope.row.开票金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="到票时间" align="center" min-width="70">
<el-table-column label="开票时间" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.开票时间 | formatTime }}
</template>
@@ -251,38 +247,13 @@ export default {
},
methods: {
getSummaries(param) { // 合计
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
} else if (index === 2) {
const values = data.map(item => Number(parseFloat(item['开票金额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] = sums[index].toFixed(2) + ' 元'
} else {
sums[index] = 'N/A'
}
}
})
return sums
},
getSummaries1(param) { // 合计
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
} else if (index === 3) {
const values = data.map(item => Number(parseFloat(item['请款金额'])))
const values = data.map(item => Number(parseFloat(item['开票金额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
@@ -309,7 +280,7 @@ export default {
param[2] = ['结束时间', this.dateRange[1]]
param[3] = ['供应商名称_check', this.check2]
param[4] = ['供应商名称', this.supplierName0]
var Data = this.CreateData('2001', '报表_备料管理_请款_查询数据', param)
var Data = this.CreateData('03', '报表_备料管理_请款_查询数据', param)
this.exportExcel_NPOI(Data)
},
// dateFormat(row, column) {
@@ -357,14 +328,17 @@ export default {
this.tableData01 = []
},
searchTable01() { // 查询待请款
this.contractGroup = []
this.supplierValue ? this.check = 1 : this.check = 0
searchOfflineContract1(this.check, this.supplierValue).then(response => {
this.tableData01 = response.data
})
if (this.supplierValue !== null) {
this.contractGroup = []
this.supplierValue ? this.check = 1 : this.check = 0
searchOfflineContract1(this.check, this.supplierValue).then(response => {
this.tableData01 = response.data
})
} else {
this.tableData01 = []
}
},
handleSelectionChange(val) {
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
for (let i = 0; i < val.length; i++) {
@@ -372,6 +346,7 @@ export default {
this.contractGroup.push(val[i].发票流水号)
this.sumGroup.push(val[i].开票金额)
}
this.SUM = Number(this.SUM).toFixed(2)
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {