Browse Source

修改直接上架

hella_online_20240829
niexiting 4 months ago
parent
commit
8a53754329
  1. 2
      .env.development
  2. 18
      src/common/style/pdabasic.css
  3. 15
      src/pages.json
  4. 19
      src/pages/fg/receiptByPlan.vue
  5. 24
      src/pages/fg/receiptNoPlan.vue
  6. 1
      src/pages/index/index.vue
  7. 2
      src/pages/productPutaway/record/fgDirectPutaway.vue
  8. 100
      src/pages/productPutaway/record/productPutawayRecord.vue
  9. 23
      src/pages/productPutaway/record/semiDirectPutaway.vue
  10. 1
      src/pages/productReceipt/record/productReceiptRecord.vue
  11. 48
      src/pages/productReceipt/record/semiDirectReceipt.vue
  12. 21
      src/pages/purchaseReceipt/job/receiptDetail.vue

2
.env.development

@ -1,4 +1,4 @@
VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL=http://192.168.0.128:12080/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置 # 租户配置

18
src/common/style/pdabasic.css

@ -480,7 +480,7 @@ export function getItemTypeStyle(val) {
.detail-list { .detail-list {
background-color: #fff; background-color: #fff;
padding:5rpx 10rpx; padding: 5rpx 10rpx;
/* margin: 20rpx; */ /* margin: 20rpx; */
/* border-radius: 16rpx; */ /* border-radius: 16rpx; */
/* overflow: hidden; */ /* overflow: hidden; */
@ -729,24 +729,26 @@ page {
font-size: 35rpx; font-size: 35rpx;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
} }
.page-header .header-view { .page-header .header-view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #fff; background-color: #fff;
font-size: 35rpx; font-size: 35rpx;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
border-radius:4px; border-radius: 4px;
} }
.page-header .header-view .header_item { .page-header .header-view .header_item {
/* padding-left: 10rpx; */ /* padding-left: 10rpx; */
padding: 5rpx 10rpx; padding: 5rpx 10rpx;
font-size:32rpx ; font-size: 32rpx;
} }
.page-header .header-view .header_job_top { .page-header .header-view .header_job_top {
padding:5rpx 0rpx; padding: 5rpx 0rpx;
} }
.page-main { .page-main {
flex: 1; flex: 1;
position: relative; position: relative;
@ -768,3 +770,11 @@ page {
background: #e0e0e0; background: #e0e0e0;
} }
.page-footer {
/* color: #fff; */
line-height: 100rpx;
/* 不放大不缩小固定100rpx */
flex: 0 0 100rpx;
/* background-color: #00AAFF; */
}

15
src/pages.json

@ -1099,7 +1099,6 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "pages/productReceipt/record/productReceiptRecord", "path": "pages/productReceipt/record/productReceiptRecord",
"style": { "style": {
@ -1141,14 +1140,14 @@
} }
}, },
// { {
// "path": "pages/productPutaway/record/productPutawayRecord", "path": "pages/productPutaway/record/productPutawayRecord",
// "style": { "style": {
// "navigationBarTitleText": "制品上架记录", "navigationBarTitleText": "制品上架记录",
// "enablePullDownRefresh": false "enablePullDownRefresh": false
// } }
// }, },
{ {
"path": "pages/productPutaway/record/fgDirectPutaway", "path": "pages/productPutaway/record/fgDirectPutaway",

19
src/pages/fg/receiptByPlan.vue

@ -7,7 +7,7 @@
</view> </view>
<view class="" v-if="dataContent"> <view class="" v-if="dataContent">
<view class="page-header"> <view class="page-header">
<view class="header-view" > <view class="header-view">
<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;"> <view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
生产计划{{dataContent.planNumber}} 生产计划{{dataContent.planNumber}}
</view> </view>
@ -32,7 +32,8 @@
<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view> <view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
</view> </view>
</view> </view>
</view></view> </view>
</view>
<view class="" style="padding: 10rpx; margin-left: 10rpx;"> <view class="" style="padding: 10rpx; margin-left: 10rpx;">
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
@ -61,7 +62,7 @@
<uni-swipe-action> <uni-swipe-action>
<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)"> <uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
<view class="uni-flex uni-row " <view class="uni-flex uni-row "
style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;" > style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
<light :lightCode='item.content'></light> <light :lightCode='item.content'></light>
<!-- <view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;"> <!-- <view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
<text style="font-size: 30rpx;color: #B66463;">唯一码 </text> <text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
@ -112,7 +113,8 @@
getRemoveOption, getRemoveOption,
deepCopyData, deepCopyData,
getCurrDateTime, getCurrDateTime,
compare compare,
getSwitchInfoByCode
} from '@/common/basic.js'; } from '@/common/basic.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
@ -179,14 +181,12 @@
}, },
methods: { methods: {
openFg() { openFg() {
setTimeout(res => { setTimeout(res => {
if (this.$refs.comReceiptPopup) { if (this.$refs.comReceiptPopup) {
this.$refs.comReceiptPopup.openRequestPopup(); this.$refs.comReceiptPopup.openRequestPopup();
} }
}, 600) }, 600)
}, },
requestConfirm(result) { requestConfirm(result) {
this.dataContent = { this.dataContent = {
@ -257,7 +257,6 @@
}, },
async commit() { async commit() {
try { try {
uni.showLoading({ uni.showLoading({
title: "提交中...", title: "提交中...",
@ -293,9 +292,14 @@
throw new Error("提交失败") throw new Error("提交失败")
} }
//
let createProductputawaySwitch = getSwitchInfoByCode(
"CreateProductputawayRequestAfterProductreceiptRecordCreated")
if (createProductputawaySwitch) {
createPutawayRequestByPlan(list[0].requestNumber).then(res => { createPutawayRequestByPlan(list[0].requestNumber).then(res => {
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
}) })
}
var queryParams = { var queryParams = {
filters: [{ filters: [{
@ -351,7 +355,6 @@
res.outsideSerialNumber = res.order res.outsideSerialNumber = res.order
}) })
this.dataContent.subList = this.allList this.dataContent.subList = this.allList
return this.dataContent return this.dataContent
}, },

24
src/pages/fg/receiptNoPlan.vue

@ -7,7 +7,7 @@
</view> </view>
<view class="" v-if="dataContent"> <view class="" v-if="dataContent">
<view class="page-header"> <view class="page-header">
<view class="header-view" > <view class="header-view">
<view class="cell_box uni-flex uni-row"> <view class="cell_box uni-flex uni-row">
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">完工库位</view> <view class="text_lightblue">完工库位</view>
@ -104,7 +104,8 @@
getRemoveOption, getRemoveOption,
deepCopyData, deepCopyData,
getCurrDateTime, getCurrDateTime,
compare compare,
getSwitchInfoByCode
} from '@/common/basic.js'; } from '@/common/basic.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
@ -287,25 +288,14 @@
throw new Error("提交失败") throw new Error("提交失败")
} }
let createProductputawaySwitch = getSwitchInfoByCode(
"CreateProductputawayRequestAfterProductreceiptRecordCreated")
if (createProductputawaySwitch) {
createPutawayRequestByPlan(list[0].requestNumber).then(res => { createPutawayRequestByPlan(list[0].requestNumber).then(res => {
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
}) })
var queryParams = {
filters: [{
column: "plan_type",
action: "==",
value: "assemble"
},
{
column: "number",
action: "==",
value: this.dataContent.planNumber
}
],
pageNo: 1,
pageSize: 100,
} }
uni.hideLoading() uni.hideLoading()
this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list) this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)

1
src/pages/index/index.vue

@ -179,7 +179,6 @@
}) })
} else { } else {
this.timerRefresh(); this.timerRefresh();
} }
}, },
onUnload() { onUnload() {

2
src/pages/productPutaway/record/fgDirectPutaway.vue

@ -1,6 +1,6 @@
<template> <template>
<view class=""> <view class="">
<product-putaway-record :title="title" ref="productPutawayRecord" type='assemble'></product-putaway-record> <product-putaway-record :title="title" ref="productPutawayRecord" putawayType='assemble'></product-putaway-record>
</view> </view>
</template> </template>

100
src/pages/productPutaway/record/productPutawayRecord.vue

@ -1,11 +1,10 @@
<template> <template>
<view class="page-wraper"> <view class="">
<view class=""> <view class="">
<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="uni-flex uni-column" v-if="detailSource.length>0">
<view class="page-wraper" v-if="detailSource.length>0"> <view class="">
<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="">
@ -18,12 +17,11 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="page-footer"> <view class="page-footer" v-if="detailSource.length>0">
<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="">
<!-- <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationAreaTypeList="tolocationTypeList"></requiredLocation> -->
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_reject" style="margin-right:5px ;" hover-class="btn_commit_after" <button class="btn_single_reject" style="margin-right:5px ;" hover-class="btn_commit_after"
@ -34,6 +32,7 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package> <win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode' <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location> :locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
@ -101,6 +100,7 @@
toLocationCode: "", toLocationCode: "",
fromLocationAreaTypeList: [], fromLocationAreaTypeList: [],
tolocationTypeList: [], tolocationTypeList: [],
toLocationAreaTypeList: [],
inInventoryStatus: "", // inInventoryStatus: "", //
outInventoryStatus: "", //:"", outInventoryStatus: "", //:"",
bussinessCode: "ProductPutaway", bussinessCode: "ProductPutaway",
@ -110,17 +110,24 @@
editItem: null editItem: null
}; };
}, },
onLoad(option) { // type = 'assemble'
uni.setNavigationBarTitle({ // type = 'predict'
title: option.title props: {
}) putawayType: 'assemble',
this.type = option.type },
// if (this.type == 'predict') {
// updateTitle('') //
// } else if (this.type == 'assemble') { onNavigationBarButtonTap(e) {
// updateTitle('') if (e.index === 0) {
// } goHome();
}
},
//
onBackPress(e) {},
onPullDownRefresh() {},
mounted() {
getBusinessType(this.bussinessCode, res => { getBusinessType(this.bussinessCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
@ -132,20 +139,8 @@
this.showErrorMessage(res.message) this.showErrorMessage(res.message)
} }
}); });
}, },
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
//
onBackPress(e) {},
onPullDownRefresh() {},
mounted() {},
methods: { methods: {
getScanResult(result) { getScanResult(result) {
let label = result.label; let label = result.label;
@ -301,7 +296,6 @@
// if (res.success) { // if (res.success) {
// this.managementList = res.list; // this.managementList = res.list;
var params = this.setParams() var params = this.setParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
productPutawayRecordSubmit(params).then(res => { productPutawayRecordSubmit(params).then(res => {
@ -358,9 +352,10 @@
}, },
setParams() { setParams() {
let that = this;
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { that.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
var submitItem = deepCopyData(detail) var submitItem = deepCopyData(detail)
@ -397,12 +392,10 @@
} }
}) })
}) })
this.dataContent.subList = subList; that.dataContent.subList = subList;
if (this.type) { that.dataContent.creator = creator;
this.dataContent.type = this.type; that.dataContent.type = that.putawayType;
} return that.dataContent;
this.dataContent.creator = creator;
return this.dataContent;
}, },
@ -463,38 +456,5 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
page {
width: 100%;
height: 100%;
background-color: #fff;
}
.page-wraper {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.page-main {
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> </style>

23
src/pages/productPutaway/record/semiDirectPutaway.vue

@ -1,6 +1,6 @@
<template> <template>
<view class=""> <view class="">
<product-putaway-record :title="title" ref="productPutawayRecord" type='predict'></product-putaway-record> <product-putaway-record :title="title" ref="productPutawayRecord" putawayType='predict'></product-putaway-record>
</view> </view>
</template> </template>
@ -16,25 +16,26 @@
title:'' title:''
}; };
}, },
onLoad(option){ onLoad(option){
this.title = option.title //this.title = option.title
}, },
onShow() { onShow() {
if(this.$refs.productPutawayRecord!=undefined){ // if(this.$refs.productPutawayRecord!=undefined){
this.$refs.productPutawayRecord.refresh(); // this.$refs.productPutawayRecord.refresh();
} // }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.$refs.productPutawayRecord.refresh(); // this.$refs.productPutawayRecord.refresh();
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { // if (e.index === 0) {
this.$refs.productPutawayRecord.toHome(); // this.$refs.productPutawayRecord.toHome();
} else if (e.index == 1) { // } else if (e.index == 1) {
this.$refs.productPutawayRecord.openFilter(); // this.$refs.productPutawayRecord.openFilter();
} // }
}, },
methods: { methods: {

1
src/pages/productReceipt/record/productReceiptRecord.vue

@ -336,6 +336,7 @@
}) })
this.dataContent.subList = subList; this.dataContent.subList = subList;
this.dataContent.creator = creator; this.dataContent.creator = creator;
this.dataContent.type = "predict";//使
this.dataContent.workshopCode = this.workshopCode; this.dataContent.workshopCode = this.workshopCode;
return this.dataContent; return this.dataContent;
}, },

48
src/pages/productReceipt/record/semiDirectReceipt.vue

@ -0,0 +1,48 @@
<template>
<view class="">
<product-receipt-record :title="title" ref="productPutawayRecord" type='predict'></product-receipt-record>
</view>
</template>
<script>
import productReceiptRecord from '@/pages/productReceipt/record/productReceiptRecord.vue'
export default {
components: {
productReceiptRecord
},
data() {
return {
title:''
};
},
onLoad(option){
this.title = option.title
},
onShow() {
if(this.$refs.productReceiptRecord!=undefined){
this.$refs.productReceiptRecord.refresh();
}
},
onPullDownRefresh() {
this.$refs.productReceiptRecord.refresh();
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
this.$refs.productReceiptRecord.toHome();
} else if (e.index == 1) {
this.$refs.productReceiptRecord.openFilter();
}
},
methods: {
}
}
</script>
<style scoped lang="scss">
</style>

21
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -26,6 +26,7 @@
:isShowEdit="false"></required-location> :isShowEdit="false"></required-location>
<view class='split_line'></view> --> <view class='split_line'></view> -->
</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">
@ -38,7 +39,8 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<!-- <div style="background: white;" v-if="operation=='receipt'" >
<!-- <div style="background: white;" v-if="operation=='receipt'" >
<uni-collapse> <uni-collapse>
<uni-collapse-item> <uni-collapse-item>
<template v-slot:title> <template v-slot:title>
@ -50,6 +52,7 @@
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>
</div> --> </div> -->
<view class="page-footer"> <view class="page-footer">
<view style="background-color:ghostwhite; width: 100%; "> <view style="background-color:ghostwhite; width: 100%; ">
<view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10"> <view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10">
@ -631,14 +634,14 @@
this.jobContent.creator = creator; this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
// printCode(e) { // printCode(e) {
// this.jobContent.printerUuid = e.value; // this.jobContent.printerUuid = e.value;
// this.printDeafult = e // this.printDeafult = e
// }, // },
// templateCode(e) { // templateCode(e) {
// this.jobContent.modelCode = e.value; // this.jobContent.modelCode = e.value;
// this.templateDeafult = e // this.templateDeafult = e
// }, // },
checkLocation() { checkLocation() {
var isPass = true; var isPass = true;
if (this.toLocationCode == "" || this.toLocationCode == null) { if (this.toLocationCode == "" || this.toLocationCode == null) {

Loading…
Cancel
Save