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

jiangfuzhuang

Browse Source
This commit is contained in:
Vergil
2020-05-12 17:14:01 +08:00
parent d77511942c
commit 84d3a2140b
7 changed files with 148 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/PurchasingCenter/FundApproval.js
View File

@@ -17,6 +17,20 @@ export function initApproval(pageCurrent, pageSize, haha) {
}
})
}
// 查询审核/审批/付款
export function initApproval_noPage(haha) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购合同_审批付款_查询数据',
param: `审批_付款状态=${haha}`
}
})
}
// 执行审核/审批/付款
export function execApproval(num1, num2, reason, person, haha) {
return request({

19
src/views/Inventory/PurchasePartsStorage/index.vue
View File

@@ -89,15 +89,24 @@ export default {
Type: [
{
value: 1,
label: '采购部采购合同'
label: '采购合同(采购)'
}, {
value: 3,
label: '车间采购合同'
}, {
value: 4,
label: '车间离线合同'
label: '采购合同(制造)'
}
],
// Type: [
// {
// value: 1,
// label: '采购部采购合同'
// }, {
// value: 3,
// label: '车间采购合同'
// }, {
// value: 4,
// label: '车间离线合同'
// }
// ],
TypeValue: 1,
supplierValue: '', // 供应商
supplier: [],

108
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -55,42 +55,41 @@
</div>
</el-card>
<el-row>
<el-col style="width: 700px">
<el-col style="width: 1240px">
<el-card>
<el-table
v-loading="loading"
:data="tableData"
size="mini"
height="740"
style="width: 750px"
style="width: 1240px"
border
stripe
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="click">
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="进程" prop="进程" align="center" width="95px" sortable>
<template slot-scope="scope">
{{ scope.row.进程 }}
</template>
</el-table-column>
<el-table-column label="机床号" prop="机床图号" align="center" width="95px">
<el-table-column label="机床号" prop="机床图号" align="center" width="110px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50px">
<el-table-column label="组号" prop="组号" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="175px">
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="130px">
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" min-width="130px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -105,21 +104,26 @@
{{ scope.row.工艺员 }}
</template>
</el-table-column>
<el-table-column label="编制时间" prop="工艺完成" align="center" width="85px">
<el-table-column label="编制时间" prop="工艺完成" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺完成 }}
</template>
</el-table-column>
<el-table-column label="分配时间" prop="分配时间" align="center" width="85px">
<el-table-column label="分配时间" prop="分配时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺分配时间 ? scope.row.工艺分配时间.split( ' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="下达时间" prop="下达时间" align="center" width="85px">
<el-table-column label="下达时间" prop="下达时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.操作时间 .split( ' ')[0] }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button :disabled="scope.row.进程 === '编制中'" type="primary" size="mini" icon="el-icon-search" plain @click="viewDetails(scope.row)">查看工单</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -134,7 +138,7 @@
</div>
</el-card>
</el-col>
<el-col style="width: 680px">
<!-- <el-col style="width: 680px">
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
@@ -202,8 +206,81 @@
</tr>
</table>
</el-card>
</el-col>
</el-col> -->
</el-row>
<el-dialog
:visible.sync="centerDialogVisible"
title=""
width="680px"
center>
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
<td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
<td class="tg-c3ow" colspan="3">零件图号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
<td class="tg-c3ow">数量</td>
</tr>
<tr>
<td class="tg-c3ow" colspan="3">零件名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
<td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow" colspan="2">项目名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
<td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
<td class="tg-c3ow" colspan="3">机床</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow">材质</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
<td class="tg-c3ow">规格</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
<td class="tg-c3ow" colspan="3">组号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow">序次</td>
<td class="tg-c3ow">工艺名称</td>
<td class="tg-c3ow" colspan="3">工艺要求</td>
<td class="tg-c3ow">难度系数</td>
<td class="tg-c3ow">工作者</td>
<td class="tg-c3ow">单件</td>
<td class="tg-c3ow">准结</td>
<td class="tg-c3ow">检查结果</td>
<td class="tg-c3ow">计划完成日期</td>
<td class="tg-c3ow">工序条码</td>
</tr>
<tr v-for="(value,key) in tableData2" :id="key" :key="key">
<td class="tg-c3ow">{{ key + 1 }}</td>
<td class="tg-c3ow">{{ value.工艺名称 }}</td>
<td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
<td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.单件定额工时 }}</td>
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.计划日期 }}</td>
<td class="tg-c3ow">2{{ value.工序流水号 }}</td>
</tr>
<tr>
<td class="tg-c3ow">工艺员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
<td class="tg-c3ow">定额员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
<td class="tg-c3ow">工艺完成</td>
<td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">计划开始</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">计划结束</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间.split(' ')[0] : '' }}</td>
</tr>
</table>
</el-card>
</el-dialog>
</div>
</template>
@@ -213,6 +290,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, retu
export default {
data() {
return {
centerDialogVisible: false,
order: '',
finishTime: '',
partNumValue: [],
@@ -253,6 +331,10 @@ export default {
// this.searchData()
},
methods: {
viewDetails(row) {
this.centerDialogVisible = true
this.click(row)
},
tiaozheng() {
if (this.partNumValue.length !== 0) {
if (this.PersonValue1) {

12
src/views/PurchasingCenter/FundApproval3/index.vue
View File

@@ -30,7 +30,7 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<!-- <div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
@@ -40,7 +40,7 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
</div> -->
</el-card>
<h3 style="">合同明细</h3>
<el-row>
@@ -117,7 +117,7 @@
</template>
<script>
import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
import { initApproval_noPage, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
import { mapGetters } from 'vuex'
export default {
@@ -218,9 +218,9 @@ export default {
this.searchTable2()
},
searchTable1() {
initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
initApproval_noPage(2).then(response => {
this.tableData1 = response.data
// this.total1 = response.data.total
})
},
handleSizeChange1(val) {

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

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-card style="width: 1050px;">
<div slot="header">
<el-row>
<el-input v-model="supplierName" placeholder="供应商/合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
@@ -16,18 +16,18 @@
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
<div style="display: inline-block">
<el-button type="danger" size="small" icon="el-icon-back" plain style="margin-left:10px" @click="back">打回</el-button>
</div>
</el-tooltip>
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 130px;" @click="exportExcel">导出</el-button>
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right;margin-right: 20px;text-align: right;" @click="exportExcel">导出</el-button>
</el-row>
</div>
</el-card>
<el-row>
<el-card style="width: 45%; float: left">
<el-card style="width: 1050px; float: left">
<el-table
v-loading="loading1"
id="expandTable"
@@ -36,7 +36,7 @@
border
stripe
style="width: 100%"
height="700px"
height="350px"
highlight-current-row
@sort-change="sortChange"
@row-click="searchTable2">
@@ -93,7 +93,9 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card style="width: 55%">
</el-row>
<el-row>
<el-card style="width: 1050px;padding-bottom: 50px;">
<table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="500px">
<tr>
<th colspan="14"><h1>离线合同</h1></th>
@@ -150,7 +152,7 @@ export default {
total1: 0,
number: '',
pageCurrent1: 1,
pageSize1: 30,
pageSize1: 10,
tableData1: [],
loading1: false,
contractDetail: [],

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

@@ -12,7 +12,7 @@
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="searchTable1()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-card>
<el-card style="width: 800px">
<el-card style="width: 850px">
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
<el-table-column label="机床图号" align="center" width="100">
<template slot-scope="scope">

18
src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue
View File

@@ -27,32 +27,32 @@
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="120px">
<el-table-column align="center" label="机床图号" width="90px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="120px">
<el-table-column align="center" label="组号" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="130px" show-overflow-tooltip>
<el-table-column align="center" label="零件名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号或型号" width="150px" show-overflow-tooltip>
<el-table-column align="center" label="图号或型号" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料或规格" width="150px">
<el-table-column align="center" label="材料或规格" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="采购时间" width="80px">
<el-table-column align="center" label="采购时间" width="85px">
<template slot-scope="scope">
{{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '' }}
</template>
@@ -62,12 +62,12 @@
{{ scope.row.采购员 }}
</template>
</el-table-column>
<el-table-column align="center" label="采购数量" width="80px">
<el-table-column align="center" label="采购数" width="65px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="到货数量" width="80px">
<el-table-column align="center" label="到货数" width="65px">
<template slot-scope="scope">
{{ scope.row.已到货数量 }}
</template>
@@ -77,7 +77,7 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" width="270px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>