Merge branch 'busUser' of https://gitee.com/anthonywj/spms-vue into busUser

src/views/basic/BusTypeChange.vue

@@ -44,6 +44,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.systemDefault"
                             @click.native.stop="handleModifyClick(scope.row)"
                         >编辑
                         </el-button
@@ -51,6 +52,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.systemDefault"
                             @click.native.stop="handleDeleteClick(scope.row)"
                         >删除
                         </el-button

src/views/warehouse/stockOrderDistribution.vue

@@ -213,9 +213,7 @@ export default {
                 billType: [
                     {required: true, message: "请选择业务类型", trigger: "blur"}
                 ],
-                type: [
+
-                    {required: true, message: "请选择采购类型", trigger: "blur"}
-                ],
             },
             codeArray: [],
             total: 0,

src/views/warehouse/stockOrderEditDistribution.vue

@@ -396,9 +396,7 @@ export default {
                 billType: [
                     {required: true, message: "请选择业务类型", trigger: "blur"}
                 ],
-                type: [
+
-                    {required: true, message: "请选择采购类型", trigger: "blur"}
-                ],
             },
             codeArray: [],
             fromStorageOptions: [],