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-04-07 19:13:40 +08:00
parent a0474aaf33
commit 193dd7ece6
22 changed files with 865 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/BasicData/PartsNumberMaintenance.js
View File

@@ -115,7 +115,7 @@ export function alldelete(basicNum) {
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_基本件_删除数据_根据组件流水号',
param: `组件流水号=${basicNum}`
param: `基本件流水号组=${basicNum}`
}
})
}
@@ -193,7 +193,7 @@ export function alldeleteWB(num) {
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_标准件和外购件_删除数据_根据组件流水号',
param: '组件流水号=' + num + '=int'
param: '标准件和外购件流水号组=' + num
}
})
}

4
src/api/ManufacturingCenter/AntonMonitoring.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
export function searchTable(check, dateRange0, dateRange1, pageCurrent, pageSize) {
export function searchTable(check, dateRange0, dateRange1, order, partName, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -11,7 +11,7 @@ export function searchTable(check, dateRange0, dateRange1, pageCurrent, pageSize
ModularID: router.currentRoute.path,
type: '1',
name: 'ANDON监控_查询',
param: `日期_check=${check}&开始时间=${dateRange0}&结束时间=${dateRange1}`,
param: `日期_check=${check}&开始时间=${dateRange0}&结束时间=${dateRange1}&排序方式=${order}&排序名称=${partName}`,
Pagination: pageCurrent + '&' + pageSize
}
})

33
src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js Normal file
View File

@@ -0,0 +1,33 @@
import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '质检管理_质量情况_金工_查询数据',
param: '机床流水号_check=0&机床流水号=' + value1 + '&组件流水号_check=0&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
'&质检类型代码_check=1&质检类型代码=10&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=0&人员编号=' + value8 + '&处理结果_check=' + check9 + '&处理结果=' + value9 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}
// 质检管理_质量情况_查询数据
export function getprocessingresult() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '质检管理_不合格处理_查询数据'
}
})
}

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

@@ -32,7 +32,7 @@ export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2,
})
}
// 查询离线合同
export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) {
export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name, id) {
return request({
url: '',
method: 'post',
@@ -41,7 +41,7 @@ export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_离线合同_查询数据_新',
param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&人员编号=${id}`,
Pagination: pageCurrent + '&' + pageSize
}
})

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, check3) {
export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3, id) {
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}&查询当前_check=${check3}`,
param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}&人员编号=${id}`,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/api/WorkshopProcurement/PurchaseContractRequestFund1.js
View File

@@ -80,7 +80,7 @@ export function searchPurchaseContract(check, num) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间采购管理_采购合同_查询数据',
name: '车间采购管理_采购合同_查询数据_请款',
param: `供应商流水号_check=${check}&供应商流水号=${num}`
}
})

544
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -28,7 +28,8 @@
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
</el-tooltip>
</div>
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%;max-height: 520px" height="320">
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%;max-height: 520px" height="320" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="45"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="机床图号" align="center" min-width="150px">
<template slot-scope="scope">{{ scope.row.机床图号 }}</template>
@@ -115,7 +116,8 @@
size="mini"
height="320"
highlight-current-row
border>
border
@selection-change="handleSelectionChange1">
<el-table-column
label="序号"
align="center"
@@ -174,11 +176,13 @@
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="parseInt(scope.row.询价状态编号)===3"
size="mini"
type="text"
icon="el-icon-edit"
@click="type=1;handleEdit(scope.row)"/>
<el-button
:disabled="parseInt(scope.row.询价状态编号)===3"
size="mini"
type="text"
icon="el-icon-delete"
@@ -197,265 +201,265 @@
<!-- @current-change="handleCurrentChangeWB"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div>
<div style="font-size: 20px">未投产</div>
<el-table
:data="tableData1"
border
style="width: 100%"
height="320">
<el-table-column label="零件号" align="center" min-width="220">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center">
<template slot-scope="scope">
{{ scope.row.投产总数量 }}
</template>
</el-table-column>
<el-table-column label="批次" align="center">
<template slot-scope="scope">
{{ scope.row.最大投产批次 }}
</template>
</el-table-column>
<el-table-column label="已投" align="center">
<template slot-scope="scope">
{{ scope.row.已投产数量 }}
</template>
</el-table-column>
<el-table-column label="未投" align="center">
<template slot-scope="scope">
{{ scope.row.未投产数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="type=1;handleEdit(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="width:50%;display:inline-block;"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</div>
</el-card>
<el-card>
<div style="font-size: 20px">未平衡</div>
<el-table
:data="tableData2"
border
style="max-height: 400px;margin-top:10px"
height="320">
<el-table-column label="零件图号" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column label="机加工开始时间" align="center">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="机加工结束时间" align="center">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
</template>
</el-table-column>
<el-table-column label="工序数量" align="center">
<template slot-scope="scope">
{{ scope.row.工序数量 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleEdit(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- style="float:left"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div style="font-size: 20px">未分配采购</div>
<el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
<el-tab-pane label="标准件和外购件">
<el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="机床图号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" min-width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料类别" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column align="center" label="物料品种" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号或型号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" min-width="100px">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" min-width="80px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="100px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="type=2;handleEdit(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent3"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize3"-->
<!-- :total="total3"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange3"-->
<!-- @current-change="handleCurrentChange3"/>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="基本件">
<el-table :data="tableData4" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="机床图号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" min-width="80px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="100px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="名称" min-width="100px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="规格" min-width="100px">
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column align="center" label="材料" min-width="100px">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" min-width="80px">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="100px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="type=2;handleEdit(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent4"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize4"-->
<!-- :total="total4"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange4"-->
<!-- @current-change="handleCurrentChange4"/>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</el-card>
<!--<el-card>-->
<!--<div>-->
<!--<div style="font-size: 20px">未投产</div>-->
<!--<el-table-->
<!--:data="tableData1"-->
<!--border-->
<!--style="width: 100%"-->
<!--height="320">-->
<!--<el-table-column label="零件号" align="center" min-width="220">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="零件名称" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="投产" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.投产总数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="批次" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.最大投产批次 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="已投" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.已投产数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="未投" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.未投产数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="零件类型" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件类型名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" fixed="right" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--@click="type=1;handleEdit(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--&lt;!&ndash; <div class="block" style="margin-top: 10px;">&ndash;&gt;-->
<!--&lt;!&ndash; <el-pagination&ndash;&gt;-->
<!--&lt;!&ndash; :current-page="pageCurrent1"&ndash;&gt;-->
<!--&lt;!&ndash; :page-sizes="[10, 20, 30, 40]"&ndash;&gt;-->
<!--&lt;!&ndash; :page-size="pageSize1"&ndash;&gt;-->
<!--&lt;!&ndash; :total="total1"&ndash;&gt;-->
<!--&lt;!&ndash; style="width:50%;display:inline-block;"&ndash;&gt;-->
<!--&lt;!&ndash; layout="total, sizes, prev, pager, next, jumper"&ndash;&gt;-->
<!--&lt;!&ndash; @size-change="handleSizeChange1"&ndash;&gt;-->
<!--&lt;!&ndash; @current-change="handleCurrentChange1"/>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--</div>-->
<!--</el-card>-->
<!--<el-card>-->
<!--<div style="font-size: 20px">未平衡</div>-->
<!--<el-table-->
<!--:data="tableData2"-->
<!--border-->
<!--style="max-height: 400px;margin-top:10px"-->
<!--height="320">-->
<!--<el-table-column label="零件图号" align="center" width="300">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="零件名称" align="center" width="200">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="零件数量" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.投产数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="机加工开始时间" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机加工开始时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="机加工结束时间" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机加工结束时间 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="工序数量" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.工序数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" fixed="right" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--@click="handleEdit(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--&lt;!&ndash; <div class="block" style="margin-top: 10px;">&ndash;&gt;-->
<!--&lt;!&ndash; <el-pagination&ndash;&gt;-->
<!--&lt;!&ndash; :current-page="pageCurrent2"&ndash;&gt;-->
<!--&lt;!&ndash; :page-sizes="[10, 20, 30, 40]"&ndash;&gt;-->
<!--&lt;!&ndash; :page-size="pageSize2"&ndash;&gt;-->
<!--&lt;!&ndash; :total="total2"&ndash;&gt;-->
<!--&lt;!&ndash; style="float:left"&ndash;&gt;-->
<!--&lt;!&ndash; layout="total, sizes, prev, pager, next, jumper"&ndash;&gt;-->
<!--&lt;!&ndash; @size-change="handleSizeChange2"&ndash;&gt;-->
<!--&lt;!&ndash; @current-change="handleCurrentChange2"/>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--</el-card>-->
<!--<el-card>-->
<!--<div style="font-size: 20px">未分配采购</div>-->
<!--<el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">-->
<!--<el-tab-pane label="标准件和外购件">-->
<!--<el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>-->
<!--<el-table-column align="center" label="机床图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="组号" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="物料类别" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料类别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="物料品种" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="图号或型号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料型号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="规格" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料规格 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="数量" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="备注" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.备注 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" fixed="right" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--@click="type=2;handleEdit(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--&lt;!&ndash; <div class="block">&ndash;&gt;-->
<!--&lt;!&ndash; <el-pagination&ndash;&gt;-->
<!--&lt;!&ndash; :current-page="pageCurrent3"&ndash;&gt;-->
<!--&lt;!&ndash; :page-sizes="[10, 20, 30, 40]"&ndash;&gt;-->
<!--&lt;!&ndash; :page-size="pageSize3"&ndash;&gt;-->
<!--&lt;!&ndash; :total="total3"&ndash;&gt;-->
<!--&lt;!&ndash; style="display:inline-block;width:50%"&ndash;&gt;-->
<!--&lt;!&ndash; layout="total, sizes, prev, pager, next, jumper"&ndash;&gt;-->
<!--&lt;!&ndash; @size-change="handleSizeChange3"&ndash;&gt;-->
<!--&lt;!&ndash; @current-change="handleCurrentChange3"/>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--</el-tab-pane>-->
<!--<el-tab-pane label="基本件">-->
<!--<el-table :data="tableData4" size="mini" style="max-height: 320px" height="320px" border>-->
<!--<el-table-column align="center" label="机床图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="组号" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="规格" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.规格 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="材料" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.材料 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="数量" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="备注" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.备注 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" fixed="right" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--@click="type=2;handleEdit(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--&lt;!&ndash; <div class="block">&ndash;&gt;-->
<!--&lt;!&ndash; <el-pagination&ndash;&gt;-->
<!--&lt;!&ndash; :current-page="pageCurrent4"&ndash;&gt;-->
<!--&lt;!&ndash; :page-sizes="[10, 20, 30, 40]"&ndash;&gt;-->
<!--&lt;!&ndash; :page-size="pageSize4"&ndash;&gt;-->
<!--&lt;!&ndash; :total="total4"&ndash;&gt;-->
<!--&lt;!&ndash; style="display:inline-block;width:50%"&ndash;&gt;-->
<!--&lt;!&ndash; layout="total, sizes, prev, pager, next, jumper"&ndash;&gt;-->
<!--&lt;!&ndash; @size-change="handleSizeChange4"&ndash;&gt;-->
<!--&lt;!&ndash; @current-change="handleCurrentChange4"/>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!--</el-tab-pane>-->
<!--</el-tabs>-->
<!--</el-card>-->
<el-card>
<div>
<span style="font-size: 20px">临时表</span>
@@ -632,6 +636,8 @@ export default {
tableData5: [],
tableData6: [],
tableDataWB: [],
BasicGroup: [],
PurchaseGroup: [],
// pageCurrent: 1,
// pageSize: 10,
// pageCurrent1: 1,
@@ -758,13 +764,25 @@ export default {
})
})
},
handleSelectionChange(val) {
this.BasicGroup = []
for (let i = 0; i < val.length; i++) {
this.BasicGroup.push(val[i].基本件流水号)
}
},
handleSelectionChange1(val) {
this.PurchaseGroup = []
for (let i = 0; i < val.length; i++) {
this.PurchaseGroup.push(val[i].标准件和外购件流水号)
}
},
alldelete() {
this.$confirm('此操作将永久删除所有数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
alldelete(this.groupValue).then(res => {
alldelete(this.BasicGroup).then(res => {
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.getTableData()
@@ -783,7 +801,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
alldeleteWB(this.groupValue).then(res => {
alldeleteWB(this.PurchaseGroup).then(res => {
if (res.data[0].result === '1') {
this.$message.success('删除成功')
this.getTableData()

31
src/views/ManufacturingCenter/AntonMonitoring/index.vue
View File

@@ -15,8 +15,8 @@
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable()">查询</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" style="width: 100%;" size="mini" height="700" highlight-current-row border>
<el-table-column align="center" label="报警工位">
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" style="width: 100%;" size="mini" height="700" highlight-current-row border @sort-change="sortChange">
<el-table-column align="center" label="报警工位" prop="工位号" sortable="custom">
<template slot-scope="scope">
{{ scope.row.工位号 }}
</template>
@@ -31,7 +31,7 @@
{{ scope.row.编号描述 }}
</template>
</el-table-column>
<el-table-column align="center" label="报警内容">
<el-table-column align="center" label="报警内容" prop="安东明细描述" sortable="custom">
<template slot-scope="scope">
{{ scope.row.安东明细描述 }}
</template>
@@ -46,7 +46,7 @@
{{ scope.row.解除时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="处理时长">
<el-table-column align="center" label="处理时长" prop="处理时长" sortable="custom">
<template slot-scope="scope">
{{ scope.row.处理时长 }}
</template>
@@ -78,7 +78,9 @@ export default {
loading: false,
total1: 0,
pageCurrent1: 1,
pageSize1: 50
pageSize1: 50,
order: '',
partName: ''
}
},
created() {
@@ -87,12 +89,29 @@ export default {
this.searchTable()
},
methods: {
sortChange(column, prop, order) {
if (column.prop === '工位号') {
this.partName = 1
} else if (column.prop === '安东明细描述') {
this.partName = 2
} else if (column.prop === '处理时长') {
this.partName = 3
} else {
this.partName = ''
}
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable()
},
searchTable() {
this.loading = true
this.tableData = []
var check1
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
searchTable(check1, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
searchTable(check1, this.dateRange[0], this.dateRange[1], this.order, this.partName, this.pageCurrent1, this.pageSize1).then(response => {
this.tableData = response.data.rows
this.total1 = response.data.total
this.loading = false

416
src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue Normal file
View File

@@ -0,0 +1,416 @@
<template>
<div class="app-container">
<el-card>
<div slot="header">
<el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
<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="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" prop="物料规格" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<!--<el-table-column label="物料来源" prop="物料来源" align="center" width="80">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料来源 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--&lt;!&ndash; <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">&ndash;&gt;-->
<!--&lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!--&lt;!&ndash; {{ scope.row.仓库名称 }}&ndash;&gt;-->
<!--&lt;!&ndash; </template>&ndash;&gt;-->
<!--&lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!--<el-table-column label="货位" prop="货位名称" align="center" width="80">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.货位名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="货位存量" align="center" width="100" prop="货位存量">
<template slot-scope="scope">
<template v-if="scope.row.changeValue">
<el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
<el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
</template>
<span v-else>{{ scope.row.货位存量 }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>-->
<!-- <el-button v-else type="primary" icon="el-icon-edit" size="mini" plain @click="scope.row.changeValue=!scope.row.changeValue">编辑</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import request from '@/utils/request'
export default {
data() {
return {
materialName: '',
materialSpec: '',
materialModel: '',
tableData1: [],
pageCurrent: 1,
pageSize: 30,
total: 0,
dialogVisible: false,
tableData01: [],
pageCurrent01: 1,
pageSize01: 10,
total01: 0,
localNumber: '',
materialValue: '',
isBacklog: false
}
},
computed: {
...mapGetters([
'id' // 人员编号
])
},
mounted() {
this.initData()
this.searchMaterial()
},
methods: {
// EXCEL 导出
// 姜福壮
exportExcel() {
let check1, check2, check3
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
var param = []
param[0] = ['物料名称_check', check1]
param[1] = ['物料名称', this.materialName]
param[2] = ['物料规格_check', check2]
param[3] = ['物料规格', this.materialSpec]
param[4] = ['物料型号_check', check3]
param[5] = ['物料型号', this.materialModel]
var Data = this.CreateData('2001', '报表_采购部仓库_库存_查询', param)
this.exportExcel_NPOI(Data)
},
// 初始化数据
initData() {
const param = {
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位主文件_仓库查询'
}
}
request(param).then(res => {
for (let i = 0; i < res.data.length; i++) {
this.inventoryName.push({
label: res.data[i].仓库名称,
value: res.data[i].仓库流水号
})
}
})
},
// 根据条件查物料货位数量
searchMaterial() {
let check1, check2, check3
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
const param = {
url: '',
method: 'post',
data: {
type: '1',
name: `库存管理_库存盘点_物料货位数量_查询数据_新`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
Pagination: this.pageCurrent + '&' + this.pageSize
}
}
request(param).then(res => {
this.tableData1 = res.data.rows
this.tableData1.map(v => {
this.$set(v, 'changeValue', false)
v.原货位存量 = v.货位存量
return v
})
this.total = res.data.total
})
},
// 分页
handleSizeChange(val) {
this.pageSize = val
this.pageCurrent = 1
this.searchMaterial()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchMaterial()
},
// 取消设置
cancelEdit(row) {
row.货位存量 = row.原货位存量
row.changeValue = false
this.$message('取消修改')
},
// 确认设置
confirmEdit(row) {
Number(row.货位存量) ? row.货位存量 = Number(row.货位存量) : row.货位存量 = 0
const param = {
url: '',
method: 'post',
data: {
type: '2',
name: `库存管理_库存盘点_物料货位数量_修改数据`,
param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}`
}
}
request(param).then(res => {
if (res.data[0].result === '1') {
this.$message.success('操作成功')
row.changeValue = false
} else {
this.$message.error('操作失败')
}
})
},
// 新增物料货位数量
addMaterial() {
this.dialogVisible = true
},
// 选择物料
selectMaterial(row) {
this.materialValue = row.物料流水号
},
// 确认新增物料货位数量
submitAdd() {
const param = {
url: '',
method: 'post',
data: {
type: '2',
name: `库存管理_库存盘点_物料货位数量_增加数据`,
param: `物料流水号=${this.materialValue}&货位流水号=${this.locateNameValue}&货位存量=${this.localNumber}&是否为滞货=${Number(this.isBacklog)}`
}
}
request(param).then(res => {
if (res.data[0].result === '1') {
this.$message.success('操作成功')
this.dialogVisible = false
} else {
this.$message.error('操作失败')
}
})
},
// 查物料
searchMaterial01() {
let check1, check2, check3
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
const param = {
url: '',
method: 'post',
data: {
type: '1',
name: `库存管理_物料主文件_基本_查询数据_分页`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&PageCurrent=${this.pageCurrent01}=int&PageSize=${this.pageSize01}=int&PageCount=1=int=output&ItemCount=1=int=output`
}
}
request(param).then(res => {
this.tableData01 = res.data.result
this.total01 = Number(res.data.output[0].ItemCount)
})
},
// 分页
handleSizeChange01(val) {
this.pageSize01 = val
this.pageCurrent01 = 1
this.searchMaterial01()
},
handleCurrentChange01(val) {
this.pageCurrent01 = val
this.searchMaterial01()
}
}
}
</script>
<style scoped>
.el-select{
width:165px
}
.el-input{
width:165px
}
</style>
<!--<template>-->
<!-- <div class="app-container">-->
<!-- <el-card>-->
<!-- <div slot="header">-->
<!-- <el-row style="margin-bottom:-10px!important;">-->
<!-- <span>物料名称:</span>-->
<!-- <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
<!-- <span>物料规格:</span>-->
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- <span>物料型号:</span>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- <el-table :data="tableData1" stripe border height="700px" size="mini" show-summary>-->
<!-- <el-table-column label="名称" prop="物料名称" align="center" width="130" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <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="规格" prop="物料规格" align="center" width="200" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料规格 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="物料来源" prop="物料来源" align="center" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料来源 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="仓库" prop="仓库名称" align="center" min-width="90">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.仓库名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="货位" align="center" min-width="90">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.货位名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="货位存量" align="center" width="150" prop="货位存量">-->
<!-- <template slot-scope="scope">-->
<!-- <template v-if="scope.row.changeValue">-->
<!-- <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>-->
<!-- <el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>-->
<!-- </template>-->
<!-- <span v-else>{{ scope.row.货位存量 }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<!--</template>-->
<!--<script>-->
<!--import { mapGetters } from 'vuex'-->
<!--import request from '@/utils/request'-->
<!--export default {-->
<!-- data() {-->
<!-- return {-->
<!-- materialName: '',-->
<!-- materialSpec: '',-->
<!-- materialModel: '',-->
<!-- tableData1: [],-->
<!-- pageCurrent: 1,-->
<!-- pageSize: 10,-->
<!-- total: 0-->
<!-- }-->
<!-- },-->
<!-- computed: {-->
<!-- ...mapGetters([-->
<!-- 'id' // 人员编号-->
<!-- ])-->
<!-- },-->
<!-- mounted() {-->
<!-- this.searchMaterial()-->
<!-- },-->
<!-- methods: {-->
<!-- // 根据条件查物料货位数量-->
<!-- searchMaterial() {-->
<!-- // this.$router.push('/ManufacturingCenter/StatusQuery')-->
<!-- let check1, check2, check3-->
<!-- this.materialName ? check1 = 1 : check1 = 0-->
<!-- this.materialSpec ? check2 = 1 : check2 = 0-->
<!-- this.materialModel ? check3 = 1 : check3 = 0-->
<!-- const param = {-->
<!-- url: '',-->
<!-- method: 'post',-->
<!-- data: {-->
<!-- type: '1',-->
<!-- name: `库存管理_库存盘点_物料货位数量_查询数据`,-->
<!-- param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${0}&仓库流水号=${0}&货位流水号_check=${0}&货位流水号=${0}`,-->
<!-- Pagination: this.pageCurrent + '&' + this.pageSize-->
<!-- }-->
<!-- }-->
<!-- request(param).then(res => {-->
<!-- this.tableData1 = res.data.rows-->
<!-- this.tableData1.map(v => {-->
<!-- this.$set(v, 'changeValue', false)-->
<!-- v.原货位存量 = v.货位存量-->
<!-- return v-->
<!-- })-->
<!-- this.total = res.data.total-->
<!-- })-->
<!-- },-->
<!-- // 分页-->
<!-- handleSizeChange(val) {-->
<!-- this.pageSize = val-->
<!-- this.pageCurrent = 1-->
<!-- this.searchMaterial()-->
<!-- },-->
<!-- handleCurrentChange(val) {-->
<!-- this.pageCurrent = val-->
<!-- this.searchMaterial()-->
<!-- }-->
<!-- }-->
<!--}-->
<!--</script>-->
<!--<style scoped>-->
<!-- .el-select{-->
<!-- width:165px-->
<!-- }-->
<!-- .el-input{-->
<!-- width:165px-->
<!-- }-->
<!--</style>-->

2
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -279,7 +279,7 @@ export default {
} else {
sums[index] = 'N/A'
}
} else if (index === 12) {
} else if (index === 13) {
const values = data.map(item => Number(parseFloat(item['未税总额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {

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

@@ -87,7 +87,7 @@
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="审核结果" align="center" min-width="60">
<el-table-column label="部长审核" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.审批1结果 }}
</template>
@@ -97,12 +97,12 @@
{{ scope.row.审批1未过原因 ? scope.row.审批1未过原因 : '—' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
<el-table-column label="审核时间" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="审批结果" align="center" min-width="60">
<el-table-column label="总经理审批" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.审批4结果 }}
</template>
@@ -117,7 +117,7 @@
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="财务" align="center" min-width="60">
<el-table-column label="财务审批" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.审批3结果 }}
</template>

6
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column label="采购审批" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
{{ scope.row.审批人1结果 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -85,7 +85,7 @@
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
{{ scope.row.审批人4结果 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">
@@ -95,7 +95,7 @@
</el-table-column>
<el-table-column label="财务审批" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
{{ scope.row.审批人3结果 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="100">

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

@@ -812,12 +812,13 @@ export default {
totalPrice: 0, // 合同总额
tableData4: [], // 合同模板
stipulateArrivalTime: '', // 规定到货时间
离线合同状态: '',
离线合同状态: true,
numbers: [],
numbers1: [],
paramRow: '', // 参数row
disable: true, // 其他的禁用
tabName: '标准件',
tongguo: '',
total22: 0,
pageCurrent22: 1,
pageSize22: 20
@@ -1067,7 +1068,8 @@ export default {
this.supplierName0 ? this.check4 = 1 : this.check4 = 0
this.loading3 = true
this.tableData3 = []
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
console.log(this.id, 'id')
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0, this.id).then(response => {
console.log(response.data.rows, 99)
this.tableData2 = response.data.rows
this.total2 = response.data.total
@@ -1283,6 +1285,7 @@ export default {
!v.单价 ? v.单价 = v.参考价格 : v.单价
this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
})
console.log(this.tableData3, 'tableData31')
this.loading4 = false
console.log(response.data.length, 1231231233)
})
@@ -1439,8 +1442,17 @@ export default {
// })
},
doneOfflineContact() { // 生成离线合同
this.tongguo = true
console.log(this.tableData3, 'tableData3')
for (let i = 0; i < this.tableData3.length; i++) {
if (this.tableData3[i].数量 === '0' || this.tableData3[i].数量 === null || this.tableData3[i].数量 === '' || this.tableData3[i].单价 === '0' || this.tableData3[i].单价 === null || this.tableData3[i].单价 === '') {
this.tongguo = false
}
}
if (this.tableData3.length === 0) {
this.$message.error('无法生成空合同，请先选入物料！')
} else if (this.tongguo === false) {
this.$message.error('请完善单价或数量信息！')
} else {
let judge = true
this.tableData3.map(v => {

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

@@ -68,12 +68,17 @@
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="创建日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="采购员" align="center" min-width="60">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.采购员 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="总金额(元)" align="center" min-width="110">
<el-table-column label="合同金额(元)" align="center" min-width="110">
<template slot-scope="scope">
{{ Number(scope.row.合同总额).toFixed(2) }}
</template>
@@ -98,9 +103,9 @@
{{ scope.row.采购员 }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="创建日期" min-width="110" sortable="custom">
<el-table-column label="提交日期" align="center" prop="提交日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }}
{{ scope.row.提交日期 ? scope.row.提交日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
</el-table>
@@ -168,6 +173,7 @@ export default {
name: 'OfflineContractSearch',
data() {
return {
row1: '',
dateRange: '',
contractNumber: '',
supplierName: '',
@@ -272,6 +278,9 @@ export default {
this.searchTable1()
},
back() {
if (this.row1.到货金额 !== '0') {
this.$message.error('已有到货信息，无法打回！！！')
} else {
this.$confirm('确定打回合同?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -290,8 +299,10 @@ export default {
this.$message.warning('请选择要打回的合同')
}
})
}
},
searchTable2(row) {
this.row1 = row
this.number = row.离线合同流水号
searchOfflineContractContent(row.离线合同流水号).then(response => {
this.contractDetail = response.data

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

@@ -42,12 +42,22 @@
{{ scope.row.到货数量 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="到货金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.到货金额 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" width="220">
<el-table-column label="供应商" align="center" width="220" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>

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

@@ -470,7 +470,7 @@ export default {
this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
this.supplierValue ? check2 = 1 : check2 = 0
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 => {
searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3, this.id).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

6
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -42,12 +42,12 @@
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="单价(元)" width="100px">
<el-table-column align="center" label="单价(元)" width="150px">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
<el-input v-model="scope.row.单价" size="mini" width="100%" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
</template>
</el-table-column>
<el-table-column align="center" label="总额(元)" width="90px" prop="金额">
<el-table-column align="center" label="总额(元)" width="150px" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 }}
</template>

7
src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
View File

@@ -26,7 +26,7 @@
</el-card>
<el-card>
<el-table v-loading="loading1" :data="tableData" stripe border style="width: 980px;margin-top: 10px" height="600px" size="mini">
<el-table v-loading="loading1" :data="tableData" stripe border style="width: 1070px;margin-top: 10px" height="600px" size="mini">
<el-table-column label="采购合同编号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -67,6 +67,11 @@
{{ scope.row.已到货数量 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination

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

@@ -9,7 +9,7 @@
<el-card>
<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 id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="260px" 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">-->
@@ -141,7 +141,7 @@
<span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 420px;" height="420px" size="mini">
<el-table-column label="名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -716,10 +716,7 @@ export default {
addTable2(this.applyOrderNum, group1, group2, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('追加成功')
this.dialogVisible2 = false
searchTable2(this.applyOrderNum).then(response => {
this.tableData2 = response.data
})
this.searchTable01()
} else { this.$message.error('追加失败') }
})
} else if (this.contractType === '离线合同') {

12
src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
View File

@@ -8,7 +8,7 @@
</el-card>
<el-card>
<h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="260" size="mini" @row-click="searchTable2">
<!-- <el-table-column label="展开" align="center" type="expand" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
@@ -41,7 +41,7 @@
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="200">
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="100">
@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160" fixed="right">
@@ -110,7 +110,7 @@
<h4 style="margin: 5px;display: inline-block;width: 150px;">到结算申请单明细</h4>
<span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 420px;" height="420px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -126,7 +126,7 @@
{{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="150">
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>

8
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -12,8 +12,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>采购员:</span>
<el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<el-button
@@ -47,6 +45,11 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="递交时间" align="center">
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.含税总金额 }}
@@ -476,6 +479,7 @@ export default {
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.type = 0
})
},
Open(row) {

12
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -55,6 +55,11 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<!-- <el-table-column label="请款付款情况" align="center">-->
<el-table-column label="审批情况" width="80" align="center">
<template slot-scope="scope">
@@ -68,6 +73,11 @@
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="80" align="center">
<template slot-scope="scope">
<span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
@@ -112,7 +122,7 @@
</el-col>
<el-col style="width: 440px">
<el-card>
<el-table :data="gridData" highlight-current-row size="mini" show-summary>
<el-table :data="gridData" highlight-current-row border size="mini" show-summary>
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="120" align="center" label="采购合同编号">
<template slot-scope="scope">