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-06 08:44:51 +08:00
parent 1df919eab0
commit b7bb7d031e
15 changed files with 357 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip Normal file
View File

Binary file not shown.

16
src/api/Inventory/CreatePickingList.js
View File

@@ -140,7 +140,7 @@ export function selectIntoList(...params) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间装配管理_领料单明细_增加数据',
param: `基本件流水号组=${params[0]}&标准件和外购件流水号组=${params[1]}&领料单流水号=${params[2]}`
param: `基本件流水号组=${params[0]}&标准件和外购件流水号组=${params[1]}&领料单流水号=${params[2]}&领用数量组=${params[3]}`
}
})
}
@@ -186,3 +186,17 @@ export function searchListDetailMX(...params) {
}
})
}
// 查询三表明细领料详情
export function searchTableDetailMX(...params) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间装配管理_三表_领料详情_查询数据',
param: `基本件流水号=${params[0]}&标准件和外购件流水号=${params[1]}`
}
})
}

4
src/api/Inventory/MaterialOut.js
View File

@@ -66,7 +66,7 @@ export function searchListDetail(...params) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间装配管理_领料单明细_查询数据_新',
name: '车间装配管理_领料单明细_查询数据_物料出库',
param: `领料单流水号=${params[0]}`
}
})
@@ -109,7 +109,7 @@ export function submitOutStore(...params) {
ModularID: router.currentRoute.path,
type: '2',
name: '库存管理_物料出库_出库记录_增加数据_循环',
param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}&领料部门=${params[13]}`
param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号组=${params[11]}&离线采购件流水号组=${params[12]}&领料部门=${params[13]}`
}
})
}

14
src/api/ManufacturingCenter/ContractApprovalQuery.js
View File

@@ -44,3 +44,17 @@ export function searchTable2(num) {
}
})
}
// 撤销审核
export function editsubmit(num) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_合同审核撤销_采购部_修改数据',
param: '采购合同流水号=' + num
}
})
}

14
src/api/ManufacturingCenter/ContractApprovalQuery1.js
View File

@@ -44,3 +44,17 @@ export function searchTable2(num) {
}
})
}
// 撤销审批
export function editsubmit(num) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_合同审批撤销_采购部_修改数据',
param: '采购合同流水号=' + num
}
})
}

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

@@ -93,7 +93,7 @@ export function searchTable1(...params) {
ModularID: router.currentRoute.path,
type: '1',
name: 'xqs_采购管理_采购部采购_查询物料_分配后_采购任务分配',
param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_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]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}&排序名称=${params[23]}&排序方式=${params[24]}`,
param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_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]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`,
Pagination: params[0] + '&' + params[1]
}
})
@@ -108,7 +108,7 @@ export function searchTable2(...params) {
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_采购任务分配',
param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}&排序名称=${params[17]}&排序方式=${params[18]}`,
param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}`,
Pagination: params[0] + '&' + params[1]
}
})

100
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -33,7 +33,7 @@
</div>
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@@ -70,11 +70,41 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<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="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || Number(scope.row.货位存量1) === 0.00" :max="Number(scope.row.领用最大值)" :min="Number(scope.row.货位存量1)===0.00 ? 0 : 1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="100px">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData3" highlight-current-row size="mini" show-summary>
<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="100" align="center" label="领用数量" prop="领用数量">
<template slot-scope="scope">
{{ scope.row.领用数量 }}
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="text" size="mini" icon="el-icon-search" @click="searchTable03(scope.row)">领料详情</el-button>
</el-popover>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -89,7 +119,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -126,6 +156,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<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="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="Number(scope.row.领用最大值)" :min="Number(scope.row.货位存量1)===0.00 ? 0 : 1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -145,7 +190,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 1226px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="42"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -187,6 +232,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<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="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="Number(scope.row.领用最大值)" :min="Number(scope.row.货位存量1)===0.00 ? 0 : 1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -252,7 +312,7 @@
<div slot="header">
<el-card>
<el-row style="margin-top: 5px">
<el-input v-model="pickingListPeople" clearable size="small" placeholder="领料单编号/制单人/机床" style="width:190px;margin-left: 0px" />
<el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:100px;margin-left: 0px" />
<el-date-picker
v-model="startTime"
size="small"
@@ -315,8 +375,8 @@
<el-table v-loading="listDetailsloading" :data="pickListTable2" border style="width: 100%;" size="mini" highlight-current-row height="447px" @row-click="searchMX">
<el-table-column v-if="true" label="状态" align="center" prop="是否领料确认" width="70px">
<template slot-scope="scope">
<span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
<span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
<span v-if="(Number(scope.row.领用数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
<span v-else-if="Number(scope.row.领用数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
<span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
</template>
</el-table-column>
@@ -347,12 +407,7 @@
</el-table-column>
<el-table-column label="领用数" align="center" width="65">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="备件数" align="center" width="65">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
{{ scope.row.领用数量 }}
</template>
</el-table-column>
<el-table-column label="已领数" align="center" width="65">
@@ -442,7 +497,7 @@
</template>
<script>
import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX, searchPart, IntoMateerial } from '@/api/Inventory/CreatePickingList'
import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX, searchPart, IntoMateerial, searchTableDetailMX } from '@/api/Inventory/CreatePickingList'
import request from '@/utils/request'
import { mapGetters } from 'vuex'
import { getNowDAY, get90DAY } from '@/utils/index'
@@ -458,7 +513,7 @@ export default {
ListMX: '',
startTime: [get90DAY(), getNowDAY()],
// startTime: [],
PartType: '基本件',
PartType: '标准件',
machineNumberValue: '',
machineNumber: [],
MachineNumber: '',
@@ -473,6 +528,7 @@ export default {
}],
Name: '',
gridData: [],
gridData3: [],
groupNumberValue: '',
groupNumber: [],
groupNumber2: [],
@@ -663,7 +719,7 @@ export default {
}
},
selectable(row, index) { // 控制某行是否可选
return row.领料单编号 === null // 未采购&&确认物料修改
return row.总数量 > Number(row.已领数量) && Number(row.货位存量1) !== 0.00 // 未采购&&确认物料修改
},
selectable1(row) {
return row.领用数量 !== 0
@@ -700,6 +756,7 @@ export default {
if (this.PickingValue === false) {
this.loading0 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => {
console.log(response.data.rows, 1111)
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.loading0 = false
@@ -779,6 +836,11 @@ export default {
this.gridData = response.data
})
},
searchTable03(row) {
searchTableDetailMX(row.基本件流水号, row.标准件和外购件流水号).then(response => {
this.gridData3 = response.data
})
},
handleSizeChange0(val) {
this.pageSize0 = val
this.pageCurrent0 = 1
@@ -969,10 +1031,12 @@ export default {
}
})
} else {
const numGroup = []
const basePartGroup = []
const purchasePartGroup = []
this.multipleSelection.map(v => {
v.基本件流水号 ? basePartGroup.push(v.基本件流水号) : purchasePartGroup.push(v.标准件和外购件流水号)
numGroup.push(v.领用数量)
})
if (basePartGroup.length === 0 && purchasePartGroup.length === 0) {
this.$message.warning('请勾选零件')
@@ -983,7 +1047,7 @@ export default {
return
}
if (basePartGroup.length) { // 基本件
selectIntoList(basePartGroup, null, this.pickingListNum).then(response => {
selectIntoList(basePartGroup, null, this.pickingListNum, numGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('操作成功')
this.searchTable()
@@ -995,7 +1059,7 @@ export default {
}
})
} else { // 标准件外购件
selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
selectIntoList(null, purchasePartGroup, this.pickingListNum, numGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('操作成功')
this.searchTable()

80
src/views/Inventory/MaterialOut/index.vue
View File

@@ -56,6 +56,7 @@
<div style="width: 62%;float: left">
<el-card>
<el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.名称 }}
@@ -73,17 +74,12 @@
</el-table-column>
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
{{ scope.row.领用数量 }}
</template>
</el-table-column>
<el-table-column label="出库" align="center" width="130">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备件" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
<el-input-number :disabled="Number(scope.row.领用数量) <= Number(scope.row.出库数量1) || Number(scope.row.货位存量1) === 0" :max="scope.row.货位存量1" :min="1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="库存" align="center" width="50">
@@ -287,6 +283,7 @@ export default {
multipleSelection1: [],
multipleSelection: [],
pickingListNum: '', // 领料单流水号
pickingListNumGroup: [], // 领料单流水号
pickingPersonNum: '', // 领料人流水号
pickingListNumber: '',
pickingListNumberShow: '',
@@ -526,7 +523,7 @@ export default {
this.dialogFormVisible3 = true
},
selectable(row, index) { // 控制某行是否可选
return ((Number(row.总数量) <= Number(row.出库数量1))) === false
return ((Number(row.领用数量) <= Number(row.出库数量1))) === false
},
// 初始化数据
fetchData() {
@@ -598,20 +595,6 @@ export default {
row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
searchListDetail(this.pickingListNum).then(res => {
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].离线采购件流水号 !== 0) {
res.data[i].货位存量1 = res.data[i].货位存量
}
if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
res.data[i].货位存量1 = res.data[i].货位存量
}
if (res.data[i].货位存量1 > res.data[i].总数量) {
res.data[i].出库数量 = res.data[i].总数量
}
if (res.data[i].出库数量1 >= res.data[i].总数量) {
res.data[i].出库数量 = 0
}
}
this.pickListTable2 = res.data
})
},
@@ -633,10 +616,29 @@ export default {
},
// 多选
handleSelectionChange(val) {
this.multipleSelection1 = []
val.map(v => {
this.multipleSelection1.push(v.领料单明细流水号)
})
this.StockNumberTable = val
this.multipleSelection = []
this.basePartNum = []
this.materialNum = []
this.parchasePartNum = []
this.purchaseBillNum = []
this.groupNumValue = []
this.machineValue = []
this.offlineNum = []
this.outNumber = []
this.pickingListNumGroup = []
for (let i = 0; i < val.length; i++) {
this.multipleSelection.push(val[i].领料单明细流水号)
this.basePartNum.push(val[i].基本件流水号)
this.materialNum.push(val[i].物料流水号)
this.parchasePartNum.push(val[i].标准件和外购件流水号)
this.purchaseBillNum.push(val[i].请购单明细流水号)
this.groupNumValue.push(val[i].组件流水号)
this.machineValue.push(val[i].机床流水号)
this.offlineNum.push(val[i].离线采购件流水号)
this.outNumber.push(val[i].出库数量)
this.pickingListNumGroup.push(val[i].领料单流水号)
}
},
// 提交领料确认
pickConfirm1() {
@@ -650,18 +652,20 @@ export default {
this.machineValue = []
this.offlineNum = []
this.outNumber = []
for (let i = 0; i < this.pickListTable2.length; i++) {
this.pickingListNumGroup = []
for (let i = 0; i < this.StockNumberTable.length; i++) {
console.log(this.pickListTable2[i].出库数量, 1233)
if (this.pickListTable2[i].出库数量 !== 0) {
this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
this.basePartNum.push(this.pickListTable2[i].基本件流水号)
this.materialNum.push(this.pickListTable2[i].物料流水号)
this.parchasePartNum.push(this.pickListTable2[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.pickListTable2[i].请购单明细流水号)
this.groupNumValue.push(this.pickListTable2[i].组件流水号)
this.machineValue.push(this.pickListTable2[i].机床流水号)
this.offlineNum.push(this.pickListTable2[i].离线采购件流水号)
this.outNumber.push(this.pickListTable2[i].出库数量)
if (this.StockNumberTable[i].出库数量 !== 0) {
this.multipleSelection.push(this.StockNumberTable[i].领料单明细流水号)
this.basePartNum.push(this.StockNumberTable[i].基本件流水号)
this.materialNum.push(this.StockNumberTable[i].物料流水号)
this.parchasePartNum.push(this.StockNumberTable[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.StockNumberTable[i].请购单明细流水号)
this.groupNumValue.push(this.StockNumberTable[i].组件流水号)
this.machineValue.push(this.StockNumberTable[i].机床流水号)
this.offlineNum.push(this.StockNumberTable[i].离线采购件流水号)
this.outNumber.push(this.StockNumberTable[i].出库数量)
this.pickingListNumGroup.push(this.StockNumberTable[i].领料单流水号)
}
}
if (this.form3.DirectNote) {
@@ -670,7 +674,7 @@ export default {
this.department111 = this.departments[i].label
}
}
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.DirectNote, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.department111).then(response => {
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.DirectNote, this.form3.outTypeValue, this.pickingListNumGroup, this.offlineNum, this.department111).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible3 = false

110
src/views/Inventory/MaterialOut/index2.vue
View File

@@ -7,9 +7,14 @@
</div>
<el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1015px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column label="领料单编号" show-overflow-tooltip prop="名称" align="center" width="150">
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="110">
@@ -29,37 +34,27 @@
</el-table-column>
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
{{ scope.row.领用数量 }}
</template>
</el-table-column>
<el-table-column label="出库" align="center" width="130">
<template slot-scope="scope">
<el-input-number :disabled="parseInt(scope.row.总数量) <= parseInt(scope.row.出库数量1) || parseInt(scope.row.货位存量1) === null" :max="parseInt(scope.row.货位存量1)" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
<el-input-number :disabled="Number(scope.row.领用数量) <= Number(scope.row.出库数量1) || Number(scope.row.货位存量1) === 0" :max="Number(scope.row.货位存量1)" :min="1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备件" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column label="库存" align="center" width="50">
<el-table-column label="库存" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="50">
<el-table-column label="已领" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
<el-table-column label="领料单编号" show-overflow-tooltip prop="名称" align="center" width="130">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
</el-table>
@@ -118,7 +113,7 @@
<script>
import { initPickPerson, initMachineProject, initOutType, searchList222, selectdepartment, submitOutStore, selectleaders } from '@/api/Inventory/MaterialOut'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@@ -128,6 +123,7 @@ export default {
DirectNotes: [],
outType: [],
total1: 0,
pickList: [],
pageCurrent1: 1,
pageSize1: 50,
loading1: false,
@@ -143,9 +139,15 @@ export default {
// password: [{ required: true, message: '请输入' }],
outTypeValue: [{ required: true, message: '请选择' }]
},
multipleSelection1: []
multipleSelection1: [],
StockNumberTable: []
}
},
computed: {
...mapGetters([
'id'
])
},
methods: {
fetchData() {
this.person = []
@@ -192,20 +194,6 @@ export default {
var check
this.pickingListNumber ? check = 1 : check = 0
searchList222(check, this.pickingListNumber, this.pageCurrent1, this.pageSize1).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].离线采购件流水号 !== 0) {
response.data.rows[i].货位存量1 = response.data.rows[i].货位存量
}
if (response.data.rows[i].请购单明细流水号 !== 0 && response.data.rows[i].请购单明细流水号 !== '' && response.data.rows[i].请购单明细流水号 !== null) {
response.data.rows[i].货位存量1 = response.data.rows[i].货位存量
}
if (response.data.rows[i].货位存量1 > response.data.rows[i].总数量) {
response.data.rows[i].出库数量 = response.data.rows[i].总数量
}
if (response.data.rows[i].出库数量1 >= response.data.rows[i].总数量) {
response.data.rows[i].出库数量 = 0
}
}
this.loading1 = false
this.total1 = response.data.total
this.pickListTable2 = response.data.rows
@@ -214,7 +202,7 @@ export default {
tableRowClassName1({ row }) {
if (parseInt(row.出库数量1) === 0) {
return 'weilingliao-row'
} else if (parseInt(row.总数量) > parseInt(row.出库数量1) && parseInt(row.出库数量1)) {
} else if (parseInt(row.领用数量) > parseInt(row.出库数量1) && parseInt(row.出库数量1)) {
return 'weilingwan-row'
} else {
return ''
@@ -222,7 +210,29 @@ export default {
},
// 多选
handleSelectionChange(val) {
this.multipleSelection1 = val
this.StockNumberTable = val
this.multipleSelection = []
this.basePartNum = []
this.materialNum = []
this.parchasePartNum = []
this.purchaseBillNum = []
this.groupNumValue = []
this.machineValue = []
this.offlineNum = []
this.outNumber = []
this.pickList = []
for (let i = 0; i < val.length; i++) {
this.multipleSelection.push(val[i].领料单明细流水号)
this.basePartNum.push(val[i].基本件流水号)
this.materialNum.push(val[i].物料流水号)
this.parchasePartNum.push(val[i].标准件和外购件流水号)
this.purchaseBillNum.push(val[i].请购单明细流水号)
this.groupNumValue.push(val[i].组件流水号)
this.machineValue.push(val[i].机床流水号)
this.offlineNum.push(val[i].离线采购件流水号)
this.outNumber.push(val[i].出库数量)
this.pickList.push(val[i].领料单流水号)
}
},
// 领料确认
inputPassword() {
@@ -234,6 +244,7 @@ export default {
this.dialogFormVisible3 = true
},
selectDepartment() {
this.departments = []
selectdepartment().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.departments.push({
@@ -255,17 +266,20 @@ export default {
this.machineValue = []
this.offlineNum = []
this.outNumber = []
for (let i = 0; i < this.multipleSelection1.length; i++) {
if (this.multipleSelection1[i].出库数量 !== 0) {
this.multipleSelection.push(this.multipleSelection1[i].领料单明细流水号)
this.basePartNum.push(this.multipleSelection1[i].基本件流水号)
this.materialNum.push(this.multipleSelection1[i].物料流水号)
this.parchasePartNum.push(this.multipleSelection1[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.multipleSelection1[i].请购单明细流水号)
this.groupNumValue.push(this.multipleSelection1[i].组件流水号)
this.machineValue.push(this.multipleSelection1[i].机床流水号)
this.offlineNum.push(this.multipleSelection1[i].离线采购件流水号)
this.outNumber.push(this.multipleSelection1[i].出库数量)
this.pickList = []
for (let i = 0; i < this.StockNumberTable.length; i++) {
console.log(this.pickListTable2[i].出库数量, 1233)
if (this.StockNumberTable[i].出库数量 !== 0) {
this.multipleSelection.push(this.StockNumberTable[i].领料单明细流水号)
this.basePartNum.push(this.StockNumberTable[i].基本件流水号)
this.materialNum.push(this.StockNumberTable[i].物料流水号)
this.parchasePartNum.push(this.StockNumberTable[i].标准件和外购件流水号)
this.purchaseBillNum.push(this.StockNumberTable[i].请购单明细流水号)
this.groupNumValue.push(this.StockNumberTable[i].组件流水号)
this.machineValue.push(this.StockNumberTable[i].机床流水号)
this.offlineNum.push(this.StockNumberTable[i].离线采购件流水号)
this.outNumber.push(this.StockNumberTable[i].出库数量)
this.pickList.push(this.StockNumberTable[i].领料单流水号)
}
}
if (this.form3.DirectNote) {
@@ -274,7 +288,7 @@ export default {
this.department111 = this.departments[i].label
}
}
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.DirectNote, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.department111).then(response => {
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.DirectNote, this.form3.outTypeValue, this.pickList, this.offlineNum, this.department111).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible3 = false

21
src/views/Inventory/PickingListApproval/index.vue
View File

@@ -77,29 +77,12 @@
</el-table-column>
<el-table-column label="总数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="备件数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
{{ scope.row.领用数量 }}
</template>
</el-table-column>
<el-table-column label="已领数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已确认</el-tag>
<el-tag v-else type="warning" size="mini">未确认</el-tag>
</template>
</el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" width="100">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已确认</el-tag>
<el-tag v-else type="warning" size="mini">未确认</el-tag>
{{ scope.row.已领数量 }}
</template>
</el-table-column>
</el-table>

36
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -29,7 +29,7 @@
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="采购合同编号" align="center" width="110">
<el-table-column label="采购合同编号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
@@ -94,13 +94,18 @@
{{ scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50px" fixed="right">
<el-table-column label="操作" align="center" width="80px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -124,7 +129,7 @@
</template>
<script>
import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery'
import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery'
export default {
data() {
@@ -201,6 +206,31 @@ export default {
this.dialogFormVisible = true
})
},
editSubmit(row) {
if (row.审批情况流水号 !== '3') {
this.$message.error('该合同已审批，无法撤回！')
} else {
this.$confirm('确定删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
editsubmit(row.采购合同流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('撤销成功')
} else {
this.$message.error('操作失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}
this.searchTable1()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val

80
src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
View File

@@ -9,7 +9,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 0">审批时间:</span>
<span style="margin-left: 0">提交时间:</span>
<el-date-picker
v-model="dateRange"
size="small"
@@ -29,63 +29,83 @@
</el-card>
<el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
<el-table-column label="采购合同编号" align="center" min-width="130">
<el-table-column label="采购合同编号" align="center" width="120">
<template slot-scope="scope">
{{ 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>
</el-table-column>
<el-table-column label="采购员" align="center" min-width="60">
<el-table-column label="采购员" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="合同金额(元)" align="center" min-width="60">
<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" min-width="60">
<el-table-column label="提交时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.交货日期 }}
{{ 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" width="90">
<template slot-scope="scope">
{{ 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" min-width="60">
<el-table-column label="审核结果" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
{{ scope.row.审核情况内容 }}
</template>
</el-table-column>
<el-table-column label="审批人" align="center" min-width="60">
<el-table-column label="审核未过原因" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批人" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.审批人姓名 }}
</template>
</el-table-column>
<el-table-column label="审批结果" align="center" min-width="60">
<el-table-column label="审批时间" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
</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" min-width="60">
<el-table-column label="审批未过原因" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="90px" fixed="right">
<el-table-column label="操作" align="center" width="80px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="撤销审核" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" @click="editSubmit(scope.row)">撤销</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -102,14 +122,14 @@
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="900px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审核通知" center style="min-height: 300px;" width="900px">
<div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
</el-dialog>
</div>
</template>
<script>
import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery1'
import { initBuyer, searchTable1, searchTable2, editsubmit } from '@/api/ManufacturingCenter/ContractApprovalQuery'
export default {
data() {
@@ -151,6 +171,7 @@ export default {
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
this.personValue ? check3 = 1 : check3 = 0
searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
console.log(response.data)
this.loading1 = false
this.tableData1 = response.data.rows
this.total1 = response.data.total
@@ -175,7 +196,7 @@ export default {
}
param[6] = ['人员编号_check', check3]
param[7] = ['人员编号', this.personValue]
var Data = this.CreateData('2001', '报表_采购管理_合同审批查询_查询数据', param)
var Data = this.CreateData('2001', '报表_采购管理_合同审核查询_查询数据', param)
this.exportExcel_NPOI(Data)
},
searchTable2(row) {
@@ -185,6 +206,31 @@ export default {
this.dialogFormVisible = true
})
},
editSubmit(row) {
if (row.审批情况流水号 !== '3') {
this.$message.error('该合同已审批，无法撤回！')
} else {
this.$confirm('确定撤回?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
editsubmit(row.采购合同流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('撤销成功')
} else {
this.$message.error('操作失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
}
this.searchTable1()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val

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

@@ -147,10 +147,10 @@
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审核：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button v-positive="'loading'" :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
<el-button :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
<!--html代码-->
@@ -397,7 +397,8 @@ export default {
},
// 价格实时保存
priceChange(price, num1, num2, row, num3, num4, num5) {
if (!this.quickChangePrice) {
console.log(123132123)
if (this.quickChangePrice) {
this.tableData1.map(v => {
v.物料流水号 = v.物料流水号 || ''
v.零件名称 = v.零件名称 || ''
@@ -879,7 +880,7 @@ export default {
this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
this.tableData1.map(v => {
if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
if ((this.hasTax === '含税' && v.含税单价 !== '') || (this.hasTax === '未税' && v.未税单价 !== '')) { // 筛掉未询到价格的物料
this.组件零件流水号组.push(v.组件零件流水号)
this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
this.数量组.push(v.数量)

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

@@ -329,9 +329,9 @@ export default {
let total = 0
for (let j = 0; j < this.contractDetail.length; j++) {
document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail[j].物料名称
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号
document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail[j].物料名称 ? this.contractDetail[j].物料名称 : this.contractDetail[j].零件名称
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格 ? this.contractDetail[j].物料规格 : this.contractDetail[j].规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号 ? this.contractDetail[j].物料型号 : this.contractDetail[j].零件图号
document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量
document.getElementsByClassName('tableData')[j].children[5].innerHTML = Number(this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2)

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

@@ -92,7 +92,7 @@
<!--<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;">-->
<!--<span style="margin-left: 0">采购员:</span>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 210px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 100px">
<el-option
v-for="item in person"
:key="item.value"
@@ -107,12 +107,12 @@
style="margin-left: 10px"
@click="allocateTask1">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 50px"
style="margin-left: 170px"
@click="executeReturn1">打回</el-button>
</el-tooltip>
<!--</div>-->
@@ -124,11 +124,10 @@
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
size="mini"
height="740px"
style="width: 1363px"
style="width: 1650px"
border
stripe
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" label="进程" prop="询价状态编号" width="60px">
@@ -189,7 +188,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -329,7 +328,7 @@
style="margin-left: 10px"
@click="allocateTask1">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
@@ -341,7 +340,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @sort-change="sortChange1" @selection-change="handleSelectionChange1">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
<template slot-scope="scope">
@@ -366,7 +365,7 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" min-width="80px">
<el-table-column align="center" label="数量" min-width="70px">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
@@ -396,7 +395,7 @@
{{ scope.row.接收日期 }}
</template>
</el-table-column>
<el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio1===2" align="center" prop="任务分配时间" label="分配日期" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间 }}
</template>
@@ -509,7 +508,7 @@
style="margin-left: 10px"
@click="allocateTask2">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-tooltip :open-delay="100" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="repulse"
size="small"
@@ -521,7 +520,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @sort-change="sortChange2" @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
<template slot-scope="scope">
@@ -576,7 +575,7 @@
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
<el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }}
</template>
@@ -612,11 +611,11 @@
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio2===2" align="center" label="撤回分配" width="100px" fixed="right">
<el-table-column v-if="radio2===2" align="center" label="撤回分配" width="80px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
type="repulse"
type="text"
plain
size="mini"
icon="el-icon-back"
@@ -939,21 +938,6 @@ export default {
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
}
},
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable0()
},
searchTable0() { // 查询标准件
this.checked ? this.radio = 2 : this.radio = 1
console.log(this.checked, this.radio, 991)
@@ -968,27 +952,12 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
// this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '', this.partName, this.order).then(response => {
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.loading = false
})
},
sortChange1(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable1()
},
searchTable1() { // 查询外购件
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
@@ -1001,28 +970,12 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.checked2 ? this.radio1 = 2 : this.radio1 = 1
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '', this.partName, this.order).then(response => {
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '').then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.loading = false
})
},
sortChange2(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '任务分配时间') {
this.partName = 1
} else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable2()
},
searchTable2() { // 查询基本件
this.loading = true
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -1034,7 +987,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.checked3 ? this.radio2 = 2 : this.radio2 = 1
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial, this.partName, this.order).then(response => {
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.loading = false