This commit is contained in:
liushuai
2020-03-21 17:10:21 +08:00
parent 3c554e5909
commit e314062d42
23 changed files with 473 additions and 793 deletions

View File

@@ -3,47 +3,47 @@
<el-card>
<div slot="header">
<!--<span>供应商:</span>-->
<el-input v-model="supperiler" placeholder="供应商或发票号" size="small" clearable/>
<el-input v-model="supperiler" placeholder="供应商或发票号" size="small" clearable @change="searchTable1()"/>
<!--<span>发票号:</span>-->
<!--<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
<!-- <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>-->
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="createOrder()">结算申请</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
</div>
<h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
<el-table-column type="expand">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-row>
<el-col :lg="10" :sm="12">
<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 type="expand">
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-row>
<el-col :lg="10" :sm="12">
<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" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -162,14 +162,16 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
<el-tooltip v-show="true" :open-delay="100" content="删除" placement="right">
<el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="700px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum">
@@ -178,7 +180,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="发票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="发票金额" type="number"/>
<el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="发票金额" type="number" @blur="changeToFixde"/>
<!--<el-input v-model="form1.money" size="small" placeholder="发票金额"/>-->
</el-form-item>
</el-col>
@@ -243,7 +245,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-if="title1 === '创建发票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-if="title1 === '发票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
</div>
</el-dialog>
@@ -255,7 +257,7 @@
<el-radio label="采购合同" border/>
<el-radio label="离线合同" border/>
</el-radio-group>
<el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable02">
<el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="200px" size="mini" @row-click="searchTable02">
<el-table-column label="供应商" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -273,7 +275,7 @@
</el-table-column>
</el-table>
<el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="35"/>
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -304,7 +306,7 @@
{{ 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%;"/>
</template>
@@ -398,6 +400,9 @@ export default {
}
})
},
changeToFixde() {
this.form1.money = Number(this.form1.money).toFixed(2)
},
createOrder() {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
@@ -410,7 +415,7 @@ export default {
this.form1.tax = ''
this.form1.isCost = ''
this.form1.remark = ''
this.title1 = '创建发票结算申请'
this.title1 = '发票结算申请'
this.dialogVisible1 = true
},
searchTable1() {
@@ -573,7 +578,7 @@ export default {
addInStoreRecord() {
if (this.applyOrderNum) {
this.searchTable01()
this.title2 = '追加入库'
this.title2 = '追加入库'
this.dialogVisible2 = true
} else {
this.$message.error('请选择发票!')
@@ -619,7 +624,7 @@ export default {
handleSelectionChange(val) {
this.group = val
},
submitAdd2() { // 追加入库
submitAdd2() { // 追加入库
if (this.group.length === 0) {
this.$message.warning('请选择零件或物料')
} else {

View File

@@ -87,6 +87,18 @@
</el-row>
<el-row>
<el-input v-model="MaterialName" placeholder="物料名称/物料规格/物料型号" style="width: 220px" size="small" clearable/>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator=""
start-placeholder="开始申请日期"
end-placeholder="结束申请日期"/>
<!--<el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>-->
<!--<el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>-->
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;PageSize = 30;searchMaterial()">查询</el-button>
@@ -98,7 +110,7 @@
<el-table
v-loading="loading"
:data="tableData"
style="width: 945px;margin-top: 3px"
style="width: 1200px;margin-top: 3px"
height="600"
size="mini"
highlight-current-row
@@ -124,6 +136,16 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column align="center" label="申请时间" width="132px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="申请人" width="132px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="审核状态" width="80px">
<template slot-scope="scope">
<el-tag v-if="scope.row.是否通过===0" type="primary" size="small">未审核</el-tag>
@@ -131,36 +153,36 @@
<el-tag v-if="scope.row.是否通过===2" type="danger" size="small">未通过</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="打回原因" width="180px">
<el-table-column align="center" label="打回原因" width="130px">
<template slot-scope="scope">
{{ scope.row.打回原因 ? scope.row.打回原因 : '——' }}
</template>
</el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="150">-->
<!--<template slot-scope="scope">-->
<!--<el-tooltip :open-delay="1000" effect="dark" content="编辑">-->
<!--<div style="display: inline-block">-->
<!--<el-button-->
<!--:disabled="token !== 11 && token !== 36"-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-edit-outline"-->
<!--@click="handleEdit(scope.row)"/>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--<el-tooltip effect="dark" content="删除" placement="top">-->
<!--<div style="display: inline-block">-->
<!--<el-button-->
<!--:disabled="token !== 11 && token !== 36"-->
<!--size="mini"-->
<!--type="text"-->
<!--style="margin-left: 20px"-->
<!--icon="el-icon-delete"-->
<!--@click="handleDelete(scope.row)"/>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" fixed="right" align="center" width="60">
<template slot-scope="scope">
<!-- <el-tooltip :open-delay="1000" effect="dark" content="编辑">-->
<!-- <div style="display: inline-block">-->
<!-- <el-button-->
<!-- :disabled="token !== 11 && token !== 36"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit-outline"-->
<!-- @click="handleEdit(scope.row)"/>-->
<!-- </div>-->
<!-- </el-tooltip>-->
<el-tooltip effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否通过 === 1"
size="mini"
type="text"
style="margin-left: 20px"
icon="el-icon-delete"
@click="handleDelete(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -323,6 +345,7 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
dateRange: '',
loading: false,
Gonghuoshang: [],
Gonghuoshang2: [],
@@ -388,6 +411,33 @@ export default {
check9: '',
check10: '',
title: '',
pickerOptions: {
shortcuts: [{
text: '上季度',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end])
}
}, {
text: '过去半年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
picker.$emit('pick', [start, end])
}
}, {
text: '过去一年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end])
}
}]
},
form: {
物料流水号: '',
物料类别流水号: '',
@@ -480,6 +530,7 @@ export default {
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
},
searchMaterial() { // 物料查询
let check
this.MaterialName !== '' ? this.check1 = 1 : this.check1 = 0 // 物料名称
this.FullNameOfMaterial !== '' ? this.check2 = 1 : this.check2 = 0 // 物料全称
this.MaterialSpecification !== '' ? this.check3 = 1 : this.check3 = 0 // 物料规格
@@ -489,8 +540,9 @@ export default {
this.MeasurementUnitValue !== '' ? this.check7 = 1 : this.check7 = 0 // 计量单位
this.MaterialSourceValue !== '' ? this.check8 = 1 : this.check8 = 0 // 物料来源
this.GonghuoshangValue !== '' ? this.check9 = 1 : this.check9 = 0 // 供货商
this.dateRange ? check = 1 : (check = 0, this.dateRange = '')
this.loading = true
searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue).then(response => {
searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue, check, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
@@ -555,7 +607,7 @@ export default {
this.addForm('form', [this.dialogFormVisible1 = true, this.title = '新增物料申请'])
},
submitAdd() { // 提交增加
this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue], 'form', function() {
this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue, this.id], 'form', function() {
this.dialogFormVisible1 = false
this.searchMaterial()
})

View File

@@ -158,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=100000;total22=0;searchTable22()"/>
<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-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row>
<el-table
@@ -814,7 +814,7 @@ export default {
tabName: '标准件',
total22: 0,
pageCurrent22: 1,
pageSize22: 100000
pageSize22: 20
}
},
computed: {

View File

@@ -4,6 +4,18 @@
<div slot="header">
<el-row>
<el-input v-model="supplierName" placeholder="供应商/合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>-->
<el-button
type="primary"
@@ -11,7 +23,7 @@
icon="el-icon-search"
plain
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
<div style="display: inline-block">
<el-button
@@ -27,7 +39,7 @@
</div>
</el-card>
<el-row>
<el-card style="width: 40%; float: left">
<el-card style="width: 42%; float: left">
<el-table
v-loading="loading1"
id="expandTable"
@@ -38,8 +50,9 @@
style="width: 100%"
height="700px"
highlight-current-row
@sort-change="sortChange"
@row-click="searchTable2">
<el-table-column label="供应商" align="center" min-width="200">
<el-table-column label="供应商" align="center" prop="供应商名称" min-width="200" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -49,7 +62,7 @@
<!-- {{ scope.row.离线合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" min-width="120">
<el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="120" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
@@ -59,11 +72,16 @@
<!-- {{ scope.row.采购员 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="总金额(元)" align="center" min-width="75">
<el-table-column label="总金额(元)" align="center" min-width="90">
<template slot-scope="scope">
{{ Number(scope.row.合同总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -129,28 +147,73 @@ export default {
name: 'OfflineContractSearch',
data() {
return {
dateRange: '',
contractNumber: '',
supplierName: '',
total1: 0,
number: '',
pageCurrent1: 1,
pageSize1: 20,
pageSize1: 30,
tableData1: [],
loading1: false,
contractDetail: []
contractDetail: [],
pickerOptions: {
shortcuts: [{
text: '上季度',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end])
}
}, {
text: '过去半年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
picker.$emit('pick', [start, end])
}
}, {
text: '过去一年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end])
}
}]
}
}
},
created() {
this.searchTable1()
// this.searchTable1()
},
methods: {
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '供应商名称') {
this.partName = 1
} else if (column.prop === '离线合同编号') { this.partName = 2 } else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable1()
},
// 查合同列表
searchTable1() {
let check1, check2
let check1, check2, check3
this.contractNumber ? check1 = 1 : check1 = 0
this.supplierName ? check2 = 1 : check2 = 0
this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
this.loading1 = true
searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName).then(response => {
console.log(this.dateRange, 'dateRange')
searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName, this.order, this.partName, check3, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading1 = false
@@ -217,7 +280,7 @@ export default {
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号
document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量
document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.contractDetail[j].单价
document.getElementsByClassName('tableData')[j].children[5].innerHTML = Number(this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail[j].交货期要求
document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail[j].备注

View File

@@ -218,6 +218,7 @@
<el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else-if="0 < Number(scope.row.到货数量) < Number(scope.row.采购数量)">部分到货</span>
<span v-else>未到货</span>
</template>
</el-table-column>
@@ -649,6 +650,7 @@ export default {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData0.push({
人员编号: response.data.result[i].人员编号,
姓名: response.data.result[i].姓名,
询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.result[i].机床图号,
@@ -720,6 +722,7 @@ export default {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData1.push({
人员编号: response.data.result[i].人员编号,
姓名: response.data.result[i].姓名,
询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.result[i].机床图号,