diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index 7fb0a6f..5aed59b 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -167,9 +167,7 @@
label-position="right"
:rules="rule1"
>
-
-
-
+
diff --git a/hb_client/src/views/wpm/worktask.vue b/hb_client/src/views/wpm/worktask.vue
index 5e6a15d..4b6c748 100644
--- a/hb_client/src/views/wpm/worktask.vue
+++ b/hb_client/src/views/wpm/worktask.vue
@@ -227,8 +227,8 @@
>
-
-
+
+
@@ -627,7 +627,7 @@ export default {
from: [],
workdata: {},
wproductdata: {},
- iproducts: []
+
};
},
process: "",
@@ -746,22 +746,37 @@ export default {
handlewproduct(scope){
this.dialogTableVisible = true;
+ this.pcId=scope.row.id;
getiproductList({page:0,material:scope.row.material,warehouse:scope.row.warehouse,batch:scope.row.batch}).then((response) => {
if (response.data) {
this.iproductData= response.data;
}
this.listLoading = false;
});
+
},
//勾选半成品
handleSelectionChanges(val){
- let _this = this;
- _this.wpID = [];
+ this.iproducts= [];
val.forEach((item) => {
- _this.wpID.push(item.id);
+ this.iproducts.push(item.id);
});
},
+ //提交半成品
+ iproductsSubmit(){
+
+ this.dialogTableVisible = false;
+ this.havewl.forEach((item) => {
+ if(item.id== this.pcId)
+ {
+ item.iproducts=this.iproducts;
+
+ }
+
+ });
+
+ },
//领料
handleNeed(scope) {
this.need = Object.assign({}, defaulteneed);
@@ -778,17 +793,18 @@ export default {
//确认领料
handlePick() {
this.pickData.subproduction_plan = this.id;
- this.pickData.picks = this.havewl;
-
- // console.log(this.pickData);
+
+
+ this.pickData.picks = this.havewl;
+
createPick(this.pickData).then((res) => {
if (res.code >= 200) {
this.dialogVisiblenw = false;
- this.$message.success("领料成功!");
+ this.$message.success("领料成功!");
}
- });
+ });
},
prev() {
--this.values;