Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/orderHomogeneityInspectDialog.vue

@@ -49,8 +49,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="编号:">
-                <el-input readonly v-model="orderInfo.productCode"></el-input>
+              <el-form-item label="行号:">
+                <el-input readonly v-model="orderInfo.lineNumber"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">

src/views/saleOrder/index.vue

@@ -491,9 +491,9 @@
         }
         for (let i = 0; i < this.selection.length; i++) {
           let el = this.selection[i];
-          if (!el.bomCategoryId) {
-            return this.$message.warning('请选择有BOM版本的数据');
-          }
+          // if (!el.bomCategoryId) {
+          //   return this.$message.warning('请选择有BOM版本的数据');
+          // }
         }
 
         let codeList = [];