@@ -96,298 +102,142 @@
@@ -398,23 +248,28 @@ export default class RawReceiptDetail extends BasePage {
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
+
.uni-scroll-view-content {
overflow-x: auto;
+
.single {
width: 100%;
- height: 100px;
+ height: 80px;
display: flex;
- padding-top: 50px;
+ padding-top: 30px;
+
.single-left {
- width: 80%;
+ width: 100%;
height: 60px;
display: flex;
+
view {
width: 110rpx;
height: 100%;
line-height: 100rpx;
}
}
+
.single-right {
button {
margin-top: 15rpx;
@@ -423,7 +278,35 @@ export default class RawReceiptDetail extends BasePage {
}
}
}
+
+ .singles {
+ width: 100%;
+ height: 50px;
+ // height: 100px;
+ display: flex;
+
+ .single-lefts {
+ width: 80%;
+ height: 60px;
+ display: flex;
+
+ view {
+ width: 110rpx;
+ height: 100%;
+ line-height: 100rpx;
+ }
+ }
+
+ .single-rights {
+ button {
+ margin-top: 15rpx;
+ width: 150rpx;
+ height: 70rpx;
+ }
+ }
+ }
}
+
.header {
position: fixed;
top: 36rpx;
@@ -437,13 +320,16 @@ export default class RawReceiptDetail extends BasePage {
font-size: 34rpx;
font-weight: 500;
text-align: center;
+
.title {
flex: 3;
}
+
.left,
.right {
flex: 1;
}
+
.icon {
display: flex;
justify-content: center;
@@ -452,41 +338,50 @@ export default class RawReceiptDetail extends BasePage {
height: 88rpx;
}
}
+
.content {
width: 100%;
background: white;
border-radius: 15rpx;
padding: 10rpx;
+
.material {
width: 100%;
height: 100rpx;
display: flex;
+
.material-left {
width: 100%;
height: 100%;
display: flex;
+
view {
width: 145rpx;
line-height: 100rpx;
}
+
.search {
padding-left: 12px;
}
}
}
+
.material {
width: 100%;
height: 100rpx;
display: flex;
+
.material-right {
width: 100%;
height: 100%;
display: flex;
+
.material-right-title {
width: 145rpx;
height: 100%;
line-height: 100rpx;
}
+
.material-right-code {
width: 80%;
height: 100%;
@@ -497,18 +392,22 @@ export default class RawReceiptDetail extends BasePage {
}
}
}
+
.number {
height: 100rpx;
display: flex;
+
.number-left {
width: 50%;
height: 100%;
display: flex;
+
.number-left-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
}
+
.input {
width: 200rpx;
height: 70rpx;
@@ -516,16 +415,19 @@ export default class RawReceiptDetail extends BasePage {
margin-left: 15rpx;
}
}
+
.number-right {
width: 50%;
height: 100%;
display: flex;
+
.number-right-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
text-align: center;
}
+
.input {
width: 200rpx;
height: 70rpx;
@@ -534,32 +436,39 @@ export default class RawReceiptDetail extends BasePage {
}
}
}
+
.library {
width: 100%;
height: 100rpx;
+
.library-left {
width: 100%;
height: 100%;
- display: flex;
+ // display: flex;
+
view {
width: 120rpx;
line-height: 100rpx;
}
- .search {
- padding-left: 19px;
- text-align: left;
+
+ .material-right-code {
+ width: 200px;
+ padding-left: 20px;
}
}
+
.library-right {
width: 50%;
height: 100%;
display: flex;
+
.library-right-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
// text-align: center;
}
+
.input {
width: 200rpx;
height: 70rpx;
@@ -567,10 +476,12 @@ export default class RawReceiptDetail extends BasePage {
margin-left: 15rpx;
}
}
+
.add {
width: 100%;
height: 100rpx;
position: relative;
+
button {
position: absolute;
top: 10rpx;
@@ -579,6 +490,7 @@ export default class RawReceiptDetail extends BasePage {
}
}
}
+
.bottom-bar {
z-index: 21;
position: fixed;
diff --git a/src/pages/raw/handover/feeding/model.ts b/src/pages/raw/handover/feeding/model.ts
index 0d77d06..896b8b7 100644
--- a/src/pages/raw/handover/feeding/model.ts
+++ b/src/pages/raw/handover/feeding/model.ts
@@ -18,11 +18,13 @@ export class FeedingModule extends VuexModule {
blDetailList: any[] = [];
detailedList: any;
LocList: any = [];
+ submitListCode: any = '';
/**
* 库位列表
*/
locationList = [];
+ MaterialList: any = [];
/**
* 补料明细列表是否有选择项
@@ -177,6 +179,23 @@ export class FeedingModule extends VuexModule {
return { locationList };
}
+ @MutationAction
+ async queryMaterialList(params: any) {
+ const res: any = await http.post(url.auth.query.queryAppendDetail, {
+ factoryCode: session.factoryCode,
+ loginName: session.loginName,
+ prdOrder: params.prdOrder,
+ materialCode: params.materialCode,
+ });
+ const MaterialList = res.list;
+ return { MaterialList };
+ }
+ @MutationAction
+ async submitList(params: any) {
+ const res: any = await http.post(url.auth.query.createAppendList, params);
+ const submitListCode = res.code;
+ return { submitListCode };
+ }
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async queryByFactoryCodeAndWorkAreaCode(content: any) {
const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content);
diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue
index 3129dc9..dfeeb7a 100644
--- a/src/pages/raw/handover/virtual/summary.vue
+++ b/src/pages/raw/handover/virtual/summary.vue
@@ -8,24 +8,10 @@
-
+
+
+
+
+
+ {{ $t('message.dn_Number') }}
+
+
+
+ {{ $t('message.product_Confirm') }}
+
+
+
@@ -87,6 +85,9 @@ export default class VirtualSummary extends BasePage {
* 表头
*/
headers = summaryHeaders;
+ show = false;
+ nextNum: any = '';
+ itemIndex = 0;
/**
* 处理完成
@@ -136,8 +137,8 @@ export default class VirtualSummary extends BasePage {
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
onReady() {
- this.$amountForm.setRules(this.amountFormRules);
- this.$submitForm.setRules(this.submitFormRules);
+ // this.$amountForm.setRules(this.amountFormRules);
+ // this.$submitForm.setRules(this.submitFormRules);
this.isBusinessFinished = false;
}
/**
@@ -150,76 +151,43 @@ export default class VirtualSummary extends BasePage {
this.submitForm.receiver = this.submitForm.receiverName;
this.submitForm.receiverName = userName;
}
+ Modify(e: any) {
+ this.itemIndex = e.contentIndex;
+ this.show = !this.show;
+ this.nextNum = '';
+ }
+ ModifyConfirm() {
+ if (this.nextNum == '') {
+ uni.showToast({
+ title: this.$t('message.Summary_PleaseInputNumber') as any,
+ image: '/static/icons/icon-52.png',
+ });
+ return;
+ }
+ let num: any = parseFloat(this.model.proOrderResultList[this.itemIndex].amount) - parseFloat(this.model.proOrderResultList[this.itemIndex].totalMoAmount);
+ if (parseFloat(this.nextNum) > num) {
+ uni.showToast({
+ title: this.$t('message.Commission_tips4') as any,
+ image: '/static/icons/icon-52.png',
+ });
+ return;
+ }
+ this.model.proOrderResultList[this.itemIndex].hvAmount = this.nextNum;
+ this.show = !this.show;
+ }
//选中其中某一行数据
ClickHandover(e: any) {
console.log(e);
- let item = e.data[e.data.length - 1].lineData;
- let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount);
- if (num > item.virtualAmount) {
- this.amountForm.amount = item.virtualAmount;
+ if (e.data.length != this.model.proOrderResultList.length) {
+ let index = e.data[e.data.length - 1].index;
+ let num: any = parseFloat(this.model.proOrderResultList[index].amount) - parseFloat(this.model.proOrderResultList[index].totalMoAmount);
+ this.model.proOrderResultList[index].hvAmount = num;
} else {
- this.amountForm.amount = num;
- }
- }
- onOk() {
- this.$amountForm.validate(async (valid) => {
- if (!valid) return;
- // 检查
- const firstRecord = model.proOrderResultList[0];
- if (firstRecord === undefined) {
- this.customToast(this.$t('message.LBWK') as string);
- return;
- }
- console.log('firstRecord', firstRecord);
- ///此接口的作用？？？？？？
- await model.checkAmount({
- sapFactoryCode: model.sapFactoryCode,
- loginName: session.loginName as string,
- materialCode: firstRecord.materialCode,
- unit: firstRecord.unit,
- mrpCode: firstRecord.mrpCode,
- factoryCode: session.factoryCode as string,
- sendSpot: firstRecord.sendSpot,
- amount: this.amountForm.amount,
+ this.model.proOrderResultList.forEach((item: any) => {
+ let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount);
+ item.hvAmount = num;
});
- // 改数
- const firstSelection = this.model.proOrderResultList.filter((_: any) => _.checked);
- console.log('.......????', firstSelection.length);
- if (firstSelection === undefined) {
- this.customToast(this.$t('message.Pi_tip7') as string);
- } else {
- if (firstSelection.length > 1) {
- this.customToast(this.$t('message.Pi_tip19') as string);
- return;
- } else {
- const inputAmount = parseFloat(this.amountForm.amount); //本次交接数量
- //const totalHvAmount = firstSelection[0].totalHvAmount;
- const demand = firstSelection[0].amount; //需求数量
- const totalMoAmount = firstSelection[0].totalMoAmount; //累计拣配数量
- console.log('2222', 2222222222222222222);
- if (inputAmount + totalMoAmount > demand) {
- this.customToast(this.$t('message.Pi_tip14') as string);
- return;
- }
- console.log(1);
- if (inputAmount <= 0) {
- this.customToast(this.$t('message.Pi_tip2') as string);
- } else {
- this.model.proOrderResultList.forEach((item: any) => {
- if (item.checked) {
- item.hvAmount = this.amountForm.amount;
- }
- });
- uni.showToast({
- //icon: 'success',
- title: this.$t('message.success') as string,
- duration: 2000,
- image: '/static/icons/icon-51.png',
- });
- }
- }
- }
- });
+ }
}
onSubmit() {
this.$submitForm.validate(async (valid) => {
@@ -330,13 +298,16 @@ export default class VirtualSummary extends BasePage {
font-size: 34rpx;
font-weight: 500;
text-align: center;
+
.title {
flex: 3;
}
+
.left,
.right {
flex: 1;
}
+
.icon {
display: flex;
justify-content: center;
@@ -363,6 +334,34 @@ export default class VirtualSummary extends BasePage {
right: 0;
z-index: 1000;
+ .singles {
+ width: 100%;
+ height: 50px;
+ // height: 100px;
+ display: flex;
+ padding-top: 35px;
+
+ .single-lefts {
+ width: 80%;
+ height: 60px;
+ display: flex;
+
+ view {
+ width: 110rpx;
+ height: 100%;
+ line-height: 100rpx;
+ }
+ }
+
+ .single-rights {
+ button {
+ margin-top: 15rpx;
+ width: 150rpx;
+ height: 70rpx;
+ }
+ }
+ }
+
.container {
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 3da0f09..2b9aba8 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -25,6 +25,8 @@ export const url = {
query: {
location: '/wmspda/auth/query/location',
location1: '/wmspda/material/orderin/receiveloc',
+ queryAppendDetail: '/wmspda/bl/queryAppendDetail',
+ createAppendList: '/wmspda/bl/createAppendList',
},
systime: '/wmspda/auth/systime',
userInfo: '/wmspda/auth/userinfo',