hanst
/
wms-pda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ui

master
han\hanst 4 months ago
parent
f6dbc3c20c
commit
2212a16455
2 changed files with 58 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      src/views/modules/recv/qualifiedStorage.vue
  2. 51
      src/views/modules/recv/recv.vue

34
src/views/modules/recv/qualifiedStorage.vue
View File

@ -30,7 +30,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label=""> <el-form-item label="">
<el-button type="text" class="inboundButton" @click="selectInboundItem(qualifiedDetail)" <el-button type="text" class="inboundButton" @click="selectInboundItem(qualifiedDetail)"
style="margin-top: 10px;" size="small">入库</el-button>
style="margin-top: 10px;margin-left: 20px" size="small">入库</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -98,18 +98,6 @@
<h4 style="margin: 0 0 15px 0; color: #67C23A;">入库信息确认</h4> <h4 style="margin: 0 0 15px 0; color: #67C23A;">入库信息确认</h4>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="入库数量">
<el-input v-model="inboundData.inboundQty" type="number"
:max="inboundItem.qualifiedQty" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="目标库位">
<el-input v-model="inboundData.targetLocationId" placeholder="请输入目标库位" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="入库日期"> <el-form-item label="入库日期">
<el-date-picker v-model="inboundData.inboundDate" type="date" <el-date-picker v-model="inboundData.inboundDate" type="date"
@ -123,19 +111,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--
<el-col :span="24">
<el-form-item label="入库备注">
<el-input v-model="inboundData.inboundRemark" type="textarea" rows="3"
placeholder="请输入入库备注信息" />
<el-col :span="12">
<el-form-item label="入库数量">
<el-input v-model="inboundData.inboundQty" type="number"
:max="inboundItem.qualifiedQty" />
</el-form-item> </el-form-item>
</el-col> </el-col>
-->
<el-col :span="12">
<el-form-item label="目标库位">
<el-input v-model="inboundData.targetLocationId" placeholder="请输入目标库位" />
</el-form-item>
</el-col>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-button type="text" style="font-size: 16px;" @click="processFlag = 1">回退</el-button>
<el-button type="text" style="font-size: 16px;margin-left: 30px" @click="processFlag = 1">回退</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -269,7 +261,7 @@ export default {
this.inboundData.inboundQty = item.qualifiedQty; this.inboundData.inboundQty = item.qualifiedQty;
this.inboundData.targetLocationId = item.locationId; // 默认使用原库位 this.inboundData.targetLocationId = item.locationId; // 默认使用原库位
this.inboundData.inboundDate = this.getCurrentDate(); this.inboundData.inboundDate = this.getCurrentDate();
this.inboundData.operatorName = 'current_user'; // 这里应该从用户信息中获取
this.inboundData.operatorName = this.$store.state.user.userDisplay; // 这里应该从用户信息中获取
this.processFlag = 2; this.processFlag = 2;
}, },

51
src/views/modules/recv/recv.vue
View File

@ -21,7 +21,7 @@
<el-form-item label="商品编码"><span>{{ poDetail.partNo }}</span></el-form-item> <el-form-item label="商品编码"><span>{{ poDetail.partNo }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="行号/下达号"><span>{{ poDetail.lineNo }}/{{ poDetail.wdr }}</span></el-form-item>
<el-form-item label="行号/下达号"><span>{{ poDetail.lineNo }}/{{ poDetail.wdr || '*' }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label=""> <el-form-item label="">
@ -72,8 +72,23 @@
style="font-size: 16px" size="small">包装记录</el-button> style="font-size: 16px" size="small">包装记录</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"><el-form-item label="制造日期"><el-date-picker v-model="recvItem.manufactureDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择制造日期" style="width: 100%" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="失效日期"><el-date-picker v-model="recvItem.expiringDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择失效日期" style="width: 100%" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="制造日期">
<el-date-picker v-model="recvItem.manufactureDate"
type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择制造日期" style="width: 100%" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="供应商批次">
<el-input v-model="recvItem.supplierBatchNo" placeholder="请输入供应商批次" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="交货日期">
<el-date-picker v-model="recvItem.deliveryDate"
type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择交货日期" style="width: 100%" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="到达日期">
<el-date-picker v-model="recvItem.arrivalDate" type="date" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择到达日期" style="width: 100%" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="库位"><el-input v-model="recvItem.locationNo" placeholder="请输入库位" /></el-form-item></el-col> <el-col :span="12"><el-form-item label="库位"><el-input v-model="recvItem.locationNo" placeholder="请输入库位" /></el-form-item></el-col>
<el-col :span="12"><el-form-item label="批号"><el-input v-model="recvItem.batchNo" placeholder="请输入批号" /></el-form-item></el-col> <el-col :span="12"><el-form-item label="批号"><el-input v-model="recvItem.batchNo" placeholder="请输入批号" /></el-form-item></el-col>
<el-col :span="8" style="margin-top: 10px"><el-form-item><el-button type="text" style="font-size: 16px;margin-left: 30px" @click="processFlag = 1">回退</el-button></el-form-item></el-col> <el-col :span="8" style="margin-top: 10px"><el-form-item><el-button type="text" style="font-size: 16px;margin-left: 30px" @click="processFlag = 1">回退</el-button></el-form-item></el-col>
@ -127,6 +142,7 @@ export default {
handlingUnit: [], handlingUnit: [],
hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' }, hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' },
site:localStorage.getItem('site'), site:localStorage.getItem('site'),
warehouseId:localStorage.getItem('selectedWarehouse'),
fullscreenLoading: false // 控制全屏loading fullscreenLoading: false // 控制全屏loading
}; };
}, },
@ -140,7 +156,7 @@ export default {
return `hu_${this.recvItem.poNumber}_${this.recvItem.lineNo}`; return `hu_${this.recvItem.poNumber}_${this.recvItem.lineNo}`;
}, },
displayLineWdr() { displayLineWdr() {
return `${this.recvItem.lineNo || ''}/${this.recvItem.wdr || ''}`;
return `${this.recvItem.lineNo || ''}/${this.recvItem.wdr || '*'}`;
} }
}, },
methods: { methods: {
@ -174,6 +190,9 @@ export default {
}); });
}, },
recvLine(row) { recvLine(row) {
/* if (row.receiveCaseDB!='INVDIR' && row.receiveCaseDB!='QAINV') {
return this.$message.warning("该采购订单行的收货方式为"+row.receiveCase+"，无法接收");
}*/
if (row.poStatus === 'Stopped' || row.poStatus === 'Closed' || row.poStatus === 'Cancelled' || row.poStatus === 'Planned') { if (row.poStatus === 'Stopped' || row.poStatus === 'Closed' || row.poStatus === 'Cancelled' || row.poStatus === 'Planned') {
return this.$message.warning("该采购订单状态为"+row.poStatus+"，无法接收"); return this.$message.warning("该采购订单状态为"+row.poStatus+"，无法接收");
} }
@ -184,10 +203,24 @@ export default {
...row, ...row,
poNo: row.poNumber || this.scanCode, poNo: row.poNumber || this.scanCode,
dueinQty: row.qtyToReceive || row.invQtyToReceive, dueinQty: row.qtyToReceive || row.invQtyToReceive,
transQty: row.invQtyToReceive || 0
transQty: row.invQtyToReceive || 0,
batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+1,
deliveryDate: row.plannedDeliveryDate || '',
arrivalDate: this.getCurrentDate(),
supplierBatchNo: '',
}; };
this.processFlag = 2; this.processFlag = 2;
}, },
// 获取当前日期
getCurrentDate() {
const now = new Date();
return now.getFullYear() + '-' +
String(now.getMonth() + 1).padStart(2, '0') + '-' +
String(now.getDate()).padStart(2, '0') + ' ' +
String(now.getHours()).padStart(2, '0') + ':' +
String(now.getMinutes()).padStart(2, '0') + ':' +
String(now.getSeconds()).padStart(2, '0');
},
handlingUnitStep() { handlingUnitStep() {
this.processFlag = 3; this.processFlag = 3;
const saved = localStorage.getItem(this.huKey); const saved = localStorage.getItem(this.huKey);
@ -221,12 +254,17 @@ export default {
const receiveData = { const receiveData = {
// 基本字段 // 基本字段
site: this.site, site: this.site,
warehouseId: this.warehouseId,
partNo: item.partNo, partNo: item.partNo,
partDesc: item.description,
transQty: item.transQty, transQty: item.transQty,
batchNo: item.batchNo, batchNo: item.batchNo,
locationNo: item.locationNo, locationNo: item.locationNo,
itemNo: 1, itemNo: 1,
wdr: item.wdr || '*',
deliveryDate: item.deliveryDate,
arrivalDate: item.arrivalDate,
supplierBatchNo: item.supplierBatchNo,
// PO相关字段 // PO相关字段
poNo: item.poNumber || item.poNo, poNo: item.poNumber || item.poNo,
orderNo: item.orderNo, orderNo: item.orderNo,
@ -238,6 +276,7 @@ export default {
purchaseUOM: item.purchaseUOM, purchaseUOM: item.purchaseUOM,
receiveCase: item.receiveCase, receiveCase: item.receiveCase,
receiveCaseDB: item.receiveCaseDB, receiveCaseDB: item.receiveCaseDB,
inventoryPartDB: item.inventoryPartDB,
// 业务控制字段 // 业务控制字段
needHandlingUnit: item.needHandlingUnit , needHandlingUnit: item.needHandlingUnit ,
needCheck: item.needCheck , needCheck: item.needCheck ,

Write Preview
Loading…
Cancel
Save