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

Overseamom-296 feat sto增加查询条件pick增加库位下拉

Browse Source
master
mabaoyan 2 years ago
parent c6f586fecd
commit c415b2a546
7 changed files with 171 additions and 83 deletions
Show Stats Download Patch File Download Diff File

3
src/pages/product/stoOutbound/config.ts
Unescape Escape View File

@ -41,6 +41,7 @@ export const headers = [
{ {
label: vm.$t('message.scanDate'), label: vm.$t('message.scanDate'),
key: 'createdDate', key: 'createdDate',
width: 300, width: 400,
}, },
]; ];

104
src/pages/product/stoOutbound/detail.vue
Unescape Escape View File

@ -9,8 +9,18 @@
<view class="right"></view> <view class="right"></view>
</view> </view>
<view class="table-wrapper"> <view class="table-wrapper">
<wyb-table class="table" ref="table" width="100%" @onCheck='onCheck' show-left-and-right-border :headers="headers" :contents="model.stoBarcodeList" enable-check='single' :show-vert-border="false"></wyb-table> <view style="padding: 0 7px">
<u-form labelPosition="left" :model="searchData" ref="uForm">
<u-form-item label="Scan User" borderBottom ref="item1">
<u-input v-model="searchData.createdBy" :border="true" @input="inputChange"></u-input>
</u-form-item>
<u-form-item label="Scan Date" borderBottom ref="item2">
<u-input v-model="searchData.date" :border="true" @click="inputClick" type="select"></u-input>
</u-form-item>
</u-form>
</view>
<wyb-table class="table" ref="table" width="100%" @onCheck="onCheck" show-left-and-right-border :headers="headers" :contents="model.stoBarcodeList" enable-check="single" :show-vert-border="false"></wyb-table>
</view> </view>
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
@ -19,6 +29,7 @@
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
<u-picker v-model="show" mode="time" @confirm="dateConfirm"></u-picker>
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -28,18 +39,27 @@ import model from './model';
import { headers } from './config'; import { headers } from './config';
import { session } from '@/store/modules/session'; import { session } from '@/store/modules/session';
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawReceiptDetail extends BasePage {
model = model; model = model;
headers = headers; headers = headers;
seleteData={} searchData = {
onCheck(data){ createdBy: '',
this.seleteData=data.data; date: '',
};
show = false;
seleteData = {};
stoNo: '';
onLoad(options) {
console.log(options);
this.stoNo = options.stoNo;
} }
async Delete(){ onCheck(data) {
console.log("2222ss",this.seleteData) this.seleteData = data.data;
console.log("1111ss",this.seleteData[0].lineData.barcode) }
async Delete() {
console.log('2222ss', this.seleteData);
console.log('1111ss', this.seleteData[0].lineData.barcode);
const barcode = this.seleteData[0].lineData.barcode; const barcode = this.seleteData[0].lineData.barcode;
const stoNo = this.seleteData[0].lineData.stoNo; const stoNo = this.seleteData[0].lineData.stoNo;
const stoItem = this.seleteData[0].lineData.stoItem; const stoItem = this.seleteData[0].lineData.stoItem;
@ -56,17 +76,38 @@ export default class RawReceiptDetail extends BasePage {
}; };
await this.model.deleteBarcode(SunmitList); await this.model.deleteBarcode(SunmitList);
if (this.model.DeleteCode == 1) { if (this.model.DeleteCode == 1) {
let index = this.model.stoBarcodeList.findIndex(val=>val.barcode==barcode); this.searchDataList();
this.model.stoBarcodeList.splice(index,1); this.seleteData = [];
this.seleteData=[];
uni.showToast({ uni.showToast({
title: this.$t('message.success') as string, title: this.$t('message.success') as string,
image: '/static/icons/icon-51.png', image: '/static/icons/icon-51.png',
}); });
this.seleteData={}; this.seleteData = {};
} }
// await this.model.QueryStoDetail // await this.model.QueryStoDetail
} }
inputClick() {
console.log(11111);
this.show = true;
}
inputChange(){
this.searchDataList();
}
dateConfirm(value) {
this.searchData.date = value.year + '-' + value.month + '-' + value.day;
this.searchDataList();
}
async searchDataList() {
const params = {
factoryCode: session.factoryCode,
loginName: session.loginName,
stoNo: this.stoNo,
createdDate: this.searchData.date,
createdBy:this.searchData.createdBy
};
await this.model.QueryStoDetail(params);
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -127,4 +168,41 @@ export default class RawReceiptDetail extends BasePage {
padding: 20rpx; padding: 20rpx;
} }
} }
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-left {
width: 100%;
height: 100%;
display: flex;
view {
width: 140rpx;
line-height: 100rpx;
text-align: left;
}
}
.material-right {
width: 100%;
height: 100%;
display: flex;
.material-right-title {
width: 180rpx;
height: 100%;
line-height: 100rpx;
}
.material-right-code {
width: 80%;
height: 100%;
line-height: 100rpx;
text-align: left;
padding-left: 10px;
}
}
}
</style> </style>

3
src/pages/product/stoOutbound/index.vue
Unescape Escape View File

@ -241,7 +241,8 @@ export default class dnReceiptDom extends BasePage {
}; };
await this.model.QueryStoDetail(params); await this.model.QueryStoDetail(params);
uni.setStorageSync('factory', JSON.stringify(params) as any); uni.setStorageSync('factory', JSON.stringify(params) as any);
this.toPage(this.page.product.stoOutbound.datile); let url = `${this.page.product.stoOutbound.datile}?stoNo=${this.stoNo}`
this.toPage(url);
} }
//确认弹窗 //确认弹窗
async Confirm() { async Confirm() {

4
src/pages/product/stoOutbound/model.ts
Unescape Escape View File

@ -2,6 +2,7 @@ import { getModule,Action, Module, MutationAction, VuexModule } from 'vuex-modul
import store from '@/store'; import store from '@/store';
import http from '@/utils/request'; import http from '@/utils/request';
import { url } from '@/utils/url'; import { url } from '@/utils/url';
import moment from 'moment'
import { session } from '@/store/modules/session'; import { session } from '@/store/modules/session';
@Module({ @Module({
namespaced: true, namespaced: true,
@ -110,6 +111,9 @@ export class ReceiptModule extends VuexModule {
async QueryStoDetail(content: any) { async QueryStoDetail(content: any) {
const res: any = await http.post(url.outbound.stoOutbound.stoDetailQuery, content); const res: any = await http.post(url.outbound.stoOutbound.stoDetailQuery, content);
const stoBarcodeList = res.data; const stoBarcodeList = res.data;
stoBarcodeList.forEach(element => {
element.createdDate = moment(element.createdDate).format('YYYY-MM-DD hh:mm:ss')
});
return {stoBarcodeList}; return {stoBarcodeList};
} }

8
src/pages/raw/handover/aggregating-Vn/index.vue
Unescape Escape View File

@ -229,12 +229,12 @@ export default class Aggregating extends BasePage {
this.form.sapFactoryCode = session.factoryCode; this.form.sapFactoryCode = session.factoryCode;
//this.form.requestTime = this.getNowFormatDate(); //this.form.requestTime = this.getNowFormatDate();
//设置开始时间，结束时间 //设置开始时间，结束时间
const today = moment(); // 获取当前时间 const first_month = moment().startOf('month').format('YYYY-MM-DD'); // 获取当前月的第一天
const last_month = today.clone().subtract(1, 'month'); // 获取一个月前的日期 const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
//开始时间 //开始时间
this.form.requestTimeFrom = last_month.format('YYYY-MM-DD'); this.form.requestTimeFrom = first_month;
//结束时间 //结束时间
this.form.requestTimeTo = moment().format('YYYY-MM-DD'); this.form.requestTimeTo = last_month;
} }
bookTypeChange(e: any) { bookTypeChange(e: any) {
console.log('///', e); console.log('///', e);

129
src/pages/raw/handover/picking-vn/index.vue
Unescape Escape View File

@ -50,16 +50,16 @@
<!-- 已拣配数量 --> <!-- 已拣配数量 -->
<uni-th width="80" align="center">Picked Qty</uni-th> <uni-th width="80" align="center">Picked Qty</uni-th>
<!-- 本次拣配数量 --> <!-- 本次拣配数量 -->
<uni-th width="80" align="center">Qty</uni-th> <uni-th width="120" align="center">Qty</uni-th>
<uni-th width="380" align="center">{{ $t('message.product_Location') }} </uni-th> <uni-th width="80" align="center">{{ $t('message.product_Location') }} </uni-th>
<uni-th width="50" align="center">{{ $t('message.Pi_materielNo') }}</uni-th> <uni-th width="100" align="center">{{ $t('message.Pi_materielNo') }}</uni-th>
<uni-th width="100" align="center">{{ $t('message.CommissionedMaterielDesc') }}</uni-th> <uni-th width="300" align="center">{{ $t('message.CommissionedMaterielDesc') }}</uni-th>
<uni-th width="100" align="center">{{ $t('message.Summary_ProductionDate') }}</uni-th> <!-- <uni-th width="120" align="center">{{ $t('message.Summary_ProductionDate') }}</uni-th> -->
<uni-th width="50" align="center">{{ $t('message.product_FGCode') }}</uni-th> <!-- <uni-th width="50" align="center">{{ $t('message.product_FGCode') }}</uni-th>
<uni-th width="50" align="center">FG desc</uni-th> <uni-th width="50" align="center">FG desc</uni-th> -->
</uni-tr> </uni-tr>
<!-- 表格数据行 --> <!-- 表格数据行 -->
<uni-tr v-for="(item, index) in model.proOrderList" :key="index"> <uni-tr v-for="(item, index) in model.proOrderList" :key="index" class="tr">
<uni-td align="center">{{ item.prdOrder }}</uni-td> <uni-td align="center">{{ item.prdOrder }}</uni-td>
<uni-td align="center"> <uni-td align="center">
<view>{{ item.amount }}</view> <view>{{ item.amount }}</view>
@ -69,8 +69,10 @@
<view>{{ item.totalMoAmount }}</view> <view>{{ item.totalMoAmount }}</view>
</uni-td> </uni-td>
<!-- 本次拣配数量 --> <!-- 本次拣配数量 -->
<uni-td align="center"> <uni-td width="120" align="center">
<u-input type="number" v-model="item.currentAmount" /> <view class="td_input">
<u-input type="number" v-model="item.currentAmount" />
</view>
</uni-td> </uni-td>
<!-- 原本次拣配数量 --> <!-- 原本次拣配数量 -->
<!-- <uni-td align="center"> <!-- <uni-td align="center">
@ -80,32 +82,30 @@
</view> </view>
</uni-td> --> </uni-td> -->
<uni-td align="center"> <uni-td align="center">
<!-- 地址可选 --> <view class="td_select">
<!-- <view @click="selectClick(index)">{{ <!-- 地址可选 -->
loclist.forEach((item) => { <view @click="selectClick(index)">{{item.wkposCode}}
if (item.label == loc) { <!-- {{
return true; loclist.find((item) => {return item.label == loc}) ? loc : '0011'
} }} -->
}) </view>
? loc <!-- 库位改成可手动修改 -->
: '-' <!-- <uni-td align="center">
}}</view> --> <u-input v-model="item.wkposCode" />
<!-- 库位改成可手动修改 --> </uni-td> -->
<uni-td align="center"> <!-- 此处为地址展示,字段替换下方loc即可 -->
<u-input v-model="item.wkposCode" /> <!-- <view>{{ item.wkposCode }}</view> -->
</uni-td>
<!-- 此处为地址展示,字段替换下方loc即可 -->
<!-- <view>{{ item.wkposCode }}</view> -->
<!-- <view v-if="index == indexChoose"> <view v-if="index == indexChoose">
<u-select v-model="showList" :list="loclist" @confirm="locConfirm" :default-value="subjectAarr"></u-select> <u-select v-model="showList" :list="loclist" @confirm="locConfirm" :default-value="subjectAarr"></u-select>
</view> --> </view>
</view>
</uni-td> </uni-td>
<uni-td align="center">{{ item.materialCode }}</uni-td> <uni-td align="center">{{ item.materialCode }}</uni-td>
<uni-td align="center">{{ item.materialDesc }}</uni-td> <uni-td align="left">{{ item.materialDesc }}</uni-td>
<uni-td align="center">{{ item.requireDate }}</uni-td> <!-- <uni-td align="center">{{ item.requireDate }}</uni-td> -->
<uni-td align="center">{{ item.prodCode }}</uni-td> <!-- <uni-td align="center">{{ item.prodCode }}</uni-td>
<uni-td align="center">{{ item.prodDesc }}</uni-td> <uni-td align="center">{{ item.prodDesc }}</uni-td> -->
</uni-tr> </uni-tr>
</uni-table> </uni-table>
</view> </view>
@ -155,14 +155,13 @@ export default class pickingDom extends BasePage {
*/ */
indexChoose = -1; indexChoose = -1;
amountChange = null; amountChange = null;
// showList = false; showList = false;
// loc = '0'; loc = '0';
// subjectAarr = [0]; subjectAarr = [0];
// loclist = [ loclist = [
// { value: 0, label: '篮球1234123' }, { value: '0', label: '0011' },
// { value: 1, label: '篮球2123123' }, { value: '1', label: '0029' },
// { value: 2, label: '篮球31232131' }, ];
// ];
arrList = []; arrList = [];
selectIndex = []; selectIndex = [];
tableData = []; tableData = [];
@ -280,10 +279,10 @@ export default class pickingDom extends BasePage {
this.mrpFlag = false; this.mrpFlag = false;
this.$form.setRules(this.mrpRules); this.$form.setRules(this.mrpRules);
//设置开始时间，结束时间 //设置开始时间，结束时间
const today = moment(); // 获取当前时间 const first_month = moment().startOf('month').format('YYYY-MM-DD'); // 获取当前月的第一天
const last_month = today.clone().subtract(1, 'month'); // 获取一个月前的日期 const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
this.form.requireDateRegionFrom = last_month.format('YYYY-MM-DD'); this.form.requireDateRegionFrom = first_month;
this.form.requireDateRegionTo = moment().format('YYYY-MM-DD'); this.form.requireDateRegionTo = last_month;
} else { } else {
this.mrpFlag = true; this.mrpFlag = true;
this.$form.setRules(this.rules); this.$form.setRules(this.rules);
@ -408,29 +407,19 @@ export default class pickingDom extends BasePage {
/** /**
* 点击地址选项触发下拉操作 * 点击地址选项触发下拉操作
*/ */
// selectClick(index) { selectClick(index) {
// console.log('触发了select', index); console.log('触发了select', index);
// this.showList = true; this.showList = true;
// this.indexChoose = index; this.indexChoose = index;
// } }
/** /**
* 地址选项确认操作 * 地址选项确认操作
*/ */
// locConfirm(e) { locConfirm(e) {
// console.log(e); this.loc = e[0].label;
// this.loc = e[0].label; this.model.proOrderList[this.indexChoose].wkposCode = e[0].label
// // this.selectDefault[0] = e[0].value; }
// let index = 0;
// for (let i = 0; i < this.loclist.length; i++) {
// if (this.loclist[i].value == e[0].value) {
// index = i;
// break;
// }
// }
// this.subjectAarr[0] = index;
// console.log('点击执行后', this.showList);
// }
} }
</script> </script>
@ -498,4 +487,16 @@ export default class pickingDom extends BasePage {
padding: 20rpx; padding: 20rpx;
} }
} }
.tr{
height: 10px;
}
.td_input{
border: 1px solid rgb(228, 225, 225);
border-radius: 2px;
padding-left: 2px;
}
.td_select{
border: 1px solid rgb(228, 225, 225);
height: 30px;
}
</style> </style>

3
src/pages/raw/handover/picking-vn/model.ts
Unescape Escape View File

@ -244,6 +244,9 @@ export class PickingModule extends VuexModule {
// }); // });
vm.customToast(vm.$t('message.Pi_NoDataFound') as any); vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
} }
proOrderList.forEach(element => {
element.wkposCode = '0011'
});
// 返回的是proOrderList数组 // 返回的是proOrderList数组
console.log({ proOrderList }, 1111111111); console.log({ proOrderList }, 1111111111);
return { proOrderList }; return { proOrderList };

Write Preview
Loading…
Cancel
Save