Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

Browse Source
master
hou 3 years ago
parent ad51d995bd 86d28e8876
commit 1d2666563f
26 changed files with 92 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
src/pages/SemiProduct/DumpList/DumpListFH/index.vue
Unescape Escape View File

@ -11,7 +11,7 @@
<u-form-item :required="true" :label="this.$t('message.Warehouse_OrderNo')" prop="documentNo">
<u-search
:placeholder="this.$t('message.Warehouse_Tip5')"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="searchHandle"
:show-action="false"
></u-search>

2
src/pages/SemiProduct/DumpList/DumpListSH/index.vue
Unescape Escape View File

@ -11,7 +11,7 @@
<u-form-item :required="true" :label="this.$t('message.Warehouse_OrderNo')" prop="documentNo">
<u-search
:placeholder="this.$t('message.Warehouse_Tip5')"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="searchHandle"
:show-action="false"
></u-search>

1
src/pages/login/login/index.vue
Unescape Escape View File

@ -107,7 +107,6 @@ export default class LoginPage extends BasePage {
get serverAddress(): string | null {
return server.serverAddress;
}
// 小数点保留
username = '';
@Watch('username')

2
src/pages/product/inbound/finishProductOffline/index.vue
Unescape Escape View File

@ -25,7 +25,7 @@
<!-- ></u-select>-->
</u-form-item>
<u-form-item :label="$t('message.product_barCode')">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.barCode" @search="getBarcode" :focus="firstFocus" maxlength="20" :show-action="false"></u-search>
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.barCode" @search="getBarcode" :focus="firstFocus" maxlength="20" :show-action="false"></u-search>
</u-form-item>
</u-col>
<u-col :span="12">

2
src/pages/product/inbound/semiFinishProductOffline2/index.vue
Unescape Escape View File

@ -34,7 +34,7 @@
<u-form-item :label="this.$t('message.product_MaterialCode')">
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.productCode"
v-model.trim="form.productCode"
@search="getBarcode"
:show-action="false"
></u-search>

2
src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
<!-- 单号查询 -->
<u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="orderNo">
<u-search :placeholder="$t('message.Commission_tips1')" v-model="form.orderNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.orderNo" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 单据总数 -->
<u-form-item :label="$t('message.product_TotalNumber')">

4
src/pages/product/warehouse/LocationInventory/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.code') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model="form.pddNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.pddNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -32,7 +32,7 @@
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">

4
src/pages/product/warehouse/MaterialInventory/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.code') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model="form.pddNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.pddNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -40,7 +40,7 @@
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">

4
src/pages/product/warehouse/wholeCollect/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.Requisition') }}</view>
<u-search :placeholder="$t('message.collecting')" v-model="form.order3" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.collecting')" v-model.trim="form.order3" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -44,7 +44,7 @@
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">

4
src/pages/product/warehouse/wholeLnventory/index.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 单号 -->
<u-form-item :required="true" :label="$t('message.Warehouse_OrderNo')" prop="pddNo">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.pddNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.pddNo" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 库位 -->
<u-form-item :required="true" :label="$t('message.product_Location')">
@ -19,7 +19,7 @@
</u-form-item>
<!-- 扫码 -->
<u-form-item :label="$t('message.Warehouse_ScanCode')">
<u-search v-model="form.code" :placeholder="$t('message.po_PleaseInput')" @search="scanCode" :show-action="false"></u-search>
<u-search v-model.trim="form.code" :placeholder="$t('message.po_PleaseInput')" @search="scanCode" :show-action="false"></u-search>
</u-form-item>
<u-row>
<!-- 已扫 -->

4
src/pages/product/warehouse/wholeScrap/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.Scrap_ScrapNo') }}</view>
<u-search :placeholder="$t('message.Scrap_Tip')" v-model="form.order3" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Scrap_Tip')" v-model.trim="form.order3" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -52,7 +52,7 @@
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">

6
src/pages/product/warehouse/wholeTransfer/index.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<view class="page-product-receipt">
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view>
<view class="title">{{ $t('message.Relocation') }}</view>
<view class="right"></view>
@ -15,7 +15,7 @@
</u-form-item>
<!-- 条码 -->
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 已扫 -->
<!-- <u-form-item :label="$t('message.product_Swept')">
@ -54,7 +54,7 @@
</u-col>
<!-- 返回 -->
<u-col :span="4">
<u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
<u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
</view>

2
src/pages/raw/handover/returning/index.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
<!-- 订单号 -->
<u-form-item :required="true" :label="$t('message.Pi_OrderNo')" prop="prdOrder">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.prdOrder" @search="model.queryOrderInInfo" :show-action="false"></u-search>
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.prdOrder" @search="model.queryOrderInInfo" :show-action="false"></u-search>
<u-button size="mini" style="margin-left: 10rpx" type="primary" @click="screen">{{ $t('message.screen') }}</u-button>
<!-- <jPicker
sureColor="#ff0000"

4
src/pages/raw/ingoods/dnReceipt/ImportDN.vue
Unescape Escape View File

@ -13,7 +13,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.dn_OddNumbers') }}</view>
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model.trim="form.documentNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -520,7 +520,7 @@ export default class dnReceiptDom extends BasePage {
.number-right-title {
width: 140rpx;
height: 100%;
text-align: center;
//text-align: center;
line-height: 100rpx;
}
.input {

72
src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
Unescape Escape View File

@ -13,7 +13,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.dn_OddNumbers') }}</view>
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model.trim="form.documentNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@ -48,7 +48,7 @@
</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="" :type="type" :border="border" class="input" disabled />
<!-- <u-input v-model="allNum" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled /> -->
</view>
</view>
@ -521,7 +521,7 @@ export default class dnReceiptDom extends BasePage {
.number-right-title {
width: 140rpx;
height: 100%;
text-align: center;
//text-align: center;
line-height: 100rpx;
}
.input {
@ -532,39 +532,39 @@ export default class dnReceiptDom extends BasePage {
}
}
}
.library {
width: 100%;
height: 100rpx;
display: flex;
.library-left {
width: 50%;
height: 100%;
display: flex;
view {
width: 100rpx;
line-height: 100rpx;
}
.search {
padding-left: 20px;
}
}
.library-right {
width: 50%;
height: 100%;
display: flex;
.library-right-title {
width: 120rpx;
height: 100%;
padding-left: 4px;
line-height: 100rpx;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
}
}
}
// .library {
// width: 100%;
// height: 100rpx;
// display: flex;
// .library-left {
// width: 50%;
// height: 100%;
// display: flex;
// view {
// width: 100rpx;
// line-height: 100rpx;
// }
// .search {
// padding-left: 20px;
// }
// }
// .library-right {
// width: 50%;
// height: 100%;
// display: flex;
// .library-right-title {
// width: 120rpx;
// height: 100%;
// padding-left: 4px;
// line-height: 100rpx;
// }
// .input {
// width: 200rpx;
// height: 70rpx;
// margin-top: 15rpx;
// }
// }
// }
.add {
width: 100%;
height: 100rpx;

2
src/pages/raw/ingoods/dnReceipt/index.vue
Unescape Escape View File

@ -18,7 +18,7 @@
>
<u-search
:placeholder="this.$t('message.dn_PleaseScan')"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>

4
src/pages/raw/ingoods/dnReturnGoods/index.vue
Unescape Escape View File

@ -8,8 +8,8 @@
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<u-form-item :required="true" :label="this.$t('message.dn_OddNumbers')" prop="documentNo">
<u-search :placeholder="this.$t('message.dn_PleaseScan')" v-model="form.documentNo" @search="model.queryOrder" :show-action="false"></u-search>
<u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="documentNo">
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model.trim="form.documentNo" @search="model.queryOrder" :show-action="false"></u-search>
</u-form-item>
<u-form-item :label="$t('message.po_Supplier')">
<u-input v-model="model.orderInInfo.supplyCode" :placeholder="$t('message.po_PleaseInput')" />

4
src/pages/raw/ingoods/poReceipt/index.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<view class="left">
<u-icon class="icon" name="arrow-left" @click="index" />
</view>
<view class="title">{{ $t("message.po_ReceivingGoods") }}</view>
<view class="title">{{$t("message.po_ReceivingGoods") }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
@ -18,7 +18,7 @@
>
<u-search
:placeholder="this.$t('message.po_PleaseScan')"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="searchHandle"
:show-action="false"
></u-search>

2
src/pages/raw/ingoods/poReceipt/poReceiving.vue
Unescape Escape View File

@ -18,7 +18,7 @@
<view>{{ $t("message.po_OddNumbers") }}</view>
<u-search
:placeholder="$t('message.po_PleaseScan')"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>

2
src/pages/raw/ingoods/receipt/index.vue
Unescape Escape View File

@ -11,7 +11,7 @@
<u-form-item label="看单号" prop="documentNo">
<u-search
placeholder="请扫描看单号"
v-model="form.documentNo"
v-model.trim="form.documentNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>

2
src/pages/raw/warehouse/rowCollect/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.CommissionedSingleNumber') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model="order3" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="order3" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>

2
src/pages/raw/warehouse/rowInventory/index.vue
Unescape Escape View File

@ -9,7 +9,7 @@
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="pddNo">
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.pddNo" @search="model.rawMaterialInventoryCheckRaw" :show-action="false"></u-search>
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model.trim="form.pddNo" @search="model.rawMaterialInventoryCheckRaw" :show-action="false"></u-search>
</u-form-item>
<u-form-item :label="$t('message.InventoryMaterielNo')" prop="productCode">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="checkRawProductCode" :show-action="false"></u-search>

2
src/pages/raw/warehouse/rowScrap/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
<view class="single">
<view class="single-left">
<view>{{ $t('message.CommissionedSingleNumber') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model="order3" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="order3" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>

2
src/pages/raw/warehouse/rowTransfer/index.vue
Unescape Escape View File

@ -10,7 +10,7 @@
<u-form class="form" ref="form" :error-type="['toast']" label-width="150rpx">
<!-- 单号查询 -->
<u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="orderNo">
<u-search :placeholder="$t('message.Commission_tips1')" v-model="order3" @search="query" :show-action="false"></u-search>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="order3" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 物料号选择 -->
<u-form-item :required="true" :label="$t('message.CommissionedMaterielNo')">

14
src/utils/mixin.ts
Unescape Escape View File

@ -1,7 +1,7 @@
/*
* @Author: zhou lei
* @Date: 2022-01-20 11:26:20
* @LastEditTime: 2022-01-20 17:48:10
* @LastEditTime: 2022-01-22 10:21:10
* @LastEditors: zhou lei
* @Description:
* @FilePath: /wms_haiwai_app/src/utils/mixin.ts
@ -9,7 +9,7 @@
*/
import Vue from 'vue';
import { Component } from 'vue-property-decorator';
import _ from 'lodash';
@Component // 一定要用Component修饰
export default class MyMixins extends Vue {
customToast(msg: string, type = 'MODEL', title = '') {
@ -26,4 +26,14 @@ export default class MyMixins extends Vue {
});
}
}
/**
* search trim 去空格
*
* @param {*} v
* @param {*} key
* @memberof MyMixins
*/
searchchange(v, key) {
_.set(this, key, this.$u.trim(v));
}
}

13
types/vue-prototype.d.ts vendored
Unescape Escape View File

@ -2,7 +2,7 @@
/*
* @Author: zhou lei
* @Date: 2022-01-21 09:23:56
* @LastEditTime: 2022-01-21 11:47:17
* @LastEditTime: 2022-01-22 09:58:04
* @LastEditors: zhou lei
* @Description:
* @FilePath: /wms_haiwai_app/types/vue-prototype.d.ts
@ -22,5 +22,16 @@ declare module 'vue/types/vue' {
* @memberof Vue
*/
customToast(msg: string, type?: string = 'toast', title?: string = ''): void;
$u: {
trim(v: any);
};
/**
* search trim 去空格
*
* @param {*} v
* @param {*} key
* @memberof Vue
*/
searchchange(v: any, key: any): void;
}
}

Write Preview
Loading…
Cancel
Save