meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

202025V2llj恢复程序V2

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-05 10:51:06 +08:00
parent 4d87709cdf
commit 11579f9a11
2 changed files with 125 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -51,39 +51,38 @@
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag> <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip> <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" 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="180" sortable="custom" show-overflow-tooltip>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip> <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" 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="数量" align="center" width="60">
<el-table-column label="数量" align="center" width="60"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.批次数量 }}
{{ scope.row.批次数量 }} </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="120" 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="重量" align="center" width="60" >
<el-table-column label="重量" align="center" width="60" > <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.重量 }}
{{ scope.row.重量 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
<el-table-column label="工艺要求" align="center" width="300" 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>
</el-table-column></el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
v-if="!loading" v-if="!loading"
@@ -160,13 +159,12 @@ export default {
methods: { methods: {
sortChange(column, prop, order) { sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111) console.log(column + '-' + column.prop + '-' + column.order, 11111)
this.ordername = column.prop if (column.prop === '零件名称') {
if (column.ordername === '零件名称') {
this.ordername = 1 this.ordername = 1
} else if (column.ordername === '零件图号') { this.ordername = 2 } else { } else if (column.prop === '零件图号') { this.ordername = 2 } else {
this.ordername = '' this.ordername = ''
} }
console.log(this.ordername, 9990999)
if (column.order === 'ascending') { if (column.order === 'ascending') {
this.order = 1 this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else { } else if (column.order === 'descending') { this.order = 2 } else {
@@ -199,35 +197,32 @@ export default {
this.partNamecheck = false this.partNamecheck = false
} }
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => { searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => { if (response.data.total === 0) {
console.log(response) this.loading = false
if (response.data.total === 0) { } else {
this.loading = false
} else {
// this.tableData.push({ // this.tableData.push({
// 重量: response.data.rows[0].重量 // 重量: response.data.rows[0].重量
// }) // })
this.Data = response.data.rows this.Data = response.data.rows
this.total = response.data.total this.total = response.data.total
} }
}).then(() => { }).then(() => {
for (let i = 0; i < this.Data.length; i++) { for (let i = 0; i < this.Data.length; i++) {
searchtable2(this.Data[i].工艺计划流水号).then(response => { searchtable2(this.Data[i].工艺计划流水号).then(response => {
this.tableData.push({ this.tableData.push({
工艺计划流水号: this.Data[i].工艺计划流水号, 工艺计划流水号: this.Data[i].工艺计划流水号,
零件名称: this.Data[i].零件名称, 零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号, 零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印, 备料打印: this.Data[i].备料打印,
是否外购备料: this.Data[i].是否外购备料, 是否外购备料: this.Data[i].是否外购备料,
工艺要求: response.data[0].工艺要求, 工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料, 材料: this.Data[i].材料,
重量: this.Data[i].重量, 重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量 批次数量: this.Data[i].批次数量
})
}) })
this.loading = false })
} this.loading = false
}) }
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {

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

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card style="margin-left: 0px;width: 68%;float: left"> <el-card>
<el-col> <el-col>
<span>请款时间段:</span> <span>请款时间段:</span>
<el-date-picker <el-date-picker
@@ -29,6 +29,31 @@
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button> <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
</el-card>
<el-card style="margin-left: 0px;width: 68%;float: left">
<!--@expand-change="searchTable02"-->
<!--<el-table-column type="expand" label="详情">-->
<!--<template slot-scope="scope">-->
<!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
<!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
<!--<el-table-column min-width="150" align="center" label="发票号">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.发票号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="供应商">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供应商名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.开票金额 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table <el-table
v-loading="" v-loading=""
:data="tableData1" :data="tableData1"
@@ -42,29 +67,6 @@
show-summary show-summary
highlight-current-row highlight-current-row
@row-click="searchTable02"> @row-click="searchTable02">
<!--@expand-change="searchTable02"-->
<!--<el-table-column type="expand" label="详情">-->
<!--<template slot-scope="scope">-->
<!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
<!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
<!--<el-table-column min-width="150" align="center" label="发票号">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.发票号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="供应商">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供应商名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.开票金额 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -78,51 +80,47 @@
<el-table-column label="请款人" align="center" min-width="80" width="100"> <el-table-column label="请款人" align="center" min-width="80" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
<el-table-column label="请款时间" align="center" min-width="150" prop="date"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.请款时间 | formatTime }} <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
</template> <template slot-scope="scope">
</el-table-column> {{ parseFloat(scope.row.请款金额).toFixed(2) }}
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额"> </template>
<template slot-scope="scope"> </el-table-column>
{{ parseFloat(scope.row.请款金额).toFixed(2) }} <el-table-column label="审批情况内容" width="100" align="center">
</template> <template slot-scope="scope">
</el-table-column> <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
<el-table-column label="审批情况内容" width="100" align="center"> <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
<template slot-scope="scope"> <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag> </template>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag> </el-table-column>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag> <el-table-column label="未通过审批原因" width="110" align="center">
{{ parseFloat(scope.row.请款金额).toFixed(2) }} <template slot-scope="scope">
</template> {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</el-table-column> </template>
<el-table-column label="未通过审批原因" width="110" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="付款情况" width="100" align="center">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }} <template slot-scope="scope">
</template> <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
</el-table-column> <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
<el-table-column label="付款情况" width="100" align="center"> <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
<template slot-scope="scope"> </template>
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag> </el-table-column>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag> <el-table-column label="未付款原因" width="100" align="center">
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag> <template slot-scope="scope">
</template> {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</el-table-column> </template>
<el-table-column label="未付款原因" width="100" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" align="center" width="80">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }} <template slot-scope="scope">
</template> <el-tooltip effect="dark" content="取消请款" placement="top">
</el-table-column> <div style="display: inline-block">
<el-table-column label="操作" align="center" width="80"> <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
<template slot-scope="scope"> </div>
<el-tooltip effect="dark" content="取消请款" placement="top"> </el-tooltip>
<div style="display: inline-block"> </template>
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/> </el-table-column>
</div> </el-table>
</el-tooltip>
</template>
</el-table-column>
</template></el-table-column></el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"
@@ -135,7 +133,7 @@
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
</el-card> </el-card>
<el-card style="margin-left: 0px;width: 31%;float: left"> <el-card style="margin-left: 0px;width: 32%;float: left">
<el-table-column type="expand" label="详情"> <el-table-column type="expand" label="详情">
<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%"> <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>