From 5f5451c2251fafd7cbd5bdd2c36b3e8ca462d102 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 28 Nov 2019 15:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProcessTaskAssignment.js | 36 ++++++----------
src/views/Inventory/InventoryCheck/index.vue | 42 +++++++++----------
src/views/Inventory/MaterialOut/index.vue | 4 +-
src/views/Inventory/OfflinePartOut/index.vue | 8 ++--
4 files changed, 40 insertions(+), 50 deletions(-)
diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
index 9b2151ba..00a15510 100644
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -97,30 +97,6 @@ export function getTable00(PageCurrent, PageSize, num) {
}
})
}
-// 保存
-export function save(num1, num2, num3) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '车间生产管理工艺_工艺任务分配_保存数据',
- param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
- }
- })
-}
-// // 模糊查询
-// export function fuzzyQuery(num) {
-// return request({
-// url: '',
-// method: 'post',
-// data: {
-// type: '1',
-// name: '车间生产管理工艺_传递后_机床名称_查询数据_模糊查询',
-// param: '机床图号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1'
-// }
-// })
-// }
// 工艺定额人员查询
export function initPerson() {
return request({
@@ -134,6 +110,18 @@ export function initPerson() {
})
}
// 保存
+export function save(num1, num2, num3) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_工艺任务分配_保存数据',
+ param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
+ }
+ })
+}
+// 保存
export function save2(num1, num2, num3) {
return request({
url: '',
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 203c969e..31d5b1d0 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -6,13 +6,13 @@
-
-
-
+
+
+
+
+
+
+
-
- 物料名称:
-
-
-
- 物料规格:
-
-
-
- 物料型号:
-
+
+ 名称规格型号:
+
+
+
+
+
+
+
+
+
查询
@@ -134,7 +134,7 @@
@current-change="handleCurrentChange01"/>
-
+
仓库:
{
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index d42569b9..020fa906 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -436,9 +436,9 @@ export default {
},
// 领料确认
inputPassword() {
- this.form3.outTypeValue = ''
+ this.form3.outTypeValue = 21
this.form3.password = ''
- this.form3.department = ''
+ this.form3.department = '装配'
this.dialogFormVisible3 = true
},
selectable(row, index) { // 控制某行是否可选
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 5929cad3..903b4535 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -169,7 +169,7 @@
-
+
@@ -220,7 +220,8 @@ export default {
{ required: true, message: '请输入数量', trigger: 'blur' },
{ validator: checkNum, trigger: 'blur' }
],
- DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }]
+ DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }],
+ department: [{ required: true, message: '请输入领料部门', trigger: 'blur' }]
},
locateNumber: '',
materialNumber: '',
@@ -346,12 +347,13 @@ export default {
},
// 打开表单
parOut(row) {
- this.dialogFormVisible = true
+ this.form.department = '装配车间'
this.locateNumber = row.货位流水号
this.materialNumber = row.物料流水号
this.partnumber = row.货位存量
this.离线合同明细流水号 = row.离线合同明细流水号
this.组件零件基本件流水号 = row.组件零件基本件流水号
+ this.dialogFormVisible = true
},
// 重置表单
callOff() {