kelvin/wms-dj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kelvin:e8648b3712d28b680255df52afe318ad2285993b
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta
...
compare: kelvin:cfb8ce96a73e2ec4405f09521e1f09a86593cd98
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta

2 Commits
e8648b3712 ... cfb8ce96a7

Author SHA1 Message Date
汤锦科
cfb8ce96a7 Merge remote-tracking branch 'origin/master' 2024-11-27 08:59:52 +08:00
汤锦科
166ca79035 页面优化 2024-11-27 08:58:55 +08:00
3 changed files with 18 additions and 85 deletions
Show Stats Expand all files Collapse all files

2
src/views/mes/md/baseKnife/index.vue
View File

@ -58,7 +58,7 @@
<el-table-column type="selection" min-width="55" align="center"/>
<!-- <el-table-column label="更新时间" align="center" prop="baseKnifeId" />-->
<el-table-column label="台账ID" align="center" prop="baseKnifeId" min-width="55" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="rfid" align="center" prop="rfid" />-->
<el-table-column label="rfid" align="center" prop="rfid" />
<el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="刀具名称" align="center" prop="knifeName" min-width="180" :show-overflow-tooltip="true"/>
<el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"

99
src/views/mes/md/inventoryBatch/index.vue
View File

@ -52,7 +52,7 @@
type="text"
@click="handleLook(scope.row)"
v-hasPermi="['md:TASK:edit']"
>查看物料清单
>查看明细
</el-button>
</template>
</el-table-column>
@ -66,84 +66,18 @@
@pagination="getList"
/>
<!-- 添加或修改出库任务对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="出库计划ID" prop="wmsOutPlanId">
<el-input v-model="form.wmsOutPlanId" placeholder="请输入出库计划ID"/>
</el-form-item>
<el-form-item label="出库计划编码" prop="wmsOutPlanCode">
<el-input v-model="form.wmsOutPlanCode" placeholder="请输入出库计划编码"/>
</el-form-item>
<el-form-item label="出库计划明细ID" prop="wmsOutPlanDetailId">
<el-input v-model="form.wmsOutPlanDetailId" placeholder="请输入出库计划明细ID"/>
</el-form-item>
<el-form-item label="出库类型ID" prop="wmsBusinessTypeId">
<el-input v-model="form.wmsBusinessTypeId" placeholder="请输入出库类型ID"/>
</el-form-item>
<el-form-item label="任务编码" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请输入任务编码"/>
</el-form-item>
<el-form-item label="任务数量" prop="taskNumber">
<el-input v-model="form.taskNumber" placeholder="请输入任务数量"/>
</el-form-item>
<el-form-item label="出库数量" prop="outNumber">
<el-input v-model="form.outNumber" placeholder="请输入出库数量"/>
</el-form-item>
<el-form-item label="目标库位ID" prop="wmStorageAreaId">
<el-input v-model="form.wmStorageAreaId" placeholder="请输入目标库位ID"/>
</el-form-item>
<el-form-item label="批次" prop="batchNum">
<el-input v-model="form.batchNum" placeholder="请输入批次"/>
</el-form-item>
<el-form-item label="物料ID" prop="mdItemId">
<el-input v-model="form.mdItemId" placeholder="请输入物料ID"/>
</el-form-item>
<el-form-item label="物料编码" prop="mdItemCode">
<el-input v-model="form.mdItemCode" placeholder="请输入物料编码"/>
</el-form-item>
<el-form-item label="物料名称" prop="mdItemName">
<el-input v-model="form.mdItemName" placeholder="请输入物料名称"/>
</el-form-item>
<el-form-item label="物料单位" prop="mdItemUnit">
<el-input v-model="form.mdItemUnit" placeholder="请输入物料单位"/>
</el-form-item>
<el-form-item label="任务状态" prop="taskState">
<el-select v-model="form.taskState" placeholder="请选择任务状态">
<el-option
v-for="dict in dict.type.in_plan_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="领料人" prop="recipientUsername">
<el-input v-model="form.recipientUsername" placeholder="请输入领料人"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :close-on-click-modal="false" title="出库物品清单" :visible.sync="openLook" width="60%" append-to-body>
<el-table :data="outInfoList" >
<el-table-column label="计划状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
<el-table-column label="计划类型" align="center" prop="planType" :show-overflow-tooltip="true"/>
<el-table-column label="出库类型编码" align="center" prop="planTypeCode" :show-overflow-tooltip="true"/>
<el-table-column label="出库类型名称" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
<el-dialog :close-on-click-modal="false" title="批次台账明细" :visible.sync="openLook" width="60%" append-to-body>
<el-table :data="infoList" >
<el-table-column label="台账ID" align="center" prop="baseKnifeId" :show-overflow-tooltip="true"/>
<el-table-column label="物料编码" align="center" prop="mdItemCode" :show-overflow-tooltip="true"/>
<el-table-column label="库房" align="center" prop="wmWarehouseName" :show-overflow-tooltip="true"/>
<el-table-column label="库位" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
<el-table-column label="明细批次" align="center" prop="detailBatchNum" :show-overflow-tooltip="true"/>
<el-table-column label="物料名称" align="center" prop="mdItemName" :show-overflow-tooltip="true"/>
<el-table-column label="库位编码" align="center" prop="wmStorageAreaCode" :show-overflow-tooltip="true"/>
<el-table-column label="库位名称" align="center" prop="wmStorageAreaName" :show-overflow-tooltip="true"/>
<el-table-column label="当时寿命%" align="center" prop="knifeLife" :show-overflow-tooltip="true"/>
<el-table-column label="物料编码" align="center" prop="mdItemCode" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="mdItemUnit" :show-overflow-tooltip="true"/>
<el-table-column label="业务类型" align="center" prop="planTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="业务编码" align="center" prop="planCode" :show-overflow-tooltip="true"/>
<el-table-column label="出/入库时间" align="center" prop="dateTime" :show-overflow-tooltip="true"/>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="openLook = false">关 闭</el-button>
@ -210,7 +144,7 @@ export default {
// 表单校验
rules: {},
openLook: false,
outInfoList: []
infoList: []
};
},
created() {
@ -316,12 +250,9 @@ export default {
},
/** 查看按钮操作 */
handleLook(row) {
const wmsOutTaskIds = row.wmsOutTaskId || this.ids;
getTASK(wmsOutTaskIds).then(response => {
this.openLook = true;
this.outInfoList = []
this.outInfoList = response.data.outInfoList;
});
this.openLook = true;
this.infoList = []
this.infoList = row.infoList;
},
/** 执行按钮操作 */
handleRun(row) {

2
src/views/mes/wm/zdTask/index.vue
View File

@ -193,6 +193,7 @@
{{scope.row.standardDosage * form.productIdQty}}
</template>
</el-table-column>
<el-table-column label="当前库存" prop="currentInventory" min-width="150" />
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
@ -243,6 +244,7 @@
{{scope.row.standardDosage * form.productIdQty}}
</template>
</el-table-column>
<el-table-column label="当前库存" prop="currentInventory" min-width="150" />
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">