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

pull/2/head
zengchenxi 9 months ago
commit 91c45ecf00

@ -462,7 +462,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<el-form-item label="有无图纸/数模" prop="hasBlueprint"> <el-form-item label="有无图纸/数模" prop="hasBlueprint">
<el-radio-group <el-radio-group
:disabled="detailDisabled" :disabled="detailDisabled"
@ -513,7 +513,7 @@
label-width="0" label-width="0"
> >
<el-table :data="formData.projectOrderSubs" class="hl-table"> <el-table :data="formData.projectOrderSubs" class="hl-table">
<el-table-column label="序号" type="index" width="100" /> <el-table-column label="序号" type="index" width="80" />
<el-table-column min-width="150" align="center"> <el-table-column min-width="150" align="center">
<template #header> <span class="hl-table_header">*</span>子项目名称 </template> <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
@ -620,7 +620,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" min-width="150" align="center"> <el-table-column label="备注" min-width="180" align="center">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item <el-form-item
:prop="`${$index}.remark`" :prop="`${$index}.remark`"
@ -636,7 +636,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="240"> <el-table-column label="操作" align="center" width="150">
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-if="'update,create'.indexOf(query.active) > -1 && !formData.hasAlter" v-if="'update,create'.indexOf(query.active) > -1 && !formData.hasAlter"

@ -1,7 +1,11 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<template #header>
<span>实时库存 </span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
<el-form-item label="物料编码" prop="matCode"> <el-form-item label="物料编码" prop="matCode">
<el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery" <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
class="!w-240px" /> class="!w-240px" />
@ -39,7 +43,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索 <Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
@ -51,24 +55,25 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column label="物料编码" align="center" prop="matCode" /> <el-table-column label="物料编码" align="center" prop="matCode" fixed min-width="120" />
<el-table-column label="物料名称" align="center" prop="matName" /> <el-table-column label="物料名称" align="center" prop="matName" fixed min-width="120"/>
<el-table-column label="物料类型" align="center" prop="matType" /> <el-table-column label="物料类型" align="center" prop="matType" min-width="120"/>
<el-table-column label="物料简称" align="center" prop="shortName" /> <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
<el-table-column label="规格/型号" align="center" prop="matSpec" /> <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
<el-table-column label="品牌" align="center" prop="matBrand" /> <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
<el-table-column label="仓库" align="center" prop="whName" /> <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
<el-table-column label="库区" align="center" prop="rgName" /> <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
<el-table-column label="库位" align="center" prop="pnName" /> <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
<el-table-column label="变动数量" align="center" prop="storageOkQty" /> <el-table-column label="库存数量" align="center" prop="storageOkQty" min-width="120"/>
<el-table-column label="库存单位" align="center" prop="matUnit" /> <el-table-column label="库存单位" align="center" prop="matUnit" min-width="120"/>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
</ContentWrap> </ContentWrap>
</el-card>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

@ -1,75 +1,132 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<!-- 搜索工作栏 --> <template #header>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <span>库存变动日志</span>
<el-form-item label="物料编码" prop="matCode"> </template>
<el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery" <ContentWrap class="borderxx">
class="!w-240px" /> <!-- 搜索工作栏 -->
</el-form-item> <el-form
<el-form-item label="物料名称" prop="matName"> class="-mb-15px"
<el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery" :model="queryParams"
class="!w-240px" /> ref="queryFormRef"
</el-form-item> :inline="true"
<el-form-item label="物料类型" prop="matType"> label-width="120px"
<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" <el-form-item label="物料编码" prop="matCode">
:value="dict.label" /> <el-input
</el-select> v-model="queryParams.matCode"
</el-form-item> placeholder="物料编码"
<el-form-item label="批次号" prop="lotNo"> clearable
<el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" /> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="业务单据编号" prop="stockNo"> />
<el-input v-model="queryParams.stockNo" placeholder="业务单据编号" clearable @keyup.enter="handleQuery" </el-form-item>
class="!w-240px" /> <el-form-item label="物料名称" prop="matName">
</el-form-item> <el-input
<el-form-item label="变动方向" prop="stockType"> v-model="queryParams.matName"
<el-select v-model="queryParams.stockType" placeholder="下拉选择" clearable class="!w-240px"> placeholder="物料名称"
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)" :key="dict.value" :label="dict.label" clearable
:value="dict.value" /> @keyup.enter="handleQuery"
</el-select> class="!w-240px"
</el-form-item> />
<el-form-item label="上游单据编号" prop="headerNo"> </el-form-item>
<el-input v-model="queryParams.headerNo" placeholder="上游单据编号" clearable @keyup.enter="handleQuery" <el-form-item label="物料类型" prop="matType">
class="!w-240px" /> <el-select
</el-form-item> 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">
<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-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>
</el-form-item>
<el-form-item label="上游单据编号" prop="headerNo">
<el-input
v-model="queryParams.headerNo"
placeholder="上游单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<el-form-item> <!-- 列表 -->
<el-button @click="handleQuery"> <ContentWrap>
<Icon icon="ep:search" class="mr-5px" /> 搜索 <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table">
</el-button> <el-table-column label="物料编码" align="center" prop="matCode" min-width="120" fixed />
<el-button @click="resetQuery"> <el-table-column label="物料名称" align="center" prop="matName" min-width="120" fixed />
<Icon icon="ep:refresh" class="mr-5px" /> 重置 <el-table-column label="物料类型" align="center" prop="matType" min-width="120" />
</el-button> <el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
</el-form-item> <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
</el-form> <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
</ContentWrap> <el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="120"/>
<el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120"/>
<!-- 列表 --> <el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120"/>
<ContentWrap> <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
<el-table-column label="物料编码" align="center" prop="matCode" /> <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
<el-table-column label="物料名称" align="center" prop="matName" /> <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
<el-table-column label="物料类型" align="center" prop="matType" /> <el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120"/>
<el-table-column label="物料简称" align="center" prop="shortName" /> <el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120"/>
<el-table-column label="规格/型号" align="center" prop="matSpec" /> </el-table>
<el-table-column label="品牌" align="center" prop="matBrand" /> <!-- 分页 -->
<el-table-column label="业务单据编号" align="center" prop="stockNo" /> <Pagination
<el-table-column label="业务单据类型" align="center" prop="stockTypeName" /> :total="total"
<el-table-column label="上游单据编号" align="center" prop="headerNo" /> v-model:page="queryParams.pageNo"
<el-table-column label="仓库" align="center" prop="whName" /> v-model:limit="queryParams.pageSize"
<el-table-column label="库区" align="center" prop="rgName" /> @pagination="getList"
<el-table-column label="库位" align="center" prop="pnName" /> />
<el-table-column label="批次号" align="center" prop="lotNo" /> </ContentWrap>
<el-table-column label="变动数量" align="center" prop="storageOkQty" /> </el-card>
<el-table-column label="库存单位" align="center" prop="matUnit" />
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -104,7 +161,7 @@ const queryParams = reactive({
pnId: undefined, pnId: undefined,
stockNo: undefined, stockNo: undefined,
stockType: undefined, stockType: undefined,
headerNo: undefined, headerNo: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //

Loading…
Cancel
Save