|
@@ -11,16 +11,9 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :lg="8">
|
|
<a-col :lg="8">
|
|
- <a-form-item name="goodsAllocation">
|
|
|
|
- <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
|
|
|
|
- <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" />
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
- <template v-if="toggleSearchStatus">
|
|
|
|
- <a-col :lg="8">
|
|
|
|
- <a-form-item name="project">
|
|
|
|
- <template #label><span title="项目(project)">项目(project)</span></template>
|
|
|
|
- <ApiSelect
|
|
|
|
|
|
+ <a-form-item name="project">
|
|
|
|
+ <template #label><span title="项目(project)">项目(project)</span></template>
|
|
|
|
+ <ApiSelect
|
|
:api="ProjectOption"
|
|
:api="ProjectOption"
|
|
showSearch
|
|
showSearch
|
|
v-model:value="queryParam.project"
|
|
v-model:value="queryParam.project"
|
|
@@ -30,7 +23,14 @@
|
|
valueField="id"
|
|
valueField="id"
|
|
:params="{ pageSize: -1 }"
|
|
:params="{ pageSize: -1 }"
|
|
optionFilterProp="label"
|
|
optionFilterProp="label"
|
|
- />
|
|
|
|
|
|
+ />
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <template v-if="toggleSearchStatus">
|
|
|
|
+ <a-col :lg="8">
|
|
|
|
+ <a-form-item name="goodsAllocation">
|
|
|
|
+ <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
|
|
|
|
+ <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :lg="8">
|
|
<a-col :lg="8">
|
|
@@ -155,6 +155,7 @@
|
|
// },
|
|
// },
|
|
scroll: {
|
|
scroll: {
|
|
x: '3500px',
|
|
x: '3500px',
|
|
|
|
+ y:'calc(100vh - 400px)',
|
|
},
|
|
},
|
|
beforeFetch: async (params) => {
|
|
beforeFetch: async (params) => {
|
|
let rangerQuery = await setRangeQuery();
|
|
let rangerQuery = await setRangeQuery();
|