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-27 17:21:28 +08:00
parent d968be25f2
commit 9078070157
10 changed files with 288 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,6 +200,19 @@ export function purchaseRequisition2(projectFloatValue, machineFloatValue, group
} }
}) })
} }
export function purchaseRequisition2Back(projectFloatValue, machineFloatValue, groupFloatValue, BasicPartsNumber, NumberOfParts) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_采购部采购_基本件_退回记录_传递数据',
param: `组件流水号组=${groupFloatValue}&基本件流水号组=${BasicPartsNumber}&项目流水号组=${projectFloatValue}&机床流水号组=${machineFloatValue}&零件数量组=${NumberOfParts}`
}
})
}
export function MoveOut(num, num1) { export function MoveOut(num, num1) {
return request({ return request({
url: '', url: '',
@@ -239,6 +252,19 @@ export function PurchasingDepartment(num, num1, time, MaterialNum, NumberOfParts
} }
}) })
} }
export function PurchasingDepartmentBack(num, num1, MaterialNum, NumberOfParts, projectFloatValue, machineFloatValue) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '车间管理_车间采购_标准件和外购件_退回记录_传递数据',
param: `组件流水号组=${num}&标准件和外购件流水号组=${num1}&物料流水号组=${MaterialNum}&零件数量组=${NumberOfParts}&项目流水号组=${projectFloatValue}&机床流水号组=${machineFloatValue}`
}
})
}
export function Production(num, MaterialNum, Number, projectFloatValue, machineFloatValue) { export function Production(num, MaterialNum, Number, projectFloatValue, machineFloatValue) {
return request({ return request({
url: '', url: '',

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

@@ -151,7 +151,7 @@ export function executeReturn1(...params) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '采购部采购_退回物料', name: '采购部采购_退回物料',
param: `标准件和外购件流水号组=${params[0]}&组件零件流水号组=${params[1]}` param: `标准件和外购件流水号组=${params[0]}&组件零件流水号组=${params[1]}&数量组=${params[2]}`
} }
}) })
} }
@@ -165,7 +165,7 @@ export function executeReturn2(...params) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '采购部采购_退回物料_基本件', name: '采购部采购_退回物料_基本件',
param: `基本件流水号组=${params[0]}&组件零件基本件流水号组=${params[1]}` param: `基本件流水号组=${params[0]}&组件零件基本件流水号组=${params[1]}&数量组=${params[2]}`
} }
}) })
} }

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

@@ -392,6 +392,11 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="PartCallbackInformation"/> @change="PartCallbackInformation"/>
<el-button
size="small"
type="success"
plain
@click="submit()">采购部采购</el-button>
<!-- :row-class-name="tableRowClassName"--> <!-- :row-class-name="tableRowClassName"-->
<el-table <el-table
:data="tableData9" :data="tableData9"
@@ -399,7 +404,9 @@
style="width: 97%;max-height: 300px" style="width: 97%;max-height: 300px"
height="400" height="400"
highlight-current-row highlight-current-row
border> border
@selection-change="handleSelectionChange10">
<el-table-column align="center" type="selection" width="42px"/>
<el-table-column align="center" label="零件图号"> <el-table-column align="center" label="零件图号">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -415,9 +422,9 @@
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件数量" width="80"> <el-table-column align="center" label="零件数量" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 }} <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 95px"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称"> <el-table-column align="center" label="项目名称">
@@ -440,20 +447,20 @@
{{ scope.row.退回时间 }} {{ scope.row.退回时间 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column property="date" label="操作" width="200" align="center">--> <!--<el-table-column property="date" label="操作" width="200" align="center">-->
<!-- <template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!-- <el-button--> <!--&lt;!&ndash;<el-button&ndash;&gt;-->
<!-- size="mini"--> <!--&lt;!&ndash;size="mini"&ndash;&gt;-->
<!-- type="success"--> <!--&lt;!&ndash;type="success"&ndash;&gt;-->
<!-- plain--> <!--&lt;!&ndash;plain&ndash;&gt;-->
<!-- @click="submit(scope.row)">确认</el-button>--> <!--&lt;!&ndash;@click="submit(scope.row)">确认</el-button>&ndash;&gt;-->
<!-- <el-button--> <!--&lt;!&ndash;<el-button&ndash;&gt;-->
<!-- size="mini"--> <!--&lt;!&ndash;size="mini"&ndash;&gt;-->
<!-- type="danger"--> <!--&lt;!&ndash;type="danger"&ndash;&gt;-->
<!-- plain--> <!--&lt;!&ndash;plain&ndash;&gt;-->
<!-- @click="Delete(scope.row)">删除</el-button>--> <!--&lt;!&ndash;@click="Delete(scope.row)">删除</el-button>&ndash;&gt;-->
<!-- </template>--> <!--</template>-->
<!-- </el-table-column>--> <!--</el-table-column>-->
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
@@ -475,6 +482,11 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="PartCallbackInformation1"/> @change="PartCallbackInformation1"/>
<el-button
size="small"
type="success"
plain
@click="submit1()">采购部采购</el-button>
<!-- :row-class-name="tableRowClassName"--> <!-- :row-class-name="tableRowClassName"-->
<el-table <el-table
:data="tableData10" :data="tableData10"
@@ -482,7 +494,9 @@
style="width: 97%;max-height: 300px" style="width: 97%;max-height: 300px"
height="400" height="400"
highlight-current-row highlight-current-row
border> border
@selection-change="handleSelectionChange11">
<el-table-column align="center" type="selection" width="42px"/>
<el-table-column align="center" label="物料名称"> <el-table-column align="center" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -498,9 +512,9 @@
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件数量" width="80"> <el-table-column align="center" label="零件数量" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 }} <el-input-number v-model="scope.row.零件数量" :min="0" size="mini" style="width: 95px"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称"> <el-table-column align="center" label="项目名称">
@@ -523,27 +537,27 @@
{{ scope.row.退回时间 }} {{ scope.row.退回时间 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column property="date" label="操作" width="200" align="center">--> <!--<el-table-column property="date" label="操作" width="200" align="center">-->
<!-- <template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!-- <el-button--> <!--<el-button-->
<!-- size="mini"--> <!--size="mini"-->
<!-- type="success"--> <!--type="success"-->
<!-- plain--> <!--plain-->
<!-- @click="submit1(scope.row)">确认</el-button>--> <!--@click="submit1(scope.row)">确认</el-button>-->
<!-- <el-button--> <!--<el-button-->
<!-- size="mini"--> <!--size="mini"-->
<!-- type="danger"--> <!--type="danger"-->
<!-- plain--> <!--plain-->
<!-- @click="Delete1(scope.row)">删除</el-button>--> <!--@click="Delete1(scope.row)">删除</el-button>-->
<!-- </template>--> <!--</template>-->
<!-- </el-table-column>--> <!--</el-table-column>-->
</el-table> </el-table>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment' import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Cookie from 'js-cookie' import Cookie from 'js-cookie'
export default { export default {
@@ -569,6 +583,9 @@ export default {
stockNum: '', stockNum: '',
MaterialNumber: '', MaterialNumber: '',
PurchaseOrder: '', PurchaseOrder: '',
project: [],
machine: [],
group: [],
PartType: '基本件', PartType: '基本件',
tableData: [], tableData: [],
tableData1: [], tableData1: [],
@@ -613,6 +630,8 @@ export default {
MaterialModel: [], MaterialModel: [],
NumberOfParts: [], NumberOfParts: [],
multipleSelection: [], multipleSelection: [],
multipleSelection10: [],
multipleSelection11: [],
ReMarks: [], ReMarks: [],
projectName: '', projectName: '',
MachineToolNumber: '', MachineToolNumber: '',
@@ -742,47 +761,98 @@ export default {
this.tableData10 = response.data this.tableData10 = response.data
}) })
}, },
submit(row) { submit() {
submit(row.基本件流水号).then(response => { if (this.multipleSelection10.length > 0) {
this.value = 0 this.MaterialNum = []
if (response.data[0].result === '1') { this.BasicPartsNumber = []
this.$message.success('确认成功') this.MaterialName = []
PartCallbackInformation().then(response => { this.PartToolNumber = []
for (let i = 0; i < response.data.length; i++) { this.Material = []
if (response.data[i].退回时间 !== '') { this.NumberOfParts = []
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] this.project = []
} this.machine = []
if (response.data[i].是否确认 === 0) { this.group = []
this.value += 1 for (let i = 0; i < this.multipleSelection10.length; i++) {
} this.MaterialNum[i] = this.multipleSelection10[i].物料流水号
} this.BasicPartsNumber[i] = this.multipleSelection10[i].基本件流水号
this.tableData9 = response.data this.MaterialName[i] = this.multipleSelection10[i].零件名称
}) this.PartToolNumber[i] = this.multipleSelection10[i].零件图号
} else { this.Material[i] = this.multipleSelection10[i].材料
this.$message.error('确认失败') this.NumberOfParts[i] = this.multipleSelection10[i].零件数量
this.ReMarks[i] = this.multipleSelection10[i].零件备注
this.project[i] = this.multipleSelection10[i].项目流水号
this.machine[i] = this.multipleSelection10[i].机床流水号
this.group[i] = this.multipleSelection10[i].组件流水号
} }
}) purchaseRequisition2Back(this.project, this.machine, this.group, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
if (response.data[0].result !== '0') {
console.log(response.data[0].result)
this.$message.success('请购成功')
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
})
} else {
this.$message.error('请购失败')
}
})
} else {
this.$message.warning('请勾选')
}
}, },
submit1(row) { submit1() {
submit1(row.标准件和外购件流水号).then(response => { if (this.multipleSelection11.length > 0) {
this.value1 = 0 this.MaterialNum = []
if (response.data[0].result === '1') { this.MaterialCode = []
this.$message.success('确认成功') this.StandardPartsAndOutsourcing = []
PartCallbackInformation1().then(response => { this.MaterialName = []
for (let i = 0; i < response.data.length; i++) { this.MaterialSpecification = []
if (response.data[i].退回时间 !== '') { this.MaterialModel = []
response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] this.NumberOfParts = []
} this.project = []
if (response.data[i].是否确认 === 0) { this.machine = []
this.value1 += 1 this.group = []
} for (let i = 0; i < this.multipleSelection11.length; i++) {
} this.StandardPartsAndOutsourcing[i] = this.multipleSelection11[i].标准件和外购件流水号
this.tableData10 = response.data this.MaterialNum[i] = this.multipleSelection11[i].物料流水号
}) this.MaterialCode[i] = this.multipleSelection11[i].物料代码
} else { this.MaterialName[i] = this.multipleSelection11[i].物料名称
this.$message.error('确认失败') this.MaterialSpecification[i] = this.multipleSelection11[i].物料规格
this.MaterialModel[i] = this.multipleSelection11[i].物料型号
this.NumberOfParts[i] = this.multipleSelection11[i].零件数量
this.ReMarks[i] = this.multipleSelection11[i].备注
this.project[i] = this.multipleSelection11[i].项目流水号
this.machine[i] = this.multipleSelection11[i].机床流水号
this.group[i] = this.multipleSelection11[i].组件流水号
} }
}) PurchasingDepartmentBack(this.group, this.StandardPartsAndOutsourcing, this.MaterialNum, this.NumberOfParts, this.project, this.machine).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('请购成功')
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
})
} else {
this.$message.error('请购失败')
}
})
} else {
this.$message.warning('请勾选')
}
}, },
Delete(row) { Delete(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
@@ -1167,6 +1237,12 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
}, },
handleSelectionChange10(val) {
this.multipleSelection10 = val
},
handleSelectionChange11(val) {
this.multipleSelection11 = val
},
purchaseRequisition() { purchaseRequisition() {
if (this.RequisitionList !== '') { if (this.RequisitionList !== '') {
if (this.time !== '' && this.time !== null) { if (this.time !== '' && this.time !== null) {

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

@@ -20,8 +20,9 @@
<el-table-column label="序号" align="center" type="index" width="55"/> <el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="外协状态" align="center" width="80px"> <el-table-column label="外协状态" align="center" width="80px">
<template slot-scope="scope"> <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="primary" size="mini">未提交</el-tag>
<el-tag v-if="Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag> <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目名称" align="center" width="130px"> <el-table-column label="项目名称" align="center" width="130px">

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

@@ -103,12 +103,12 @@
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }} {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合计" align="center" min-width="80" prop="合计"> <el-table-column label="合计（元）" align="center" min-width="100" prop="合计">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }} {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" min-width="80" prop="单价"> <el-table-column label="单价（元）" align="center" min-width="100" prop="单价">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.单价||0).toFixed(2) }} {{ parseFloat(scope.row.单价||0).toFixed(2) }}
</template> </template>
@@ -220,6 +220,29 @@ export default {
} else { } else {
sums[index] = '0' sums[index] = '0'
} }
} else if (index === 5) {
for (let i = 0; i < data.length; i++) {
if (!data[i].到货数量) {
data[i].到货数量 = 0
}
if (!data[i].已到货数量) {
data[i].已到货数量 = 0
}
}
const values = data.map(item => Number(parseInt(item['数量'])) * Number(parseInt(item['单价'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] = Number(sums[index]).toFixed(2) + ' 元'
} else {
sums[index] = '0.00'
}
} }
}) })
return sums return sums

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

@@ -416,7 +416,7 @@ export default {
showtable02: true, showtable02: true,
showtable03: false, showtable03: false,
supperiler: '', supperiler: '',
disabled: false, disabled: true,
contractType: '采购合同', contractType: '采购合同',
invoiceNum: '', invoiceNum: '',
total1: 0, total1: 0,
@@ -506,6 +506,7 @@ export default {
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
searchTable1() { searchTable1() {
this.disabled = true
this.tableData2 = [] this.tableData2 = []
let check1, check2, check3 let check1, check2, check3
this.invoiceNum ? check1 = 1 : check1 = 0 this.invoiceNum ? check1 = 1 : check1 = 0

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

@@ -23,7 +23,7 @@
end-placeholder="结束日期"/> 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="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-goods" plain style="" @click="requestFund">请款</el-button> <el-button type="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-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> <el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
</div> </div>
<!--<h3>请款表</h3>--> <!--<h3>请款表</h3>-->
@@ -259,7 +259,7 @@ import { getNowTime, timeToStamp } from '@/utils/tool'
export default { export default {
data() { data() {
return { return {
searchAll: false, searchAll: true,
selectContents: [], selectContents: [],
getDate: null, getDate: null,
tableData0: [], tableData0: [],

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

@@ -135,11 +135,16 @@
<!-- {{ scope.row.采购合同名称 }}--> <!-- {{ scope.row.采购合同名称 }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="采购合同号" prop="采购合同编号" align="center" width="150" show-overflow-tooltip> <el-table-column label="采购合同号" prop="采购合同编号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="创建时间" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="合同审核" prop="审核情况内容" align="center" width="80"> <el-table-column label="合同审核" prop="审核情况内容" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.审核情况内容==='未审核'">未审核</span> <span v-if="scope.row.审核情况内容==='未审核'">未审核</span>
@@ -160,12 +165,12 @@
<!-- <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>--> <!-- <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未审核原因" align="center" width="120" show-overflow-tooltip> <el-table-column label="未审核原因" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }} {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未审批原因" align="center" width="130" show-overflow-tooltip> <el-table-column label="未审批原因" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }} {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
</template> </template>
@@ -190,7 +195,7 @@
{{ scope.row.欠款金额 }} {{ scope.row.欠款金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="110" show-overflow-tooltip> <el-table-column label="审批时间" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '-' }} {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '-' }}
</template> </template>
@@ -533,7 +538,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].审批时间,
操作时间: response.data.rows[i].操作时间
}) })
} }
} }

82
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -111,12 +111,12 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="90px"> <!-- <el-table-column align="center" label="到货状态" width="90px">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <!-- <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
<span v-else>未到货</span> <!-- <span v-else>未到货</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom"> <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
@@ -137,6 +137,16 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" width="100px">
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -159,7 +169,7 @@
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1"> <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px"> <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag> <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span> <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span> <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
@@ -170,7 +180,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom"> <el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -215,13 +225,13 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="90px"> <!-- <el-table-column align="center" label="到货状态" width="90px">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <!-- <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-if="0 < Number(scope.row.到货数量) < Number(scope.row.采购数量)">部分到货</span>-->
<span v-else>未到货</span> <!-- <span v-else>未到货</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom"> <el-table-column align="center" label="供应商" prop="供应商名称" min-width="150px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
@@ -242,6 +252,16 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -275,7 +295,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" prop="组号" width="70px" sortable="custom"> <el-table-column align="center" label="组号" prop="组号" width="80px" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
@@ -327,12 +347,12 @@
{{ scope.row.不合格数量 }} {{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货状态" width="90px"> <!-- <el-table-column align="center" label="到货状态" width="90px">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <!-- <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
<span v-else>未到货</span> <!-- <span v-else>未到货</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip sortable="custom"> <el-table-column align="center" label="供应商" prop="供应商名称" min-width="100px" show-overflow-tooltip sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
@@ -353,6 +373,16 @@
{{ scope.row.备注 || '—' }} {{ scope.row.备注 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="采购日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="分配日期" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="下达时间" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }} {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
@@ -670,7 +700,9 @@ export default {
采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—', 采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—', 到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.result[i].不合格数量, 不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.result[i].操作日期 任务分配时间: response.data.result[i].任务分配时间,
操作日期: response.data.result[i].操作日期,
采购时间: response.data.result[i].采购时间
}) })
} }
} }
@@ -742,7 +774,9 @@ export default {
采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—', 采购数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].数量 || response.data.result[i].离线采购数量 || '—',
到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—', 到货数量: Number(response.data.result[i].询价状态编号) === 1 && response.data.result[i].人员编号 !== '' ? '—' : response.data.result[i].已到货数量 || response.data.result[i].离线到货数量 || '—',
不合格数量: response.data.result[i].不合格数量, 不合格数量: response.data.result[i].不合格数量,
操作日期: response.data.result[i].操作日期 操作日期: response.data.result[i].操作日期,
采购时间: response.data.result[i].采购时间,
任务分配时间: response.data.result[i].任务分配时间
}) })
} }
} }

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

@@ -506,7 +506,7 @@
size="small" size="small"
icon="el-icon-menu" icon="el-icon-menu"
style="margin-left: 10px" style="margin-left: 10px"
@click="executeReturn2">分配</el-button> @click="allocateTask2">分配</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-button <el-button
@@ -514,7 +514,7 @@
size="small" size="small"
icon="el-icon-back" icon="el-icon-back"
style="margin-left: 50px" style="margin-left: 50px"
@click="allocateTask2">打回</el-button> @click="executeReturn2">打回</el-button>
</el-tooltip> </el-tooltip>
<!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>--> <!--<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>--> <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
@@ -761,6 +761,8 @@ export default {
basic: [], basic: [],
groupAndPart: [], groupAndPart: [],
groupAndPartBasic: [], groupAndPartBasic: [],
partNumber: [],
partNumberBasic: [],
pageCurrent0: 1, pageCurrent0: 1,
pageSize0: 50, pageSize0: 50,
total0: 0, total0: 0,
@@ -993,17 +995,21 @@ export default {
handleSelectionChange1(val) { // 标准件和外购件多选 handleSelectionChange1(val) { // 标准件和外购件多选
this.standardAndPurchase = [] this.standardAndPurchase = []
this.groupAndPart = [] this.groupAndPart = []
this.partNumber = []
for (let i = 0; i < val.length; i++) { for (let i = 0; i < val.length; i++) {
this.standardAndPurchase.push(val[i].标准件和外购件流水号) this.standardAndPurchase.push(val[i].标准件和外购件流水号)
this.groupAndPart.push(val[i].组件零件流水号) this.groupAndPart.push(val[i].组件零件流水号)
this.partNumber.push(val[i].零件数量)
} }
}, },
handleSelectionChange2(val) { // 基本件多选 handleSelectionChange2(val) { // 基本件多选
this.basic = [] this.basic = []
this.groupAndPartBasic = [] this.groupAndPartBasic = []
this.partNumberBasic = []
for (let i = 0; i < val.length; i++) { for (let i = 0; i < val.length; i++) {
this.basic.push(val[i].基本件流水号) this.basic.push(val[i].基本件流水号)
this.groupAndPartBasic.push(val[i].组件零件基本件流水号) this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
this.partNumberBasic.push(val[i].零件数量)
} }
}, },
selectable(row) { // 多选禁用 selectable(row) { // 多选禁用
@@ -1099,7 +1105,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => { executeReturn1(this.standardAndPurchase, this.groupAndPart, this.partNumber).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('操作成功') this.$message.success('操作成功')
this.searchTable0() this.searchTable0()
@@ -1123,7 +1129,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
executeReturn2(this.basic, this.groupAndPartBasic).then(response => { executeReturn2(this.basic, this.groupAndPartBasic, this.partNumberBasic).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('操作成功') this.$message.success('操作成功')
this.searchTable2() this.searchTable2()