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-19 17:53:05 +08:00
parent 97bb2dcd3d
commit 3c9e0cb1b5
11 changed files with 474 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/ManufacturingCenter/ManHourStatistics/index.vue
View File

@@ -31,7 +31,7 @@
</el-table-column>
<el-table-column label="录入工时(分)" align="center">
<template slot-scope="scope">
{{ scope.row.实际工时 }}
{{ scope.row.录入工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center">
@@ -172,7 +172,7 @@ export default {
}
searchtable(this.workerName_ckeck, this.workerName, check1, this.dateRange[0], this.dateRange[1]).then(response => {
response.data.map(v => {
this.$set(v, '工时比值', v.计划工时 === 0 ? 0 : Math.round(v.扫码工时 / v.计划工时 * 100) / 100.00)
this.$set(v, '工时比值', v.计划工时 === 0 ? 0 : Math.round(v.录入工时 / v.计划工时 * 100) / 100.00)
})
this.tableData = response.data
this.loading = false
@@ -180,22 +180,22 @@ export default {
},
// 导出
exportTable() {
import('./Export2Excel').then(excel => {
const filterVal1 = ['姓名', '计划工时', '实际工时', '扫码工时', '工时比值']
const data1 = this.tableData.map(v => filterVal1.map(j => v[j]))
const dataGroup = []
dataGroup.push(data1)
const headerGroup = [['操作员', '计划工时', '录入工时', '扫码工时', '工时比值']]
const sheetGroup = ['工时统计表']
excel.export_json_to_excel({
headerGroup: headerGroup,
dataGroup: dataGroup,
sheetGroup: sheetGroup,
filename: '工时统计表',
autoWidth: true,
bookType: 'xlsx'
})
})
let check, check1
this.workerName ? check = 1 : check = 0
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
var param = []
param[0] = ['操作者_check', check]
param[1] = ['姓名', this.workerName]
param[6] = ['时间_check', check1]
if (check1 === 0) {
param[7] = ['开始时间', '']
param[8] = ['结束时间', '']
} else {
param[7] = ['开始时间', this.dateRange[0]]
param[8] = ['结束时间', this.dateRange[1]]
}
var Data = this.CreateData('2001', '报表_人员工时查询', param)
this.exportExcel_NPOI(Data)
},
searchTable2() {
this.loading2 = true

48
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -46,8 +46,8 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
<el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:140px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:140px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -77,22 +77,17 @@
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=50;total11=0;searchTable11()">查询</el-button>
<el-button type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="开启物料变更" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="开启物料变更" placement="top">
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
</el-tooltip>
<el-popover v-model="visible1" placement="top" width="140">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="visible1 = false;tiaozheng1()">确定</el-button>
</div>
<el-button slot="reference" type="primary" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">-->
<!--<div style="text-align: right; margin: 0">-->
<!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
@@ -114,15 +109,15 @@
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 500px;"
height="400px"
height="300px"
size="mini"
@sort-change="sortChange"
@selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column v-if="switchValue" label="操作" align="center" width="100" fixed="left">
<el-table-column v-if="switchValue" label="操作" align="center" width="110" fixed="left">
<template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="distribution" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
</template>
</el-table-column>
<!--<el-table-column label="状态" align="center" width="70">-->
@@ -273,8 +268,8 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="searchTable12()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
<el-input v-model="partNum" placeholder="图号名称规格" size="small" style="width:140px" clearable @keyup.enter.native="searchTable12()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:140px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
v-for="item in machine"
@@ -304,8 +299,8 @@
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable12()">查询</el-button>
<el-button type="search" size="small" icon="el-icon-download" plain style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-button type="primary" size="small" plain style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
<el-button type="primary" size="small" plain style="float: right; margin: 0px 20px 0px 0px" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
@@ -335,7 +330,7 @@
:row-class-name="tableRowClassName2"
border
style="width: 100%;max-height: 500px;"
height="400px"
height="300px"
size="mini"
@selection-change="handleSelectionChange2"
@sort-change="sortChange"
@@ -629,7 +624,7 @@
</el-row>
<el-card style="margin-top: 5px">
<el-card style="width: 1188px">
<el-card style="width: 1310px">
<el-row>
<el-input v-model="inquirySheetNum" placeholder="询价单号或供应商" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()"/>
<el-button
@@ -643,7 +638,7 @@
type="distribution"
icon="el-icon-circle-plus-outline"
size="mini"
style="margin-left: 10px"
style="margin-left: 50px"
@click="createInquirySheet">询价单</el-button>
<el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<!--<el-button-->
@@ -1351,6 +1346,7 @@ export default {
// 2020 03 04 刘路加表头排序
// 1 供货商 2 机床图号 3 物料名称 4 物料型号
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '供货商') {
this.ordername = 1
} else if (column.prop === '机床图号') {

62
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -61,7 +61,7 @@
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/>
</el-row>
<el-table v-loading="loading" :data="tableData1" :summary-method="getSummaries" border style="margin: 10px 0;max-height: 480px;width: 1365px" height="480px" size="mini" show-summary tooltip-effect="dark">
<el-table v-loading="loading" :data="tableData1" :summary-method="getSummaries" border style="margin: 10px 0;max-height: 480px;width: 1365px" height="400px" size="mini" show-summary tooltip-effect="dark">
<el-table-column label="序号" align="center" width="50" type="index"/>
<el-table-column label="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
@@ -395,35 +395,37 @@ export default {
},
// 价格实时保存
priceChange(price, num1, num2, row, num3, num4, num5) {
this.tableData1.map(v => {
v.物料流水号 = v.物料流水号 || ''
v.零件名称 = v.零件名称 || ''
v.零件图号 = v.零件图号 || ''
v.规格 = v.规格 || ''
row.物料流水号 = row.物料流水号 || ''
row.零件名称 = row.零件名称 || ''
row.零件图号 = row.零件图号 || ''
row.规格 = row.规格 || ''
if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号) && v.零件名称 === row.零件名称 && v.零件图号 === row.零件图号 && v.规格 === row.规格) {
v.含税单价 = row.含税单价
v.未税单价 = row.未税单价
}
})
const group = this.tableData1
this.tableData1 = []
this.tableData1 = group
price = price || 0
num1 = num1 || ''
num3 = num3 || ''
num4 = num4 || ''
num5 = num5 || ''
savePrice(price, num1, num2, num3, num4, num5).then(res => {
if (res.data[0].result === '1') {
console.log('单价实时保存成功')
} else {
console.log('单价实时保存失败')
}
})
if (!this.quickChangePrice) {
this.tableData1.map(v => {
v.物料流水号 = v.物料流水号 || ''
v.零件名称 = v.零件名称 || ''
v.零件图号 = v.零件图号 || ''
v.规格 = v.规格 || ''
row.物料流水号 = row.物料流水号 || ''
row.零件名称 = row.零件名称 || ''
row.零件图号 = row.零件图号 || ''
row.规格 = row.规格 || ''
if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号) && v.零件名称 === row.零件名称 && v.零件图号 === row.零件图号 && v.规格 === row.规格) {
v.含税单价 = row.含税单价
v.未税单价 = row.未税单价
}
})
const group = this.tableData1
this.tableData1 = []
this.tableData1 = group
price = price || 0
num1 = num1 || ''
num3 = num3 || ''
num4 = num4 || ''
num5 = num5 || ''
savePrice(price, num1, num2, num3, num4, num5).then(res => {
if (res.data[0].result === '1') {
console.log('单价实时保存成功')
} else {
console.log('单价实时保存失败')
}
})
}
},
deleteAllDate() {
this.tableData1.map(v => {

173
src/views/PurchasingCenter/FundApproval1/index.vue
View File

@@ -10,7 +10,7 @@
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
{{ scope.row.请款时间.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="100">
@@ -30,92 +30,101 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40, 10000]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</el-card>
<!--<h3 style="">合同明细</h3>-->
<el-row>
<el-col :span="10">
<el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
<el-table-column min-width="150" align="center" label="合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
</el-table>
<el-card>
<el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
<el-table-column min-width="110" align="center" label="合同编号" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="合同总额(元)" prop="合同总额">
<template slot-scope="scope">
{{ parseFloat(scope.row.合同总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col :span="14">
<el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="260">
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="到货数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column label="合计" align="center" min-width="100" prop="合计">
<template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" min-width="100" prop="单价">
<template slot-scope="scope">
{{ parseFloat(scope.row.单价||0).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table>
<el-card>
<el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="到货数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column label="合计" align="center" min-width="80" prop="合计">
<template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" min-width="80" prop="单价">
<template slot-scope="scope">
{{ parseFloat(scope.row.单价||0).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
</div>
@@ -132,7 +141,7 @@ export default {
contractDetail1: '',
contractDetail2: [],
tableData1: [],
pageSize1: 10,
pageSize1: 10000,
pageCurrent1: 1,
total1: 0,
tableData2: [],

139
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -25,19 +25,14 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
<el-popover v-model="visible1" placement="top" width="140">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" @click="visible1 = false;tiaozheng1()">确定</el-button>
</div>
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
</el-popover>
<el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px; float: right" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<!--:row-class-name="tableRowClassName"-->
<el-table
@@ -45,7 +40,7 @@
:data="tableData00"
border
style="width: 100%;max-height: 500px;"
height="500px"
height="300px"
size="mini"
@selection-change="handleSelectionChange1"
@select="handleSelection">
@@ -100,7 +95,7 @@
{{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
</template>
</el-table-column>
<el-table-column label="使用库存数量" align="center" width="105" prop="使用库存数">
<el-table-column label="使用库存数量" align="center" width="110" prop="使用库存数">
<template slot-scope="scope">
<span v-if="Number(scope.row.零件类型) !== 1 || (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) === 0">-</span>
<el-input-number v-if="Number(scope.row.零件类型) === 1 && (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) !== 0" v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
@@ -145,7 +140,10 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0 0 0;">
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="margin: 10px 0 0 0;display: inline-block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 20, 30, 40, 100]"
@@ -160,7 +158,7 @@
</el-tab-pane>
<el-tab-pane label="仓库" name="仓库">
<el-row>
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=20;total22=0;searchTable22()"/>
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=100000;total22=0;searchTable22()"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row>
<el-table
@@ -169,7 +167,7 @@
border
stripe
style="width: 594px;max-height: 500px;"
height="500px"
height="300px"
size="mini"
@selection-change="handleSelectionChange1"
@select="handleSelection1">
@@ -195,7 +193,10 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="display: inline-block">
<el-pagination
:current-page="pageCurrent22"
:page-sizes="[20, 50, 100, 150]"
@@ -216,38 +217,36 @@
<el-input v-model="offlineContract" placeholder="离线合同号/供应商" size="small" style="width: 170px" clearable/>
<!--<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" plain style="margin-left: 40px" @click="addMateriel">选入物料</el-button>
<el-button type="warning" size="small" plain style="margin-right:10px;margin-left:100px;" @click="addOfflineContract">创建离线合同</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disable" type="success" size="small" plain style="margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
</el-tooltip>
<!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
<el-tooltip :content="hasTax" placement="top" style="margin-right: 370px">
<el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/>
</el-tooltip>
<el-input v-model="taxRate" style="float:right;width:100px;" placeholder="税率" size="mini"/>
<el-input v-model="taxRate" style="float:right;width:60px;" placeholder="税率" size="mini"/>
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
</el-tooltip>
<el-button type="warning" size="small" plain style="float:right;margin-right:10px;" @click="addOfflineContract">创建离线合同</el-button>
<!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>-->
<!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>-->
</div>
<el-table v-loading="loading3" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="详情" type="expand" fixed="left" width="50px">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="离线合同备注">
{{ scope.row.离线合同备注 }}
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table v-loading="loading3" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<!-- <el-table-column label="详情" type="expand" fixed="left" width="50px">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-form-item label="离线合同备注">-->
<!-- {{ scope.row.离线合同备注 }}-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="合同状态" align="center" width="80" fixed="left">
<template slot-scope="scope">
<el-tag v-if="editing(scope.row)" type="warning" size="small">编辑中</el-tag>
<el-tag v-if="purchasing(scope.row)" type="primary" size="small">已采购</el-tag>
<el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
<span v-if="editing(scope.row)" style="color: #E6A23C" size="small">编辑中</span>
<span v-if="purchasing(scope.row)" style="color: #409eff" size="small">已采购</span>
<span v-if="arrival(scope.row)" style="color: #67c23a" size="small">全部到货</span>
</template>
</el-table-column>
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" width="120">
@@ -260,7 +259,7 @@
{{ scope.row.离线合同名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="180" show-overflow-tooltip>
<el-table-column label="供应商" prop="供应商名称" align="center" width="320" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -290,19 +289,19 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0;">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="display:inline-block;width:50%"
layout="total"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<!-- <div class="block" style="margin: 10px 0;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
<!--<h3>合同详细信息</h3>-->
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -318,7 +317,7 @@
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数" align="center" width="90">
<el-table-column label="采购数" align="center" width="100">
<template slot-scope="scope">
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px" @change="saveContract()"/>
<b v-else>{{ scope.row.数量 }}</b>
@@ -340,9 +339,9 @@
<b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
</template>
</el-table-column>
<el-table-column label="单价(含税)元" align="center" width="110" prop="单价">
<el-table-column label="单价(含税)元" align="center" width="120" prop="单价">
<template slot-scope="scope">
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:90px" @change="saveContract()"/>
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/>
<b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
</template>
</el-table-column>
@@ -356,9 +355,9 @@
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="140" prop="备注">
<el-table-column label="备注" align="center" min-width="120" prop="备注">
<template slot-scope="scope">
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px" @change="saveContract()"/>
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
<b v-else>{{ scope.row.备注 || '—' }}</b>
</template>
</el-table-column>
@@ -570,13 +569,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="离线合同备注" prop="离线合同备注">
<el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="离线合同备注" prop="离线合同备注">-->
<!-- <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
@@ -815,7 +814,7 @@ export default {
tabName: '标准件',
total22: 0,
pageCurrent22: 1,
pageSize22: 20
pageSize22: 100000
}
},
computed: {
@@ -829,7 +828,7 @@ export default {
this.projectChange()
this.getSupplier1()
// this.searchTable2()
this.searchTable11()
// this.searchTable11()
this.initDirection()
},
methods: {
@@ -1042,18 +1041,19 @@ export default {
})
},
tabClick(tab) {
console.log(tab.name, 1111)
if (tab.name === '外购件') {
this.tabName = '外购件'
this.searchTable11()
} else if (tab.name === '标准件') {
this.tabName = '标准件'
this.searchTable11()
// this.searchTable11()
} else if (tab.name === '基本件') {
this.tabName = '基本件'
this.searchTable12()
} else {
this.tabName = '仓库'
this.searchTable22()
// this.searchTable22()
}
},
searchTable2() { // 查询离线合同列表
@@ -1387,6 +1387,7 @@ export default {
})
},
saveContract() {
console.log(11111)
this.totalPrice = 0
this.partGroup = []
this.numGroup = []
@@ -1482,7 +1483,7 @@ export default {
}
},
exportExcel(row) {
this.$confirm('确定导出该合同?', '提示', {
this.$confirm('确定打印该合同?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

15
src/views/PurchasingCenter/ProjectTotalSearch/index.vue
View File

@@ -31,10 +31,12 @@
size="small"
icon="el-icon-search"
plain
style="margin-left:10px"
style="margin-left:10px; margin-right: 320px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<span>项目总价（元）：</span>
<span>{{ projectTotalPrice? Number(projectTotalPrice).toFixed(2) : '' }}</span>
</div>
<el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini">
<el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 700px;" height="700px" size="mini">
<el-table-column label="序号" align="center" width="80" type="index"/>
<!-- <el-table-column label="采购状态" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
@@ -83,7 +85,7 @@
<!-- {{ scope.row.单价 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单价" align="center" min-width="100">
<el-table-column label="单价(元)" align="center" min-width="100">
<template slot-scope="scope">
{{ Number(scope.row.优惠后单价).toFixed(2) }}
</template>
@@ -124,7 +126,8 @@ export default {
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
tableData1: []
tableData1: [],
projectTotalPrice: ''
}
},
computed: {
@@ -177,6 +180,7 @@ export default {
})
},
searchTable1() {
this.projectTotalPrice = ''
if (this.projectValue) {
let check2, check3
this.machineValue ? check2 = 1 : check2 = 0
@@ -184,6 +188,9 @@ export default {
console.log(1, this.projectValue, check2, this.machineValue, check3, this.groupValue)
searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
this.tableData1 = response.data
for (let i = 0; i <= response.data.length; i++) {
this.projectTotalPrice = Number(this.projectTotalPrice) + Number(response.data[i].优惠后单价) * Number(response.data[i].数量)
}
})
} else {
this.$message.error('请选择项目')

176
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -23,9 +23,10 @@
end-placeholder="结束日期"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-goods" plain style="" @click="requestFund">请款</el-button>
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
</div>
<!--<h3>请款表</h3>-->
<el-table v-loading="" :data="tableData1" border size="mini" height="300" stripe highlight-current-row @row-click="searchTable02">
<el-table v-loading="" :data="tableData1" border size="mini" height="200" stripe highlight-current-row @row-click="searchTable02">
<el-table-column label="供应商" prop="供应商名称" align="center" width="220" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -36,7 +37,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" width="150" prop="请款金额">
<el-table-column label="请款金额（元）" align="center" width="150" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
@@ -84,7 +85,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
<el-tooltip v-show="true" :open-delay="100" content="删除请款信息" placement="right">
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -104,82 +107,87 @@
<!--<h3 style="margin-top: 0">合同明细</h3>-->
<el-row>
<el-col :span="10">
<el-table :data="gridData" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContract">
<el-table-column min-width="150" align="center" label="合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="合同总额(元)" prop="合同总额">
<template slot-scope="scope">
{{ scope.row.合同总额 ? parseFloat(scope.row.合同总额).toFixed(2) : 0 }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
</el-table>
<el-card>
<el-table :data="gridData" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContract">
<el-table-column width="100" align="center" label="合同编号">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="合同总额(元)" prop="合同总额">
<template slot-scope="scope">
<span v-if="scope.row.合同总额">{{ scope.row.合同总额 ? parseFloat(scope.row.合同总额).toFixed(2) : 0 }}</span>
<span v-if="scope.row.离线合同总额">{{ scope.row.离线合同总额 ? parseFloat(scope.row.离线合同总额).toFixed(2) : 0 }}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col :span="14">
<el-table :data="tableData2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="260">
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="到货数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template>
</el-table-column>
<!--<el-table-column label="合计" align="center" min-width="100" prop="合计">-->
<!--<template slot-scope="scope">-->
<!--{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="单价" align="center" min-width="100" prop="单价">-->
<!--<template slot-scope="scope">-->
<!--{{ parseFloat(scope.row.单价||0).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table>
<el-card>
<el-table :data="tableData2" :summary-method="getSummaries" border height="450px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="到货数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template>
</el-table-column>
<!--<el-table-column label="合计" align="center" min-width="100" prop="合计">-->
<!--<template slot-scope="scope">-->
<!--{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="单价" align="center" min-width="100" prop="单价">-->
<!--<template slot-scope="scope">-->
<!--{{ parseFloat(scope.row.单价||0).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="120" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
</el-card>
@@ -329,6 +337,20 @@ export default {
// this.searchTable1()
},
methods: {
exportExcel() { // 合同请款导出
let check1, check2
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
this.supplierValue ? check2 = 1 : check2 = 0
var param = []
param[0] = ['时间段_check', check1]
param[1] = ['开始时间', this.dateRange[0]]
param[2] = ['结束时间', this.dateRange[1]]
param[3] = ['供应商流水号_check', check2]
param[4] = ['供应商流水号', this.supplierValue]
console.log(param, 'param')
var Data = this.CreateData('2001', '报表_合同请款', param)
this.exportExcel_NPOI(Data)
},
timeToStamp(param) { // 转时间戳
return timeToStamp(param)
},

18
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -92,7 +92,7 @@
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
<!--<div style="float:right;">-->
<!--<span style="margin-left: 0">采购员:</span>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 162px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 260px">
<el-option
v-for="item in person"
:key="item.value"
@@ -143,12 +143,12 @@
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" prop="物料规格" label="规格" min-width="300" width="150px">
<el-table-column align="center" show-overflow-tooltip prop="物料规格" label="规格" min-width="300" width="150px">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px" width="150px">
<el-table-column align="center" show-overflow-tooltip prop="物料型号" label="图号或型号" min-width="150px" width="150px">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
@@ -313,7 +313,7 @@
<el-checkbox v-model="checked2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 162px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 260px">
<el-option
v-for="item in person"
:key="item.value"
@@ -365,12 +365,12 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" min-width="80px" width="80px">
<el-table-column align="center" label="数量" min-width="80px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -385,7 +385,7 @@
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px" width="80px">
<el-table-column align="center" label="物料品种" prop="物料品种" min-width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
@@ -493,7 +493,7 @@
<el-checkbox v-model="checked3" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 430px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 520px">
<el-option
v-for="item in person"
:key="item.value"
@@ -540,7 +540,7 @@
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column align="center" prop="零件图号" label="图号或型号" width="150px">
<el-table-column align="center" prop="零件图号" label="图号或型号" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>

98
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -44,7 +44,6 @@
</el-card>
<el-card>
<el-table v-show="contractNumType===1" :data="tableData5" border style="width: 1200px" height="100px" size="mini">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="组件名称" align="center" width="180">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
@@ -637,14 +636,14 @@ export default {
this.contractSum1 = 0
this.costAccount = 0
this.riseFallPoint = 0
this.tableData4 = []
for (let i = 0; i < this.groupNum2.length; i++) {
if (this.groupNum2[i].单价 === '') {
this.groupNum2[i].单价 = 0.00
// this.tableData4 = []
for (let i = 0; i < this.tableData4.length; i++) {
if (this.tableData4[i].单价 === '') {
this.tableData4[i].单价 = 0.00
}
this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量)
this.contractSum1 += parseFloat(this.groupNum2[i].金额)
this.tableData4.push(this.groupNum2[i])
this.tableData4[i].金额 = parseFloat(this.tableData4[i].单价) * parseFloat(this.tableData4[i].零件数量)
this.contractSum1 += parseFloat(this.tableData4[i].金额)
// this.tableData4.push(this.groupNum2[i])
}
this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = (parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100).toFixed(2)
@@ -660,8 +659,8 @@ export default {
this.contractSum1 = 0
this.costAccount = 0
this.riseFallPoint = 0
for (let i = 0; i < this.groupNum5.length; i++) {
this.contractSum1 += parseFloat((parseInt(this.groupNum5[i].数量) * parseFloat(this.groupNum5[i].单价)).toFixed(2))
for (let i = 0; i < this.tableData5.length; i++) {
this.contractSum1 += parseFloat((parseInt(this.tableData5[i].数量) * parseFloat(this.tableData5[i].单价)).toFixed(2))
}
this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
@@ -766,49 +765,52 @@ export default {
this.$message.error('请选择供应商！')
} else {
if (this.contractNumType === 0) {
this.group1 = ''
this.group2 = ''
this.group3 = ''
this.group5 = []
this.group7 = ''
this.group8 = ''
this.group9 = []
this.group10 = ''
this.group11 = ''
this.group12 = ''
for (let i = 0; i < this.tableData4.length; i++) {
for (let j = 0; j < this.multipleSelection.length; j++) {
if (this.tableData4[i].请购单明细流水号 === this.multipleSelection[j].请购单明细流水号) {
console.log(333333)
this.group1 += this.tableData4[i].物料流水号 + ','
this.group2 += this.tableData4[i].零件数量 + ','
this.group3 += this.tableData4[i].单价 + ','
this.group7 += this.taxRate + ','
this.group8 += this.currencyValue + ','
this.group9.push(Number(this.tableData4[i].请购单明细流水号))
this.group11 += this.tableData4[i].单件定额工时 + ','
this.group12 += this.tableData4[i].准结定额工时 + ','
} else {
if (this.group5.indexOf(Number(this.tableData4[i].请购单明细流水号)) === -1 && this.Selection.indexOf(Number(this.tableData4[i].请购单明细流水号)) === -1) {
this.group5.push(Number(this.tableData4[i].请购单明细流水号))
if (this.multipleSelection.length > 0) {
this.group1 = ''
this.group2 = ''
this.group3 = ''
this.group5 = []
this.group7 = ''
this.group8 = ''
this.group9 = []
this.group10 = ''
this.group11 = ''
this.group12 = ''
for (let i = 0; i < this.tableData4.length; i++) {
for (let j = 0; j < this.multipleSelection.length; j++) {
if (this.tableData4[i].请购单明细流水号 === this.multipleSelection[j].请购单明细流水号) {
this.group1 += this.tableData4[i].物料流水号 + ','
this.group2 += this.tableData4[i].零件数量 + ','
this.group3 += this.tableData4[i].单价 + ','
this.group7 += this.taxRate + ','
this.group8 += this.currencyValue + ','
this.group9.push(Number(this.tableData4[i].请购单明细流水号))
this.group11 += this.tableData4[i].单件定额工时 + ','
this.group12 += this.tableData4[i].准结定额工时 + ','
} else {
if (this.group5.indexOf(Number(this.tableData4[i].请购单明细流水号)) === -1 && this.Selection.indexOf(Number(this.tableData4[i].请购单明细流水号)) === -1) {
this.group5.push(Number(this.tableData4[i].请购单明细流水号))
}
}
}
}
}
for (let i = 0; i < this.contractNum.length; i++) {
if (this.contractNum[i].value === this.contractNumValue) {
this.RequisitionNumber = this.contractNum[i].label
for (let i = 0; i < this.contractNum.length; i++) {
if (this.contractNum[i].value === this.contractNumValue) {
this.RequisitionNumber = this.contractNum[i].label
}
}
this.group1 = this.group1.substr(0, this.group1.length - 1)
this.group2 = this.group2.substr(0, this.group2.length - 1)
this.group3 = this.group3.substr(0, this.group3.length - 1)
doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.contractValue, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge, this.group5).then(response => {
if (response.data[0].result === '1') {
this.$message.success('生成合同成功')
this.reload()
} else { this.$message.error('生成合同失败') }
})
} else {
this.$message.warning('请勾选要生成合同的物料')
}
this.group1 = this.group1.substr(0, this.group1.length - 1)
this.group2 = this.group2.substr(0, this.group2.length - 1)
this.group3 = this.group3.substr(0, this.group3.length - 1)
doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.contractValue, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge, this.group5).then(response => {
if (response.data[0].result === '1') {
this.$message.success('生成合同成功')
this.reload()
} else { this.$message.error('生成合同失败') }
})
} else {
if (this.contractValue === 4) {
for (let i = 0; i < this.contractNum.length; i++) {

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

@@ -338,7 +338,7 @@
</el-table-column>
<el-table-column label="到货件数" align="center" width="120px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0.00" size="mini" style="width:100%" @change="saveData(scope.row)"/>
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:100%" @change="saveData(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="到货重量(KG)" align="center" width="150px" prop="到货重量">
@@ -431,7 +431,20 @@
<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" :row-selection="{selectedRowKeys: selectedRowKeys}" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table
ref="multipleTable"
:row-key="getRowKeys"
:summary-method="getSummaries3"
:row-selection="{selectedRowKeys: selectedRowKeys}"
:data="tableData20"
border
show-summary
highlight-current-row
stripe
style="margin: 3px 0"
height="300px"
size="mini"
@selection-change="handleSelectionChange1">
<el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
<el-table-column label="采购单号" align="center" width="120">
<template slot-scope="scope">
@@ -463,14 +476,14 @@
{{ scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column label="到货件数" align="center" width="90px">
<el-table-column label="到货件数" align="center" width="120px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:95px" @change="saveData(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="到货重量(KG)" align="center" width="120px">
<el-table-column label="到货重量(KG)" align="center" width="150px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:100%" @change="saveData(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -490,7 +503,7 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入备料材料</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联备料材料</el-button>
</div>
</el-dialog>
</div>
@@ -511,6 +524,7 @@ export default {
expands: [],
totalWight: 0.00,
totalWight1: 0.00,
totalWight2: 0.00,
pickerOptions: {
shortcuts: [{
text: '上季度',
@@ -560,6 +574,7 @@ export default {
}
],
arrest: [],
arrest1: [],
check: 0,
Name: '',
单价: '',
@@ -717,6 +732,30 @@ export default {
未到货数量: row.未到货数量
})
}
if (this.arrest.length > 0) {
this.arrest.map(v => {
if (v.采购计划明细流水号 === row.采购计划明细流水号) {
v.到货重量 = row.到货重量
v.未到货数量 = row.未到货数量
}
})
this.totalWight = 0.00
for (let i = 0; i < this.arrest.length; i++) {
this.totalWight += this.arrest[i].到货重量
}
}
if (this.arrest1.length > 0) {
this.arrest1.map(v => {
if (v.采购计划明细流水号 === row.采购计划明细流水号) {
v.到货重量 = row.到货重量
v.未到货数量 = row.未到货数量
}
})
this.totalWight2 = 0.00
for (let i = 0; i < this.arrest1.length; i++) {
this.totalWight2 += this.arrest1[i].到货重量
}
}
},
fetchdata() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
@@ -883,6 +922,19 @@ export default {
})
return sums
},
getSummaries3(param) {
const { columns } = param
const sums = []
columns.forEach((column, index) => {
if (index === 7) {
sums[index] = '总重量：'
return
} else if (index === 8) {
sums[index] = this.totalWight2 + ' KG'
}
})
return sums
},
// 查询到货单
searchTable4() {
this.tableData5 = []
@@ -1154,15 +1206,23 @@ export default {
for (let i = 0; i < val.length; i++) {
this.totalWight += val[i].到货重量
}
console.log(this.totalWight, 111)
this.arrest = val
},
handleSelectionChange1(val) {
this.totalWight2 = 0.00
for (let i = 0; i < val.length; i++) {
this.totalWight2 += val[i].到货重量
}
this.arrest1 = val
},
// 选入
addMateriel() {
if (!this.ArrivalOrderMXNumber) {
this.$message.warning('请选择到货材料')
} else if (this.arrest.length === 0) {
} else if (this.arrest1.length === 0) {
this.$message.warning('请勾选需要关联的材料')
} else if (this.未绑定数量 < this.totalWight2) {
this.$message.warning('所选物料总重量超出未绑定重量')
} else {
this.工艺计划流水号组 = []
this.采购计划明细流水号组 = []
@@ -1170,7 +1230,7 @@ export default {
this.本次到货数量组 = []
this.到货重量组 = []
this.到货金额组 = []
this.arrest.map(v => {
this.arrest1.map(v => {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)

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

@@ -169,7 +169,7 @@
</template>
</el-table-column>
</el-table>
<span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
<span>合计：<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
<el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
</el-dialog>
</div>
@@ -341,6 +341,7 @@ export default {
handleSelectionChange(val) {
this.contractGroup = []
this.sumGroup = []
this.SUM = 0
for (let i = 0; i < val.length; i++) {
this.SUM += parseFloat(val[i].开票金额)
this.contractGroup.push(val[i].发票流水号)