Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:ef2ed73f53e7292c2cc6a525990eb70f2a0a957e
Branches Tags
Yangwl:master
..
compare: Yangwl:c351cd809aa75671df568f83a1bfe2c4c54e34c2
Branches Tags
Yangwl:master

No commits in common. 'ef2ed73f53e7292c2cc6a525990eb70f2a0a957e' and 'c351cd809aa75671df568f83a1bfe2c4c54e34c2' have entirely different histories.
ef2ed73f53 ... c351cd809a

6 changed files with 71 additions and 76 deletions
Show Stats

2
src/pages/login/login/index.vue
Unescape Escape View File

@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version); // console.log('Version////', this.Version);
} }
///********版本号修改区域********** ///********版本号修改区域**********
version = '0.0.179'; //正式版本号 version = '0.0.173'; //正式版本号
//version = '0.0.14'; //测试版本号 //version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true; //isTest = true;

16
src/pages/wms/Raw/ProductionREQ/index.vue
Unescape Escape View File

@ -43,18 +43,8 @@
</view> </view>
<view class="row-list"> <view class="row-list">
<view class="row-list-item1"> <view class="row-list-item1">
<view class="list-item"> 应出: </view> <view class="list-item"> 应出/已出: </view>
<view> {{ item.planNumber }} </view> <view> {{ item.planNumber }}/{{ item.outNumber }} </view>
</view>
<view class="row-list-item2">
<view class="list-item"> 已出: </view>
<view> {{ item.outNumber }} </view>
</view>
</view>
<view class="row-list">
<view class="row-list-item1">
<view class="list-item"> 未出: </view>
<view> {{ parseFloat(item.planNumber) - parseFloat(item.outNumber) }} </view>
</view> </view>
<view class="row-list-item2"> <view class="row-list-item2">
<view class="list-item"> 单位: </view> <view class="list-item"> 单位: </view>
@ -503,7 +493,7 @@ body {
background-color: #fff; background-color: #fff;
padding: 20rpx 20rpx 20rpx; padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
height: 350rpx; height: 340rpx;
overflow: scroll; overflow: scroll;
margin-bottom: 6rpx; margin-bottom: 6rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);

50
src/pages/wms/Raw/ReceiveSRM/index.vue
Unescape Escape View File

@ -277,37 +277,27 @@ export default class receiveSRM extends BasePage {
}; };
await this.model.PurchaseOrderPda(query); await this.model.PurchaseOrderPda(query);
let prodlist = model.orderNoItemList; let prodlist = model.orderNoItemList;
if (prodlist.length > 0) { this.reducelist = this.uniqueArray(prodlist);
this.isdisabled = false; this.reducelist.forEach((item) => {
this.reducelist = this.uniqueArray(prodlist); item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
this.reducelist.forEach((item) => { item.label = item.materialDesc;
item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/)); });
item.label = item.materialDesc; console.log('this.reducelist', this.reducelist);
}); this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0];
console.log('this.reducelist', this.reducelist); this.oldprodlist = prodlist.map((item) => {
this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0]; let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
this.oldprodlist = prodlist.map((item) => { return {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); ...item,
return { handlematerialCode: newmaterialCode,
...item, realityaddNumber: item.realityNumber,
handlematerialCode: newmaterialCode, };
realityaddNumber: item.realityNumber, });
}; this.list = this.oldprodlist.filter((item) => {
}); return item.handlematerialCode == this.bimWl.value;
this.list = this.oldprodlist.filter((item) => { });
return item.handlematerialCode == this.bimWl.value;
});
//查询标志卡 //查询标志卡
this.querycard(); this.querycard();
} else {
(this.$refs.uToast as any).show({
title: '请去到货登记!',
type: 'default',
duration: 3000,
});
this.isdisabled = true;
}
} }
//查询标志卡 //查询标志卡
async querycard() { async querycard() {

74
src/pages/wms/Raw/ReturnMaterials/index.vue
Unescape Escape View File

@ -12,19 +12,25 @@
<u-form-item label="退料单"> <u-form-item label="退料单">
<u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search> <u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
</u-form-item> </u-form-item>
<!-- <u-form-item label="标志卡"> <!-- <u-form-item label="库区">
<u-search placeholder="请扫描" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search> <u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
</u-form-item>
<u-form-item label="仓库">
{{ waCodeList && waCodeList.warehouseName }}
</u-form-item> --> </u-form-item> -->
<u-form-item label="标志卡">
<u-search placeholder="请扫描" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
</u-form-item>
</u-form> </u-form>
<u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" style="margin-top: 1rpx; background-color: #ffffff" class="form3"> <u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" :style="{ marginTop: '1rpx', backgroundColor: item.planNumber <= item.returnNumber ? '#4eea9b59' : '#ffffff' }" class="form3">
<view class="list"> <view class="list">
<view class="row-list"> <view class="row-list">
<view style="width: 25%" class="list-item"> 退料单: </view> <view style="width: 25%" class="list-item"> 退料单: </view>
<view style="width: 80%"> {{ item.procureCode }} </view> <view style="width: 80%"> {{ item.produceCode }} </view>
</view> </view>
<view class="row-list"> <view class="row-list">
<view style="width: 25%" class="list-item"> 标志卡: </view> <view style="width: 25%" class="list-item"> 过账凭证: </view>
<view> {{ item.sn }} </view> <view style="width: 80%"> {{ item.userDefined9 || '' }} </view>
</view> </view>
<view class="row-list"> <view class="row-list">
<view style="width: 25%" class="list-item"> 物料编码: </view> <view style="width: 25%" class="list-item"> 物料编码: </view>
@ -35,10 +41,6 @@
<view style="width: 80%"> {{ item.materialDesc }} </view> <view style="width: 80%"> {{ item.materialDesc }} </view>
</view> </view>
<view class="row-list"> <view class="row-list">
<view style="width: 25%" class="list-item"> 数量: </view>
<view style="width: 80%"> {{ item.planNumber }} </view>
</view>
<!-- <view class="row-list">
<view class="row-list-item1"> <view class="row-list-item1">
<view class="list-item"> 计划/已退: </view> <view class="list-item"> 计划/已退: </view>
<view> {{ item.planNumber }}/{{ item.returnNumber }} </view> <view> {{ item.planNumber }}/{{ item.returnNumber }} </view>
@ -47,12 +49,12 @@
<view class="list-item"> 单位: </view> <view class="list-item"> 单位: </view>
<view> {{ item.unit }} </view> <view> {{ item.unit }} </view>
</view> </view>
</view> --> </view>
</view> </view>
</u-form> </u-form>
</view> </view>
<!-- <view style="height: 14rpx"></view> --> <!-- <view style="height: 14rpx"></view> -->
<!-- <view class="scroll"> <view class="scroll">
<view v-for="(item, index) in list" :key="item.id"> <view v-for="(item, index) in list" :key="item.id">
<u-form style="margin-top: 10rpx" class="form2"> <u-form style="margin-top: 10rpx" class="form2">
<view class="list"> <view class="list">
@ -80,17 +82,17 @@
</view> </view>
</u-form> </u-form>
</view> </view>
</view> --> </view>
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
<!-- 确定 --> <!-- 确定 -->
<u-col :span="12"> <u-col :span="6">
<u-button @click="onSubmit" type="primary">一键回仓</u-button> <u-button @click="onSubmit" type="primary">确认入库</u-button>
</u-col> </u-col>
<!-- 返回 --> <!-- 返回 -->
<!-- <u-col :span="6"> <u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})">返回</u-button> <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
</u-col> --> </u-col>
</u-row> </u-row>
</view> </view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
@ -161,9 +163,10 @@ export default class ReturnMaterials extends BasePage {
await this.model.ProductionMaterialRequisition(this.orderNo); await this.model.ProductionMaterialRequisition(this.orderNo);
if (model.orderNoItemList) { if (model.orderNoItemList) {
this.materilist = []; this.materilist = [];
// this.list = []; this.list = [];
this.materilist = model.orderNoItemList; this.materilist = model.orderNoItemList;
this.materilist.forEach((item) => { this.materilist.forEach((item) => {
item.returnoutNumber = item.returnNumber;
item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
}); });
} else { } else {
@ -231,19 +234,33 @@ export default class ReturnMaterials extends BasePage {
}); });
return; return;
} }
// if (this.areaCode == '') {
// if (this.list.length == 0 || this.list == '') {
// (this.$refs.uToast as any).show({ // (this.$refs.uToast as any).show({
// title: '请先扫描标志卡', // title: '请先扫描或输入库区',
// // url: '/pages/user/index' // type: 'default',
// }); // });
// return; // return;
// } // }
// if (Object.keys(this.waCodeList).length == 0) {
// (this.$refs.uToast as any).show({
// title: '没有仓库信息',
// type: 'default',
// });
// return;
// }
if (this.list.length == 0 || this.list == '') {
(this.$refs.uToast as any).show({
title: '请先扫描标志卡',
// url: '/pages/user/index'
});
return;
}
let params = []; let params = [];
this.materilist.map((item) => { this.list.map((item) => {
params.push({ params.push({
createBy: session.loginName, createBy: session.loginName,
factoryCode: item.siteCode, factoryCode: session.FactoryCode,
// whCode: this.waCodeList.warehouseCode, // whCode: this.waCodeList.warehouseCode,
// waCode: this.areaCode, // waCode: this.areaCode,
planNumber: item.planNumber, planNumber: item.planNumber,
@ -252,7 +269,7 @@ export default class ReturnMaterials extends BasePage {
materialCode: item.materialCode, materialCode: item.materialCode,
materialDesc: item.materialDesc, materialDesc: item.materialDesc,
userDefined3: item.userDefined4, userDefined3: item.userDefined4,
sn: item.sn, sn: item.userDefined1,
userDefined5: item.userDefined7 || null, userDefined5: item.userDefined7 || null,
}); });
}); });
@ -273,12 +290,11 @@ export default class ReturnMaterials extends BasePage {
} }
} }
mepty() { mepty() {
// this.list = []; this.list = [];
this.materilist = []; this.materilist = [];
this.orderNo = '';
//this.areaCode = ''; //this.areaCode = '';
//this.waCodeList = {}; //this.waCodeList = {};
//this.query(); this.query();
} }
delet(deletobj, index) { delet(deletobj, index) {
this.list.splice(index, 1); this.list.splice(index, 1);
@ -401,7 +417,7 @@ body {
background-color: #fff; background-color: #fff;
padding: 20rpx 20rpx 20rpx; padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
height: 310rpx; height: 260rpx;
overflow: scroll; overflow: scroll;
margin-bottom: 6rpx; margin-bottom: 6rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);

4
src/pages/wms/Raw/ReturnMaterials/model.ts
Unescape Escape View File

@ -13,8 +13,8 @@ export class ReturnMaterials extends VuexModule {
orderNoItemList: any = []; orderNoItemList: any = [];
@MutationAction @MutationAction
async ProductionMaterialRequisition(orderNo: any) { async ProductionMaterialRequisition(orderNo: any) {
const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.newselectOrderCardTLTWO, { const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.listReturnSC, {
procureCode: orderNo, produceCode: orderNo,
factoryCode: session.FactoryCode, factoryCode: session.FactoryCode,
}); });
// http.defaults.headers.common['Accept-Language'] = session.PoolName; // http.defaults.headers.common['Accept-Language'] = session.PoolName;

1
src/utils/url.ts
Unescape Escape View File

@ -174,7 +174,6 @@ export const url = {
listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC', listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC',
addReturnSC: qianzhuione + '/wms/WmsToWCSmission/addReturnSC', addReturnSC: qianzhuione + '/wms/WmsToWCSmission/addReturnSC',
selectOrderCardTL: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTL', selectOrderCardTL: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTL',
newselectOrderCardTLTWO: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTLTWO',
}, },
TrayStatusUpdate: { TrayStatusUpdate: {
out: qianzhuione + '/wms/order/TraystatusUpdate', out: qianzhuione + '/wms/order/TraystatusUpdate',

Write Preview
Loading…
Cancel
Save