diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index 066a83bb..3b82dfd3 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -1,14 +1,15 @@
import request from '@/utils/request'
// 领料单查询
-export function searchList(listNumber_check, listNumber) {
+export function searchList(listNumber_check, listNumber, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间装配管理_领料单_领料单查询',
- param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber
+ param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+ Pagination: pageCurrent + '&' + pageSize
}
})
}
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index eae2fabc..ab022fbc 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -6,20 +6,8 @@
查询
-
-
+
+
{{ scope.row.离线合同编号 }}
@@ -311,5 +299,10 @@ export default {
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 2b5d6148..446bf69e 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -1,22 +1,14 @@
- 领料单编号
+ 领料单编号:
- 查询
-
-
+ 查询
+
+
+
+
+
{{ scope.row.领料单编号 }}
@@ -24,7 +16,7 @@
- {{ scope.row.领料时间 }}
+ {{ scope.row.领料时间 ? scope.row.领料时间.split(' ')[0] : '—' }}
@@ -33,34 +25,44 @@
-
-
-
+
+
+
+
+
+
- {{ scope.row.零件图号 }}
+ {{ scope.row.名称 }}
-
+
+
+ {{ scope.row.零件图号 || scope.row.物料型号 }}
+
+
+
+
+ {{ scope.row.规格 || scope.row.物料规格 }}
+
+
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
@@ -70,12 +72,12 @@
{{ scope.row.出库数量 }}
-
+
{{ scope.row.仓库名称 }}
-
+
{{ scope.row.货位名称 }}
@@ -85,32 +87,23 @@
{{ scope.row.备注 }}
-
+
{{ scope.row.类型名称 }}
-
+
- 异常
- 出库
+ 异常
+ 出库
+
-
-
+
+
{{ scope.row.交换单编号 }}
@@ -212,6 +205,9 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
+ pageCurrent1: 1,
+ pageSize1: 10,
+ total1: 0,
ProjectValue: ' ',
Project: [],
ProjectValue_check: 1,
@@ -271,23 +267,29 @@ export default {
},
created() {
this.getpeopleid()
+ this.searchListinfor()
},
methods: {
+ handleSizeChange1(val) {
+ this.pageCurrent1 = 1
+ this.pageSize1 = val
+ this.searchListinfor()
+ },
+ handleCurrentChange1(val) {
+ this.pageCurrent1 = val
+ this.searchListinfor()
+ },
// 获取人员编号
getpeopleid() {
this.picikingPeople = this.id
},
// 查询领料单
searchListinfor() {
- if (this.pickingListNumber === null) {
- this.pickingListNumber_check = 0
- }
+ this.pickingListNumber ? this.pickingListNumber_check = 1 : this.pickingListNumber_check = 0
this.listLoading = true
- searchList(this.pickingListNumber_check, this.pickingListNumber).then(response => {
- for (let i = 0; i < response.data.length; i++) {
- response.data[i].领料时间 = response.data[i].领料时间.substring(0, response.data[i].领料时间.length - 8)
- }
- this.tableData1 = response.data
+ searchList(this.pickingListNumber_check, this.pickingListNumber, this.pageCurrent1, this.pageSize1).then(response => {
+ this.tableData1 = response.data.rows
+ this.total1 = response.data.total
this.listLoading = false
})
},
@@ -295,7 +297,6 @@ export default {
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
this.getpicikingPeople = row.领料人流水号
- console.log(this.pickingListNumberx, 223344)
this.searchListDetailt()
this.searchExchange()
},
@@ -324,34 +325,41 @@ export default {
},
// 出库
partOut(row) {
- if (row.出库类型 === 3) {
- WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
- if (response.data[0].result === '1') {
- ListDetailOut(row.领料单明细流水号)
- this.$message.success('出库成功')
- this.searchListDetailt()
- } else { this.$message.error('出库失败') }
- })
- } else if (row.出库类型 === 2) {
- PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
- if (response.data[0].result === '1') {
- ListDetailOut(row.领料单明细流水号)
- this.$message.success('出库成功')
- this.searchListDetailt()
- } else { this.$message.error('出库失败') }
- })
- } else {
- BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
- if (response.data[0].result === '1') {
- this.$message.success('出库成功')
- ListDetailOut(row.领料单明细流水号)
- this.searchListDetailt()
- } else { this.$message.error('增加失败') }
- })
- }
+ this.$confirm('确认出库?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ if (row.出库类型 === 3) {
+ WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
+ if (response.data[0].result === '1') {
+ ListDetailOut(row.领料单明细流水号)
+ this.$message.success('出库成功')
+ this.searchListDetailt()
+ } else { this.$message.error('出库失败') }
+ })
+ } else if (row.出库类型 === 2) {
+ PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
+ if (response.data[0].result === '1') {
+ ListDetailOut(row.领料单明细流水号)
+ this.$message.success('出库成功')
+ this.searchListDetailt()
+ } else { this.$message.error('出库失败') }
+ })
+ } else {
+ BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('出库成功')
+ ListDetailOut(row.领料单明细流水号)
+ this.searchListDetailt()
+ } else { this.$message.error('增加失败') }
+ })
+ }
+ }).catch(() => {
+ this.$message('已取消操作')
+ })
},
ErrorpartOut(row) {
- console.log(row, 1111)
this.dialogFormVisible = true
this.projectnumber = row.项目流水号
this.machinenumber = row.机床流水号
@@ -363,7 +371,7 @@ export default {
this.partType = row.零件类型
this.partName = row.名称
},
- callOff(form) {
+ callOff() {
this.form = []
this.dialogFormVisible = false
},
@@ -394,5 +402,10 @@ export default {