Browse Source

【nev】相关问题修改

ag_report_nev
安虹睿 11 months ago
parent
commit
0cf4485f61
  1. 2
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 2
      fe/PC/src/utils/summaryTableColumns/index.js
  3. 3
      fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
  4. 8
      fe/PC/src/views/padManage/isPadForTransferLibJob.vue

2
fe/PC/src/utils/detailsTableColumns/index.js

@ -260,7 +260,7 @@ export const InspectRequest = [
{ label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
{ label: "库位", prop: 'locationCode' }, { label: "库位", prop: 'locationCode' },
{ label: "ERP储位", prop: 'locationErpCode' }, { label: "ERP储位", prop: 'locationErpCode' },
{ label: "检验单号", prop: "number" }, { label: "任务单号", prop: "number" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "计量单位", prop: 'uom' }, { label: "计量单位", prop: 'uom' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },

2
fe/PC/src/utils/summaryTableColumns/index.js

@ -16,7 +16,7 @@ export const InspectRequest = [
{ label: "不合格数量", prop: 'failedQty' }, { label: "不合格数量", prop: 'failedQty' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "检验人", prop: 'inspectUser' }, { label: "检验人", prop: 'inspectUser' },
{ label: "检验单号", prop: "number" }, { label: "任务单号", prop: "number" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" }, { label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" },

3
fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue

@ -438,7 +438,7 @@ export default {
toProduceDate: _toData_new.produceDate || null, toProduceDate: _toData_new.produceDate || null,
toExpireDate: _toData_new.expireDate || null, toExpireDate: _toData_new.expireDate || null,
toLot: _toData_new.lot || null, toLot: _toData_new.lot || null,
toStatus: 1, toStatus: 2,
toLocationCode: _toData.locationCode || null, toLocationCode: _toData.locationCode || null,
toLocationArea: _toLocationInfo.areaCode || null, toLocationArea: _toLocationInfo.areaCode || null,
toLocationGroup: _toLocationInfo.locationGroupCode || null, toLocationGroup: _toLocationInfo.locationGroupCode || null,
@ -493,7 +493,6 @@ export default {
details:_details, details:_details,
recDetails:_recDetail recDetails:_recDetail
} }
itemTransformNewCreate(_finalData) itemTransformNewCreate(_finalData)
.then(item=>{ .then(item=>{
this.Loading.appMainLoading = false this.Loading.appMainLoading = false

8
fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@ -56,10 +56,10 @@
<el-button type="primary" @click="compeletHandleSure()"> </el-button> <el-button type="primary" @click="compeletHandleSure()"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 查看余额 --> <!-- 查看库存余额 -->
<el-dialog <el-dialog
class="showInventoryPop" class="showInventoryPop"
title="查看余额" title="查看库存余额"
:visible="showInventoryVisible" :visible="showInventoryVisible"
top="5vh" top="5vh"
width="90%"> width="90%">
@ -248,7 +248,7 @@ export default {
}, },
// //
currentRowData:null, currentRowData:null,
// //
showInventoryVisible:false, showInventoryVisible:false,
showInventoryLoading:false, showInventoryLoading:false,
inventoryTableData:[], inventoryTableData:[],
@ -395,7 +395,7 @@ export default {
} }
}); });
}, },
// //
inventoryCloseHandle(){ inventoryCloseHandle(){
this.showInventoryVisible = false this.showInventoryVisible = false
this.inventoryTableData = [] this.inventoryTableData = []

Loading…
Cancel
Save