yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
pull/3/head
zengchenxi 9 months ago
parent 083c56a22e 41829d973a
commit 5c3069b214
2 changed files with 35 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<el-card class="hl-card">
<template #header>
<span>订单信息</span>
<span>订单发货</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->

117
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
Unescape View File

@ -5,87 +5,31 @@
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="120px"
>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form-item label="物料编码" prop="matCode">
<el-input
v-model="queryParams.matCode"
placeholder="物料编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="物料名称" prop="matName">
<el-input
v-model="queryParams.matName"
placeholder="物料名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="物料类型" prop="matType">
<el-select
v-model="queryParams.matType"
placeholder="下拉选择"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)"
:key="dict.label"
:label="dict.label"
:value="dict.label"
/>
<el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label" :value="dict.label" />
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo" v-if="false">
<el-input
v-model="queryParams.lotNo"
placeholder="批次号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="业务单据编号" prop="stockNo">
<el-input
v-model="queryParams.stockNo"
placeholder="业务单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.stockNo" placeholder="业务单据编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="变动方向" prop="stockType">
<el-select
v-model="queryParams.stockType"
placeholder="下拉选择"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.stockType" placeholder="下拉选择" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="上游单据编号" prop="headerNo">
<el-input
v-model="queryParams.headerNo"
placeholder="上游单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.headerNo" placeholder="上游单据编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item>
@ -106,25 +50,32 @@
<el-table-column label="物料名称" align="center" prop="matName" min-width="120" fixed />
<el-table-column label="物料类型" align="center" prop="matType" min-width="120" />
<el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
<el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
<el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
<el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="180"/>
<el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120"/>
<el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120"/>
<el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
<el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
<el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
<el-table-column label="批次号" align="center" prop="lotNo" min-width="120" v-if="false"/>
<el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120"/>
<el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120"/>
<el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120" />
<el-table-column label="品牌" align="center" prop="matBrand" min-width="120" />
<el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="180" />
<el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120" />
<el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120" />
<el-table-column label="仓库" align="center" prop="whName" min-width="120" />
<el-table-column label="库区" align="center" prop="rgName" min-width="120" />
<el-table-column label="库位" align="center" prop="pnName" min-width="140" />
<el-table-column label="批次号" align="center" prop="lotNo" min-width="120" v-if="false" />
<el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120">
<template #default="scope">
<span v-if="scope.row.storageOkQty<0" style="color:#EC808D;">
{{scope.row.storageOkQty}}
</span>
<span v-else-if="scope.row.storageOkQty>0" style="color:#63A103;">
+{{scope.row.storageOkQty}}
</span>
<span v-else>
{{scope.row.storageOkQty}}
</span>
</template>
</el-table-column>
<el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120" />
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
</ContentWrap>
</el-card>
</template>

Write Preview
Loading…
Cancel
Save