19 changed files with 740 additions and 73 deletions
@ -0,0 +1,87 @@ |
|||
<template> |
|||
<view class=""> |
|||
|
|||
|
|||
<uni-collapse ref="collapse"> |
|||
<uni-collapse-item :open="true"> |
|||
<template v-slot:title> |
|||
<view class="" style="font-size: 32rpx;"> |
|||
<view class="" > |
|||
客户 : {{dataContent.customerName}} ({{dataContent.customerCode}}) |
|||
</view> |
|||
|
|||
<view class=""> |
|||
总数量 : {{dataContent.totalQty}} |
|||
</view> |
|||
</view> |
|||
|
|||
</template> |
|||
<u-line /> |
|||
<uni-swipe-action ref="swipeAction"> |
|||
<view v-for="(item, index) in dataContent.subList" :key="index"> |
|||
<uni-swipe-action-item> |
|||
<view class="" style="font-size: 32rpx;margin: 10rpx;"> |
|||
<view class=""> |
|||
物品代码 : {{item.itemCode}} |
|||
</view> |
|||
<view class=""> |
|||
物品名称 : {{item.itemName}} |
|||
</view> |
|||
|
|||
<view class="uni-flex uni-row uni-center"> |
|||
<view class=""> |
|||
数量 : {{item.qty}} 单位 : |
|||
</view> |
|||
<view class=""> |
|||
<uom :uom="item.uom"></uom> |
|||
</view> |
|||
|
|||
</view> |
|||
|
|||
</view> |
|||
</uni-swipe-action-item> |
|||
<u-line /> |
|||
</view> |
|||
</uni-swipe-action> |
|||
|
|||
</uni-collapse-item> |
|||
</uni-collapse> |
|||
|
|||
|
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import uom from '@/mycomponents/qty/uom.vue' |
|||
export default { |
|||
components: { |
|||
uom |
|||
}, |
|||
data() { |
|||
return { |
|||
|
|||
} |
|||
}, |
|||
props: { |
|||
dataContent: { |
|||
type: Object, |
|||
default: {} |
|||
}, |
|||
}, |
|||
methods: { |
|||
update(){ |
|||
this.$nextTick(r => { |
|||
this.$refs.collapse.resize() |
|||
}); |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style> |
|||
</style> |
|||
@ -0,0 +1,272 @@ |
|||
<template> |
|||
<view class=""> |
|||
<uni-popup ref="popup" :maskClick="false"> |
|||
<view class="uni-flex uni-column pop_customer"> |
|||
<view class="" style="padding:10rpx"> |
|||
<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx"> |
|||
<view class="" style="font-size: 35rpx;"> |
|||
{{title}} |
|||
</view> |
|||
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" |
|||
@click="closeRequestPopup()"></image> |
|||
</view> |
|||
<u-line /> |
|||
<view class="uni-flex uni-column" style="background-color: white; "> |
|||
<view class="uni-flex uni-column "> |
|||
<view class="uni-flex uni-row padding title u-col-center"> |
|||
<text>客户 : </text> |
|||
<view class="uni-flex u-col-center uni-row" @click="showSelect"> |
|||
<view class="" style="margin-left: 20rpx;"> |
|||
{{customerName}} |
|||
</view> |
|||
<u-select v-model="showCustomer" mode="single-column" :list="customerList" |
|||
@confirm="confirmSelect"></u-select> |
|||
</view> |
|||
|
|||
</view> |
|||
<u-line /> |
|||
|
|||
<view class="uni-flex uni-row padding title u-col-center"> |
|||
<text>零件 : </text> |
|||
<view class="uni-flex u-col-center uni-row"> |
|||
<u-input v-model="itemCode" :focus="itemCodeFocus" :border="true" |
|||
placeholder="请输入需求零件" @confirm="itemCodeConfirm" /> |
|||
<image src="/static/search.svg" mode="" |
|||
style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick"> |
|||
</image> |
|||
|
|||
</view> |
|||
</view> |
|||
<u-line /> |
|||
|
|||
<view class="uni-flex uni-row padding title u-col-center"> |
|||
<text>数量 : </text> |
|||
<view class="uni-flex uni-row uni-center" |
|||
style="align-items: center;margin-left: 20rpx;"> |
|||
<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;' |
|||
:focus="numberFocus" @blur='numberFocus = false'> |
|||
</uni-number-box> |
|||
<uom :uom="uom"></uom> |
|||
|
|||
</view> |
|||
</view> |
|||
<u-line /> |
|||
</view> |
|||
</view> |
|||
</view> |
|||
<view class="uni-flex uni-row hide_border"> |
|||
<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button> |
|||
<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button> |
|||
</view> |
|||
</view> |
|||
</uni-popup> |
|||
|
|||
<comMessage ref="comMessage"></comMessage> |
|||
<selectList ref='selectList' @selectedItem="selectedItem"></selectList> |
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
getBasicLocationByCode, |
|||
getBasicItemByCode, |
|||
getProductionlineItem, |
|||
getWorkShopLineStation, |
|||
getBasicCustomerList, |
|||
} from '@/api/request2.js'; |
|||
import { |
|||
getLocationTypeName, |
|||
getListLocationTypeDesc, |
|||
checkDirectoryItemExist |
|||
} from '@/common/directory.js'; |
|||
import uom from '@/mycomponents/qty/uom.vue' |
|||
import balanceStatus from '@/mycomponents/status/balanceStatus.vue' |
|||
import comMessage from '@/mycomponents/common/comMessage.vue' |
|||
import selectList from '@/mycomponents/popup/selectList.vue' |
|||
|
|||
|
|||
export default { |
|||
components: { |
|||
uom, |
|||
balanceStatus, |
|||
comMessage, |
|||
selectList |
|||
}, |
|||
data() { |
|||
return { |
|||
// itemCode: 'CE115F11161AG', |
|||
itemCode: '', |
|||
itemName: "", |
|||
qty: 0, |
|||
itemCodeFocus: false, |
|||
requestInfo: null, |
|||
itemCodeList: [], |
|||
isCheckItemCode: false, |
|||
counQty: 0, |
|||
editPosition: true, |
|||
numberFocus: false, |
|||
uom: "", |
|||
showCustomer: false, |
|||
isModifiedPosition: true, |
|||
customerList: [], |
|||
customerName: "请选择客户", |
|||
customerCode:"" |
|||
} |
|||
}, |
|||
props: { |
|||
title: { |
|||
type: String, |
|||
default: '需求信息' |
|||
}, |
|||
}, |
|||
methods: { |
|||
openRequestPopup(editPosition) { |
|||
if (this.customerList.length == 0) { |
|||
getBasicCustomerList().then(res => { |
|||
if (res.data.length > 0) { |
|||
var list = res.data; |
|||
list.forEach(item => { |
|||
item.label = item.name |
|||
item.value = item.code |
|||
}) |
|||
this.customerList = list; |
|||
} |
|||
}).catch(error => { |
|||
|
|||
}) |
|||
} |
|||
|
|||
this.editPosition = editPosition; |
|||
if (this.isModifiedPosition) { |
|||
this.isModifiedPosition = false |
|||
} else { |
|||
this.itemCode = ""; |
|||
this.uom = "" |
|||
this.qty = 0 |
|||
this.itemCodeGetFocus(); |
|||
} |
|||
|
|||
this.$refs.popup.open('bottom') |
|||
}, |
|||
closeRequestPopup() { |
|||
this.$refs.popup.close() |
|||
}, |
|||
locationConfirm() { |
|||
//查询库位信息 |
|||
this.checkLocatioCode(); |
|||
}, |
|||
itemCodeClick() { |
|||
if (this.customerName == "请选择客户") { |
|||
this.showErrorMessage("请选择客户") |
|||
return |
|||
} |
|||
this.$refs.selectList.queryList(this.customerCode) |
|||
|
|||
}, |
|||
|
|||
itemCodeGetFocus() { |
|||
this.itemCodeFocus = true; |
|||
}, |
|||
itemCodeLoseFocus() { |
|||
this.itemCodeFocus = false; |
|||
}, |
|||
selectedItem(item) { |
|||
this.itemCode = item.itemCode; |
|||
this.checkItemCode(); |
|||
}, |
|||
|
|||
confirm() { |
|||
if (this.itemCode == "" || !this.isCheckItemCode) { |
|||
this.showErrorMessage("请输入零件", "itemCode") |
|||
return |
|||
} |
|||
if (this.qty == 0) { |
|||
this.showErrorMessage("数量必须大于0") |
|||
return |
|||
} |
|||
|
|||
this.callback('add'); |
|||
|
|||
}, |
|||
|
|||
confirmSelect(e){ |
|||
this.customerName = e[0].label |
|||
this.customerCode = e[0].value |
|||
}, |
|||
|
|||
checkItemCode() { |
|||
//校验零件 |
|||
getBasicItemByCode(this.itemCode).then(res => { |
|||
uni.hideLoading(); |
|||
if (res.data != null && res.data.list.length > 0) { |
|||
this.itemCode = res.data.list[0].code; |
|||
this.itemName = res.data.list[0].name |
|||
this.isCheckItemCode = true; |
|||
this.numberFocus = true |
|||
this.uom = res.data.list[0].uom |
|||
} else { |
|||
this.showErrorMessage('未查找到零件【' + this.itemCode + '】', "itemCode"); |
|||
} |
|||
|
|||
}).catch(error => { |
|||
uni.hideLoading(); |
|||
this.showErrorMessage(error, "itemCode"); |
|||
}) |
|||
}, |
|||
|
|||
|
|||
callback(action) { |
|||
let item = { |
|||
customerName :this.customerName, |
|||
customerCode:this.customerCode, |
|||
itemCode: this.itemCode, |
|||
itemName: this.itemName, |
|||
uom: this.uom, |
|||
qty: this.qty |
|||
}; |
|||
this.closeRequestPopup(); |
|||
this.$emit("confirm", action, item); |
|||
}, |
|||
|
|||
showErrorMessage(message, type) { |
|||
setTimeout(r => { |
|||
this.$refs.comMessage.showErrorMessage(message, res => { |
|||
if (type == "itemCode") { |
|||
this.itemCodeGetFocus(); |
|||
} else { |
|||
this.numberFocus = true; |
|||
} |
|||
}) |
|||
if (type == "itemCode") { |
|||
this.itemCode = "" |
|||
this.isCheckItemCode = false; |
|||
} |
|||
}) |
|||
}, |
|||
itemCodeConfirm() { |
|||
this.checkItemCode(); |
|||
}, |
|||
change(value) { |
|||
this.qty = value; |
|||
}, |
|||
cancel(e) { |
|||
this.closeRequestPopup(); |
|||
}, |
|||
showSelect() { |
|||
if (this.editPosition) { |
|||
this.showCustomer = true |
|||
} |
|||
|
|||
}, |
|||
|
|||
|
|||
|
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style lang="scss"> |
|||
.title { |
|||
font-size: 30rpx; |
|||
} |
|||
</style> |
|||
@ -0,0 +1,222 @@ |
|||
<template> |
|||
<view class="page-wraper"> |
|||
<view class="" v-if='detailSource.subList.length==0'> |
|||
<com-blank-view @goScan='goScan(true)'></com-blank-view> |
|||
</view> |
|||
<view v-else class="page-wraper"> |
|||
<view class="page-main"> |
|||
<comDeliverRequestCreator ref="deliverRequest" :dataContent="detailSource"> |
|||
</comDeliverRequestCreator> |
|||
<button class="btn_add" @click="goScan(false)">+去添加</button> |
|||
</view> |
|||
|
|||
<div class="btn_bottom"> |
|||
<view class="" style="display: flex;flex-direction: row;"> |
|||
<view class=""> |
|||
<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button> |
|||
</view> |
|||
</view> |
|||
</div> |
|||
<comMessage ref="comMessage"></comMessage> |
|||
</view> |
|||
</view> |
|||
<comDeliverRequestPopup ref="comDeliverRequestPopup" @confirm='requestConfirm'></comDeliverRequestPopup> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
deliverRequestSubmit, |
|||
issueRecordSubmit |
|||
} from '@/api/request2.js'; |
|||
|
|||
import { |
|||
goHome, |
|||
updateTitle, |
|||
getRemoveOption, |
|||
getISODateTime |
|||
} from '@/common/basic.js'; |
|||
|
|||
import { |
|||
getDataSource |
|||
} from '@/pages/issue/js/issue.js'; |
|||
|
|||
import comBlankView from '@/mycomponents/common/comBlankView.vue' |
|||
import comDeliverRequestPopup from '@/pages/deliver/coms/comDeliverRequestPopup.vue' |
|||
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' |
|||
import comMessage from '@/mycomponents/common/comMessage.vue' |
|||
import comDeliverRequestCreator from '@/pages/deliver/coms/comDeliverRequestCreator.vue' |
|||
|
|||
export default { |
|||
name: 'issueRequestSubmit', |
|||
components: { |
|||
comBlankView, |
|||
comDeliverRequestPopup, |
|||
jobDetailPopup, |
|||
comMessage, |
|||
comDeliverRequestCreator |
|||
}, |
|||
data() { |
|||
return { |
|||
subList: [], //接口返回的任务subList |
|||
detailSource: { |
|||
subList: [] |
|||
}, //绑定在页面上的数据源 |
|||
detailOptions: [], |
|||
scanOptions: [], |
|||
fromType: "", |
|||
dataContent:{} |
|||
|
|||
} |
|||
}, |
|||
mounted() { |
|||
this.goScan(true) |
|||
}, |
|||
onLoad(option) { |
|||
this.fromType = option.fromType |
|||
|
|||
}, |
|||
methods: { |
|||
goScan(editPosition) { |
|||
this.$refs.comDeliverRequestPopup.openRequestPopup(editPosition); |
|||
}, |
|||
|
|||
//确定需求信息 |
|||
requestConfirm(action, item) { |
|||
|
|||
if (this.detailSource.subList.length == 0) { |
|||
this.detailSource = { |
|||
customerCode: item.customerCode, |
|||
customerName: item.customerName, |
|||
totalQty: 0, |
|||
subList: [] |
|||
} |
|||
var subItem = { |
|||
itemCode: item.itemCode, |
|||
itemName: item.itemName, |
|||
qty: item.qty, |
|||
uom: item.uom |
|||
} |
|||
this.detailSource.subList.push(subItem) |
|||
} else { |
|||
var result = this.detailSource.subList.filter(res => { |
|||
if (res.itemCode == item.itemCode && |
|||
res.productionLineCode == item.productionLineCode && |
|||
res.workStationCode == item.workStationCode) { |
|||
return res |
|||
} |
|||
}) |
|||
|
|||
//没有添加数据 |
|||
if (result.length == 0) { |
|||
var subItem = { |
|||
productionLineCode: item.productionLineCode, |
|||
productionLineName: item.productionLineName, |
|||
workStationCode: item.workStationCode, |
|||
workStationName: item.workStationName, //工位 |
|||
itemCode: item.itemCode, |
|||
itemName: item.itemName, |
|||
qty: item.qty, |
|||
uom: item.uom |
|||
} |
|||
|
|||
this.detailSource.subList.push(subItem) |
|||
|
|||
} else { |
|||
//有了更新数据 |
|||
result[0].qty += item.qty |
|||
|
|||
} |
|||
} |
|||
this.caclcQty(); |
|||
if (this.$refs.deliverRequest != undefined) { |
|||
this.$refs.deliverRequest.update() |
|||
} |
|||
}, |
|||
|
|||
caclcQty() { |
|||
var totalQty = 0; |
|||
this.detailSource.subList.forEach(res => { |
|||
totalQty += res.qty |
|||
}) |
|||
this.detailSource.totalQty = totalQty; |
|||
}, |
|||
|
|||
|
|||
setParams() { |
|||
return this.detailSource |
|||
}, |
|||
submit() { |
|||
uni.showLoading({ |
|||
title: "提交中....", |
|||
mask: true |
|||
}); |
|||
|
|||
var params = this.setRequestParams() |
|||
console.log("提交参数", JSON.stringify(params)); |
|||
// deliverRequestSubmit(params).then(res => { |
|||
// uni.hideLoading() |
|||
// if (res.data) { |
|||
// this.showCommitSuccessMessage("提交成功<br>生成成品发货申请" + res.data) |
|||
// } else { |
|||
// this.showErrorMessage("提交失败[" + res.msg + "]") |
|||
// } |
|||
// }).catch(error => { |
|||
// uni.hideLoading() |
|||
// this.showErrorMessage(error) |
|||
// }) |
|||
|
|||
|
|||
}, |
|||
|
|||
setRequestParams(){ |
|||
var subList = [] |
|||
this.detailSource.subList.forEach(detail => { |
|||
debugger |
|||
detail.soNumber = detail.package.soNumber; |
|||
detail.soLine = detail.package.soLine; |
|||
detail.remark ="" |
|||
// soNumber: 926926926, |
|||
// soLine: 926, |
|||
// itemCode: THILDD0A691AG, |
|||
// remark: , |
|||
// qty: 2, |
|||
// uom: EA |
|||
subList.push(detail) |
|||
}) |
|||
|
|||
this.detailSource.subList = subList |
|||
this.detailSource.deliverPlanNumber = "DP20231130-0001" |
|||
this.detailSource.customerCode = this.detailSource.customerCode |
|||
this.detailSource.customerDockCode = "" |
|||
this.detailSource.carrierCode = "" |
|||
this.detailSource.transferMode = "" |
|||
this.detailSource.vehiclePlateNumber = "" |
|||
this.detailSource.remark = "" |
|||
this.detailSource.dueTime = "" |
|||
this.detailSource.departmentCode = "研发部门" |
|||
this.detailSource.status = 1 |
|||
this.detailSource.autoCommit = "FALSE" |
|||
this.detailSource.autoAgree = "FALSE" |
|||
this.detailSource.autoExecute = "FALSE" |
|||
this.detailSource.directCreateRecord = "FALSE" |
|||
|
|||
return this.detailSource; |
|||
}, |
|||
showCommitSuccessMessage(hint) { |
|||
this.$refs.comMessage.showSuccessMessage(hint, res => { |
|||
uni.navigateTo({ |
|||
url: './deliverRequest' |
|||
}) |
|||
}) |
|||
}, |
|||
showErrorMessage(message) { |
|||
this.$refs.comMessage.showErrorMessage(message, res => { |
|||
if (res) {} |
|||
}); |
|||
}, |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style> |
|||
</style> |
|||
Loading…
Reference in new issue