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-05-22 18:09:43 +08:00
parent 69cd14dd97
commit b12d00329b
9 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ export function searchTable1(...params) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[16]}&排序名称=${params[17]}&PageCount=1=int=output&ItemCount=1=int=output`
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[18]}&排序名称=${params[19]}&PageCount=1=int=output&ItemCount=1=int=output`
// Pagination: params[4] + '&' + params[5]
}
})
@@ -54,7 +54,7 @@ export function searchTable2(...params) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[15]}&排序名称=${params[16]}&PageCount=1=int=output&ItemCount=1=int=output`
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[17]}&排序名称=${params[18]}&PageCount=1=int=output&ItemCount=1=int=output`
// Pagination: params[4] + '&' + params[5]
}
})

2
src/views/Inventory/PurchaseOutRecord/index.vue
View File

@@ -49,7 +49,7 @@
</el-row>
</el-card>
<el-card style="width: 1410px">
<el-table :data="tableData" border stripe size="mini" height="700">
<el-table :data="tableData" border stripe size="mini" style="width: 98%" height="700">
<el-table-column label="名称" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}

2
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -702,7 +702,7 @@ export default {
// 工序状态变色
tableRowClassName1({ row, rowIndex }) {
row.index = rowIndex
if (parseInt(row.工序状态) > 3) {
if (parseInt(row.工序状态) > 3 || row.完成日期) {
return 'CompleteColor'
}
},

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

@@ -76,12 +76,12 @@
{{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="规定到货日期" align="center" width="120">
<el-table-column label="计划到货" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="到货日期" align="center" width="120">
<el-table-column label="实际到货" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
</template>

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

@@ -138,7 +138,7 @@
</el-table-column>
<el-table-column label="待询价数" align="center" width="80">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
{{ Number(scope.row.零件类型) === 1 ? scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) - Number(scope.row.使用库存数) }}
</template>
</el-table-column>
<el-table-column label="已用滞货" align="center" width="80">

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

@@ -21,6 +21,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="Name" placeholder="名称规格型号" size="small" clearable/>
<el-input v-model="supplier" placeholder="供应商合同编号" size="small" clearable/>
<!-- <el-input v-model="spec" placeholder="规格" size="small" clearable/>-->
<!-- <el-input v-model="model" placeholder="型号" size="small" clearable/>-->
<el-date-picker
@@ -34,7 +35,7 @@
style="width:250px;margin-left: 5px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="searchTable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="pageCurrent0=1;pageCurrent1=1;pageCurrent2=1;searchTable()">查询</el-button>
<!--<el-button-->
<!--plain-->
<!--@click="open2(1)">-->
@@ -46,7 +47,7 @@
</el-row>
</el-card>
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tabs v-model="PartType" type="border-card" @tab-click="pageCurrent0=1;pageCurrent1=1;pageCurrent2=1;searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
@@ -428,6 +429,7 @@ export default {
Name: '',
spec: '',
model: '',
supplier: '',
machineNumberValue: '',
machineNumber: [],
groupNumberValue: '',
@@ -678,15 +680,16 @@ export default {
},
searchTable0() { // 查询标准件
this.tableData0 = []
let check1, check2, check3, check4, check5, check6
let check1, check2, check3, check4, check5, check6, check7
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.supplier ? check7 = 1 : check7 = 0
this.loading0 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => {
if (response.data.result !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData0.push({
@@ -751,15 +754,16 @@ export default {
},
searchTable1() { // 查询外购件
this.tableData1 = []
let check1, check2, check3, check4, check5, check6
let check1, check2, check3, check4, check5, check6, check7
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
this.supplier ? check7 = 1 : check7 = 0
this.loading1 = true
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => {
console.log(response.data.result.length, 222)
// this.total02 = parseInt(response.data.output[0].ItemCount)
@@ -780,6 +784,7 @@ export default {
零件数量: 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].供应商名称,
@@ -825,7 +830,7 @@ export default {
this.searchTable2()
},
searchTable2() { // 查询基本件
let check1, check2, check3, check4, check5, check6
let check1, check2, check3, check4, check5, check6, check7
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0
@@ -833,7 +838,8 @@ export default {
this.model ? check5 = 1 : check5 = 0
this.loading2 = true
this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '')
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => {
this.supplier ? check7 = 1 : check7 = 0
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], check7, this.supplier, this.order, this.partName).then(response => {
this.tableData2 = response.data.result
this.total2 = parseInt(response.data.output[0].ItemCount)
this.loading2 = false

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

@@ -86,8 +86,8 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
<el-checkbox v-model="checked" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=30;total0=0;searchTable0()">查询</el-button>
<el-checkbox v-model="checked" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=30;total0=0;searchTable0()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
<!--<div style="float:right;">-->
@@ -233,8 +233,7 @@
<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="danger"
plain
type="text"
size="mini"
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>
@@ -440,8 +439,7 @@
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
plain
type="repulse"
type="text"
size="mini"
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>
@@ -617,7 +615,6 @@
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="text"
plain
size="mini"
icon="el-icon-back"
@click="retract(scope.row)">撤回</el-button>

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

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card style="width: 850px">
<el-card style="width: 870px">
<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
<el-option
v-for="item in project"
@@ -11,7 +11,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: 850px">
<el-card style="width: 870px">
<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">
@@ -38,7 +38,7 @@
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="单价(元)" align="center" width="100">
<el-table-column label="单价(元)" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.单价.toFixed(2) }}
</template>

41
src/views/layout/components/Navbar.vue
View File

@@ -34,7 +34,7 @@ import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundAp
import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
// import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
import { search } from '@/api/Assembly/DeliveryConfirmation'
import { searchtable as searchtableSupplement } from '@/api/WorkshopProcurement/ScrappedSupplementaryInvestment1' // 查询报废补投零件
@@ -86,9 +86,6 @@ export default {
} else if (this.token.toString() === '2' || this.token.toString() === '3') { // 2 采购部长 3 采购员 18 财务(会计)
this.comfirmMaterial_CG()
this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
} else if (this.token.toString() === '15') { // 15 库管员
this.comfirmMaterial_KG()
this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
} else if (this.token.toString() === '5') { // 5 计划员
this.comfirmUrgentItem()
this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5)
@@ -103,24 +100,24 @@ export default {
clearInterval(this.timer)
},
methods: {
comfirmMaterial_KG() {
getPickingList().then(res => {
if (res.data.length) {
this.noticeContractKG = null
this.noticeContractKG = this.$notify.success({
title: '提示',
message: '您有新的领料单需要备料确认，请及时处理，点击查看',
onClick: () => {
setPickingList().then(res => {
this.$router.push({ path: '/Inventory/MaterialOut' })
setTimeout(this.noticeContractKG.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
},
// comfirmMaterial_KG() {
// getPickingList().then(res => {
// if (res.data.length) {
// this.noticeContractKG = null
// this.noticeContractKG = this.$notify.success({
// title: '提示',
// message: '您有新的领料单需要备料确认，请及时处理，点击查看',
// onClick: () => {
// setPickingList().then(res => {
// this.$router.push({ path: '/Inventory/MaterialOut' })
// setTimeout(this.noticeContractKG.close(), 1000)
// })
// },
// duration: 1000 * 60
// })
// }
// })
// },
comfirmMaterial_CG() {
getMaterial_NOTES().then(res => {
if (res.data.length) {