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 20:28:29 +08:00
parent 64703a0c64
commit 95fb83f7cc
16 changed files with 326 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
View File

@@ -137,7 +137,8 @@ export function searchPurchaseDetail(data) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_采购合同明细_查询数据NEW',
// name: '车间采购管理_采购合同明细_查询数据NEW',
name: '车间采购管理_采购合同明细_追加入库单_查询数据',
param: '采购合同流水号=' + data
}
})

40
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -92,7 +92,7 @@
</el-table-column>
<el-table-column label="外协价格(元)" align="center" width="130px">
<template slot-scope="scope">
<el-input v-positive="'float'" v-model="scope.row.加工价格_成交" type="float" style="text-align: right" size="small"/>
<el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small"/>
</template>
</el-table-column>
<el-table-column label="机加工开始时间" align="center" width="150px">
@@ -499,7 +499,19 @@ export default {
this.loading = true
this.List3 = []
getParts(this.Number).then(response => {
this.List3 = response.data
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.List3.push({
外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
批次数量: response.data[i].批次数量,
外协工序: response.data[i].外协工序
})
}
}
this.getList()
this.loading = false
})
@@ -521,7 +533,19 @@ export default {
this.loading = true
this.List3 = []
getParts(this.Number).then(response => {
this.List3 = response.data
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.List3.push({
外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
批次数量: response.data[i].批次数量,
外协工序: response.data[i].外协工序
})
}
}
this.loading = false
})
})
@@ -604,6 +628,12 @@ export default {
}
</script>
<style scoped>
<style>
.editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
-webkit-appearance: none;
text-align: center;
}
.editWorkTime input[type="number"]{
-moz-appearance: textfield;
}
</style>

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

@@ -46,7 +46,7 @@
<!--: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="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-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
@@ -114,7 +114,7 @@
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 500px;"
height="500px"
height="400px"
size="mini"
@sort-change="sortChange"
@selection-change="handleSelectionChange1"
@@ -333,7 +333,7 @@
:row-class-name="tableRowClassName2"
border
style="width: 100%;max-height: 500px;"
height="500px"
height="400px"
size="mini"
@selection-change="handleSelectionChange2"
@sort-change="sortChange"
@@ -434,8 +434,9 @@
<div style="display: inline-block; float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
type="primary"
size="small"
icon="el-icon-bottom"
plain
style="margin: 0px 20px"
@click="addInquirySheet">选入物料</el-button>
@@ -625,13 +626,14 @@
</el-col>
</el-row>
<el-card>
<el-card style="margin-top: 5px">
<el-card style="width: 1188px">
<el-row>
<el-input v-model="inquirySheetNum" placeholder="询价单号或供应商" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()"/>
<el-button
type="search"
type="primary"
size="mini"
plain
icon="el-icon-search"
style="margin:0px 10px"
@click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
@@ -641,7 +643,7 @@
size="mini"
style="margin-left: 10px"
@click="createInquirySheet">询价单</el-button>
<el-button type="distribution" size="mini" icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<!--<el-button-->
<!--:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"-->
<!--type="repulse"-->
@@ -649,9 +651,9 @@
<!--size="mini"-->
<!--icon="el-icon-back"-->
<!--@click="deleteInquirySheet">撤回</el-button>-->
<el-button type="repulse" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
<el-button :disabled="tableData3.length===0" type="search" size="mini" style="float: right" icon="el-icon-printer" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="search" size="mini" style="margin-left:10px;float: right" icon="el-icon-download" @click="exportInquirySheet()">导出</el-button>
<el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
<el-button :disabled="tableData3.length===0" type="primary" plain size="mini" style="float: right" icon="el-icon-printer" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="success" plain size="mini" style="margin-left:10px;float: right" icon="el-icon-download" @click="exportInquirySheet()">导出</el-button>
</el-row>
</el-card>
<el-row>

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

@@ -148,7 +148,7 @@
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审批：</span>
<span>递交审核：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>

20
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -54,7 +54,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="发票金额" align="center" width="80">
<el-table-column label="发票金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.发票金额 }}
</template>
@@ -196,32 +196,32 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="尚欠金额(元)">
<el-input v-positive="'float'" v-model="form1.unpaid" class="editWorkTime" size="small" placeholder="尚欠金额" type="number"/>
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="税额(元)">
<el-form-item v-show="false" label="税额(元)">
<el-input v-positive="'float'" v-model="form1.tax" class="editWorkTime" size="small" placeholder="税额" type="number"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已付款项">
<el-form-item v-show="false" label="已付款项">
<el-input v-model="form1.paid" size="small" placeholder="已付款项"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否费用类">
<el-form-item v-show="false" label="是否费用类">
<el-input v-model="form1.isCost" size="small" placeholder="是否费用类发票"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
<el-form-item v-show="false" label="尚欠金额(元)">
<el-input v-positive="'float'" v-model="form1.unpaid" class="editWorkTime" size="small" placeholder="尚欠金额" type="number"/>
</el-form-item>
</el-col>
<!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
@@ -436,8 +436,8 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
this.invoiceNum = this.form1.invoiceNum
this.searchTable1(this.invoiceNum)
this.supperiler = this.form1.invoiceNum
this.searchTable1(this.supperiler)
} else {
this.$message.error('增加失败')
}

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

@@ -284,8 +284,8 @@
<template slot-scope="scope">
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/>
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="导出合同" placement="top">
<el-button type="text" size="mini" icon="el-icon-download" plain @click="exportExcel(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="打印合同" placement="top">
<el-button type="text" size="mini" icon="el-icon-printer" plain @click="exportExcel(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>

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

@@ -12,13 +12,17 @@
plain
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-back"
plain
style="margin-left:10px"
@click="back">打回</el-button>
<el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
<div style="display: inline-block">
<el-button
type="danger"
size="small"
icon="el-icon-back"
plain
style="margin-left:10px"
@click="back">打回</el-button>
</div>
</el-tooltip>
</el-row>
</div>
</el-card>

22
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -26,7 +26,7 @@
<!--<span>供应商:</span>-->
<!--<el-input v-focus1="rec1" v-model="rec1" size="small"/>-->
<!--<span>{{ rec1 }}</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
<el-input v-model="supplierName" placeholder="供应商或合同号" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
<!--<span>合同编号:</span>-->
<!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>-->
<!--<span>采购员:</span>-->
@@ -74,11 +74,11 @@
@click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
<el-button
type="warning"
type="primary"
size="small"
icon="el-icon-download"
icon="el-icon-printer"
plain
@click="download()">导出</el-button>
@click="download()">打印</el-button>
</el-tooltip>
</el-row>
</div>
@@ -217,7 +217,7 @@
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)"/>
<el-button :disabled="Number(id) !== Number(scope.row.采购员流水号) || !((Number(scope.row.审核情况流水号) !== 1) && (Number(scope.row.审批情况流水号) !== 1))" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -246,6 +246,7 @@
import { initContract, initBuyer, searchTable1, searchTable2, handleDone, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
import QRCode from 'qrcode'
import $ from 'jquery'
import { mapGetters } from 'vuex'
// import { exportExcelMethod } from './exportExcel'
export default {
@@ -343,6 +344,14 @@ export default {
contractValue: '' // 显示表2和变更合同用的变量
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id'
])
},
created() {
this.fetchData()
this.searchTable1()
@@ -474,6 +483,8 @@ export default {
未通过审核原因: response.data.rows[i].未通过审核原因,
审核情况内容: response.data.rows[i].审核情况内容,
审批情况内容: response.data.rows[i].审批情况内容,
审核情况流水号: response.data.rows[i].审核情况流水号,
审批情况流水号: response.data.rows[i].审批情况流水号,
未通过原因: response.data.rows[i].未通过原因,
合同总额: response.data.rows[i].合同总额,
付款金额: response.data.rows[i].付款金额,
@@ -482,6 +493,7 @@ export default {
姓名: response.data.rows[i].姓名,
合同金额: response.data.rows[i].合同金额,
欠款金额: response.data.rows[i].欠款金额,
采购员流水号: response.data.rows[i].采购员流水号,
采购合同流水号: response.data.rows[i].采购合同流水号
})
}

4
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="total=0;pageCurrent=1;pageSize=10;searchTable()">
<el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width:160px" filterable clearable @change="total=0;pageCurrent=1;pageSize=10;searchTable()">
<el-option
v-for="item in contractNum"
:key="item.value"
@@ -52,7 +52,7 @@
</el-table-column>
<el-table-column align="center" label="单价" width="100px">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @change="update(scope.row)"/>
<el-input v-model="scope.row.单价" size="mini" width="80px" align="center" readonly @change="update(scope.row)"/>
</template>
</el-table-column>
<el-table-column align="center" label="总额" width="70px">

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

@@ -21,7 +21,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="AdvanceCharge" size="small" style="width: 120px" placeholder="预付款"/>
<el-input v-model="AdvanceCharge" size="small" style="width: 120px" type="number" placeholder="预付款"/>
<el-select v-model="currencyValue" placeholder="币种" style="width: 100px" size="small" clearable>
<el-option
v-for="item in currency"
@@ -29,13 +29,13 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-date-picker
v-model="stipulateArrivalTime"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="规定到货时间"/>
<!-- <el-date-picker-->
<!-- v-model="stipulateArrivalTime"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- format="yyyy-MM-dd"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="规定到货时间"/>-->
<el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
<el-input v-model="taxRate" placeholder="税率" style="width: 100px" size="small"/>
<el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
@@ -59,9 +59,9 @@
<el-input v-model="scope.row.数量" size="mini" style="width:100%" @change="update1(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="150">
<el-table-column label="单价(元)" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:100%" @change="update1(scope.row)"/>
<el-input v-model="scope.row.单价" positive="'float'" class="editWorkTime" size="mini" style="width:100%" type="number" @input="filterNuber1(scope.row.单价, scope.$index, '单价')" @change="update1(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="150">
@@ -110,14 +110,14 @@
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="140">
<el-table-column label="单价(元)" align="center" width="140">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:100px" @change="calculateContractSum"/>
<el-input v-model="scope.row.单价" positive="'float'" class="editWorkTime" size="mini" type="number" style="width:100px" @input="filterNuber(scope.row.单价, scope.$index, '单价')" @change="calculateContractSum"/>
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.金额.toFixed(2) }}
{{ Number(scope.row.金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="150">
@@ -138,15 +138,17 @@
</template>
</el-table-column>
</el-table>
<el-button
type="distribution"
size="small"
style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button>
<!-- <el-button-->
<!-- type="distribution"-->
<!-- size="small"-->
<!-- style="margin-top:10px"-->
<!-- @click="calculateContractSum">计算合同总额</el-button>-->
<span>合同总额(未税):</span>
<el-input v-model="contractSum2" size="small"/>
<span style="margin-left: -10px;">元</span>
<span>合同总额(含税):</span>
<el-input v-model="contractSum" size="small"/>
<el-input v-model="contractSum" size="small" />
<span style="margin-left: -10px;">元</span>
</el-card>
<el-card>
<el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -327,6 +329,7 @@ export default {
disable6: true,
tableData01: [],
tableData2: [], // 合同模板表
price: [],
form1: {},
form2: {},
form3: {
@@ -455,9 +458,39 @@ export default {
},
methods: {
linkGroup() {
console.log(this.form3, 111)
this.dialogVisible2 = true
},
filterNuber(val, index, date) {
console.log(index, 6666)
let value = '' + val
value = value
.replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
.replace('.', '$#$')
.replace(/\./g, '')
.replace('$#$', '.')
.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
if (value.indexOf('.') < 0 && value !== '') {
value = parseFloat(value).toFixed(2)
}
console.log(value)
this.tableData4[index][date] = value
},
filterNuber1(val, index, date) {
let value = '' + val
value = value
.replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
.replace('.', '$#$')
.replace(/\./g, '')
.replace('$#$', '.')
.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
if (value.indexOf('.') < 0 && value !== '') {
value = parseFloat(value).toFixed(2)
}
console.log(value)
this.tableData5[index][date] = value
},
submitGroup() {
submitGroup(this.contractNumValue, this.form3.groupNumValue).then(response => {
if (response.data[0].result === '1') {
@@ -482,6 +515,7 @@ export default {
})
},
update1(row) {
this.calculateContractSum()
update1(row.组件流水号, row.数量, row.单价, row.物料计划到货时间, row.备注).then(response => {
})
},
@@ -503,21 +537,63 @@ export default {
this.contractNumType = this.contractNum[i].id
}
}
console.log(this.contractNumType, 1111)
searchData1(this.contractNumValue).then(response => {
console.log(response.datas)
this.tableData5 = response.data
this.tableData5 = []
console.log(response, 'tableData5')
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData5.push({
组号: response.data[i].组号,
组件名称: response.data[i].组件名称,
数量: response.data[i].数量,
组件流水号: response.data[i].组件流水号,
单价: Number(response.data[i].单价).toFixed(2),
交货期: response.data[i].交货期,
备注: response.data[i].备注,
请购单流水号: response.data[i].请购单流水号,
已到货数量: response.data[i].已到货数量
})
}
}
}).then(() => {
this.groupNum5 = this.tableData5 // 给中间变量，需要时重新push
console.log(this.tableData5)
// console.log(this.tableData5, 'tableData5')
})
searchData2(this.contractNumValue).then(response => {
console.log(response, 2233)
this.tableData4 = response.data
this.tableData4 = []
console.log(response, 'tableData4')
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData4.push({
请购单明细流水号: response.data[i].请购单明细流水号,
项目名称: response.data[i].项目名称,
机床图号: response.data[i].机床图号,
组号: response.data[i].组号,
物料名称: response.data[i].物料名称,
物料代码: response.data[i].物料代码,
规格或材料: response.data[i].规格或材料,
图号或型号: response.data[i].图号或型号,
零件数量: response.data[i].零件数量,
零件类型: response.data[i].零件类型,
请购单流水号: response.data[i].请购单流水号,
基本件流水号: response.data[i].基本件流水号,
标准件和外购件流水号: response.data[i].标准件和外购件流水号,
物料流水号: response.data[i].物料流水号,
物料计划到货时间: response.data[i].物料计划到货时间,
单价: Number(response.data[i].单价).toFixed(2),
发货天数: response.data[i].发货天数,
税率: response.data[i].税率,
币种流水号: response.data[i].币种流水号,
备注: response.data[i].备注,
机床流水号: response.data[i].机床流水号,
组件流水号: response.data[i].组件流水号,
金额: response.data[i].金额 ? response.data[i].金额 : (Number(response.data[i].单价) * Number(response.data[i].零件数量)).toFixed(2)
})
}
}
this.machineValue = response.data[0].机床流水号
this.form3.机床 = response.data[0].机床图号
this.form3.groupNumValue = response.data[0].组件流水号
console.log(this.machineValue, 111)
this.groupNum = []
initGroupNum(this.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -532,7 +608,7 @@ export default {
}
}).then(() => {
this.groupNum2 = this.tableData4 // 给中间变量，需要时重新push
console.log(this.tableData4)
// console.log(this.tableData4, 'tableData4')
})
},
update(row) {
@@ -547,15 +623,18 @@ export default {
this.riseFallPoint = 0
this.tableData4 = []
for (let i = 0; i < this.groupNum2.length; i++) {
if (this.groupNum2[i].单价 === '') {
this.groupNum2[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.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.contractSum2 = (parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100).toFixed(2)
this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0')
// this.$message.error('成本核算不可为0')
} else {
this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount
this.riseFallPoint = this.riseFallPoint.toFixed(2)
@@ -568,12 +647,11 @@ export default {
for (let i = 0; i < this.groupNum5.length; i++) {
this.contractSum1 += parseFloat((parseInt(this.groupNum5[i].数量) * parseFloat(this.groupNum5[i].单价)).toFixed(2))
}
console.log(this.contractSum1, this.groupNum5, 898989)
this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0')
// this.$message.error('成本核算不可为0')
} else {
this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount
this.riseFallPoint = this.riseFallPoint.toFixed(2)
@@ -668,8 +746,8 @@ export default {
doneContract() { // 生成采购合同
if (this.contractNumValue === '') {
this.$message.error('请选择生成合同的请购单')
} else if (this.stipulateArrivalTime === '' || this.stipulateArrivalTime === null) {
this.$message.error('请选择规定到货时间！')
} else if (this.supplierValue === '' || this.supplierValue === null) {
this.$message.error('请选择供应商！')
} else {
if (this.contractNumType === 0) {
this.group1 = ''
@@ -744,4 +822,12 @@ export default {
margin-bottom: 5px;
}
</style>
<style>
.editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
-webkit-appearance: none;
text-align: center;
}
.editWorkTime input[type="number"]{
-moz-appearance: textfield;
}
</style>

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

@@ -96,10 +96,10 @@
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
<el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
<el-button type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 90px" @click="saveMateriel">保存</el-button>
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 90px" @click="saveMateriel">保存</el-button>
</el-tooltip>
</div>
<el-table
@@ -372,6 +372,7 @@ export default {
return {
dateRange: '',
checktime: '',
state: '',
pickerOptions: {
shortcuts: [{
text: '上季度',

82
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -10,38 +10,38 @@
<el-card>
<h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
<el-table-column label="详情" type="expand">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-row>
<el-col :span="6">
<viewer>
<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">
</viewer>
</el-col>
<el-col :span="6">
<el-form-item label="已付款项">
<span>{{ scope.row.已付款项 }}</span>
</el-form-item><br>
<el-form-item label="尚欠金额">
<span>{{ scope.row.尚欠金额 }}</span>
</el-form-item><br>
<el-form-item label="备注">
<span>{{ scope.row.备注 }}</span>
</el-form-item><br>
</el-col>
<el-col :span="6">
<el-form-item label="是否费用类发票">
<span>{{ scope.row.是否费用类 }}</span>
</el-form-item><br>
<el-form-item label="税额">
<span>{{ scope.row.税额 }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
</el-table-column>
<!-- <el-table-column label="详情" type="expand">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <viewer>-->
<!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
<!-- </viewer>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="已付款项">-->
<!-- <span>{{ scope.row.已付款项 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="尚欠金额">-->
<!-- <span>{{ scope.row.尚欠金额 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="备注">-->
<!-- <span>{{ scope.row.备注 }}</span>-->
<!-- </el-form-item><br>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="是否费用类发票">-->
<!-- <span>{{ scope.row.是否费用类 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="税额">-->
<!-- <span>{{ scope.row.税额 }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -211,12 +211,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="尚欠金额(元)">
<el-input v-model="form1.unpaid" size="small" placeholder="尚欠金额"/>
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="false">
<el-col :span="12">
<el-form-item label="税额(元)">
<el-input v-model="form1.tax" size="small" placeholder="税额"/>
@@ -228,15 +228,15 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="false">
<el-col :span="12">
<el-form-item label="是否费用类">
<el-input v-model="form1.isCost" size="small" placeholder="是否费用类发票"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
<el-form-item label="尚欠金额(元)">
<el-input v-model="form1.unpaid" size="small" placeholder="尚欠金额"/>
</el-form-item>
</el-col>
<!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
@@ -319,9 +319,9 @@
{{ scope.row.到票数量 }}
</template>
</el-table-column>
<el-table-column label="本次到票数量" align="center" width="100">
<el-table-column label="本次到票数量" align="center" width="120">
<template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="scope.row.已到货数量-scope.row.到票数量" class="editWorkTime" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -620,6 +620,7 @@ export default {
this.supplierValue = row.供应商流水号
Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
searchTable2(row.发票结算申请单流水号).then(response => {
console.log(response, 123)
this.tableData2 = response.data
})
},
@@ -690,6 +691,7 @@ export default {
},
handleSelectionChange(val) {
this.group = val
console.log(this.group, 'group')
},
submitAdd2() { // 追加入库单
if (this.group.length === 0) {

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

@@ -92,7 +92,7 @@
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" prop="数量" width="70">
<el-table-column label="重量" align="center" prop="数量" width="70">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
@@ -116,7 +116,7 @@
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top">
<div style="display: inline-block">
<el-button :disabled="disable === '1'" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
<el-button :disabled="disable === '1' || totalWight1 === 数量" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="200" effect="dark" content="取消关联" placement="top">
@@ -509,6 +509,8 @@ export default {
check2: 0,
dateRange: '',
expands: [],
totalWight: 0.00,
totalWight1: 0.00,
pickerOptions: {
shortcuts: [{
text: '上季度',
@@ -841,6 +843,7 @@ export default {
return parseInt(Number(prev) * 100) / 100
}
}, 0)
this.totalWight1 = sums[index]
sums[index] += ' KG'
} else {
sums[index] = 'N/A'
@@ -868,27 +871,14 @@ export default {
return sums
},
getSummaries2(param) {
const { columns, data } = param
const { columns } = 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'
}
sums[index] = this.totalWight + ' KG'
}
})
return sums
@@ -1030,50 +1020,55 @@ export default {
},
submitAddArrivalOrderMX() {
if (this.form10.数量 > 0) {
this.form10.金额 = this.form10.数量 * this.form10.单价
this.$refs['form10'].validate((valid) => {
if (valid) {
if (this.arrest.length === 0) {
this.$message.warning('请勾选要绑定的材料')
console.log(this.form10.数量, this.totalWight)
if (this.form10.数量 >= this.totalWight) {
this.form10.金额 = this.form10.数量 * this.form10.单价
this.$refs['form10'].validate((valid) => {
if (valid) {
if (this.arrest.length === 0) {
this.$message.warning('请勾选要绑定的材料')
} else {
this.工艺计划流水号组 = []
this.采购计划明细流水号组 = []
this.离线采购计划明细流水号组 = []
this.本次到货数量组 = []
this.到货重量组 = []
this.到货金额组 = []
this.arrest.map(v => {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.form10.单价)
})
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.单价 = ''
this.form10.金额 = ''
this.tableData30 = []
this.searchTable20()
this.$refs['form10'].resetFields()
searchTable5(this.ArrivalOrderNumber).then(response => {
this.tableData5 = response.data
})
// this.dialogVisible1 = false
} else { this.$message.error('新建到货单失败') }
})
}
} else {
this.工艺计划流水号组 = []
this.采购计划明细流水号组 = []
this.离线采购计划明细流水号组 = []
this.本次到货数量组 = []
this.到货重量组 = []
this.到货金额组 = []
this.arrest.map(v => {
this.工艺计划流水号组.push(v.工艺计划流水号)
this.采购计划明细流水号组.push(v.采购计划明细流水号)
this.离线采购计划明细流水号组.push(v.离线采购计划明细流水号)
this.本次到货数量组.push(v.未到货数量)
this.到货重量组.push(v.到货重量)
this.到货金额组.push(v.到货重量 * this.form10.单价)
})
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.单价 = ''
this.form10.金额 = ''
this.tableData30 = []
this.searchTable20()
this.$refs['form10'].resetFields()
searchTable5(this.ArrivalOrderNumber).then(response => {
this.tableData5 = response.data
})
// this.dialogVisible1 = false
} else { this.$message.error('新建到货单失败') }
})
return false
}
} else {
return false
}
})
})
} else {
this.$message.error('重量和所选物料总重量不等')
}
} else {
this.$message.error('数量不能为0')
this.$message.error('重量不能为0')
}
},
submitAddArrivalOrderMX1() {
@@ -1155,7 +1150,10 @@ export default {
this.searchTable20()
},
handleSelectionChange(val) {
console.log(val, 111)
this.totalWight = 0.00
for (let i = 0; i < val.length; i++) {
this.totalWight += val[i].到货重量
}
this.arrest = val
},
// 选入

12
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -70,11 +70,11 @@
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="规定到货时间" align="center">
<template slot-scope="scope">
{{ scope.row.规定到货时间 }}
</template>
</el-table-column>
<!-- <el-table-column label="规定到货时间" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.规定到货时间 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -509,7 +509,7 @@ export default {
param[6] = ['供应商名称', this.supplierName]
param[7] = ['审批情况流水号_check', this.check5]
param[8] = ['审批情况流水号', this.approvalValue]
var Data = this.CreateData('12', '采购管理_合同_查询数据_导出', param)
var Data = this.CreateData('2001', '报表_采购管理_合同_查询数据', param)
this.exportExcel_NPOI(Data)
},
searchTable1() {

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

@@ -100,7 +100,7 @@ export default {
exportExcel() {
var param = []
param[0] = ['项目流水号', this.projectValue]
var Data = this.CreateData('2001', '车间采购管理_项目总价_明细_查询数据_导出', param)
var Data = this.CreateData('2001', '报表_项目采购明细（制造）', param)
this.exportExcel_NPOI(Data)
},
searchTable1() {

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

@@ -66,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>
@@ -125,9 +125,9 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
<el-table-column width="100" align="center" label="开票日期" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
@@ -280,7 +280,7 @@ export default {
param[2] = ['结束时间', this.dateRange[1]]
param[3] = ['供应商名称_check', this.check2]
param[4] = ['供应商名称', this.supplierName0]
var Data = this.CreateData('03', '报表_备料管理_请款_查询数据', param)
var Data = this.CreateData('2001', '报表_备料管理_请款_查询数据', param)
this.exportExcel_NPOI(Data)
},
// dateFormat(row, column) {