版本自动更新,数量输入限制

master
guoshuang 3 years ago
parent 07ec266d02
commit d44f9a90be

@ -27,6 +27,8 @@ export default {
//版本更新
updatePrompt: '更新提示',
Tip1: '检测到有新版本,是否更新?',
restart: '重启',
Tip2: '更新成功,是否重启?',
//服务器设置
ServerSetting: '服务器设置',
PleaseInputIPAddress: '请输入IP地址',

@ -30,6 +30,8 @@ export default {
//版本更新
updatePrompt: 'Update tips',
Tip1: 'New version detected, update?',
restart: 'restart',
Tip2: 'Update succeeded. Are you sure to restart?',
//服务器设置
ServerSetting: 'Server Setting',
PleaseInputIPAddress: 'Please input IP address',

@ -86,6 +86,7 @@ import { BasePage } from '@/components/base/page';
import { VForm } from 'vue/types/form';
import { Lang } from '@/i18n';
import { url } from '@/utils/url';
import { path } from 'lodash/fp';
// import { any } from 'lodash/fp';
@Component({
@ -143,10 +144,8 @@ export default class LoginPage extends BasePage {
async update() {
await session.QueryVersion();
if (this.Version != session.Version) {
//alert('!');
//
uni.showModal({
//title: this.$t('message.updatePrompt') as string,
content: this.$t('message.Tip1') as string,
confirmText: this.$t('message.workArea_Confirm') as string,
cancelText: this.$t('message.Cancel') as string,
@ -154,38 +153,104 @@ export default class LoginPage extends BasePage {
if (res.confirm) {
//
let downloadApkUrl = session.url;
// uni.downloadFile({
// url: downloadApkUrl,
// });
var dtask = plus.downloader.createDownload(downloadApkUrl, {}, function (d, status) {
if (status == 200) {
console.log('Download success: ' + d.filename);
uni.showToast({
icon: 'none',
title: d.filename,
});
} else {
console.log('Download failed: ' + status);
}
////////////////uni,
uni.downloadFile({
url: downloadApkUrl,
success: (downloadResult) => {
//uni.hideLoading();
if (downloadResult.statusCode == 200) {
//
plus.runtime.install(downloadResult.tempFilePath, { force: true }, function (res) {
//uni.showToast('');
plus.runtime.restart();
});
// uni.showModal({
// //content: '',
// content: this.$t('message.Tip2') as string,
// confirmText: this.$t('message.restart') as string,
// cancelText: this.$t('message.Cancel') as string,
// success: function (res) {
// if (res.confirm == true) {
// plus.runtime.install(downloadResult.tempFilePath, { force: true }, function (res) {
// //uni.showToast('');
// plus.runtime.restart();
// });
// }
// },
// });
}
},
});
dtask.start();
///////////////////// plus
// plus.downloader
// .createDownload(downloadApkUrl, {}, function (d, status) {
// uni.showModal({
// content: status,
// });
// if (status == 200) {
// uni.showModal({
// title: '',
// content: this.$t('message.Tip2') as string,
// confirmText: this.$t('message.restart') as string,
// cancelText: this.$t('message.Cancel') as string,
// success: function (res) {
// if (res.confirm == true) {
// plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), { force: true }, function (res) {
// //uni.showToast('');
// plus.runtime.restart();
// });
// }
// },
// });
// } else {
// console.log('Download failed: ' + status);
// }
// })
// .start();
// dtask.start();
/////////////////plus
} else if (res.cancel) {
//console.log('');
}
},
});
//dtask.addEventListener("statechanged", onStateChanged, false);
// await uni.downloadFile({
// url: session.url,
// success: (res) => {
// console.log('res.statusCode', res.statusCode);
// console.log('res.tempFilePath', res.tempFilePath);
// console.log("url,url,url",session.url);
// },
// });
}
}
/////////////////
//
async installApk(path) {
plus.runtime.install(
path,
{},
function () {
console.log('安装文件成功!');
plus.runtime.restart();
},
function (e) {
uni.hideLoading();
console.log(JSON.stringify(e)); //enullpath_downloads/apk/10.apk
uni.showToast({
title: '安装失败',
mask: false,
duration: 1500,
});
},
);
}
/* 安装失败 */
failed() {
uni.showToast({
icon: 'none',
mask: true,
title: '更新失败!请退出重试或向工作人员反映',
duration: 1500,
});
setTimeout(function () {
plus.runtime.quit();
}, 1500);
}
////////////////////////////
login(): void {
this.$form.validate(async (valid: boolean) => {
if (valid) {

@ -14,7 +14,7 @@
</u-form-item>
<!-- 单据总数 -->
<u-form-item :label="$t('message.product_TotalNumber')">
<u-input v-model="model.orderInInfo.stoAmount" :placeholder="$t('message.po_PleaseInput')" />
<u-input v-model="model.orderInInfo.stoAmount" type="number" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item>
<!-- 行项目 -->
<u-form-item :required="true" :label="$t('message.Line')">
@ -38,7 +38,7 @@
</u-col>
<u-col :span="6">
<u-form-item :label="$t('message.product_Swept')" label-width="80rpx">
<u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
<u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" type="number" />
</u-form-item>
</u-col>
</u-row>

@ -31,7 +31,7 @@
<!-- 总数 -->
<u-col :span="6">
<u-form-item :label="$t('message.Warehouse_TotalNumber')" label-width="80rpx">
<u-input v-model="form.ypQty" :placeholder="$t('message.po_PleaseInput')" />
<u-input v-model="form.ypQty" :placeholder="$t('message.po_PleaseInput')" type="number" />
</u-form-item>
</u-col>
</u-row>

@ -47,11 +47,11 @@
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" :type="type" :border="border" class="input" />
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :border="border" class="input" />
</view>
</view>
<!-- 添加 -->

@ -26,11 +26,11 @@
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input v-model="qty" :type="type" :border="border" class="input" :placeholder="$t('message.Summary_PleaseInputNumber')" />
<u-input v-model="qty" type="number" :border="border" class="input" :placeholder="$t('message.Summary_PleaseInputNumber')" />
</view>
</view>
<!-- 添加 -->

@ -29,7 +29,7 @@
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
<u-input v-model="qty" :type="type" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
<u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
</view>
</view>
<!-- 添加 -->

@ -30,7 +30,7 @@
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
<u-input v-model="qty" :type="type" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
<u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
</view>
</view>
<!-- 添加 -->

@ -54,7 +54,7 @@
</u-col>
<u-col :span="5">
<u-form-item :required="true" :label="$t('message.Summary_Number')" prop="amount" label-width="80rpx">
<u-input v-model="form.amount" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
<u-input v-model="form.amount" type="number" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
</u-form-item>
</u-col>
</u-row>

@ -59,7 +59,7 @@
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" />
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
</view>
</view>
<!-- 添加 -->

@ -44,11 +44,11 @@
<view class="number">
<view class="number-left">
<view class="number-left-title">{{ $t('message.DemandQuantity') }}</view>
<u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" disabled />
<u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" :disabled="true" />
</view>
<view class="number-right">
<view class="number-right-title">{{ $t('message.Cumulative') }}</view>
<u-input v-model="every.receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled />
<u-input v-model="every.receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" :disabled="true" style="background-color: #f4f5f5" />
</view>
</view>
<!-- 库位 -->
@ -59,7 +59,7 @@
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" />
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
</view>
</view>
<!-- 添加 -->
@ -138,10 +138,13 @@ export default class dnReceiptDom extends BasePage {
poNo: any = null;
//
requestAmount: number = null;
//receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
async onReady() {
//this.initLocation();
}
input() {
this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
}
//
//
async initLocation(condition): Promise<LocationDetail[]> {

@ -28,7 +28,7 @@
</u-form-item>
<!-- 数量 -->
<u-form-item :label="$t('message.Summary_Number')">
<u-input v-model="Some.qty" placeholder="" />
<u-input v-model="Some.qty" placeholder="" type="number" />
</u-form-item>
<!-- 原库位 -->
<u-form-item :label="$t('message.Warehouse_OriginalLocation')">

@ -47,6 +47,7 @@
<u-input
v-model="form.spQty"
:placeholder="$t('message.po_PleaseInput')"
type="number"
/>
</u-form-item>
</u-form>

@ -28,7 +28,7 @@
</u-form-item>
<!-- 数量 -->
<u-form-item :label="$t('message.Summary_Number')">
<u-input v-model="Some.qty" placeholder="" />
<u-input v-model="Some.qty" placeholder="" type="number" />
</u-form-item>
<!-- 原库位 -->
<u-form-item :label="$t('message.Warehouse_OriginalLocation')">

@ -35,7 +35,7 @@
</u-form-item>
<!-- 本次数量 -->
<u-form-item :label="$t('message.CommissionedThisNumber')">
<u-input v-model="NEWqty" placeholder="" />
<u-input v-model="NEWqty" placeholder="" type="number" />
</u-form-item>
</u-form>
<view class="bottom-bar">

Loading…
Cancel
Save