feat: 添加空置库选项和打印标签功能

- 在WarehouseTree组件中添加showEmpty属性以显示空置库选项
- 在DrillDownTable和search组件中传递showEmpty属性
- 在base面板中添加打印标签功能
- 在correct页面添加创建人选择功能
- 在receive报表页面添加收货计划筛选功能
This commit is contained in:
砂糖
2026-01-12 15:32:09 +08:00
parent c19fee0909
commit b35d739e08
7 changed files with 72 additions and 18 deletions

View File

@@ -307,6 +307,12 @@
<el-date-picker v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建时间" style="width: 100%;" />
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-select v-model="form.createBy" placeholder="请选择创建人" style="width: 100%;" clearable filterable>
<el-option v-for="item in userList" :key="item.userName" :label="item.nickName" :value="item.userName" />
</el-select>
<!-- <el-input v-model="form.createBy" placeholder="请输入创建人" /> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
@@ -318,6 +324,7 @@
<script>
import { listMaterialCoil, updateMaterialCoilSimple } from '@/api/wms/coil'
import { listUser } from '@/api/system/user'
import { listPendingAction, startProcess, cancelAction, delPendingAction, addPendingAction } from '@/api/wms/pendingAction'
import { parseTime } from '@/utils/klp'
import ProductInfo from '@/components/KLPService/Renderer/ProductInfo'
@@ -395,7 +402,8 @@ export default {
},
form: {},
correctVisible: false,
buttonLoading: false
buttonLoading: false,
userList: [],
}
},
computed: {
@@ -461,6 +469,8 @@ export default {
this.getPendingAction()
}
})
// 加载用户列表
this.getUsers()
},
mounted() {
// 确保在mounted时也尝试加载字典数据可能此时才加载完成
@@ -473,6 +483,12 @@ export default {
},
methods: {
parseTime,
/** 查询用户列表 */
getUsers() {
listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
this.userList = response.rows || []
})
},
// 处理材料类型变化
handleMaterialTypeChange(value) {
// 清空物品选择

View File

@@ -36,7 +36,7 @@
<el-col :span="12">
<el-form-item label="实际库区" prop="actualWarehouseId">
<actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;"
clearable />
clearable :showEmpty="true" />
</el-form-item>
</el-col>
<el-col :span="12">