diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js index 7e182398..cc41a6a7 100644 --- a/src/api/distribution/createTask.js +++ b/src/api/distribution/createTask.js @@ -74,7 +74,14 @@ export const $_getDetailInfo = params => { }); }; - +// 查询货位信息 +export const $_getList = ( params) => { + return request({ + url: '/api/logpm-basicdata/goodsAllocation/list', + method: 'get', + params + }) +} /** * 盘点状态修改 diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue index 02ddb149..f82c04df 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue @@ -586,4 +586,10 @@ export default { margin-right: 0; } } +:deep(.el-card){ +height: 100%; +.el-card__body{ + height: 100%; +} +} diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index 836f0bd9..a7031dcb 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -202,7 +202,7 @@ :data="TcPD" row-key="name" border - height="700" + height="600" style="width: 100%" @select-all="TcselectAll" @select="TcselectChange" @@ -652,6 +652,7 @@ import { $_submit, $_questDetailIds, $_exportGetContrastInfo, + $_getList, } from '@/api/distribution/createTask'; import { ElMessage } from 'element-plus'; import { downloadXls } from '@/utils/util'; @@ -924,7 +925,7 @@ const InventoryDetails = ref([ { prop: 'positionCode', label: '货位', - type: 4, + type: 5, values: '', width: '260', checkarr: [], @@ -1686,7 +1687,6 @@ const ViewEvent = val => { item.values=null }) InventoryState.value=false;//修改标题(盘点数据) - TcFrom.value={};//重置表单搜索 TccurrentPage.value = 1; //重置页码 NotCounted.value = false; //关闭未盘点 row.value = val; @@ -1998,6 +1998,15 @@ const Tclist = val => { }; // 盘点详情编辑 const InventoryEditing = val => { + $_getList({ + current: 1, //页码 + size: 10000, //条数 + warehouseId:val.warehouseId, + }).then(res=>{ + console.log(res); + }) + + counting.value = {}; //重置数据值对象 WrapBarEditing.value.radio = null; readList.value = []; @@ -2101,13 +2110,17 @@ const TcChenge = (event, val) => { console.log(event, val); TcPdloading.value = true; console.log(row.value,'必须参数'); + console.log(row.value.questNum,'questNum'); + let quest=row.value.questNum + let qstId=row.value.id let data = { - questNum: UncheckedRow.value.questNum, - questId: UncheckedRow.value.id, current: TccurrentPage.value, //页码 size: TcpageSize.value, //条数 ...TcFrom.value, + questNum:quest, + questId:qstId, }; + console.log(data, '要提交的数据'); $_getDetailInfo(data).then(res => {