diff --git a/hw-ui/src/layout/components/Navbar.vue b/hw-ui/src/layout/components/Navbar.vue
index 44a5d5ec..e58a7322 100644
--- a/hw-ui/src/layout/components/Navbar.vue
+++ b/hw-ui/src/layout/components/Navbar.vue
@@ -81,6 +81,7 @@
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
-->
- BOM内物料搜索
- 非BOM内物料搜索
+ BOM内物料搜索
+ 非BOM内物料搜索
重置
@@ -210,6 +210,7 @@ export default {
YES: '1',//是
},
wmsRawOutstockDetailList:[],
+ bomFlag:undefined,
};
},
created() {
@@ -280,8 +281,18 @@ export default {
this.searchMaterial();
},
+ searchBomMaterial(){
+ this.bomFlag = "1";
+ this.searchMaterial()
+ },
+
+ searchNoneBomMaterial(){
+ this.bomFlag = "0";
+ this.searchMaterial();
+ },
+
// 物料搜索
- searchMaterial(bomFlag) {
+ searchMaterial() {
this.loading = true;
if (this.form.warehouseId === null || this.form.warehouseId === undefined
|| this.form.warehouseId === "") {
@@ -293,7 +304,7 @@ export default {
this.queryParams.planDetailCode = this.form.planDetailCode;
this.queryParams.productId = this.form.productId;
this.queryParams.materialBomId = this.form.materialBomId;
- this.queryParams.accessoriesFlag = bomFlag;
+ this.queryParams.accessoriesFlag = this.bomFlag;
getStockTotal(this.queryParams).then(e => {
this.total = e.total;
// e.rows.forEach(ee =>{
diff --git a/hw-ui/src/views/mes/saleOrder/index.vue b/hw-ui/src/views/mes/saleOrder/index.vue
index 8bf52ed3..8ba8ec55 100644
--- a/hw-ui/src/views/mes/saleOrder/index.vue
+++ b/hw-ui/src/views/mes/saleOrder/index.vue
@@ -783,7 +783,7 @@ export default {
/** 导入按钮操作 */
handleImport() {
- this.upload.title = "提资单导入";
+ this.upload.title = "销售订单导入";
this.upload.open = true;
this.submitLoading = false;
},
diff --git a/hw-ui/src/views/system/config/index.vue b/hw-ui/src/views/system/config/index.vue
index 8f66f5a3..40840cfc 100644
--- a/hw-ui/src/views/system/config/index.vue
+++ b/hw-ui/src/views/system/config/index.vue
@@ -47,7 +47,7 @@
-
+
修改
-
+
修改
- 删除
+ >删除
@@ -154,13 +154,13 @@
-
+
-
+
\ No newline at end of file
+
diff --git a/hw-ui/src/views/system/dict/data.vue b/hw-ui/src/views/system/dict/data.vue
index 3befe4a6..8dc5527d 100644
--- a/hw-ui/src/views/system/dict/data.vue
+++ b/hw-ui/src/views/system/dict/data.vue
@@ -36,16 +36,16 @@
-
- 新增
-
+
+
+
+
+
+
+
+
+
+
修改
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.createTime) }}
-
+
-
+
@@ -399,4 +399,4 @@ export default {
}
}
};
-
\ No newline at end of file
+
diff --git a/hw-ui/src/views/system/dict/index.vue b/hw-ui/src/views/system/dict/index.vue
index 6ca54571..7a31d1c1 100644
--- a/hw-ui/src/views/system/dict/index.vue
+++ b/hw-ui/src/views/system/dict/index.vue
@@ -52,16 +52,16 @@
-
- 新增
-
+
+
+
+
+
+
+
+
+
+
修改
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.createTime) }}
-
+
-
+
-
+
\ No newline at end of file
+