Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-18 f02c08d6540d0ea3a72ca3958e0e16d960fbbf8e

 src/views/warehouseManage/position/AddDialog.vue

@@ -53,7 +53,7 @@
                    v-model="editConfig.infomation.parentId"
                    placeholder="请选择"
                    size="mini"
                    :disabled="!showFooter"
                    :disabled="editCommonConfig.title=='编辑'"
                    style="width: 90%"
                  >
                    <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
@@ -68,7 +68,7 @@
                  <el-select
                    v-model="editConfig.infomation.type"
                    filterable
                    :disabled="!showFooter"
                    :disabled="editCommonConfig.title=='编辑'"
                    placeholder="请选择"
                    style="width: 90%"
                    no-data-text="暂无数据"