Merge branch 'master' of http://115.190.214.62:3001/Teams/kunshan-bzfm-mes-vue
This commit is contained in:
@@ -38,29 +38,22 @@
|
|||||||
header-cell-class-name="el-table-header-cell"
|
header-cell-class-name="el-table-header-cell"
|
||||||
highlight-current-row
|
highlight-current-row
|
||||||
@sort-change="sortChange">
|
@sort-change="sortChange">
|
||||||
<el-table-column prop="unit" label="计量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
|
<el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
|
||||||
<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
|
<el-table-column prop="inboundNo" label="入库单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('inboundNo')" />
|
||||||
<el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remarks')" />
|
<el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
|
||||||
<el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('operator')" />
|
<el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
|
||||||
<el-table-column prop="supplierName" label="供应商名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierName')" />
|
<el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
|
||||||
<el-table-column prop="supplierCode" label="供应商编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierCode')" />
|
<el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
|
||||||
<el-table-column prop="expiryDate" label="有效期至" :show-overflow-tooltip="true" v-if="columns.showColumn('expiryDate')" />
|
<el-table-column prop="quantity" label="入库数量" align="center" v-if="columns.showColumn('quantity')" />
|
||||||
<el-table-column prop="productionDate" label="生产日期" :show-overflow-tooltip="true" v-if="columns.showColumn('productionDate')" />
|
|
||||||
<el-table-column prop="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
|
|
||||||
<el-table-column prop="transactionType" label="入库类型" align="center" v-if="columns.showColumn('transactionType')">
|
<el-table-column prop="transactionType" label="入库类型" align="center" v-if="columns.showColumn('transactionType')">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="options.transactionTypeOptions" :value="scope.row.transactionType" />
|
<dict-tag :options="options.transactionTypeOptions" :value="scope.row.transactionType" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
|
|
||||||
<el-table-column prop="quantity" label="入库数量" align="center" v-if="columns.showColumn('quantity')" />
|
|
||||||
<el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
|
|
||||||
<el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
|
<el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
|
||||||
<el-table-column prop="warehouseName" label="仓库名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseName')" />
|
<el-table-column prop="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
|
||||||
<el-table-column prop="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
|
<el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('operator')" />
|
||||||
<el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
|
<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
|
||||||
<el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
|
|
||||||
<el-table-column prop="inboundNo" label="入库单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('inboundNo')" />
|
|
||||||
<el-table-column label="操作" width="160">
|
<el-table-column label="操作" width="160">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@@ -286,6 +279,12 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :lg="12">
|
||||||
|
<el-form-item label="仓库编码" prop="warehouseCode">
|
||||||
|
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="批次号" prop="batchNo">
|
<el-form-item label="批次号" prop="batchNo">
|
||||||
<el-input v-model="form.batchNo" placeholder="请输入批次号" />
|
<el-input v-model="form.batchNo" placeholder="请输入批次号" />
|
||||||
@@ -458,7 +457,6 @@ function cancel() {
|
|||||||
|
|
||||||
// 重置表单
|
// 重置表单
|
||||||
function reset() {
|
function reset() {
|
||||||
|
|
||||||
form.value = {
|
form.value = {
|
||||||
unit: null,
|
unit: null,
|
||||||
createdTime: null,
|
createdTime: null,
|
||||||
|
|||||||
Reference in New Issue
Block a user