Browse Source

报废申请

wms3.0_pda
lijuncheng 9 months ago
parent
commit
f0cb753b3f
  1. 4
      api/request2.js
  2. 1
      mycomponents/scan/winScanPackAndLocation.vue
  3. 7
      pages/package/record/mergePackageRecord.vue
  4. 7
      pages/package/record/overPackageRecord.vue
  5. 5
      pages/package/record/splitPackageRecord.vue
  6. 7
      pages/pallet/record/unBindPalletRecord.vue
  7. 3
      pages/productDismantle/coms/requestInfoPopup.vue
  8. 6
      pages/productDismantle/job/productDismantleDetail.vue
  9. 7
      pages/productPutaway/job/productPutawayDetail.vue
  10. 1
      pages/putaway/job/putawayDetail.vue
  11. 836
      pages/scrap/record/scrapRecord.vue
  12. 78
      pages/scrap/request/scrapRequestCreate.vue
  13. 1
      pages/unPlanned/record/issueRecord.vue
  14. 1
      pages/unPlanned/record/receiptRecord.vue
  15. 1
      static/config.json

4
api/request2.js

@ -2687,8 +2687,8 @@ export function getScrapRequestDetail(id) {
*/ */
export function scrapRequestCreate(params) { export function scrapRequestCreate(params) {
return request({ return request({
url: baseApi + "/wms/scrap-job-main/create", url: baseApi + "/wms/scrap-request-main/create",
method: "put", method: "post",
data: params, data: params,
}); });
} }

1
mycomponents/scan/winScanPackAndLocation.vue

@ -139,6 +139,7 @@
this.$refs.popup.open('bottom'); this.$refs.popup.open('bottom');
this.fromInventoryStatuses = jobContent.outInventoryStatuses this.fromInventoryStatuses = jobContent.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //; // this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //; //
debugger
this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); // this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //
}, },

7
pages/package/record/mergePackageRecord.vue

@ -44,10 +44,13 @@
<script> <script>
import { import {
goHome, goHome
} from '@/common/basic.js';
import {
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray getDirectoryItemArray
} from '@/common/basic.js'; } from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,

7
pages/package/record/overPackageRecord.vue

@ -41,10 +41,13 @@
<script> <script>
import { import {
goHome, goHome
} from '@/common/basic.js';
import {
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray getDirectoryItemArray
} from '@/common/basic.js'; } from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,

5
pages/package/record/splitPackageRecord.vue

@ -41,9 +41,12 @@
<script> <script>
import { import {
goHome, goHome,
} from '@/common/basic.js';
import {
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray getDirectoryItemArray
} from '@/common/basic.js'; } from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,

7
pages/pallet/record/unBindPalletRecord.vue

@ -47,9 +47,12 @@
getContainerDetailByNumber getContainerDetailByNumber
} from '@/api/request.js'; } from '@/api/request.js';
import { import {
goHome, goHome
getDirectoryItemArray
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getDirectoryItemArray
} from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,

3
pages/productDismantle/coms/requestInfoPopup.vue

@ -45,10 +45,11 @@
<script> <script>
import { import {
dateFormat, dateFormat,
getDirectoryItemArray,
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getDirectoryItemArray,
getInventoryStatusDesc, getInventoryStatusDesc,
getLocationTypeNameList getLocationTypeNameList
} from '@/common/directory.js'; } from '@/common/directory.js';

6
pages/productDismantle/job/productDismantleDetail.vue

@ -64,8 +64,12 @@
getCurrDateTime, getCurrDateTime,
navigateBack, navigateBack,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName,
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getInventoryStatusName
} from '@/common/directory.js';
import { import {
getLocationTypeArray getLocationTypeArray
} from '@/common/array.js'; } from '@/common/array.js';

7
pages/productPutaway/job/productPutawayDetail.vue

@ -64,8 +64,13 @@
getCurrDateTime, getCurrDateTime,
navigateBack, navigateBack,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName,
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getInventoryStatusName,
getInventoryStatusDesc,
getDirectoryItemArray
} from '@/common/directory.js';
import { import {
getLocationTypeArray getLocationTypeArray
} from '@/common/array.js'; } from '@/common/array.js';

1
pages/putaway/job/putawayDetail.vue

@ -183,7 +183,6 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
that.jobContent.outInventoryStatuses='INSP'
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)

836
pages/scrap/record/scrapRecord.vue

@ -1,428 +1,408 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view> <com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="fromLocationCode!=''"> <view class="page-wraper" v-if="fromLocationCode!=''">
<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0"> <view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;"> <view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
报废原因 : 报废原因 :
</view> </view>
<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;" <uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList" class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList"
v-model="reason"> v-model="reason">
</uni-data-picker> </uni-data-picker>
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
scrapRequestSubmit, scrapRecordSubmit
scrapRecordSubmit } from '@/api/request2.js';
} from '@/api/request2.js';
import {
import { goHome,
goHome, updateTitle,
updateTitle, getScarpReasonList
getScarpReasonList } from '@/common/basic.js';
} from '@/common/basic.js';
import {
import { getInventoryStatusDesc,
getInventoryStatusDesc, getDirectoryItemArray,
getDirectoryItemArray, } from '@/common/directory.js';
} from '@/common/directory.js';
import {
import { getBusinessType,
getBusinessType, createItemInfo,
createItemInfo, createDetailInfo,
createDetailInfo, calcHandleQty
calcHandleQty } from '@/common/record.js';
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
export default { components: {
components: { winScanButton,
winScanButton, winScanPack,
winScanPack, requiredLocation,
requiredLocation, comBlankView,
comBlankView, winScanLocation,
winScanLocation, comMessage,
comMessage, winScanPackAndLocation,
winScanPackAndLocation, recordComDetailCard
recordComDetailCard },
}, data() {
data() { return {
return { id: '',
id: '', receiptJob: {},
receiptJob: {}, received: false,
received: false, isShowPackingCode: true,
isShowPackingCode: true, scanCount: 0,
scanCount: 0, dataContent: {}, //
dataContent: {}, // subList: [], //subList
subList: [], //subList detailSource: [], //
detailSource: [], // locationTypeList: [],
locationTypeList: [], toLocationInfo: {},
toLocationInfo: {}, businessTypeInfo: {},
businessTypeInfo: {}, fromLocationInfo: {},
fromLocationInfo: {}, fromLocationCode: "",
fromLocationCode: "", isShowLocation: false,
isShowLocation: false, fromlocationTypeList: [],
fromlocationTypeList: [], tolocationTypeList: [],
tolocationTypeList: [], allowModifyLocation: false,
allowModifyLocation: false, inInventoryStatus: "", //
inInventoryStatus: "", // outInventoryStatus: "", //
outInventoryStatus: "", // businessType: {},
businessType: {}, reasonList: [],
reasonList: [], reason: "",
reason: "", };
fromType:"" },
}; onLoad(option) {
}, this.reasonList = getScarpReasonList();
onLoad(option) { var typeCode = "Scrap"
this.fromType = option.fromType getBusinessType(typeCode, res => {
if(this.fromType=="requestType"){ updateTitle("报废申请") }else { updateTitle("报废记录") } if (res.success) {
this.reasonList = getScarpReasonList(); this.businessType = res.businessType;
var typeCode = "Scrap" this.fromlocationTypeList = res.fromlocationTypeList;
getBusinessType(typeCode, res => { this.tolocationTypeList = res.tolocationTypeList;
if (res.success) { this.showFromLocationPopup();
this.businessType = res.businessType; } else {
this.fromlocationTypeList = res.fromlocationTypeList; this.$refs.comMessage.showBreakMessage(res.message );
this.tolocationTypeList = res.tolocationTypeList; }
this.showFromLocationPopup(); });
} else {
this.$refs.comMessage.showBreakMessage(res.message ); },
} //
}); onNavigationBarButtonTap(e) {
if (e.index === 0) {
}, goHome();
// }
onNavigationBarButtonTap(e) { },
if (e.index === 0) { //
goHome(); onBackPress(e) {},
}
}, onPullDownRefresh() {},
//
onBackPress(e) {}, mounted() {
onPullDownRefresh() {}, },
methods: {
mounted() { getScanResult(result) {
let balance = result.balance;
}, let label = result.label;
methods: { let pack = result.package;
getScanResult(result) { var item = this.detailSource.find(res => {
let balance = result.balance; if (res.itemCode == balance.itemCode) {
let label = result.label; return res
let pack = result.package; }
var item = this.detailSource.find(res => { })
if (res.itemCode == balance.itemCode) { if (item == undefined) {
return res var itemp = createItemInfo(balance, pack);
} let newDetail = createDetailInfo(balance, pack); //
}) itemp.subList.push(newDetail);
if (item == undefined) { this.detailSource.push(itemp)
var itemp = createItemInfo(balance, pack); } else {
let newDetail = createDetailInfo(balance, pack); // var detail = item.subList.find(r => {
itemp.subList.push(newDetail); if (r.packingNumber == balance.packingNumber &&
this.detailSource.push(itemp) r.batch == balance.batch &&
} else { r.locationCode == balance.locationCode &&
var detail = item.subList.find(r => { r.inventoryStatus == balance.inventoryStatus) {
if (r.packingNumber == balance.packingNumber && return r;
r.batch == balance.batch && }
r.locationCode == balance.locationCode && })
r.inventoryStatus == balance.inventoryStatus) { if (detail == undefined) {
return r; let newDetail = createDetailInfo(balance, pack);
} item.subList.push(newDetail);
}) } else {
if (detail == undefined) { if (detail.scaned == true) {
let newDetail = createDetailInfo(balance, pack); this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
item.subList.push(newDetail); }
} else { }
if (detail.scaned == true) { }
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") this.calcHandleQty();
}
} },
}
this.calcHandleQty(); createItemInfo(balance, pack) {
let item = {
}, itemCode: balance.itemCode,
itemName: pack.itemName,
createItemInfo(balance, pack) { stdPackQty: pack.stdPackQty,
let item = { stdPackUnit: pack.stdPackUnit,
itemCode: balance.itemCode, qty: Number(balance.qty),
itemName: pack.itemName, handleQty: 0,
stdPackQty: pack.stdPackQty, uom: pack.uom,
stdPackUnit: pack.stdPackUnit, subList: []
qty: Number(balance.qty), }
handleQty: 0, return item;
uom: pack.uom, },
subList: []
} showErrorMessage(message) {
return item; this.$refs.comMessage.showErrorMessage(message, res => {
}, if (res) {
showErrorMessage(message) { }
this.$refs.comMessage.showErrorMessage(message, res => { });
if (res) { },
calcHandleQty() {
} calcHandleQty(this.detailSource)
}); this.$forceUpdate();
}, },
calcHandleQty() {
calcHandleQty(this.detailSource) updateData() {
this.$forceUpdate(); this.calcHandleQty();
}, },
removeItem(index, item) {
updateData() { this.detailSource.splice(index, 1)
this.calcHandleQty(); },
}, removePack() {
removeItem(index, item) { for (var i = 0; i < this.detailSource.length; i++) {
this.detailSource.splice(index, 1) var item = this.detailSource[i];
}, if (item.subList.length == 0) {
removePack() { this.detailSource.splice(i, 1)
for (var i = 0; i < this.detailSource.length; i++) { }
var item = this.detailSource[i]; }
if (item.subList.length == 0) { this.updateData();
this.detailSource.splice(i, 1) },
}
} openScanPopup() {
this.updateData();
}, if (this.fromLocationCode == "") {
this.showFromLocationPopup();
openScanPopup() { return
}
if (this.fromLocationCode == "") { this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.showFromLocationPopup(); },
return showFromLocationPopup() {
} this.$nextTick(() => {
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); this.$refs.scanLocationCode.openScanPopup();
}, })
showFromLocationPopup() { },
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup(); closeScanPopup() {
}) this.$refs.scanPopup.closeScanPopup();
}, },
closeScanPopup() { scanPopupGetFocus() {
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.getfocus();
}, },
scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); commit() {
}, if(this.reason==""){
this.showMessage("请先选择报废原因")
return;
commit() { }
if(this.reason==""){ //
this.showMessage("请先选择报废原因") uni.showLoading({
return; title: "提交中....",
} mask: true
// });
uni.showLoading({
title: "提交中....",
mask: true // scrapRecordSubmit(params).then(res => {
}); // uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data, )
if(this.fromType=="requestType"){ // } else {
var params = this.setRequestParams(); // this.showErrorMessage("[" + res.msg + "]")
console.log("提交" + JSON.stringify(params)) // }
// scrapRequestSubmit(params).then(res => { // }).catch(error => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // this.showErrorMessage(error)
// this.showCommitSuccessMessage("<br>" + res.data, ) // })
// } else {
// this.showErrorMessage("[" + res.msg + "]") },
// }
// }).catch(error => { setParams() {
// uni.hideLoading() var subList = []
// this.showErrorMessage(error) this.detailSource.forEach(item => {
// }) item.subList.forEach(detail => {
}else { if (detail.scaned) {
// scrapRecordSubmit(params).then(res => { // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
// uni.hideLoading() // detail.packingNumber, detail.batch);
// if (res.data) { // detail.toPackingNumber =info.packingNumber;
// this.showCommitSuccessMessage("<br>" + res.data, ) // detail.toBatch =info.batch;
// } else { subList.push(detail)
// this.showErrorMessage("[" + res.msg + "]") }
// } })
// }).catch(error => { })
// uni.hideLoading() return subList;
// this.showErrorMessage(error) },
// })
} setRequestParams(){
var subList = []
}, var supplierCode=""
this.detailSource.forEach(item => {
setParams() { item.subList.forEach(detail => {
var subList = [] if (detail.scaned) {
this.detailSource.forEach(item => { if(supplierCode==""){
item.subList.forEach(detail => { supplierCode = detail.package.supplierCode
if (detail.scaned) { }
// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, subList.push(detail)
// detail.packingNumber, detail.batch); }
// detail.toPackingNumber =info.packingNumber; })
// detail.toBatch =info.batch; })
subList.push(detail)
} this.dataContent.subList = subList
}) this.dataContent.supplierCode = supplierCode
}) this.dataContent.businessType = "PurchasePutaway"
return subList; this.dataContent.departmentCode= "研发部门";
}, this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
setRequestParams(){ this.dataContent.autoAgree = "FALSE";
var subList = [] this.dataContent.autoExecute = "FALSE";
var supplierCode="" this.dataContent.directCreateRecord = "FALSE";
this.detailSource.forEach(item => { return this.dataContent;
item.subList.forEach(detail => { },
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode showMessage(message) {
} this.$refs.comMessage.showMessage(message, res => {
subList.push(detail) if (res) {}
} });
}) },
}) showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
this.dataContent.subList = subList if (res) {
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway" }
this.dataContent.departmentCode= "研发部门"; });
this.dataContent.status= 1 ; },
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE"; showScanMessage(message) {
this.dataContent.autoExecute = "FALSE"; this.$refs.comMessage.showScanMessage(message);
this.dataContent.directCreateRecord = "FALSE"; },
return this.dataContent;
}, afterCloseMessage() {
this.scanPopupGetFocus();
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { closeScanMessage() {
if (res) {} this.scanPopupGetFocus();
}); },
}, getLocation(location, code) {
showErrorMessage(message) { this.getFromLocationCode(location, code)
this.$refs.comMessage.showErrorMessage(message, res => { },
if (res) { getFromLocationCode(location, code) {
this.fromLocationInfo = location;
} this.fromLocationCode = code;
}); this.openScanPopup();
}, },
showScanMessage(message) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showScanMessage(message); this.$refs.comMessage.showSuccessMessage(hint, res => {
}, this.fromLocationCode = '';
afterCloseMessage() { })
this.scanPopupGetFocus(); },
},
updateData() {
closeScanMessage() { this.calcHandleQty();
this.scanPopupGetFocus(); for (var i = 0; i < this.detailSource.length; i++) {
}, let item = this.detailSource[i];
getLocation(location, code) { if (item.qty == 0) {
this.getFromLocationCode(location, code) this.detailSource.splice(i, 1)
}, }
getFromLocationCode(location, code) { }
this.fromLocationInfo = location; }
this.fromLocationCode = code; }
this.openScanPopup(); }
}, </script>
showCommitSuccessMessage(hint) { <style scoped lang="scss">
this.$refs.comMessage.showSuccessMessage(hint, res => { page {
this.fromLocationCode = ''; width: 100%;
height: 100%;
}) background-color: #fff;
}, }
updateData() { .page-wraper {
this.calcHandleQty(); display: flex;
for (var i = 0; i < this.detailSource.length; i++) { flex-direction: column;
let item = this.detailSource[i]; width: 100%;
if (item.qty == 0) { height: 100%;
this.detailSource.splice(i, 1) }
}
}
} .page-main {
} flex: 1;
} position: relative;
</script> }
<style scoped lang="scss"> .page-main-scroll {
page { position: absolute;
width: 100%; left: 0;
height: 100%; right: 0;
background-color: #fff; top: 0;
} bottom: 0;
}
.page-wraper {
display: flex; .page-main-list {
flex-direction: column; /* height: 80rpx;
width: 100%; line-height: 80rpx; */
height: 100%; text-align: center;
} background: #e0e0e0;
}
.page-main { </style>
flex: 1;
position: relative;
}
.page-main-scroll {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
.page-main-list {
/* height: 80rpx;
line-height: 80rpx; */
text-align: center;
background: #e0e0e0;
}
</style>

78
pages/scrap/request/scrapRequestCreate.vue

@ -5,8 +5,8 @@
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="flex u-col-center" style="width: 100%;background-color:#fff;"> <view class="flex u-col-center" style="width: 100%;background-color:#fff;">
<view class="" style="margin-left: 20rpx; font-size: 30rpx;flex-shrink: 0;">报废原因</view> <view class="" style="margin-left: 20rpx; font-size: 30rpx;flex-shrink: 0;">报废原因</view>
<view style="width: 100%"> <view style="width: 100%">
<uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker' <uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker'
placeholder="请选择报废原因" popup-title="报废原因" :localdata="reasonList" @change="reasonChange"> placeholder="请选择报废原因" popup-title="报废原因" :localdata="reasonList" @change="reasonChange">
</uni-data-picker> </uni-data-picker>
@ -51,18 +51,20 @@
import { import {
scrapRequestCreate, scrapRequestCreate,
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle updateTitle,
getCurrDateOneMonthsTimes,
navigateBack
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray, getDirectoryItemArray,
getScarpReasonList getScarpReasonList
} from '@/common/directory.js'; } from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,
createItemInfo, createItemInfo,
@ -78,7 +80,7 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default { export default {
components: { components: {
winScanButton, winScanButton,
@ -113,9 +115,9 @@
reasonList: [], reasonList: [],
reasonText: "", reasonText: "",
}; };
}, },
onLoad(option) { onLoad(option) {
this.reasonList = getScarpReasonList(); this.reasonList = getScarpReasonList();
var typeCode = "Scrap" var typeCode = "Scrap"
@ -126,7 +128,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message ); this.$refs.comMessage.showBreakMessage(res.message);
} }
}); });
@ -143,7 +145,7 @@
onPullDownRefresh() {}, onPullDownRefresh() {},
mounted() { mounted() {
}, },
methods: { methods: {
getScanResult(result) { getScanResult(result) {
@ -235,11 +237,11 @@
commit() { commit() {
if(this.reasonText==""){ if (this.reasonText == "") {
this.showMessage("请先选择报废原因") this.showMessage("请先选择报废原因")
return; return;
} }
if(this.detailSource.length==0){ if (this.detailSource.length == 0) {
this.showErrorMessage("请先扫描数据") this.showErrorMessage("请先扫描数据")
return; return;
} }
@ -248,46 +250,41 @@
title: "提交中....", title: "提交中....",
mask: true mask: true
}); });
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
// scrapRequestCreate(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)
// })
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
scrapRequestCreate(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成报废出库申请<br>" + res.data, )
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
}, },
setRequestParams(){ setRequestParams() {
var subList = [] var subList = []
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
detail.fromLocationCode = detail.locationCode
subList.push(detail) subList.push(detail)
} }
}) })
}) })
this.dataContent.subList = subList this.dataContent.subList = subList
this.dataContent.businessType = "PurchasePutaway" this.dataContent.status = 1;
this.dataContent.departmentCode= "研发部门"; this.dataContent.fromWarehouseCode = "W1";
this.dataContent.status= 1 ; this.dataContent.dueTime = getCurrDateOneMonthsTimes();
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent; return this.dataContent;
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
@ -324,8 +321,7 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; navigateBack(1)
}) })
}, },

1
pages/unPlanned/record/issueRecord.vue

@ -51,7 +51,6 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import { import {
unPlannedIssueRequestSubmit,
unPlannedIssueRecordSubmit unPlannedIssueRecordSubmit
} from '@/api/request2.js'; } from '@/api/request2.js';

1
pages/unPlanned/record/receiptRecord.vue

@ -52,7 +52,6 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import { import {
unPlannedReceiptRequestbSubmit,
unPlannedReceiptRecordbSubmit unPlannedReceiptRecordbSubmit
} from '@/api/request2.js'; } from '@/api/request2.js';

1
static/config.json

@ -26,6 +26,7 @@
"local": "http://localhost:12080", "local": "http://localhost:12080",
"desc": "api请求地址" "desc": "api请求地址"
}, },
"tenantId": { "tenantId": {
"name": "tenantId", "name": "tenantId",
"value": "1", "value": "1",

Loading…
Cancel
Save