From c36d21457381acef567d3f2487dcf3d1f1f3baaa Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Wed, 29 Sep 2021 09:57:33 +0800 Subject: [PATCH 01/16] xial --- hb_client/src/views/inm/warehouse.vue | 10 +- hb_client/src/views/mtm/materialdo.vue | 592 ++++++++++++++----------- 2 files changed, 350 insertions(+), 252 deletions(-) diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue index eb6e1e9..d632f37 100644 --- a/hb_client/src/views/inm/warehouse.vue +++ b/hb_client/src/views/inm/warehouse.vue @@ -61,7 +61,11 @@ width="220px" > - diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue index d632f37..928ed5b 100644 --- a/hb_client/src/views/inm/warehouse.vue +++ b/hb_client/src/views/inm/warehouse.vue @@ -177,9 +177,9 @@ export default { this.listLoading = false; }); }, - + //跳转到该仓库的物料表 handleMaterial(scope){ - alert(1) + this.$router.push({name: "MaterialBatch", params: { id: scope.row.id }, }) }, handleFilter() { this.listQuery.page = 1; diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue index a64aab7..85efa25 100644 --- a/hb_client/src/views/mtm/materialdo.vue +++ b/hb_client/src/views/mtm/materialdo.vue @@ -61,16 +61,7 @@ - - - - - - + diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue index 29afc03..29734fe 100644 --- a/hb_client/src/views/mtm/productprocess.vue +++ b/hb_client/src/views/mtm/productprocess.vue @@ -15,8 +15,7 @@ fit stripe highlight-current-row - height="100" - v-el-height-adaptive-table="{bottomOffset: 50}" + @current-change="handleCurrentChange"> @@ -30,9 +29,6 @@ - - - @@ -56,7 +52,9 @@ - + + +
+
+ 生产分解 +
+ 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+
+ + @@ -272,8 +351,10 @@ - - + + + + - + + +
@@ -327,10 +410,7 @@
- - 新增 - + 新增 @@ -426,7 +506,8 @@ \ No newline at end of file diff --git a/hb_client/src/views/pm/resources.vue b/hb_client/src/views/pm/resources.vue new file mode 100644 index 0000000..21af9ad --- /dev/null +++ b/hb_client/src/views/pm/resources.vue @@ -0,0 +1,308 @@ + + \ No newline at end of file