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-26 18:31:59 +08:00
parent 6480d06063
commit 7317c3d73e
11 changed files with 326 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -96,7 +96,7 @@ export function searchTable1(PurchaseOrder, check4) {
}
})
}
export function addData(num1, num2, id, remarks) {
export function addData(num1, num2, id, time, remarks) {
return request({
url: '',
method: 'post',
@@ -105,11 +105,11 @@ export function addData(num1, num2, id, remarks) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_基本件采购_请购单_增加数据',
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&备注=' + remarks
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks
}
})
}
export function editData(RequisitionList, num1) {
export function editData(RequisitionList, num1, time) {
return request({
url: '',
method: 'post',
@@ -118,7 +118,7 @@ export function editData(RequisitionList, num1) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_基本件采购_请购单_编辑数据',
param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1
param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time
}
})
}
@@ -252,7 +252,7 @@ export function Production(num, MaterialNum, Number, projectFloatValue, machineF
}
})
}
export function PartCallbackInformation() {
export function PartCallbackInformation(check, partNumber, check1, dateRange0, dateRange1) {
return request({
url: '',
method: 'post',
@@ -260,11 +260,12 @@ export function PartCallbackInformation() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_退回记录_基本件_查询数据'
name: '采购管理_退回记录_基本件_查询数据',
param: `零件图号_check=${check}&零件图号=${partNumber}&时间_check=${check1}&开始时间=${dateRange0}&结束时间=${dateRange1}`
}
})
}
export function PartCallbackInformation1() {
export function PartCallbackInformation1(check, partNumber1, check1, dateRange10, dateRange11) {
return request({
url: '',
method: 'post',
@@ -272,7 +273,8 @@ export function PartCallbackInformation1() {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_退回记录_标准件和外购件_查询数据'
name: '采购管理_退回记录_标准件和外购件_查询数据',
param: `零件图号_check=${check}&零件图号=${partNumber1}&时间_check=${check1}&开始时间=${dateRange10}&结束时间=${dateRange11}`
}
})
}

4
src/api/PurchasingCenter/InvoiceSettlementApplication.js
View File

@@ -38,8 +38,8 @@ export function searchTable1(...group) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_发票结算申请单_查询数据',
param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}`,
Pagination: group[4] + '&' + group[5]
param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}&时间段_check=${group[4]}&开始日期=${group[5]}&结束日期=${group[6]}`,
Pagination: group[7] + '&' + group[8]
}
})
}

4
src/api/PurchasingCenter/PurchaseContractRequestFund.js
View File

@@ -30,7 +30,7 @@ export function searchContract(check, num1, num2) {
})
}
// 查询请款表
export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) {
export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3) {
return request({
url: '',
method: 'post',
@@ -39,7 +39,7 @@ export function searchRequestFund(pageCurrent, pageSize, check1, start, end, che
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购合同_请款_查询数据',
param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`,
param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}`,
Pagination: pageCurrent + '&' + pageSize
}
})

217
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -32,14 +32,14 @@
</el-card>
<el-tabs type="border-card" @tab-click="selectPart">
<el-tab-pane label="基本件">
<el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="零件名称" align="center" min-width="140px" show-overflow-tooltip>
<el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="120px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -69,19 +69,19 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="投产总数量" align="center" width="150px">
<el-table-column label="投产总数量" align="center" width="120px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 100%"/>
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 95px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="90px">
<el-table-column label="备注" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.零件备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-right" @click="OutParts(scope.row)">移出</el-button>
<el-button type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
@@ -89,22 +89,22 @@
<el-tab-pane label="外购件">
<el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" min-width="120">
<el-table-column label="物料代码" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料代码 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="120">
<el-table-column label="物料规格" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="120">
<el-table-column label="物料型号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
@@ -124,12 +124,12 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="采购总数量" align="center" width="150px">
<el-table-column label="采购总数量" align="center" width="135px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="120">
<el-table-column label="备注" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -139,22 +139,22 @@
<el-tab-pane label="标准件">
<el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" min-width="120">
<el-table-column label="物料代码" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料代码 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="120">
<el-table-column label="物料规格" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="120">
<el-table-column label="物料型号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
@@ -174,12 +174,12 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="采购总数量" align="center" width="150px">
<el-table-column label="采购总数量" align="center" width="115px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/>
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="120">
<el-table-column label="备注" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -211,10 +211,10 @@
</el-card>
<el-card style="padding: 3px;">
<el-row>
<el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
<el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable @change="searchTable1"/>
<el-button icon="el-icon-search" type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">请购单</el-button>
<el-button icon="el-icon-delete" type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-delete" type="info" size="mini" style="margin-left: 50px" plain @click="handleDelete()">删除</el-button>
<el-button icon="el-icon-bottom" type="success" plain size="mini" @click="exportExcel()">导出</el-button>
</el-row>
</el-card>
@@ -301,7 +301,7 @@
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-right" @click="MoveOut(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
</el-tooltip>
</template>
@@ -325,6 +325,17 @@
readonly
style="width:160px;"/>
</el-form-item>
<el-form-item label="请购时间" prop="请购时间">
<el-date-picker
v-model="form.请购时间"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 160px"
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="form.Remarks"
@@ -369,9 +380,21 @@
center
width="70%"
style="min-height: 400px">
<el-input v-model="partNumber" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation"/>
<el-date-picker
v-model="dateRange"
type="daterange"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="~"
style="width:240px;margin-left: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="PartCallbackInformation"/>
<!-- :row-class-name="tableRowClassName"-->
<el-table
:data="tableData9"
:row-class-name="tableRowClassName"
size="mini"
style="width: 97%;max-height: 300px"
height="400"
@@ -392,7 +415,7 @@
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件数量" width="70">
<el-table-column align="center" label="零件数量" width="80">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
@@ -417,20 +440,20 @@
{{ scope.row.退回时间 }}
</template>
</el-table-column>
<el-table-column property="date" label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
plain
@click="submit(scope.row)">确认</el-button>
<el-button
size="mini"
type="danger"
plain
@click="Delete(scope.row)">删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column property="date" label="操作" width="200" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- plain-->
<!-- @click="submit(scope.row)">确认</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- plain-->
<!-- @click="Delete(scope.row)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-dialog>
<el-dialog
@@ -440,9 +463,21 @@
center
width="70%"
style="min-height: 400px">
<el-input v-model="partNumber1" size="small" placeholder="零件图号及名称" style="width: 200px" clearable @change="PartCallbackInformation1"/>
<el-date-picker
v-model="dateRange1"
type="daterange"
size="small"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="~"
style="width:240px;margin-left: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="PartCallbackInformation1"/>
<!-- :row-class-name="tableRowClassName"-->
<el-table
:data="tableData10"
:row-class-name="tableRowClassName"
size="mini"
style="width: 97%;max-height: 300px"
height="400"
@@ -488,20 +523,20 @@
{{ scope.row.退回时间 }}
</template>
</el-table-column>
<el-table-column property="date" label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
plain
@click="submit1(scope.row)">确认</el-button>
<el-button
size="mini"
type="danger"
plain
@click="Delete1(scope.row)">删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column property="date" label="操作" width="200" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="success"-->
<!-- plain-->
<!-- @click="submit1(scope.row)">确认</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- plain-->
<!-- @click="Delete1(scope.row)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-dialog>
</div>
@@ -515,6 +550,10 @@ export default {
inject: ['reload'],
data() {
return {
dateRange: '',
partNumber: '',
dateRange1: '',
partNumber1: '',
DeliveryTime: '', // 三表下达时间
projectFloatValue: '',
machineNumberValue: '',
@@ -665,35 +704,43 @@ export default {
})
}
})
PartCallbackInformation().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value += 1
}
}
this.tableData9 = response.data
})
PartCallbackInformation1().then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value1 += 1
}
}
this.tableData10 = response.data
})
}
},
PartCallbackInformation() {
let check, check1
this.dialogFormVisible1 = true
this.tableData9 = []
this.partNumber ? check = 1 : check = 0
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
PartCallbackInformation(check, this.partNumber, check1, this.dateRange[0], this.dateRange[1]).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value += 1
}
}
this.tableData9 = response.data
})
},
PartCallbackInformation1() {
this.dialogFormVisible2 = true
let check, check1
this.tableData10 = []
this.partNumber1 ? check = 1 : check = 0
this.dateRange1 ? check1 = 1 : (check1 = 0, this.dateRange1 = '')
PartCallbackInformation1(check, this.partNumber1, check1, this.dateRange1[0], this.dateRange1[1]).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].退回时间 !== '') {
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
}
if (response.data[i].是否确认 === 0) {
this.value1 += 1
}
}
this.tableData10 = response.data
})
},
submit(row) {
submit(row.基本件流水号).then(response => {
@@ -923,7 +970,7 @@ export default {
submitAdd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
addData(this.form.请购车间, this.name, this.id, this.form.Remarks).then(response => {
addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogFormVisible = false
@@ -945,11 +992,12 @@ export default {
this.dialogFormVisible = true
this.RequisitionList = row.请购单流水号
this.form.请购车间 = row.请购车间
this.form.请购时间 = row.请购时间
},
submitEdit(formName) { // 提交单据编辑
this.$refs[formName].validate((valid) => {
if (valid) {
editData(this.RequisitionList, this.form.请购车间).then(response => {
editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
@@ -978,19 +1026,6 @@ export default {
this.$message.success('删除成功')
this.tableData6 = []
this.searchTable1()
if (this.PartType === '基本件') {
searchPart(this.groupFloatValue).then(response => {
this.tableData1 = response.data
})
} else if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2).then(response => {
this.tableData2 = response.data
})
} else if (this.PartType === '标准件') {
searchPart1(this.groupFloatValue, 1).then(response => {
this.tableData3 = response.data
})
}
} else {
this.$message.error('删除失败')
}

10
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -17,14 +17,14 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="外协状态" align="center" width="90px">
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="外协状态" align="center" width="80px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
<el-tag v-if="Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="140px">
<el-table-column label="项目名称" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -39,7 +39,7 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="70">
<el-table-column label="数量" align="center" width="55">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -64,7 +64,7 @@
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="外协单号" align="center" width="180">
<el-table-column label="外协单号" align="center" width="160">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>

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

@@ -4,6 +4,19 @@
<div slot="header">
<!--<span>供应商:</span>-->
<el-input v-model="supperiler" placeholder="供应商或到票号" size="small" clearable @change="searchTable1()"/>
<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="结束日期"
@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>-->
@@ -59,6 +72,11 @@
{{ scope.row.发票金额 }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="创建时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.创建时间 ? scope.row.创建时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="申请人" prop="申请人姓名" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
@@ -66,7 +84,7 @@
</el-table-column>
<el-table-column label="申请时间" prop="申请时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间.substr(0,10) : '—' }}
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="审核" align="center" min-width="60">
@@ -76,7 +94,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间.substr(0,10) : '—' }}
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="审批" align="center" min-width="60">
@@ -86,7 +104,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批4时间 ? scope.row.审批4时间.substr(0,10) : '—' }}
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="财务" align="center" min-width="60">
@@ -96,7 +114,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间.substr(0,10) : '—' }}
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200" fixed="right">
@@ -367,6 +385,34 @@ export default {
name: '', // 发票结算申请
data() {
return {
dateRange: '',
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])
}
}]
},
showtable02: true,
showtable03: false,
supperiler: '',
@@ -461,10 +507,11 @@ export default {
},
searchTable1() {
this.tableData2 = []
let check1, check2
let check1, check2, check3
this.invoiceNum ? check1 = 1 : check1 = 0
this.supperiler ? check2 = 1 : check2 = 0
searchTable1(check1, this.invoiceNum, check2, this.supperiler, this.pageCurrent1, this.pageSize1).then(response => {
this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
searchTable1(check1, this.invoiceNum, check2, this.supperiler, check3, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
this.tableData1 = response.data.rows
this.tableData1.map(v => {
this.$set(v, 'scanSrc', '')

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

@@ -142,7 +142,7 @@
</el-table-column>
</el-table>
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="margin: 10px 0 0 0;display: inline-block">
<el-pagination
@@ -159,7 +159,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: 180px;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
@@ -167,35 +167,35 @@
:data="tableData22"
border
stripe
style="width: 594px;max-height: 500px;"
style="width: 680px;max-height: 500px;"
height="300px"
size="mini"
@selection-change="handleSelectionChange1"
@select="handleSelection1">
<el-table-column align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="153" show-overflow-tooltip>
<el-table-column label="名称" align="center" prop="物料名称" width="170" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="128" show-overflow-tooltip>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" width="119" show-overflow-tooltip>
<el-table-column label="规格" align="center" prop="物料规格" width="140" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="132">
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="160">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
</el-table>
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 5px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="display: inline-block">
<el-pagination
@@ -222,7 +222,7 @@
<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-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-right:30px;margin-left:100px;" @click="addOfflineContract">离线合同</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
<el-button :disabled="disabledbutton" type="success" size="small" plain style="margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
<el-button 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>-->
@@ -818,7 +818,6 @@ export default {
paramRow: '', // 参数row
disable: true, // 其他的禁用
tabName: '标准件',
disabledbutton: false,
total22: 0,
pageCurrent22: 1,
pageSize22: 20
@@ -1048,6 +1047,7 @@ export default {
})
},
tabClick(tab) {
console.log(tab.name, 1111)
if (tab.name === '外购件') {
this.tabName = '外购件'
this.searchTable11()
@@ -1285,11 +1285,6 @@ export default {
})
this.loading4 = false
console.log(response.data.length, 1231231233)
if (response.data.length === 0) {
this.disabledbutton = true
} else {
this.disabledbutton = false
}
})
this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式
},
@@ -1370,6 +1365,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(row.离线合同明细流水号, 1111)
deleteMateriel(row.离线合同明细流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('移除成功')
@@ -1399,6 +1395,7 @@ export default {
})
},
saveContract() {
console.log(11111)
this.totalPrice = 0
this.partGroup = []
this.numGroup = []
@@ -1442,55 +1439,59 @@ export default {
// })
},
doneOfflineContact() { // 生成离线合同
let judge = true
this.tableData3.map(v => {
judge = judge && v.数量
})
if (judge) {
this.$confirm('确定生成合同?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.totalPrice = 0
this.partGroup = []
this.numGroup = []
this.priceGroup = []
const dateGroup = []
const remarkGroup = []
for (let i = 0; i < this.tableData3.length; i++) {
this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价
this.partGroup.push(this.tableData3[i].离线合同明细流水号)
this.numGroup.push(this.tableData3[i].数量)
this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate))
dateGroup.push(this.tableData3[i].交货期要求)
remarkGroup.push(this.tableData3[i].备注)
}
doneOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => {
if (response.data[0].result === '1') {
this.$message.success('离线合同生成成功')
this.searchTable2()
this.tableData3 = []
// searchMateriel(this.offlineContractNum).then(response => {
// this.tableData3 = response.data
// this.tableData3.map(v => {
// this.$set(v, '未税总额', 0)
// this.$set(v, '含税总额', 0)
// !v.单价 ? v.单价 = v.参考价格 : v.单价
// this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
// })
// this.disable = true // 是否为编辑模式
// })
} else { this.$message.error('离线合同生成失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
if (this.tableData3.length === 0) {
this.$message.error('无法生成空合同，请先选入物料！')
} else {
this.$message.error('数量不正确')
let judge = true
this.tableData3.map(v => {
judge = judge && v.数量
})
if (judge) {
this.$confirm('确定生成合同?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.totalPrice = 0
this.partGroup = []
this.numGroup = []
this.priceGroup = []
const dateGroup = []
const remarkGroup = []
for (let i = 0; i < this.tableData3.length; i++) {
this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价
this.partGroup.push(this.tableData3[i].离线合同明细流水号)
this.numGroup.push(this.tableData3[i].数量)
this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate))
dateGroup.push(this.tableData3[i].交货期要求)
remarkGroup.push(this.tableData3[i].备注)
}
doneOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => {
if (response.data[0].result === '1') {
this.$message.success('离线合同生成成功')
this.searchTable2()
this.tableData3 = []
// searchMateriel(this.offlineContractNum).then(response => {
// this.tableData3 = response.data
// this.tableData3.map(v => {
// this.$set(v, '未税总额', 0)
// this.$set(v, '含税总额', 0)
// !v.单价 ? v.单价 = v.参考价格 : v.单价
// this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
// })
// this.disable = true // 是否为编辑模式
// })
} else { this.$message.error('离线合同生成失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
} else {
this.$message.error('数量不正确')
}
}
},
exportExcel(row) {

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

@@ -93,7 +93,12 @@
{{ (Number(scope.row.合同总额) - Number(scope.row.已付金额)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" min-width="90">
<el-table-column label="采购员" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.采购员 }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="创建日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }}
</template>
@@ -210,7 +215,11 @@ export default {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '供应商名称') {
this.partName = 1
} else if (column.prop === '离线合同编号') { this.partName = 2 } else {
} else if (column.prop === '离线合同编号') {
this.partName = 2
} else if (column.prop === '创建日期') {
this.partName = 3
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)

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

@@ -23,6 +23,7 @@
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-checkbox v-model="searchAll" style="margin-left: 50px">查询全部</el-checkbox>
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
</div>
<!--<h3>请款表</h3>-->
@@ -258,6 +259,7 @@ import { getNowTime, timeToStamp } from '@/utils/tool'
export default {
data() {
return {
searchAll: false,
selectContents: [],
getDate: null,
tableData0: [],
@@ -464,10 +466,11 @@ export default {
this.searchTable1()
},
searchTable1() { // 查请款信息
let check1, check2
let check1, check2, check3
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
this.supplierValue ? check2 = 1 : check2 = 0
searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue).then(response => {
this.searchAll === false ? check3 = 1 : check3 = 0
searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

16
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: 260px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 210px">
<el-option
v-for="item in person"
:key="item.value"
@@ -112,7 +112,7 @@
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 10px"
style="margin-left: 50px"
@click="executeReturn1">打回</el-button>
</el-tooltip>
<!--</div>-->
@@ -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: 260px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 210px">
<el-option
v-for="item in person"
:key="item.value"
@@ -333,7 +333,7 @@
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 10px"
style="margin-left: 50px"
@click="executeReturn1">打回</el-button>
</el-tooltip>
<!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>-->
@@ -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: 520px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 480px">
<el-option
v-for="item in person"
:key="item.value"
@@ -506,15 +506,15 @@
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="allocateTask2">分配</el-button>
@click="executeReturn2">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 10px"
@click="executeReturn2">打回</el-button>
style="margin-left: 50px"
@click="allocateTask2">打回</el-button>
</el-tooltip>
<!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>-->
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->

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

@@ -1,14 +1,47 @@
<template>
<div class="app-container">
<el-card>
<el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/>
<!-- <span>发票号:</span>-->
<el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
</el-card>
<el-card>
<h5 style="margin: 5px">到票结算申请单</h5>
<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="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -119,6 +152,11 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<!-- <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.供应商名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="合同编号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.采购合同编号 || scope.row.离线合同编号 }}