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

2 years ago · 51a3a0c67a
parent 057f5a5704 08e187a727
commit 51a3a0c67a
3 changed files with 4 additions and 6 deletions
--- a/src/views/basic/BusTypeChange.vue
+++ b/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
--- a/src/views/warehouse/stockOrderDistribution.vue
+++ b/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,
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/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: [],