Skip to content

M
mes-pda-scan
Commit 6a694903 authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

录入领料单

parent 5924ef81
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 42 deletions
lang/th_TH.json
View file @ 6a694903
...@@ -218,5 +218,6 @@ ...@@ -218,5 +218,6 @@
"检测到有新版本！": "พบเวอร์ชันใหม่!", "检测到有新版本！": "พบเวอร์ชันใหม่!",
"请升级app到最新版本！": "กรุณาอัปเกรดแอปเป็นเวอร์ชันล่าสุด!", "请升级app到最新版本！": "กรุณาอัปเกรดแอปเป็นเวอร์ชันล่าสุด!",
"暂不升级": "ไม่อัปเกรดในขณะนี้", "暂不升级": "ไม่อัปเกรดในขณะนี้",
"立即升级": "อัปเกรดทันที" "立即升级": "อัปเกรดทันที",
"领用套数": "จํานวนชุดที่จะใช้"
} }
lang/zh_CN.json
View file @ 6a694903
...@@ -218,5 +218,6 @@ ...@@ -218,5 +218,6 @@
"检测到有新版本！": "检测到有新版本！", "检测到有新版本！": "检测到有新版本！",
"请升级app到最新版本！": "请升级app到最新版本！", "请升级app到最新版本！": "请升级app到最新版本！",
"暂不升级": "暂不升级", "暂不升级": "暂不升级",
"立即升级": "立即升级" "立即升级": "立即升级",
"领用套数": "领用套数"
} }
\ No newline at end of file
manifest.json
View file @ 6a694903
...@@ -2,12 +2,15 @@ ...@@ -2,12 +2,15 @@
"name" : "希迈扫码系统", "name" : "希迈扫码系统",
"appid" : "__UNI__6E34D09", "appid" : "__UNI__6E34D09",
"description" : "希迈扫码系统", "description" : "希迈扫码系统",
"versionName" : "1.0.0", "versionName" : "1.0.4",
"versionCode" : 125, "versionCode" : 125,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
"usingComponents" : true, "usingComponents" : true,
"statusbar" : {
"immersed" : false
},
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3, "compilerVersion" : 3,
// "screenOrientation" : [ // "screenOrientation" : [
......
pages/forstorage/Main.vue
View file @ 6a694903
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
> >
</input> </input>
</u-form-item> </u-form-item>
<u-form-item prop="tc013" :label="$t('类型：')"> <!-- <u-form-item prop="tc013" :label="$t('类型：')">
<uni-data-select <uni-data-select
v-model="form.tc013" v-model="form.tc013"
:clear="false" :clear="false"
:localdata="typeData" :localdata="typeData"
></uni-data-select> ></uni-data-select>
</u-form-item> </u-form-item> -->
<u-form-item prop="tc004" :label="$t('工单单别：')"> <u-form-item prop="tc004" :label="$t('工单单别：')">
<input <input
v-model="form.tc004" v-model="form.tc004"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
> >
</input> </input>
</u-form-item> </u-form-item>
<u-form-item prop="tc006" :label="$t('移出加工顺序:')"> <!-- <u-form-item prop="tc006" :label="$t('移出加工顺序:')">
<input <input
v-model="form.tc006" v-model="form.tc006"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
@confirm="submit" @confirm="submit"
> >
</input> </input>
</u-form-item> </u-form-item> -->
<u-form-item prop="tc056" :label="$t('库位：')"> <u-form-item prop="tc056" :label="$t('库位：')">
<input <input
v-model.number="form.tc056" v-model.number="form.tc056"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</input> </input>
</u-form-item> </u-form-item>
<u-form-item prop="tb008" :label="$t('移入地：')"> <!-- <u-form-item prop="tb008" :label="$t('移入地：')">
<input <input
v-model.number="form.tb008" v-model.number="form.tb008"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
@confirm="submit" @confirm="submit"
> >
</input> </input>
</u-form-item> </u-form-item> -->
<u-form-item prop="tc032" :label="$t('批号：')"> <u-form-item prop="tc032" :label="$t('批号：')">
<input <input
v-model.number="form.tc032" v-model.number="form.tc032"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</u-form-item> </u-form-item>
<u-form-item prop="tc021" :label="$t('使用机时：')"> <u-form-item prop="tc021" :label="$t('使用机时：')">
<input <input
v-model="form.tc020" v-model="form.tc021"
type="text" type="text"
@confirm="submit" @confirm="submit"
> >
...@@ -183,7 +183,7 @@ import i18n from '../../lang/index' ...@@ -183,7 +183,7 @@ import i18n from '../../lang/index'
tc032: null, tc032: null,
tc036: null, tc036: null,
tc020: null, tc020: null,
tc020: null, tc021: null,
} }
}; };
}, },
...@@ -213,18 +213,18 @@ import i18n from '../../lang/index' ...@@ -213,18 +213,18 @@ import i18n from '../../lang/index'
if (!this.form['tc005']) { if (!this.form['tc005']) {
return this.$u.toast(i18n.t('请输入工单单号')) return this.$u.toast(i18n.t('请输入工单单号'))
} }
if (!this.form['tc006']) { // if (!this.form['tc006']) {
return this.$u.toast(i18n.t('请输入移出加工顺序')) // return this.$u.toast(i18n.t('请输入移出加工顺序'))
} // }
if (!this.form['tb005']) { // if (!this.form['tb005']) {
return this.$u.toast(i18n.t('请输入移出地')) // return this.$u.toast(i18n.t('请输入移出地'))
} // }
if (!this.form['tc056']) { if (!this.form['tc056']) {
return this.$u.toast(i18n.t('请输入库位')) return this.$u.toast(i18n.t('请输入库位'))
} }
if (!this.form['tb008']) { // if (!this.form['tb008']) {
return this.$u.toast(i18n.t('请输入移入地')) // return this.$u.toast(i18n.t('请输入移入地'))
} // }
if (!this.form['tc036']) { if (!this.form['tc036']) {
return this.$u.toast(i18n.t('请输入入库数量')) return this.$u.toast(i18n.t('请输入入库数量'))
} }
...@@ -243,7 +243,7 @@ import i18n from '../../lang/index' ...@@ -243,7 +243,7 @@ import i18n from '../../lang/index'
tc032: null, tc032: null,
tc036: null, tc036: null,
tc020: null, tc020: null,
tc020: null, tc021: null,
} }
} }
}) })
......
pages/index/index.vue
View file @ 6a694903
...@@ -38,21 +38,21 @@ import i18n from '../../lang/index' ...@@ -38,21 +38,21 @@ import i18n from '../../lang/index'
text: i18n.t('录入进货单'), text: i18n.t('录入进货单'),
url: '/pages/forcreate/Main' url: '/pages/forcreate/Main'
}, },
{ // {
src: require('@/static/images/print.png'), // src: require('@/static/images/print.png'),
text: i18n.t('委外进货打印标签'), // text: i18n.t('委外进货打印标签'),
url: '/pages/forprint/Main' // url: '/pages/forprint/Main'
}, // },
{ // {
src: require('@/static/images/check.png'), // src: require('@/static/images/check.png'),
text: i18n.t('委外检验'), // text: i18n.t('委外检验'),
url: '/pages/mocthforcheck/Main' // url: '/pages/mocthforcheck/Main'
}, // },
{ // {
src: require('@/static/images/takeup.png'), // src: require('@/static/images/takeup.png'),
text: i18n.t('委外扫码上架'), // text: i18n.t('委外扫码上架'),
url: '/pages/mocthgetforputon/Main' // url: '/pages/mocthgetforputon/Main'
}, // },
{ {
src: require('@/static/images/keyin.png'), src: require('@/static/images/keyin.png'),
text: i18n.t('录入领料单'), text: i18n.t('录入领料单'),
......
pages/moctcforcreate/Info.vue
View file @ 6a694903
<template> <template>
<view class="page"> <view class="page mocto">
<StickyNavBar> <StickyNavBar>
<NavBar :title="$t('领料单信息')" right="checkbox" @clickRight="submit"></NavBar> <NavBar :title="$t('领料单信息')" right="checkbox" @clickRight="submit"></NavBar>
</StickyNavBar> </StickyNavBar>
<u-form ref="form" :modelValue="info" :labelWidth="140" style="margin-left:20rpx;margin-right:20rpx;padding-bottom:0"> <u-form ref="form" :modelValue="info" :labelWidth="140" style="margin-left:20rpx;margin-right:20rpx;padding-bottom:0">
<u-form-item prop="tc001" :label="$t('领料单别')"> <u-form-item prop="tc001" :label="$t('领料单别')">
<input <input
v-model="info.tc001" v-model="info.tc001"
...@@ -38,9 +38,27 @@ ...@@ -38,9 +38,27 @@
</view> </view>
</view> </view>
</view> </view>
<u-form ref="form" :modelValue="form" :labelWidth="140" style="margin-left:20rpx;margin-right:20rpx;padding-bottom:0">
<u-form-item prop="ck" :label="$t('仓库')">
<input
v-model="form.ck"
@input="filterCK"
type="text"
placeholder=""
/>
</u-form-item>
<u-form-item prop="lyts" :label="$t('领用套数')">
<input
v-model="form.lyts"
type="text"
@input="calcTS"
placeholder=""
/>
</u-form-item>
</u-form>
<ContentLoadingMore class="cardbox" :list="chargaArr"> <ContentLoadingMore class="cardbox" :list="chargaArr">
<view class="cardContent" v-for="(item, index) in chargaArr" :key="index"> <view class="cardContent" v-for="(item, index) in chargaArr" :key="index">
<view class="cardItem" @click="editCard(item, index)" v-if="!item.batch"> <view class="cardItem" @click="editCard(item, index)" v-if="!item.batch && item.show">
<view class="cardLeft"> <view class="cardLeft">
<view class="boxindex">{{index+1}}</view> <view class="boxindex">{{index+1}}</view>
</view> </view>
...@@ -106,9 +124,12 @@ import i18n from '../../lang/index' ...@@ -106,9 +124,12 @@ import i18n from '../../lang/index'
let data = JSON.parse(decodeURIComponent(option.info)); let data = JSON.parse(decodeURIComponent(option.info));
if(data.moctes && data.moctes.length > 0){ if(data.moctes && data.moctes.length > 0){
data.moctes.forEach(element => { data.moctes.forEach(element => {
element['tb005'] = 1
if (!element['quantity']) { if (!element['quantity']) {
element['quantity'] = element['tb004'] element['quantity'] = this.minus(element['tb004'], element['tb005'])
} }
element['te025'] = element['te025'] ? element['te025'].trim() : ''
element['show'] = true
}); });
} }
this.chargaArr = data.moctes this.chargaArr = data.moctes
...@@ -118,16 +139,59 @@ import i18n from '../../lang/index' ...@@ -118,16 +139,59 @@ import i18n from '../../lang/index'
data() { data() {
return { return {
chargaArr: [], chargaArr: [],
chargaArrEdit: [],
loading: false, loading: false,
form: {
ck: null,
lyts: null
},
info: null info: null
}; };
}, },
created() { created() {
}, },
methods: { methods: {
filterCK(e){
console.log('e', e.detail.value)
if(!e.detail.value) {
this.chargaArr.forEach(item => {
item.show = true
})
} else {
this.chargaArr.forEach(item => {
item.show = false
if(item.tb009 && item.tb009.indexOf(e.detail.value) > -1) {
item.show = true
}
})
}
},
minus(a, b){
return parseFloat((a - b).toFixed(6))
},
calcTS(e) {
if (!e.detail.value) {
this.chargaArr.forEach((item,index) => {
if(this.chargaArrEdit && this.chargaArrEdit.length > 0) {
// 如果清空就赋值上次手动修改的值
item.quantity = this.chargaArrEdit[index]['quantity']
} else {
item.quantity = this.minus(item['tb004'], item['tb005'])
}
})
} else {
this.chargaArr.forEach((item,index) => {
let number = 0
number = (item['tb004'] / (this.info.ta015 || 1)) * e.detail.value
item.quantity = Math.round(number * 1000000) / 1000000
})
}
},
getValue(data) { getValue(data) {
this.chargaArr = data.moctes this.chargaArr = data.moctes
this.chargaArrEdit = JSON.parse(JSON.stringify(data.moctes))
this.info = data this.info = data
}, },
editCard(row, index) { editCard(row, index) {
...@@ -136,7 +200,8 @@ import i18n from '../../lang/index' ...@@ -136,7 +200,8 @@ import i18n from '../../lang/index'
}); });
}, },
submit(){ submit(){
const purcdPrintParamsList = this.chargaArr.map(v => ({quantity: v.quantity, tb003: v.tb003, tb006: v.tb006, te010: v.te010, te025: v.te025})) const arr = this.chargaArr.filter(v=>v.show)
const purcdPrintParamsList = arr.map(v => ({quantity: v.quantity, tb003: v.tb003, tb006: v.tb006, te010: v.te010, te025: v.te025}))
this.$u.api.moctccreate({ this.$u.api.moctccreate({
ta001: this.info.ta001, ta001: this.info.ta001,
ta002: this.info.ta002, ta002: this.info.ta002,
...@@ -220,5 +285,11 @@ import i18n from '../../lang/index' ...@@ -220,5 +285,11 @@ import i18n from '../../lang/index'
font-size: 18px; font-size: 18px;
} }
} }
.mocto {
/deep/ .u-border-bottom:after {
border-bottom-width: 0 !important;
}
}
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment