diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index b1de18c..7ddf842 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
- version = '0.0.113'; //正式版本号
+ version = '0.0.114'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue
index 4014bb6..92fde87 100644
--- a/src/pages/wms/Raw/ProductionREQ/index.vue
+++ b/src/pages/wms/Raw/ProductionREQ/index.vue
@@ -51,6 +51,10 @@
{{ item.unit }}
+
+ 是否过账:
+
+
@@ -142,6 +146,22 @@ export default class ProductionREQ extends BasePage {
itemdetail: any = '';
outNumber: any = 0;
realityaddNumber = 0;
+ isdisabled = false;
+ reducelist: any = [
+ {
+ label: '否',
+ value: '0',
+ },
+ {
+ label: '是',
+ value: '1',
+ },
+ ];
+ isguozhang: any = {};
+ bookTypeChange(e: any, index: any) {
+ console.log(e, index);
+ this.materilist[index].isguozhang.value = e.pickerName.value;
+ }
async onReady() {
// await this.model.getwarehouselist();
// this.warehouselist = model.warehouselist;
@@ -169,6 +189,10 @@ export default class ProductionREQ extends BasePage {
this.materilist.forEach((item) => {
item.returnoutNumber = item.outNumber;
item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+ item.isguozhang = {
+ label: '否',
+ value: '0',
+ };
});
} else {
this.materilist = [];
@@ -235,15 +259,23 @@ export default class ProductionREQ extends BasePage {
});
return;
}
+ let guozhannglist = [];
+ guozhannglist = this.materilist
+ .filter((item) => {
+ return item.isguozhang.value == '1' && item.planNumber > item.outNumber;
+ })
+ .map((item) => {
+ console.log('item', item);
+ return { id: item.id };
+ });
let params = [];
this.list.map((item) => {
item.createBy = session.loginName;
item.factoryCode = session.FactoryCode;
params.push(item);
});
- //console.log('list', params);
- // this.mepty();
- await this.model.out(params);
+ //console.log('list', {orderList: params, gzList: guozhannglist});
+ await this.model.out({ orderList: params, gzList: guozhannglist });
if (this.model.SubmitCode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
@@ -385,7 +417,7 @@ body {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
- height: 240rpx;
+ height: 280rpx;
overflow: scroll;
margin-bottom: 6rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
diff --git a/src/pages/wms/Raw/ProductionREQ/model.ts b/src/pages/wms/Raw/ProductionREQ/model.ts
index 7dce89b..fd54d10 100644
--- a/src/pages/wms/Raw/ProductionREQ/model.ts
+++ b/src/pages/wms/Raw/ProductionREQ/model.ts
@@ -73,7 +73,7 @@ export class ProductionREQ extends VuexModule {
}
@MutationAction
async out(params: any) {
- const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.NewConMaterialOutSC, params);
+ const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.NewConMaterialOutSCNew, params);
const SubmitCode = result.code;
return { SubmitCode };
}
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 107b5e7..d20b2cf 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -158,6 +158,7 @@ export const url = {
out: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionAdd',
ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC',
NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC',
+ NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSCNew',
},
ReturnMaterials: {
listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC',