zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【nev-pc】回收料相关需求修改

ag_report_nev
安虹睿 11 months ago
parent
190a92e318
commit
ba17bebb37
5 changed files with 60 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      fe/PC/src/filters/status.js
  2. 2
      fe/PC/src/mixins/printMixin.js
  3. 4
      fe/PC/src/utils/tableColumns/index.js
  4. 4
      fe/PC/src/utils/tabsDesTions/index.js
  5. 89
      fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue

2
fe/PC/src/filters/status.js
View File

@ -132,7 +132,7 @@ import store from '@/store/index'
background:"#EC5B28",
},
30: {
label: "等待",
label: "待库移",//等待
value: 30,
background:"#00b6ff",
},

2
fe/PC/src/mixins/printMixin.js
View File

@ -38,6 +38,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
"lot": item[_options.lot] || item.lot,//生产批次
"locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
"itemCode": item[_options.itemCode] || item.itemCode,//ERP料号
"itemDesc1": item[_options.itemDesc1] || item.itemDesc1,
"configuration": item[_options.configuration] || item.configuration,
"qty": item[_options.qty] || item.qty,//要货数量 + 整包数量
"packingCode": item[_options.packingCode] || item.packingCode,//条形码
"printIndex":item[_options.printIndex] || Number(key)+1,//打印序列

4
fe/PC/src/utils/tableColumns/index.js
View File

@ -1312,7 +1312,7 @@ export const unqualifiedToQualifiedNote = [
type: "name",
width: orderWidth
},
{ label: "备注", prop: 'remark' },
{ label: "原因", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -1835,6 +1835,7 @@ export const FISDeliverRequest = [
},
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -1875,6 +1876,7 @@ export const FISDeliverNote = [
},
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },

4
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -791,7 +791,7 @@ export const InspectNote = [
// 不合格转合格记录
export const unqualifiedToQualifiedNote = [
{ label: "转合格单号", prop: "number" },
{ label: "备注", prop: 'remark' },
{ label: "原因", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -1176,6 +1176,7 @@ export const FISDeliverRequest = [
{ label: "发货申请单号", prop: "number" },
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -1208,6 +1209,7 @@ export const FISDeliverNote = [
{ label: "发货记录单号", prop: 'number' },
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "发货申请单号", prop: "deliverRequestNumber" },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },

89
fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
View File

@ -163,18 +163,18 @@ export default {
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.addPopData_HB) },
width:"auto"
},
{
type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_FS[tableScope.$index].itemCode),1000)},
width:"auto",
},
{
type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_FS[tableScope.$index].itemCode,supplierCode:this.addPopData_FS[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
colSpan: 12,width:"auto",
},
// {
// type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
// beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
// focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_FS[tableScope.$index].itemCode),1000)},
// width:"auto",
// },
// {
// type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
// beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
// focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_FS[tableScope.$index].itemCode,supplierCode:this.addPopData_FS[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
// colSpan: 12,width:"auto",
// },
{ type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "2"),1000)},
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) },
@ -259,18 +259,18 @@ export default {
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.addPopData_HB) },
width:"auto",
},
{
type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_HB[tableScope.$index].itemCode),1000)},
width:"auto",
},
{
type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_HB[tableScope.$index].itemCode,supplierCode:this.addPopData_HB[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
colSpan: 12,width:"auto",
},
// {
// type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
// beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
// focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_HB[tableScope.$index].itemCode),1000)},
// width:"auto",
// },
// {
// type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
// beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
// focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_HB[tableScope.$index].itemCode,supplierCode:this.addPopData_HB[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
// colSpan: 12,width:"auto",
// },
{ type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",false,1000)},
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) },
@ -495,7 +495,7 @@ export default {
.then(item=>{
this.Loading.appMainLoading = false
// 提示是否打印箱码，之后在清除数据
this.$confirm('提交成功, 是否需要打印箱标签?', '提示', {
this.$confirm('提交成功, 是否需要打印混拌料箱标签?', '提示', {
confirmButtonText: '打印',
cancelButtonText: '关闭',
type: 'warning'
@ -514,7 +514,14 @@ export default {
}
_HBPack.packingCode = _HBPack.code
_printData.details.push(_HBPack)
let _data = initPrintPackingCodeData(_printData);
// 前端反查配置,描述
_printData.details.forEach(item=>{
item.configuration = this.itemStagingLists[item.itemCode].configuration
item.itemDesc1 = this.itemStagingLists[item.itemCode].desc1
})
console.log(521,_printData)
let _data = initPrintPackingCodeData(_printData,null,'xiangbq_hsl.rdlx');
console.log(523,_data)
this.Loading.appMainLoading = true
this.Print(_data)
.then(data=>{
@ -560,10 +567,10 @@ export default {
let _item = this.needNewPackingList[index]
let _item_info = this.itemStagingLists[_item.itemCode]
let _location_info = this.locationStagingLists[_item.locationCode]
let _supplieritem_name = _item.supplierCode + '_' + _item.itemCode
let _supplieritem_info = this.supplierItemStagingLists[_supplieritem_name]
let _supplier_only_info = this.supplierOnlyStagingLists[_item.supplierCode]
let _asn_info = this.asnStagingLists[_item.poNumber]
// let _supplieritem_name = _item.supplierCode + '_' + _item.itemCode
// let _supplieritem_info = this.supplierItemStagingLists[_supplieritem_name]
// let _supplier_only_info = this.supplierOnlyStagingLists[_item.supplierCode]
// let _asn_info = this.asnStagingLists[_item.poNumber]
let _creatPackData = {
itemCode: _item_info.code || null,
itemName: _item_info.name || null,
@ -582,8 +589,10 @@ export default {
containerCode: null,
supplierCode: _item.supplierCode,
poNumber: _item.poNumber,
rpNumber: _asn_info.rpNumber,
asnNumber: _asn_info.number,
// rpNumber: _asn_info.rpNumber,
// asnNumber: _asn_info.number,
rpNumber: null,
asnNumber: null,
qLevel: _item_info.elevel || null,
qualityFile: null,
prodLine: null,
@ -592,10 +601,14 @@ export default {
specifications: null,
supplierBatch: null,
supplierName: null,
supplierSimpleName: _supplier_only_info.shortName,
supplierItemCode: _supplieritem_info.supplierItemCode,
supplierItemName: _supplieritem_info.itemName,
labelType: 1,//采购标签
// supplierSimpleName: _supplier_only_info.shortName,
// supplierItemCode: _supplieritem_info.supplierItemCode,
// supplierItemName: _supplieritem_info.itemName,
supplierSimpleName: null,
supplierItemCode: null,
supplierItemName: null,
// labelType: 1,//采购标签
labelType: 2,//生成标签
planArriveDate: "9999-12-31",
remark:null,
}
@ -612,7 +625,7 @@ export default {
// 验证【粉碎料】信息是否填全
let _err_FS=0
this.addPopData_FS.forEach(item=>{
if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode || !item.supplierCode || !item.poNumber){
if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode){
_err_FS++
}
})
@ -645,7 +658,7 @@ export default {
// 验证【混拌料】信息是否填全
let _err_HB=0
this.addPopData_HB.forEach(item=>{
if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode || !item.supplierCode || !item.poNumber){
if(!item.itemCode || Number(item.qty <= 0) || !item.locationCode){
_err_HB++
}
})

Write Preview
Loading…
Cancel
Save