4.0.14

车间申请领料分页点击报错问题，销售订单导入title问题修改

hw-ui/src/views/board/common/applyRawOutstock.vue

@@ -42,8 +42,8 @@
 <!--      </el-form-item>-->
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchMaterial('1')">BOM内物料搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchBomMaterial">BOM内物料搜索</el-button>
-        <el-button type="warning" icon="el-icon-search" size="mini" @click="searchMaterial('0')">非BOM内物料搜索</el-button>
+        <el-button type="warning" icon="el-icon-search" size="mini" @click="searchNoneBomMaterial()">非BOM内物料搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -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 =>{

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;
     },