From 04a831b2a945b9b6bcb659038a6fed1d3148e3ce Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 14:20:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
/dev/null | 124 ------------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 19 +
代码管理/淮安PDA/pages.json | 398 ---------------------------------------
代码管理/淮安PDA/pages/stash/receiveorder.vue | 5
4 files changed, 14 insertions(+), 532 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index d18e849..6d593ae 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -95,7 +95,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒版敹璐у崟");
}
- if (receiveOrder.ReceiveOrderStatus==ReceiveOrderStatusEnum.Completed.ObjToInt())
+ if (receiveOrder.ReceiveOrderStatus == ReceiveOrderStatusEnum.Completed.ObjToInt())
{
return WebResponseContent.Instance.Error($"鏀惰揣鍗曞凡瀹屾垚");
}
@@ -126,7 +126,7 @@
Serno = item.RowNo,
Supplotno = "",
Taxrate = "",
-
+
};
recevieOrderDetails.Add(recevieOrderDetail);
}
@@ -142,7 +142,7 @@
ReceiveDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
PlantsId = "HA02",
SuppliersId = receiveOrder.SuppliersId,
- Type = Enum.GetName(typeof(ReceiveOrderTypeEnum),receiveOrder.ReceiveOrderType),
+ Type = Enum.GetName(typeof(ReceiveOrderTypeEnum), receiveOrder.ReceiveOrderType),
UniqueTag = receiveOrder.ReceiveOrderId.ToString(),
WarehouseCode = warehouse.WarehouseCode,
Way = 1,
@@ -150,8 +150,8 @@
};
//鏀惰揣鎺ㄩ�佽嚦ERP
string Content = _invokeERPService.InvokeMatReceiveApi(receiveModel);
- ErpRequestContent erpRequest=Content.DeserializeObject<ErpRequestContent>();
- if (erpRequest.res==0)
+ ErpRequestContent erpRequest = Content.DeserializeObject<ErpRequestContent>();
+ if (erpRequest.res == 0)
{
return WebResponseContent.Instance.Error(erpRequest.Data);
}
@@ -173,15 +173,16 @@
try
{
int pageNo = saveModel.MainData["pageNo"].ObjToInt();
+ int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
string orderNo = saveModel.MainData["orderNo"].ToString();
List<Dt_ReceiveOrder> dt_ReceiveOrders = new List<Dt_ReceiveOrder>();
if (string.IsNullOrEmpty(orderNo))
{
- dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
+ dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
}
else
{
- dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
+ dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
}
content.OK(data: dt_ReceiveOrders);
@@ -230,7 +231,7 @@
Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
{
- InboundOrderNo="TestInboundNo21",//娴嬭瘯
+ InboundOrderNo = "TestInboundNo21",//娴嬭瘯
UpperOrderNo = receiveOrder.ReceiveOrderNo,
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
@@ -352,7 +353,7 @@
}
receiveOrder = new Dt_ReceiveOrder()
{
- ReceiveOrderNo= "TestReceiveOrderNo21",//娴嬭瘯
+ ReceiveOrderNo = "TestReceiveOrderNo21",//娴嬭瘯
ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt(),
CustomerId = "",
DeliveryCode = "/",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages.json"
index c91abb8..767a3c3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages.json"
@@ -77,404 +77,6 @@
"navigationBarTitleText": "鏀惰揣鍗�",
"enablePullDownRefresh": false
}
- },
- // {
- // "path": "pages/materielGroup/inboundOrder",
- // "style": {
- // "navigationBarTitleText": "鍏ュ簱璁㈠崟",
- // "enablePullDownRefresh": false
- // }
- // },
- //鍘熸潗鏂欑粍鐩�(璁㈠崟)
- {
- "path": "pages/raworderboxing/inboundorder",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/raworderboxing/orderboxing",
- "style": {
- "navigationBarTitleText": "缁勭洏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/raworderboxing/releaseboxing",
- "style": {
- "navigationBarTitleText": "瑙ｇ粦鎵樼洏",
- "enablePullDownRefresh": false
- }
- },
- //鍏朵粬缁勭洏
- {
- "path": "pages/otherboxing/otherboxing",
- "style": {
- "navigationBarTitleText": "鍏朵粬缁勭洏",
- "enablePullDownRefresh": false
- }
- },
-
- //鎴愬搧缁勭洏
- {
- "path": "pages/productboxing/productboxing",
- "style": {
- "navigationBarTitleText": "鎴愬搧缁勭洏",
- "enablePullDownRefresh": false
- }
- },
-
- //鎵嬪姩鍑哄簱绠＄悊
- {
- "path": "pages/rawhandoutbound/rawhandoutbound",
- "style": {
- "navigationBarTitleText": "鍘熸枡鎵嬪姩鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/rawhandoutbound/handoutbound",
- "style": {
- "navigationBarTitleText": "ZB鎵嬪姩鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/rawhandoutbound/kbhandoutbound",
- "style": {
- "navigationBarTitleText": "KB鎵嬪姩鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/rawhandoutbound/manualoutbound",
- "style": {
- "navigationBarTitleText": "鏍堟澘鍖烘寚瀹氬嚭搴�",
- "enablePullDownRefresh": false
- }
- },
-
- //鎴愬搧鍑哄簱
- {
- "path": "pages/productoutbound/productoutbound",
- "style": {
- "navigationBarTitleText": "鎴愬搧鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
-
- //鍗婃垚鍝佺粍鐩�
- {
- "path": "pages/halfproduct/hpreceiveorder",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佺粍鐩�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/halfproduct/halfproductboxing",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佺粍鐩�",
- "enablePullDownRefresh": false
- }
- },
-
- //鐢熶骇棰嗘枡鍗�(浠撳簱鎵嬪姩澶囨枡)
- {
- "path": "pages/receiveorder/receiveorder",
- "style": {
- "navigationBarTitleText": "鏀惰揣鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/receiveorder/multiplereceiveorder",
- "style": {
- "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�(澶�)",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/receiveorder/multiplereceiveorderout",
- "style": {
- "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�(澶�)",
- "enablePullDownRefresh": false
- }
- },
-
- //璋冩嫧鐢宠鍗�(浠撳簱鎵嬪姩澶囨枡)
- {
- "path": "pages/allocationorder/allocationorder",
- "style": {
- "navigationBarTitleText": "璋冩嫧鐢宠鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/allocationorder/allocationorderoutbound",
- "style": {
- "navigationBarTitleText": "璋冩嫧鐢宠鍗�",
- "enablePullDownRefresh": false
- }
- },
-
- //鐩存帴璋冩嫧鍗�(浠撳簱鎵嬪姩澶囨枡)
- {
- "path": "pages/directorder/directorder",
- "style": {
- "navigationBarTitleText": "鐩存帴璋冩嫧鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/directorder/directorderoutbound",
- "style": {
- "navigationBarTitleText": "鐩存帴璋冩嫧鍗�",
- "enablePullDownRefresh": false
- }
- },
-
- //鍏朵粬鍑哄簱鍗�(浠撳簱鎵嬪姩澶囨枡)
- {
- "path": "pages/otheroutboundorder/otheroutboundorder",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/otheroutboundorder/otherorderoutbound",
- "style": {
- "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�",
- "enablePullDownRefresh": false
- }
- },
-
- //绉诲簱绠＄悊
- {
- "path": "pages/relocation/relocation",
- "style": {
- "navigationBarTitleText": "绉诲簱",
- "enablePullDownRefresh": false
- }
- },
-
- //绌虹绠＄悊
- {
- "path": "pages/emptybox/emptyboxmanage",
- "style": {
- "navigationBarTitleText": "绌虹绠＄悊",
- "enablePullDownRefresh": false
- }
- },
-
- //鎷ｉ�夌鐞�
- {
- "path": "pages/picking/pickingMat",
- "style": {
- "navigationBarTitleText": "鎷ｉ��",
- "enablePullDownRefresh": false
- }
- },
-
- //鐢熶骇鍙枡绠＄悊
- {
- "path": "pages/callmat/receiveorder",
- "style": {
- "navigationBarTitleText": "鐢熶骇鍙枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/callmat/ordercallmat",
- "style": {
- "navigationBarTitleText": "鐢熶骇鍙枡",
- "enablePullDownRefresh": false
- }
- },
-
-
- //閰嶉�佺鐞�
- {
- "path": "pages/delivery/delivery",
- "style": {
- "navigationBarTitleText": "閰嶉�佺鐞�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/delivery/getcarryinfo",
- "style": {
- "navigationBarTitleText": "閰嶉�佷俊鎭煡璇�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/delivery/carrycheck",
- "style": {
- "navigationBarTitleText": "閰嶉�佹牎楠�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/delivery/trainstockbind",
- "style": {
- "navigationBarTitleText": "灏忕伀杞﹀簱瀛樼粦瀹�",
- "enablePullDownRefresh": false
- }
- },
-
- //C鍖虹鐞�
- {
- "path": "pages/carea/carea",
- "style": {
- "navigationBarTitleText": "C鍖虹鐞�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/carea/zbareaboxing",
- "style": {
- "navigationBarTitleText": "C鍖虹粍鐩�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/carea/cacheareacallmat",
- "style": {
- "navigationBarTitleText": "C鍖哄彨鏂�",
- "enablePullDownRefresh": false
- }
- },
-
-
- //搴撳瓨绠＄悊
- {
- "path": "pages/stock/stock",
- "style": {
- "navigationBarTitleText": "搴撳瓨绠＄悊",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/stock/bindstock",
- "style": {
- "navigationBarTitleText": "搴撳瓨缁戝畾",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/stock/releasestock",
- "style": {
- "navigationBarTitleText": "搴撳瓨瑙ｇ粦",
- "enablePullDownRefresh": false
- }
- },
-
- //鍑哄簱鎵弿
- {
- "path": "pages/outboundscan/matoutboundscan",
- "style": {
- "navigationBarTitleText": "鍘熸潗鏂欏嚭搴撴壂鎻�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/outboundscan/productoutboundscan",
- "style": {
- "navigationBarTitleText": "鎴愬搧鍑哄簱鎵弿",
- "enablePullDownRefresh": false
- }
- },
-
- //鍐呯鎷嗗垎
- {
- "path": "pages/other/other",
- "style": {
- "navigationBarTitleText": "鍐呯鎷嗗垎",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/other/printtag",
- "style": {
- "navigationBarTitleText": "鍐呯鎷嗗垎(F2)",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/other/printtagf4",
- "style": {
- "navigationBarTitleText": "鍐呯鎷嗗垎(F4)",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/other/printtagf7",
- "style": {
- "navigationBarTitleText": "鍐呯鎷嗗垎(F7)",
- "enablePullDownRefresh": false
- }
- },
-
- //鍙枡璇锋眰
- {
- "path": "pages/carry/getCarryRequest",
- "style": {
- "navigationBarTitleText": "鍙枡璇锋眰",
- "enablePullDownRefresh": false
- }
- },
-
- //鍙栨秷浠诲姟
- {
- "path": "pages/taskInfo/cancelTask",
- "style": {
- "navigationBarTitleText": "鍙栨秷浠诲姟",
- "enablePullDownRefresh": false
- }
- },
-
- //鐐瑰鐐�
- {
- "path": "pages/test/qianfushitest",
- "style": {
- "navigationBarTitleText": "鐐瑰鐐逛换鍔�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/test/acrossfloor",
- "style": {
- "navigationBarTitleText": "璺ㄦゼ灞傛惉杩�",
- "enablePullDownRefresh": false
- }
- },
-
- //璁剧疆
- {
- "path": "pages/index/settings",
- "style": {
- "navigationBarTitleText": "璁剧疆",
- "enablePullDownRefresh": false
- }
- },
-
- //璺ㄦゼ灞傚彨鏂�
- {
- "path": "pages/acrossfloor/matbind",
- "style": {
- "navigationBarTitleText": "璺ㄦゼ灞傚彨鏂欑粦瀹�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/acrossfloor/acrossfloorcallmat",
- "style": {
- "navigationBarTitleText": "璺ㄦゼ灞傚彨鏂�",
- "enablePullDownRefresh": false
- }
}
],
"globalStyle": {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/acrossfloorcallmat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/acrossfloorcallmat.vue"
deleted file mode 100644
index a2c0e40..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/acrossfloorcallmat.vue"
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
- <view style="padding: 5%;">
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms label-width="120">
- <uni-forms-item label="缁堢偣鍦板潃">
- <uni-data-select v-model="value" :localdata="range"></uni-data-select>
- </uni-forms-item>
- </uni-forms>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙枡</button>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- istrue: false,
- range: [],
- value: ""
- }
- },
- onLoad() {
- this.getEndLocations();
- },
- methods: {
- submit() {
- if (this.value.length <= 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨缁堢偣鍦板潃",
- type: "error"
- })
- return;
- }
- var param = {
- MainData: {
- matCode: this.value,
- endPoint: this.value
- }
- }
- this.$u.post('/api/AcrossFloorCarry/AcrossFloorCallMat', param).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍙枡鎴愬姛",
- type: "success"
- })
- this.carNo = "";
- this.value = "";
- this.locationNo = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- getEndLocations() {
- this.$u.post('/api/AcrossFloorCarry/GetEndPoints?floor=F6', null).then(res => {
- if (res.status) {
- this.range = res.data;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/matbind.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/matbind.vue"
deleted file mode 100644
index f6ab892..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/acrossfloor/matbind.vue"
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
- <view style="padding: 5%;">
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms label-width="120">
- <uni-forms-item label="鏂欒溅缂栧彿">
- <uni-easyinput type="text" :focus="!istrue" @input="carNoInputChange" v-model="carNo"
- placeholder="璇锋壂鎻忔枡杞︾紪鍙�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item label="搴撲綅缂栧彿">
- <uni-easyinput type="text" :focus="istrue" v-model="locationNo" placeholder="璇锋壂鎻忓簱浣嶇紪鍙�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item label="缁堢偣鍦板潃">
- <uni-data-select v-model="value" :localdata="range"></uni-data-select>
- </uni-forms-item>
-
- </uni-forms>
-
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁戝畾</button>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- istrue: false,
- carNo: "",
- locationNo: "",
- endpoint: "",
- range: [],
- value: ""
- }
- },
- onLoad() {
- this.getEndLocations();
- },
- methods: {
- submit() {
- if (this.locationNo.length <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓簱浣嶇紪鍙�",
- type: "error"
- })
- return;
- }
- if (this.carNo.length <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔枡杞︾紪鍙�",
- type: "error"
- })
- return;
- }
- if (this.value.length <= 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨缁堢偣鍦板潃",
- type: "error"
- })
- return;
- }
- var param = {
- MainData: {
- carNo: this.carNo,
- locationNo: this.locationNo,
- endPoint: this.value
- }
- }
- this.$u.post('/api/AcrossFloorCarry/MatBind', param).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "缁戝畾鎴愬姛",
- type: "success"
- })
- this.carNo = "";
- this.value = "";
- this.locationNo = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- carNoInputChange() {
- this.$nextTick(() => {
- this.istrue = true;
- });
- },
- getEndLocations() {
- this.$u.post('/api/AcrossFloorCarry/GetEndPoints?floor=F6', null).then(res => {
- if (res.status) {
- this.range = res.data;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorder.vue"
deleted file mode 100644
index 039a75d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorder.vue"
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.allocation_code)" link
- :to="page+item.allocation_code" v-for="item in allReceivingOrders" :key="item.allocation_code">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 璋冩嫧鍗曞彿:{{item.allocation_code}} </view>
- <view> 璋冩嫧绫诲瀷:{{item.allocation_order_type}} </view>
- <view> 鍗曟嵁鏃ユ湡:{{item.allocation_date}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/allocationorder/allocationorderoutbound?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetAllocationOrders', postData).then((res) => {
- if (res.status) {
- if(res.data){
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- }else{
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorderoutbound.vue"
deleted file mode 100644
index 8c18071..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/allocationorder/allocationorderoutbound.vue"
+++ /dev/null
@@ -1,437 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms style="margin-left: 2%;margin-top: 20px;" label-width="180">
- <uni-forms-item :label="label"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氳皟鎷ㄧ敵璇峰崟"></uni-forms-item>
- <uni-forms-item label="鍐呯鐮侊細">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="focus"
- v-model="innerCode" @input="innercodeInput" />
- </uni-forms-item>
- <uni-forms-item :label="matCode"></uni-forms-item>
- <uni-forms-item :label="matName"></uni-forms-item>
- <uni-forms-item :label="currentQty"></uni-forms-item>
- <uni-forms-item :label="orderQty"></uni-forms-item>
- <uni-forms-item :label="scanQty"></uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item label="鍖哄煙"><uni-data-select v-model="value"
- :localdata="range"></uni-data-select></uni-forms-item>
- <uni-forms-item label="妤煎眰"><uni-data-select v-model="floor"
- :localdata="floorrange"></uni-data-select></uni-forms-item>
- </uni-forms>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
- <template v-slot:body>
- <view class="uni-list-box">
- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button>
- <view class="uni-content">
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鍗曟嵁鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">宸插垎閰嶆暟閲忥細{{item.processQty}}</view>
- <view style="font-size: 18px;">鍑哄簱鏁伴噺锛歿{item.outQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="printfloor" :localdata="printfloorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <uni-forms-item :label="tagmatName"></uni-forms-item>
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鍑哄簱鏉＄爜鎵弿', '鏄庣粏', '鎷嗗垎', '鍏ュ簱'],
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- tagFocus: true,
- numberFocus: false,
- focus: true,
- tag: "",
- number: "",
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- value: "KB",
- range: [{
- value: "KB",
- text: "KB"
- },
- {
- value: "ZB",
- text: "ZB"
- }
- ],
- floor: "F2",
- floorrange: [{
- value: "F2",
- text: "F2"
- },
- {
- value: "F3",
- text: "F3"
- },
- {
- value: "F4",
- text: "F4"
- },
- {
- value: "F7",
- text: "F7"
- }
- ],
- printfloor: "F2",
- printfloorrange: [{
- value: "F2",
- text: "F2"
- },
- {
- value: "F2-ZB",
- text: "F2-ZB"
- },
- {
- value: "F3",
- text: "F3"
- },
- {
- value: "F4",
- text: "F4"
- },
- {
- value: "F7",
- text: "F7"
- },
- {
- value: "F7-2",
- text: "F7-2"
- }
- ],
- barcode: "",
- address: "",
- istrue: false
- }
- },
- onLoad(res) {
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- updateFocus() {
- this.$nextTick(() => {
- this.innerCode = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- inbound() {
- if (this.barcode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樺彿",
- type: "error"
- })
- return;
- }
- if (this.address.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.barcode = "";
- this.address = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/ErpOrder/GetAllocationOrderInfo', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- innercodeInput() {
- this.$nextTick(() => {
- if (this.innerCode == "") {
- return;
- }
- var innerCode = this.innerCode;
- setTimeout(() => {
- this.innerCode = "";
- }, 10);
-
- // this.focus = false;
- if (innerCode.split('|').length == 7) {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- innerCode: innerCode
- },
- }
- this.$u.post('/api/ErpOrder/UpdateAlloctionOrder', postData).then((res) => {
- if (res.status) {
- this.matCode = "鐗╂枡缂栫爜锛�" + res.data.matCode;
- this.matName = "鐗╂枡鍚嶇О锛�" + res.data.matName;
- this.orderQty = "闇�姹傛暟閲忥細" + res.data.orderQty;
- this.currentQty = "宸叉壂鏁伴噺锛�" + res.data.currentQty;
- this.scanQty = "绱鏁伴噺锛�" + res.data.scanQty;
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- // this.innerCode = "";
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- }
- this.numberFocus = true;
- })
- },
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ユ暟閲�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printfloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- outbound(code) {
- var postData = {
- MainData: {
- matCode: code,
- orderNo: this.orderNo,
- system: this.value,
- floor: this.floor
- }
- }
- this.$u.post('/api/ErpOrder/AllocationOrderOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/ordercallmat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/ordercallmat.vue"
deleted file mode 100644
index fb0e547..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/ordercallmat.vue"
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item :label="label"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟"></uni-forms-item>
- <uni-forms-item label="浜х嚎绔欑偣">
- <uni-easyinput type="text" :focus="!istrue" v-model="endPoint" placeholder="璇锋壂鎻忎骇绾跨珯鐐�"
- ref='midInput' @input="inputChangebarcode()" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-combox :candidates="candidates" @input="inputChange()" placeholder="璇烽�夋嫨鐗╂枡缂栧彿"
- v-model="materialsns"></uni-combox>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙枡</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-if="innersn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(innersn.matCode)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{innersn.matCode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鍗曟嵁鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">鍑哄簱鏁伴噺锛歿{item.outQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['鐢熶骇鍙枡', '鏄庣粏'],
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- istrue: false,
- endPoint: "",
- materialsns: "",
- innersn: null,
- callMatCode: "",
- candidates: []
- }
- },
- onLoad(res) {
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrderInfoByCode', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data.receiving_Dtls;
- this.candidates = res.data.matCodes;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- inputChangebarcode() {
- // this.innersn = null;
-
- // this.$nextTick(() => {
- // if (this.materialsns.length < 14 && this.materialsns.indexOf("鍗婃垚鍝�") == -1) {
- // return;
- // }
-
- // var matInfo = this.materialsns.split('|');
- // if (matInfo.length == 6) {
- // this.callMatCode = "";
- // var matObj = {
- // matCode: matInfo[1],
- // }
- // this.callMatCode = matInfo[1];
- // this.innersn = matObj;
- // } else {
- // var matObj = {
- // matCode: this.materialsns
- // }
- // this.innersn = matObj;
- // this.callMatCode = this.materialsns;
- // }
-
- // setTimeout(() => {
- // this.materialsns = "";
- // }, 100);
- // })
- },
- inputChange(e) {
- this.innersn = null;
-
- this.$nextTick(() => {
- if (this.materialsns.length < 14 && this.materialsns.indexOf("鍗婃垚鍝�") == -1) {
- return;
- }
- var matInfo = this.materialsns.split('|');
- if (matInfo.length > 6) {
- this.callMatCode = "";
- var matObj = {
- matCode: matInfo[1],
- }
- this.callMatCode = matInfo[1];
- this.innersn = matObj;
- } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔纭绠辩爜",
- // type: "error"
- // })
- var matObj = {
- matCode: this.materialsns
- }
- this.innersn = matObj;
- this.callMatCode = this.materialsns;
- }
-
- setTimeout(() => {
- this.materialsns = "";
- }, 100);
- })
- },
- submit() {
- if(this.callMatCode == ''){
- this.$refs.uToast.show({
- title: "璇锋壂鎻忕墿鏂欑紪鍙�",
- type: "error"
- });
- return;
- }
- this.$u.post('/api/Carry/CallMaterial2', {
- MainData: {
- "endPoint": this.endPoint,
- "matCode": this.callMatCode,
- "orderNo": this.orderNo
- }
- }).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('鍙枡鎴愬姛!')
- this.innersn = null;
- this.callMatCode = "";
- this.materialsns = "";
- // this.endPoint = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/receiveorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/receiveorder.vue"
deleted file mode 100644
index 23fe3f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/callmat/receiveorder.vue"
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.receive_code)" link
- :to="page+item.receive_code" v-for="item in allReceivingOrders" :key="item.receive_code">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 宸ュ崟鍙�:{{item.receive_code}} </view>
- <view> 浜у搧鏂欏彿:{{item.receive_productNo}} </view>
- <view> 浜х嚎:{{item.receive_line}} </view>
- <view> 鏁伴噺:{{item.receive_quantity}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/callmat/ordercallmat?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrderCodes', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- } else {
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/cacheareacallmat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/cacheareacallmat.vue"
deleted file mode 100644
index 3a0c088..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/cacheareacallmat.vue"
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
- <view>
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" @input="inputChange()" v-model="materialsns" placeholder="璇锋壂鎻忓唴绠辨爣绛�"
- ref='midInput' :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item label="浜х嚎缂栧彿">
- <uni-easyinput type="text" v-model="line" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" ref='midInput' :focus="!istrue" />
- </uni-forms-item>
-
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙枡</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-if="innersn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(innersn.matCode)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{innersn.matCode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- istrue: true,
- endPoint: '',
- materialsns: "",
- matCode: "",
- innersn: null,
- line: ""
- }
- },
- onLoad(res) {},
- methods: {
- submit() {
- if (this.line == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ヤ骇绾跨紪鍙�",
- type: "error"
- })
- return;
- }
- if (this.matCode == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ョ墿鏂欑紪鍙�",
- type: "error"
- })
- return;
- }
- var temp = this.line.split('-');
- this.$u.post('/api/Carry/CallMaterial', {
- MainData: {
- "endPoint": "A-" + temp[0] + "-TEMP-" + temp[1] + "-01锛�01-01",
- "matCode": this.matCode,
- "system": "ZB"
- }
- }).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('鍙枡鎴愬姛!')
- this.innersn = null;
- this.matCode = "";
- this.materialsns = "";
- this.endPoint = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- inputChange(e) {
- this.innersn = null;
-
- this.$nextTick(() => {
- if (this.materialsns.length < 14) {
- return;
- }
-
- var matInfo = this.materialsns.split('|');
- if (matInfo.length > 6) {
- this.matCode = "";
- var matObj = {
- matCode: matInfo[1],
- }
- this.matCode = matInfo[1];
- this.innersn = matObj;
- } else {
- var matObj = {
- matCode: this.materialsns
- }
- this.innersn = matObj;
- this.matCode = this.materialsns;
- }
- setTimeout(() => {
- this.materialsns = "";
- }, 100);
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- width: 100%;
- background-color: #fff;
- padding: 20rpx 40rpx;
- }
-
- .footer {
- // padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/carea.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/carea.vue"
deleted file mode 100644
index adfe350..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/carea.vue"
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
- v-model="barcode" @input="barcodeInput" @focus="barcodeFocus" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus" v-model="materSn"
- @input="snInput" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matInfos" :key="item.orderNo">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.orderNo)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍙凤細{{item.orderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.matProductionDate}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.matQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="!bindbarcodefocus" v-model="locationNo" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @input="locationNoinputChange" />
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="bindbarcodefocus" v-model="bindbarcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput'/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="bindstock" type="primary" size="default" style="margin-top: 2%;">搴撳瓨缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" @input="inputChange()" v-model="materialsns" placeholder="璇锋壂鎻忓唴绠辨爣绛�"
- ref='midInput' :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item label="浜х嚎缂栧彿">
- <uni-easyinput type="text" v-model="line" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" ref='midInput' :focus="!istrue" />
- </uni-forms-item>
-
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙枡</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-if="innersn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(innersn.matCode)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{innersn.matCode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['C鍖虹粍鐩�', 'C鍖哄簱瀛樼粦瀹�', 'C鍖哄彨鏂�'],
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- locationNo: "",
- bindbarcode: '',
- bindbarcodefocus: false,
- }
- },
- onLoad(res) {},
- methods: {
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- updateFocus() {
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- },
- barcodeFocus() {},
- onClickItem(e) {
- if (this.barcode == "") {
- this.focus = false;
- this.addressFocus = false;
- } else {
- this.focus = true;
- this.addressFocus = true;
- }
-
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- barcodeInput() {
- this.focus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.focus = true;
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- // this.focus = false;
- var matInfo = this.materSn.split('|');
- if (matInfo.length == 7) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: this.materSn
- }
- var orderInfo = matObj.orderNo.split('.');
- var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
- if (!temp) {
- var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- if (!tmp) {
- this.matTotal.push({
- matCode: matObj.matCode,
- matQuantity: parseInt(matObj.matQty)
- })
- } else {
- tmp.matQuantity += parseInt(matObj.matQty);
- }
- this.sns.push(this.materSn);
- this.matInfos.push(matObj);
- // setTimeout(this.updateFocus, 200);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- // setTimeout(this.updateFocus, 200);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- type: "error"
- })
- // setTimeout(this.updateFocus, 200);
- }
- }
- this.materSn = '';
- })
- },
- bindstock() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.bindbarcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationNo": this.locationNo,
- "barcode": this.bindbarcode
- },
- }
- this.$u.post('/api/StockOperate/BindStock', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- locationNoinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.locationNo != '') {
- this.barcodefocus = true;
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/Bill_group_stock/OtherBoxing', {
- MainData: {
- "pallet_barcode": this.barcode,
- "orderNo": this.orderNo
- },
- DetailData: this.matInfos,
- DelKeys: this.sns
- }).then(res => {
- if (res.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- uni.showToast.show({
- title: err.message,
- type: 'error'
- })
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/zbareaboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/zbareaboxing.vue"
deleted file mode 100644
index 54cd90d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carea/zbareaboxing.vue"
+++ /dev/null
@@ -1,264 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0">
- <uni-forms style="margin-top: 20px;margin-left: 20px;width: 100%;" label-width="180">
- <uni-forms-item :label="label">
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
- v-model="barcode" @input="barcodeInput" @focus="barcodeFocus"/>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus" v-model="materSn"
- @input="snInput"/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default"style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matInfos" :key="item.orderNo">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.orderNo)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍙凤細{{item.orderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.matProductionDate}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.matQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- <view v-if="current === 1">
- <uni-forms style="margin-top: 20px;margin-left: 20px;width: 100%;" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode()" @focus="barcodeFocus"/>
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus"/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">搴撳瓨缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['缁勭洏', '搴撳瓨缁戝畾'],
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: ""
- }
- },
- onLoad(res) {
- this.focus = false;
- this.addressFocus = false;
- },
- methods: {
- updateFocus() {
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- },
- barcodeFocus() {
- },
- onClickItem(e) {
- if(this.barcode == ""){
- this.focus = false;
- this.addressFocus = false;
- }else{
- this.focus = true;
- this.addressFocus = true;
- }
-
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- barcodeInput() {
- this.focus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.focus = true;
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matInfo = this.materSn.split('|');
- if (matInfo.length == 7) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: this.materSn
- }
- var orderInfo = matObj.orderNo.split('.');
- var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
- if (!temp) {
- var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- if (!tmp) {
- this.matTotal.push({
- matCode: matObj.matCode,
- matQuantity: parseInt(matObj.matQty)
- })
- } else {
- tmp.matQuantity += parseInt(matObj.matQty);
- }
- this.sns.push(this.materSn);
- this.matInfos.push(matObj);
- setTimeout(this.updateFocus, 200);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- setTimeout(this.updateFocus, 200);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- type: "error"
- })
- setTimeout(this.updateFocus, 200);
- }
- }
- })
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/Bill_group_stock/OtherBoxing', {
- MainData: {
- "pallet_barcode": this.barcode,
- "orderNo": this.orderNo
- },
- DetailData: this.matInfos,
- DelKeys: this.sns
- }).then(res => {
- if (res.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- uni.showToast.show({
- title: err.message,
- type: 'error'
- })
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .footer {
- // padding-top: 50%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carry/getCarryRequest.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carry/getCarryRequest.vue"
deleted file mode 100644
index 994d2e5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/carry/getCarryRequest.vue"
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
- <view>
- <uni-data-select v-model="value" :localdata="range" @change="change"></uni-data-select>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="item in allReceivingOrders" :key="item.id">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 鐗╂枡缂栧彿:{{item.request_matcode}} </view>
- <view> 鍙枡缁堢偣:{{item.request_endpoint}} </view>
- <view> 宸ュ崟鍙�:{{item.request_orderno}} </view>
- <view> 鍙枡妤煎眰:{{item.request_floor}} </view>
- <view> 鍙枡浜�:{{item.creator}} </view>
- <view> 鍙枡鏃堕棿:{{item.createtime}} </view>
- <!-- <view> 鏃ユ湡:{{item.purchase_date}} </view> -->
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/outorder/receiveorderinfo?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0,
- city: "city",
- value: "F2",
- range: [{
- value: "F2",
- text: "F2"
- },
- {
- value: "F3",
- text: "F3"
- },
- {
- value: "F4",
- text: "F4"
- },
- {
- value: "F5",
- text: "F5"
- },
- ],
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- change(res) {
- this.value = res;
- this.getData();
- // console.log(res)
- },
- confirm() {
-
- },
- search(res) {
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- floor: this.value
- },
- }
- this.$u.post('/api/Carry/GetCallMatRequest', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- // console.log(this.allReceivingOrders)
- } else {
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
- $nav-height: 30px;
-
- .box-bg {
- background-color: #F5F5F5;
- padding: 5px 0;
- }
-
- .city {
- /* #ifndef APP-PLUS-NVUE */
- display: flex;
- /* #endif */
- flex-direction: row;
- align-items: center;
- justify-content: flex-start;
- // width: 160rpx;
- margin-left: 4px;
- }
-
- .input-view {
- /* #ifndef APP-PLUS-NVUE */
- display: flex;
- /* #endif */
- flex-direction: row;
- // width: 500rpx;
- flex: 1;
- background-color: #f8f8f8;
- height: $nav-height;
- border-radius: 15px;
- padding: 0 15px;
- flex-wrap: nowrap;
- margin: 7px 0;
- line-height: $nav-height;
- }
-
- .input-uni-icon {
- line-height: $nav-height;
- }
-
- .nav-bar-input {
- height: $nav-height;
- line-height: $nav-height;
- /* #ifdef APP-PLUS-NVUE */
- width: 370rpx;
- /* #endif */
- padding: 0 5px;
- font-size: 12px;
- background-color: #f8f8f8;
- }
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/carrycheck.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/carrycheck.vue"
deleted file mode 100644
index 2e0d0a1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/carrycheck.vue"
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
- <view>
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput'
- @input="barcodeinputChange" />
- </uni-forms-item>
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="barcodefocus" v-model="locationNo" @input="locationNoinputChange"
- placeholder="璇锋壂鎻忚揣浣嶇紪鍙�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item :label="label">
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- locationNo: "",
- barcode: '',
- barcodefocus: false,
- label:""
- }
- },
- onLoad(res) {
- },
- methods: {
- locationNoinputChange() {
- this.$nextTick(function(x) {
- if (this.locationNo == "") {
- return;
- }
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationCode": this.locationNo,
- "barcode": this.barcode
- },
- }
- this.$u.post('/api/Carry/PutMatCheck', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- this.locationNo = "";
- }
- this.label = res.message;
- })
- })
- },
- barcodeinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.barcodefocus = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- // padding-top: 50%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/delivery.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/delivery.vue"
deleted file mode 100644
index 5f165bc..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/delivery.vue"
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="barcodeinputChange" @confirm="submit" />
- </uni-forms-item>
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="barcodefocus" v-model="locationNo" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @confirm="submit" />
- </uni-forms-item>
-
- <uni-forms-item>
- <button @click="confirm" type="primary" size="default" style="margin-top: 2%;">鏁伴噺纭</button>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="trainStockBind" type="primary" size="default"
- style="margin-top: 2%;">鎵嬪姩缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!checkbarcodefocus" v-model="checkbarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="checkbarcodeinputChange" />
- </uni-forms-item>
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="checkbarcodefocus" v-model="checklocationNo"
- @input="locationNoinputChange" placeholder="璇锋壂鎻忚揣浣嶇紪鍙�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item :label="label">
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鏉＄爜淇℃伅">
- <uni-easyinput type="text" :focus="!infobarcodefocus" v-model="infobarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮佹垨灏忕伀杞︽潯鐮�" ref='midInput' @input="infoinputChange" />
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="(item,index) in infos" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鍑哄簱鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-title-sub uni-ellipsis-2">閰嶉�佸湴鍧�锛歿{item.address}}</view>
- <view class="uni-title-sub uni-ellipsis-2">褰撳墠浣嶇疆锛歿{item.currentAddress}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['搴撳瓨缁戝畾', '閰嶉�佹牎楠�', '閰嶉�佷俊鎭煡璇�'],
- current: 0,
- locationNo: "",
- barcode: '',
- barcodefocus: false,
-
- checklocationNo: "",
- checkbarcode: '',
- checkbarcodefocus: false,
- label: "",
-
- infos: [],
- infobarcode: '',
- infobarcodefocus: false,
- }
- },
- onLoad(res) {},
- methods: {
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- confirm() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "trainCode": this.locationNo,
- },
- }
- this.$u.post('/api/StockOperate/TrainStockBindConfirm', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- trainStockBind() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "trainCode": this.locationNo,
- "barcode": this.barcode
- },
- }
- this.$u.post('/api/StockOperate/TrainStockBind', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- barcodeinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.barcodefocus = true;
- }
- })
- },
-
-
- locationNoinputChange() {
- this.$nextTick(function(x) {
- if (this.checklocationNo == "") {
- return;
- }
- if (this.checkbarcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationCode": this.checklocationNo,
- "barcode": this.checkbarcode
- },
- }
- this.$u.post('/api/Carry/PutMatCheck', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.checklocationNo = "";
- this.checkbarcode = "";
- this.checkbarcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- this.checklocationNo = "";
- this.checkbarcode = "";
- this.checkbarcodefocus = false;
- }
- this.label = res.message;
- })
- })
- },
- checkbarcodeinputChange() {
- this.checkbarcodefocus = false;
- this.$nextTick(function(x) {
- if (this.checkbarcode != '') {
- this.checkbarcodefocus = true;
- }
- })
- },
-
- infoinputChange() {
- this.$nextTick(function(x) {
- if (this.infobarcode != '') {
- var postData = {
- MainData: {
- "barcode": this.infobarcode
- }
- };
- this.$u.post('/api/Carry/GetCarryInfo', postData).then(res => {
- if (res.status) {
- this.infos = res.data
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- this.infobarcode = "";
- })
- this.istrue = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/getcarryinfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/getcarryinfo.vue"
deleted file mode 100644
index 93ce629..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/getcarryinfo.vue"
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
- <view >
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鏉＄爜淇℃伅">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮佹垨灏忕伀杞︽潯鐮�" ref='midInput'
- @input="locationNoinputChange()" />
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="(item,index) in infos" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鍑哄簱鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-title-sub uni-ellipsis-2">閰嶉�佸湴鍧�锛歿{item.address}}</view>
- <view class="uni-title-sub uni-ellipsis-2">褰撳墠浣嶇疆锛歿{item.currentAddress}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- infos: [],
- barcode: '',
- barcodefocus: false,
- }
- },
- onLoad(res) {
- },
- methods: {
- locationNoinputChange() {
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- var postData = {
- MainData: {
- "barcode": this.barcode
- }
- };
- this.$u.post('/api/Carry/GetCarryInfo', postData).then(res => {
- if (res.status) {
- this.infos = res.data
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- this.barcode = "";
- })
- this.istrue = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- // padding-top: 20%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/trainstockbind.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/trainstockbind.vue"
deleted file mode 100644
index 2e31357..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/delivery/trainstockbind.vue"
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
- <view>
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput'
- @input="locationNoinputChange()" @confirm="submit" />
- </uni-forms-item>
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="barcodefocus" v-model="locationNo" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @confirm="submit" />
- </uni-forms-item>
-
- <uni-forms-item>
- <button @click="confirm" type="primary" size="default" style="margin-top: 2%;">鏁伴噺纭</button>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鎵嬪姩缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- locationNo: "",
- barcode: '',
- barcodefocus: false,
- }
- },
- onLoad(res) {},
- methods: {
- confirm(){
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "trainCode": this.locationNo,
- },
- }
- this.$u.post('/api/StockOperate/TrainStockBindConfirm', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- submit() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "trainCode": this.locationNo,
- "barcode": this.barcode
- },
- }
- this.$u.post('/api/StockOperate/TrainStockBind', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- locationNoinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.barcodefocus = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorder.vue"
deleted file mode 100644
index b7765af..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorder.vue"
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.directorder_code)" link
- :to="page+item.directorder_code" v-for="item in allReceivingOrders" :key="item.directorder_code">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 璋冩嫧鍗曞彿:{{item.directorder_code}} </view>
- <!-- <view> 璋冩嫧绫诲瀷:{{item.directorder_type}} </view> -->
- <view> 鍗曟嵁鏃ユ湡:{{item.directorder_date}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/directorder/directorderoutbound?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetDirectOrders', postData).then((res) => {
- if (res.status) {
- if(res.data){
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- }else{
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorderoutbound.vue"
deleted file mode 100644
index f816487..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/directorder/directorderoutbound.vue"
+++ /dev/null
@@ -1,574 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms style="margin-left: 2%;margin-top: 20px;" label-width="180">
- <uni-forms-item :label="label"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱洿鎺ヨ皟鎷ㄥ崟"></uni-forms-item>
- <uni-forms-item label="鍐呯鐮侊細">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="focus"
- v-model="innerCode" @input="innercodeInput" />
- </uni-forms-item>
- <uni-forms-item :label="matCode"></uni-forms-item>
- <uni-forms-item :label="matName"></uni-forms-item>
- <uni-forms-item :label="currentQty"></uni-forms-item>
- <uni-forms-item :label="orderQty"></uni-forms-item>
- <uni-forms-item :label="scanQty"></uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-forms label-width="180">
- <uni-forms-item label="鍖哄煙"><uni-data-select v-model="value"
- :localdata="range"></uni-data-select></uni-forms-item>
- <uni-forms-item label="妤煎眰"><uni-data-select v-model="floor"
- :localdata="floorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鍖哄煙">
- <uni-data-select v-model="endType" :localdata="endTypeRange"></uni-data-select>
- </uni-forms-item>
- </uni-forms>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
- <template v-slot:body>
- <view class="uni-list-box">
- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button>
- <view class="uni-content">
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鍗曟嵁鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">宸插垎閰嶆暟閲忥細{{item.processQty}}</view>
- <view style="font-size: 18px;">鍑哄簱鏁伴噺锛歿{item.outQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="printfloor" :localdata="printfloorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <uni-forms-item :label="tagmatName"></uni-forms-item>
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 4" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="releasevalue" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="releasefocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default" style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotals" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鎵弿', '鏄庣粏', '鎷嗗垎', '鍏ュ簱', '瑙ｇ洏'],
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- tagFocus: true,
- numberFocus: false,
- focus: true,
- tag: "",
- number: "",
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- value: "",
- range: [],
- floor: "",
- floorrange: [],
- printfloor: "",
- printfloorrange: [],
- barcode: "",
- address: "",
- istrue: false,
- releasefocus: true,
- releasevalue: "",
- matInfo: [],
- matTotals: [],
- value2: "",
- searchValue: "",
- endType: "",
- endTypeRange: []
- }
- },
- mounted() {
- this.printfloorrange = config.printFloorRange;
- this.floorrange = config.outboundFloorRange;
- if (config.outboundFloor) {
- this.floor = config.outboundFloor;
- }
- if (config.printFloor) {
- this.printfloor = config.printFloor;
- }
- this.range = config.warehouseRange;
- this.endTypeRange = config.outboundAreaRange;
- if (config.outboundArea) {
- this.endType = config.outboundArea;
- }
- if (config.warehouseArea) {
- this.value = config.warehouseArea;
- }
- },
- onLoad(res) {
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- search() {
- this.getData();
- },
- releasebox() {
- if (this.releasevalue.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.releasevalue.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.releasevalue
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.releasevalue
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.releasevalue = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.releasevalue.length == 0) {
- return;
- }
- var matInfo = this.releasevalue.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
- updateFocus() {
- this.$nextTick(() => {
- this.innerCode = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- inbound() {
- if (this.barcode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樺彿",
- type: "error"
- })
- return;
- }
- if (this.address.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.barcode = "";
- this.address = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- searchValue: this.searchValue
- },
- }
- this.$u.post('/api/ErpOrder/GetDirectOrderInfo', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- innercodeInput() {
- this.$nextTick(() => {
- if (this.innerCode == "") {
- return;
- }
- var innerCode = this.innerCode;
- setTimeout(() => {
- this.innerCode = "";
- }, 10);
-
- // this.focus = false;
- if (innerCode.split('|').length == 7) {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- innerCode: innerCode
- },
- }
- this.$u.post('/api/ErpOrder/UpdateDirectOrder', postData).then((res) => {
- if (res.status) {
- this.matCode = "鐗╂枡缂栫爜锛�" + res.data.matCode;
- this.matName = "鐗╂枡鍚嶇О锛�" + res.data.matName;
- this.orderQty = "闇�姹傛暟閲忥細" + res.data.orderQty;
- this.currentQty = "宸叉壂鏁伴噺锛�" + res.data.currentQty;
- this.scanQty = "绱鏁伴噺锛�" + res.data.scanQty;
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- // this.innerCode = "";
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- }
- this.numberFocus = true;
- })
- },
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ユ暟閲�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printfloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- outbound(code) {
- if (this.floor == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- matCode: code,
- orderNo: this.orderNo,
- system: this.value,
- floor: this.floor,
- endType: this.endType
- }
- }
- this.$u.post('/api/ErpOrder/DirectOrderOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/emptybox/emptyboxmanage.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/emptybox/emptyboxmanage.vue"
deleted file mode 100644
index fedf1ff..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/emptybox/emptyboxmanage.vue"
+++ /dev/null
@@ -1,222 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="barcodeFocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode()" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鐢宠鍏ュ簱</button>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鍑哄簱鍖哄煙">
- <uni-data-select v-model="outArea" :localdata="outAreas"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鎵�鍦ㄦゼ灞�">
- <uni-data-select v-model="floor" :localdata="floorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鏁伴噺">
- <uni-easyinput type="text" v-model="num" placeholder="璇疯緭鍏ュ嚭搴撴暟閲�" ref='midInput'
- :focus="numFocus" />
- </uni-forms-item>
- <button @click="outbound" type="primary" size="default" style="margin-top: 2%;">鍑哄簱</button>
- </uni-forms>
- </view>
- </view>
-
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- export default {
- data() {
- return {
- items: ['绌虹鍏ュ簱', '绌虹鍑哄簱'],
- current: 0,
- barcodeFocus: true, //绌虹鍏ュ簱鎵樼洏鍙峰厜鏍�
- addressFocus: false, //绌虹鍏ュ簱鍦板潃鍏夋爣
- barcode: '', //绌虹鎵樼洏鍙�
- address: "", //绌虹鍏ュ簱鍦板潃
- floorFocus: true, //绌虹鍑哄簱妤煎眰鍏夋爣
- numFocus: false, //绌虹鍑哄簱鏁伴噺鍏夋爣
- floor: '', //妤煎眰
- num: "", //绌虹鍑哄簱鏁伴噺
- floor: "",
- floorrange: [],
- outArea:"",
- outAreas:[
- {
- value: "1",
- text: "鍏ュ簱鍖�"
- },{
- value: "2",
- text: "鍑哄簱鍖�"
- },{
- value: "6",
- text: "鍏ュ簱杈撻�佺嚎"
- }
- ]
- }
- },
- mounted() {
- this.floorrange = config.outboundFloorRange;
- if (config.outboundFloor) {
- this.floor = config.outboundFloor;
- }
- },
- onLoad(res) {
- this.barcodeFocus = true;
- this.addressFocus = false;
- this.floorFocus = true;
- this.numFocus = false;
- },
- methods: {
- onClickItem(e) {
- this.addressFocus = false;
- this.floorFocus = true;
- this.numFocus = false;
- this.barcodeFocus = true;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
-
- },
- inbound() {
- if (this.barcode == '') {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.startPoint == '') {
- this.$refs.uToast.show({
- title: "鍦板潃涓嶈兘涓虹┖",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/EmptyBoxInbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- });
- this.barcode = "";
- this.address = "";
- this.barcodeFocus = true;
- this.addressFocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.barcodeFocus = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.addressFocus = true;
- }
- })
- },
- outbound() {
- if (this.floor == '') {
- this.$refs.uToast.show({
- title: "妤煎眰涓嶈兘涓虹┖",
- type: "error"
- });
- return;
- }
- if (this.num == '') {
- this.$refs.uToast.show({
- title: "鏁伴噺涓嶈兘涓虹┖",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "floor": this.floor,
- "num": this.num,
- "area": this.outArea
- }
- }
- this.$u.post('/api/Outbound/EmptyBoxOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- });
- this.barcode = "";
- this.address = "";
- this.barcodeFocus = true;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/halfproductboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/halfproductboxing.vue"
deleted file mode 100644
index 66de372..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/halfproductboxing.vue"
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item :label="label"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟"></uni-forms-item>
- <uni-forms-item label="鏂欒溅缂栫爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔枡杞︾紪鐮�"
- ref='midInput' @input="inputChangebarcode()" />
- </uni-forms-item>
- <uni-forms-item label="鐗╂枡缂栧彿">
- <uni-combox :candidates="candidates" placeholder="璇烽�夋嫨鐗╂枡缂栧彿" v-model="matcode"></uni-combox>
- </uni-forms-item>
- <uni-forms-item label="鐗╂枡鏁伴噺">
- <uni-easyinput type="number" v-model="quantity" placeholder="璇疯緭鍏ユ暟閲�" ref='midInput'
- :focus="quantityFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="addItem" type="primary" style="margin-left: 50px;" size="mini">娣诲姞</button>
- <button @click="submit" type="primary" style="margin-left: 100px;" size="mini">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matInfos" :key="item.index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matcode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="locationNo" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @input="locationNoinputChange" />
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="barcodefocus" v-model="barcode2" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="bindStock" type="primary" size="default"
- style="margin-top: 2%;">鎵嬪姩缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
-
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- // const SixUniTts = uni.requireNativePlugin("SmallSix-SixUniTts")
- export default {
- data() {
- return {
- items: ['鍗婃垚鍝佺粍鐩�', '搴撳瓨缁戝畾'],
- current: 0,
- istrue: false,
- barcode: '',
- matInfos: [],
- barcodefocus: true,
- quantity: 0,
- quantityFocus: false,
- matcode: "",
- index: 0,
- locationNo: "",
- barcode2: '',
- barcodefocus: false,
- label: "",
- orderNo: "",
- candidates: []
- }
- },
- onLoad(res) {
- this.barcodefocus = false;
- this.istrue = false;
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrderInfoByCode', postData).then((res) => {
- if (res.status) {
- // this.orderInfo = res.data.receiving_Dtls;
- this.candidates = res.data.matCodes;
- // if (this.orderInfo.length > 3) {
- // this.loadVisible = true;
- // }
- }
- })
- },
- onClickItem(e) {
- this.barcodeFo = true;
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- bindStock() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.barcode2 == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationNo": this.locationNo,
- "barcode": this.barcode2
- },
- }
- this.$u.post('/api/StockOperate/BindStock', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode2 = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
-
- locationNoinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.locationNo != '') {
- this.barcodefocus = true;
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔枡杞︾紪鐮�",
- type: "error"
- })
- return;
- }
- if (this.matInfos.length == 0) {
- this.$refs.uToast.show({
- title: "璇峰綍鍏ョ墿鏂欎俊鎭�",
- type: "error"
- })
- return;
- }
- var params = {
- MainData: {
- "barcode": this.barcode,
- "orderNo": this.orderNo
- },
- DetailData: this.matInfos
- };
- this.$u.post('/api/StockOperate/BCPBoxing', params).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.matInfos = [];
- this.barcode = "";
- this.matcode = "";
- this.quantity = 0;
- this.quantityFocus = true;
- this.istrue = false;
- this.index = 0;
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- addItem() {
- this.$nextTick(() => {
- if (this.matcode != "" && this.quantity > 0) {
- this.matInfos.push({
- matcode: this.matcode,
- quantity: parseInt(this.quantity),
- index: this.index++
- });
- this.$refs.uToast.show({
- title: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.matcode = "";
- this.quantity = 0;
- this.quantityFocus = false;
- this.istrue = true;
- } else {
- this.$refs.uToast.show({
- title: "鏁版嵁杈撳叆閿欒",
- type: "error"
- })
- }
- })
- },
- inputChange(e) {
- this.$nextTick(() => {
- this.istrue = false;
- this.quantityFocus = true;
- })
- },
- updateFocus() {
- this.materialsns = '';
- if (!this.istrue) {
- this.istrue = true;
- }
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- deleteList(res) {
- this.matInfos.map((item, index) => {
- if (item.matcode == res) {
- this.matInfos.splice(index, 1);
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/hpreceiveorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/hpreceiveorder.vue"
deleted file mode 100644
index 3446c19..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/halfproduct/hpreceiveorder.vue"
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.receive_code)" link
- :to="page+item.receive_code" v-for="item in allReceivingOrders" :key="item.receive_code">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 宸ュ崟鍙�:{{item.receive_code}} </view>
- <view> 浜у搧鏂欏彿:{{item.receive_productNo}} </view>
- <view> 浜х嚎:{{item.receive_line}} </view>
- <view> 鏁伴噺:{{item.receive_quantity}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/halfproduct/halfproductboxing?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrderCodes', postData).then((res) => {
- if (res.status) {
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/settings.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/settings.vue"
deleted file mode 100644
index 28b9447..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/index/settings.vue"
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
- <view style="padding: 5%;">
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms label-width="120">
- <uni-forms-item label="鎵撳嵃妤煎眰璁剧疆">
- <uni-data-select v-model="printFloor" :localdata="printFloorRange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱妤煎眰璁剧疆">
- <uni-data-select v-model="outboundFloor" :localdata="outboundFloorRange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="缁勭粐璁剧疆">
- <uni-data-select v-model="organizeValue" :localdata="organizeRange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍖哄煙">
- <uni-data-select v-model="warehouseArea" :localdata="warehouseRange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鍖哄煙">
- <uni-data-select v-model="outboundArea" :localdata="outboundAreaRange"></uni-data-select>
- </uni-forms-item>
- </uni-forms>
-
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">淇濆瓨</button>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config.js'
- export default {
- data() {
- return {
- printFloor: "",
- outboundFloor: "",
- organizeValue:"",
- warehouseArea:"",
- outboundArea:"",
- printFloorRange:[],
- outboundFloorRange:[],
- organizeRange:[]
- }
- },
- mounted() {
- var print = uni.getStorageSync('printFloor');
- if (print) {
- this.printFloor = print;
- config.printFloor = print;
- }
-
- var outbound = uni.getStorageSync('outboundFloor');
- if (outbound) {
- this.outboundFloor = outbound;
- config.outboundFloor = outbound;
- }
-
- var organize = uni.getStorageSync('organizeValue');
- if (organize) {
- this.organizeValue = organize;
- config.organizeValue = organize;
- }
-
- var outbound2 = uni.getStorageSync('outboundArea');
- if (outbound2) {
- this.outboundArea = outbound2;
- config.outboundArea = outbound2;
- }
-
- var warehouse = uni.getStorageSync('warehouseArea');
- if (warehouse) {
- this.warehouseArea = warehouse;
- config.warehouseArea = warehouse;
- }
- },
- onLoad(res) {
- this.printFloorRange = config.printFloorRange;
- this.outboundFloorRange = config.printFloorRange;
- this.organizeRange = config.organizeRange;
- this.outboundAreaRange = config.outboundAreaRange;
- this.warehouseRange = config.warehouseRange;
- },
- methods: {
- submit() {
- uni.setStorage({
- key: 'printFloor',
- data: this.printFloor,
- });
- config.printFloor = this.printFloor;
- uni.setStorage({
- key: 'outboundFloor',
- data: this.outboundFloor,
- });
- config.outboundFloor = this.outboundFloor;
- uni.setStorage({
- key: 'organizeValue',
- data: this.organizeValue,
- });
- config.organizeValue = this.organizeValue;
- uni.setStorage({
- key: 'warehouseArea',
- data: this.warehouseArea,
- });
- config.warehouseArea = this.warehouseArea;
- uni.setStorage({
- key: 'outboundArea',
- data: this.outboundArea,
- });
- config.outboundArea = this.outboundArea;
- this.$refs.uToast.show({
- title: "淇濆瓨鎴愬姛",
- type: "success"
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/other.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/other.vue"
deleted file mode 100644
index c8d9e14..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/other.vue"
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
- <view>
- <uni-forms style="margin-top: 30px;margin-left: 5%;width: 90%;" label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="floor" :localdata="floorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <!-- <uni-forms-item :label="tagmatName"></uni-forms-item> -->
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: 0,
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- floor: "F2",
- floorrange: [{
- value: "F2",
- text: "F2"
- },
- {
- value: "F4",
- text: "F4"
- },
- {
- value: "F7",
- text: "F7"
- },
- {
- value: "F7-2",
- text: "F7-2"
- }
- ],
- }
- },
- onLoad(res) {},
- methods: {
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.floor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtag.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtag.vue"
deleted file mode 100644
index 7055dbc..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtag.vue"
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
- <view>
- <uni-forms style="margin-top: 30px;margin-left: 30px;width: 100%;" label-width="120">
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <!-- <uni-forms-item :label="tagmatName"></uni-forms-item> -->
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: 0,
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- }
- },
- onLoad(res) {},
- methods: {
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: "F2"
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf4.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf4.vue"
deleted file mode 100644
index 1a3fe4a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf4.vue"
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
- <view>
- <uni-forms style="margin-top: 30px;margin-left: 30px;width: 100%;" label-width="120">
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <!-- <uni-forms-item :label="tagmatName"></uni-forms-item> -->
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: 0,
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- }
- },
- onLoad(res) {},
- methods: {
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: "F4"
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf7.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf7.vue"
deleted file mode 100644
index dd74102..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/other/printtagf7.vue"
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
- <view>
- <uni-forms style="margin-top: 30px;margin-left: 30px;width: 100%;" label-width="120">
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <!-- <uni-forms-item :label="tagmatName"></uni-forms-item> -->
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: 0,
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- }
- },
- onLoad(res) {},
- methods: {
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: "F7"
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otherboxing/otherboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otherboxing/otherboxing.vue"
deleted file mode 100644
index f33f27d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otherboxing/otherboxing.vue"
+++ /dev/null
@@ -1,491 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item :label="label" style="display: none;">
- </uni-forms-item>
- <uni-forms-item label="缁勭粐缂栧彿">
- <uni-data-select v-model="value" :localdata="range"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="barcodeFo"
- v-model="barcode" @input="barcodeInput" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
- v-model="materSn" @input="snInput" />
- </uni-forms-item>
- <uni-forms-item>
- <checkbox checked="check">鏄惁婊＄洏</checkbox>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="(item,index) in matInfos" :key="item.sn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.innerCode)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍙凤細{{item.orderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <!-- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.matProductionDate}}</view> -->
- <view class="uni-note">鏁伴噺锛歿{item.matQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="releasevalue" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="releasefocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default"
- style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotals" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
-
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['缁勭洏', '鍏ュ簱', '瑙ｇ洏'],
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- barcodeFo: true,
- range: [],
- releasefocus: true,
- releasevalue: "",
- matInfo: [],
- matTotals: [],
- value2: ""
- }
- },
- onLoad(res) {
- this.barcodeFo = true;
- this.focus = false;
- this.addressFocus = false;
- this.releasefocus = true;
- this.range = config.organizeRange;
- this.value = config.organizeValue;
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- releasebox() {
- if (this.releasevalue.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.releasevalue.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.releasevalue
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.releasevalue
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.releasevalue = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.releasevalue.length == 0) {
- return;
- }
- var matInfo = this.releasevalue.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
-
- updateFocus() {
- this.$nextTick(() => {
- this.focus = true;
- });
- },
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (e.currentIndex === 0) {
- this.$nextTick(() => {
- this.barcodeFo = true;
- this.focus = false;
- })
- } else if (e.currentIndex === 1) {
- this.$nextTick(() => {
- this.addressFocus = false;
- })
- } else if (e.currentIndex === 2) {
- this.$nextTick(() => {
- this.releasefocus = true;
- })
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- // if (this.barcode != '') {
- // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- this.barcodeFo = false;
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- // type: "error"
- // })
- // // setTimeout(this.barcodeFocus, 200);
- // }
- // }
- })
- },
- snInput() {
- // this.
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matSn = this.materSn;
- setTimeout(() => {
- this.materSn = "";
- }, 10);
-
- var matInfo = matSn.split('|');
- if (matInfo.length == 7) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: matSn
- }
- var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
- if (!temp) {
- var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- if (!tmp) {
- this.matTotal.push({
- matCode: matObj.matCode,
- matQuantity: parseInt(matObj.matQty)
- })
- } else {
- tmp.matQuantity += parseInt(matObj.matQty);
- }
- this.sns.push(matSn);
- this.matInfos.push(matObj);
- setTimeout(this.updateFocus, 200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- setTimeout(this.updateFocus, 200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- type: "error"
- })
- setTimeout(this.updateFocus, 200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- }
- })
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- this.addressFocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- var sn = '';
- this.matInfos.map((item, index) => {
- if (item.innerCode == res) {
- this.matInfos.splice(index, 1);
- sn = item.sn;
- var tmp = this.matTotal.find(x => x.matCode == item.matCode);
- if (tmp) {
- tmp.matQuantity -= parseInt(item.matQty);
- }
- }
- })
- this.sns.map((item, index) => {
- if (item == res) {
- this.sns.splice(index, 1);
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- if(this.value.length == 0){
- this.$refs.uToast.show({
- title: "璇烽�夋嫨缁勭粐",
- type: 'error'
- })
- return;
- }
- var postData = {
- MainData: {
- "pallet_barcode": this.barcode,
- "organizeCode": this.value
- },
- DetailData: this.matInfos
- }
- this.$u.post('/api/Bill_group_stock/OtherBoxing', postData).then(res => {
- if (res.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- this.barcodeFo = true;
- this.focus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- uni.showToast.show({
- title: err.message,
- type: 'error'
- })
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 30px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otherorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otherorderoutbound.vue"
deleted file mode 100644
index d3e4b2a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otherorderoutbound.vue"
+++ /dev/null
@@ -1,588 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms style="margin-left: 2%;margin-top: 20px;" label-width="180">
- <uni-forms-item :label="label"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氬叾浠栧嚭搴撳崟"></uni-forms-item>
- <uni-forms-item label="鍐呯鐮侊細">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="focus"
- v-model="innerCode" @input="innercodeInput" />
- </uni-forms-item>
- <uni-forms-item :label="matCode"></uni-forms-item>
- <uni-forms-item :label="matName"></uni-forms-item>
- <uni-forms-item :label="currentQty"></uni-forms-item>
- <uni-forms-item :label="orderQty"></uni-forms-item>
- <uni-forms-item :label="scanQty"></uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-forms label-width="180">
- <uni-forms-item label="鍖哄煙"><uni-data-select v-model="value"
- :localdata="range"></uni-data-select></uni-forms-item>
- <uni-forms-item label="妤煎眰"><uni-data-select v-model="floor"
- :localdata="floorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鍖哄煙">
- <uni-data-select v-model="endType" :localdata="endTypeRange"></uni-data-select>
- </uni-forms-item>
- </uni-forms>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
- <template v-slot:body>
- <view class="uni-list-box">
- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button>
- <view class="uni-content">
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鍗曟嵁鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">宸插垎閰嶆暟閲忥細{{item.processQty}}</view>
- <view style="font-size: 18px;">鍑哄簱鏁伴噺锛歿{item.outQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="printfloor" :localdata="printfloorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <uni-forms-item :label="tagmatName"></uni-forms-item>
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 4" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="releasevalue" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="releasefocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default" style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotals" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鎵弿', '鏄庣粏', '鎷嗗垎', '鍏ュ簱', '瑙ｇ洏'],
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- tagFocus: true,
- numberFocus: false,
- focus: true,
- tag: "",
- number: "",
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- value: "",
- range: [],
- floor: "",
- floorrange: [],
- printfloor: "",
- printfloorrange: [],
- barcode: "",
- address: "",
- istrue: false,
- releasefocus: true,
- releasevalue: "",
- matInfo: [],
- matTotals: [],
- value2: "",
- searchValue: "",
- endType: "",
- endTypeRange: []
- }
- },
- mounted() {
- this.printfloorrange = config.printFloorRange;
- this.floorrange = config.outboundFloorRange;
- if (config.outboundFloor) {
- this.floor = config.outboundFloor;
- }
- if (config.printFloor) {
- this.printfloor = config.printFloor;
- }
- this.range = config.warehouseRange;
- this.endTypeRange = config.outboundAreaRange;
- if (config.outboundArea) {
- this.endType = config.outboundArea;
- }
- if (config.warehouseArea) {
- this.value = config.warehouseArea;
- }
- },
- onLoad(res) {
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- search() {
- this.getData();
- },
- releasebox() {
- if (this.releasevalue.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.releasevalue.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.releasevalue
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.releasevalue
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.releasevalue = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.releasevalue.length == 0) {
- return;
- }
- var matInfo = this.releasevalue.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
- updateFocus() {
- this.$nextTick(() => {
- this.innerCode = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- inbound() {
- if (this.barcode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樺彿",
- type: "error"
- })
- return;
- }
- if (this.address.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.barcode = "";
- this.address = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- searchValue: this.searchValue
- },
- }
- this.$u.post('/api/ErpOrder/GetOtherOutOrderInfo', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- innercodeInput() {
- this.$nextTick(() => {
- if (this.innerCode == "") {
- return;
- }
- var innerCode = this.innerCode;
- setTimeout(() => {
- this.innerCode = "";
- }, 10);
-
- // this.focus = false;
- if (innerCode.split('|').length == 7) {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- innerCode: innerCode
- },
- }
- this.$u.post('/api/ErpOrder/UpdateOtherOutOrder', postData).then((res) => {
- if (res.status) {
- this.matCode = "鐗╂枡缂栫爜锛�" + res.data.matCode;
- this.matName = "鐗╂枡鍚嶇О锛�" + res.data.matName;
- this.orderQty = "闇�姹傛暟閲忥細" + res.data.orderQty;
- this.currentQty = "宸叉壂鏁伴噺锛�" + res.data.currentQty;
- this.scanQty = "绱鏁伴噺锛�" + res.data.scanQty;
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- // this.innerCode = "";
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- }
- this.numberFocus = true;
- })
- },
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ユ暟閲�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printfloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- outbound(code) {
- if (this.floor == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- if(this.value == ""){
- this.$refs.uToast.show({
- title: "璇烽�夋嫨鍖哄煙",
- type: "error"
- })
- return;
- }
- if(this.endType == ""){
- this.$refs.uToast.show({
- title: "璇烽�夋嫨鍑哄簱鍖哄煙",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- matCode: code,
- orderNo: this.orderNo,
- system: this.value,
- floor: this.floor,
- endType: this.endType
- }
- }
- this.$u.post('/api/ErpOrder/OtherOutOrderOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otheroutboundorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otheroutboundorder.vue"
deleted file mode 100644
index d697c6e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/otheroutboundorder/otheroutboundorder.vue"
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.other_outbound_no)" link
- :to="page+item.other_outbound_no" v-for="item in allReceivingOrders" :key="item.order_id">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 璋冩嫧鍗曞彿:{{item.other_outbound_no}} </view>
- <!-- <view> 璋冩嫧绫诲瀷:{{item.directorder_type}} </view> -->
- <view> 鍗曟嵁鏃ユ湡:{{item.other_outbound_date}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/otheroutboundorder/otherorderoutbound?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetOtherOutOrders', postData).then((res) => {
- if (res.status) {
- if(res.data){
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- }else{
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/matoutboundscan.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/matoutboundscan.vue"
deleted file mode 100644
index b773cab..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/matoutboundscan.vue"
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
- <view>
- <view style="background-color: #fff; padding: 20px 20px 20px 20px;width: 96%;margin-left: 2%;margin-top: 20px;">
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="鍐呯鐮�" style="background-color: #fff;">
- <uni-easyinput type="text" :focus="true" v-model="innerCode" placeholder="璇锋壂鎻忓唴绠辩爜"
- ref='midInput' @input="innerCodeInput"/>
- </uni-forms-item>
- </uni-forms>
- </view>
- <uni-list class="body" style="width: 96%;margin-left: 2%;" v-if="matInfo">
- <uni-list-item direction="column">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <!-- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view> -->
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{matInfo.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{matInfo.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{matInfo.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="outbound" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- innerCode: "",
- matInfo: null
- }
- },
- methods: {
- innerCodeInput(){
- if(this.innerCode != ""){
- var postData = {
- MainData: {
- innerCode: this.innerCode
- },
- }
- this.$u.post('/api/Outbound/GetMatInfo', postData).then((res) => {
- if (res.status) {
- this.matInfo = res.data;
- } else {
- this.$refs.uToast.show({
- title: "搴撳瓨淇℃伅鏌ヨ澶辫触" + res.message,
- type: "error"
- });
- }
- })
- }
- },
- outbound() {
- if(this.innerCode == ""){
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- innerCode: this.innerCode
- },
- }
- this.$u.post('/api/Outbound/HandOutboundScan', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 60px;
- text-align: center;
- z-index: 999;
- left: 40px;
- height: 20%;
- }
-
- .footer {
- // padding-top: 30%;
- }
-
- .body {
- padding-bottom: 80px;
- background-color: #f1f3f4;
- }
-
- .footerxy {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/productoutboundscan.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/productoutboundscan.vue"
deleted file mode 100644
index 873faa4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/outboundscan/productoutboundscan.vue"
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
- <view>
- <view style="background-color: #fff; padding: 20px 20px 20px 20px;width: 96%;margin-left: 2%;margin-top: 20px;">
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="浜у搧鏉＄爜" style="background-color: #fff;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="sn" placeholder="璇锋壂鎻忎骇鍝佹潯鐮�"
- ref='midInput' @input="outbound" />
- </uni-forms-item>
- </uni-forms>
- </view>
- <uni-list class="body" style="width: 96%;margin-left: 2%;" v-if="matInfo">
- <uni-list-item direction="column">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <!-- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view> -->
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{matInfo.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{matInfo.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{matInfo.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <!-- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="outbound" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view> -->
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- sn: "",
- matInfo: null
- }
- },
- methods: {
- snInput() {
- if (this.sn != "") {
- var postData = {
- MainData: {
- sn: this.sn
- },
- }
- this.$u.post('/api/Outbound/GetProductInfo', postData).then((res) => {
- if (res.status) {
- debugger
-
- this.outbound();
- } else {
- this.$refs.uToast.show({
- title: "搴撳瓨淇℃伅鏌ヨ澶辫触" + res.message,
- type: "error"
- });
- }
- })
- }
- },
- outbound() {
- this.$nextTick(() => {
- if (this.sn == "") {
-
- return;
- }
- var postData = {
- MainData: {
- sn: this.sn
- },
- }
- this.$u.post('/api/Outbound/ProductOutboundScan', postData).then((res) => {
- if (res.status) {
- this.matInfo = res.data;
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.sn = "";
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 60px;
- text-align: center;
- z-index: 999;
- left: 40px;
- height: 20%;
- }
-
- .footer {
- // padding-top: 30%;
- }
-
- .body {
- padding-bottom: 80px;
- background-color: #f1f3f4;
- }
-
- .footerxy {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/picking/pickingMat.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/picking/pickingMat.vue"
deleted file mode 100644
index be4f7f5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/picking/pickingMat.vue"
+++ /dev/null
@@ -1,430 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode()" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" @input="inputChange()" v-model="materialsns"
- placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鏁伴噺">
- <uni-easyinput type="number" v-model="num" placeholder="璇疯緭鍏ュ嚭搴撴暟閲�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item>
- <label style="margin-left: 0%;">鎬绘暟閲�:{{totalNum}}</label>
- <label style="margin-left: 30%;">鍑哄簱鏁伴噺:{{pickNum}}</label>
- </uni-forms-item>
- <uni-forms-item>
- <label style="margin-left: 0%;">宸ュ崟鎬绘暟閲�:{{orderTotalNum}}</label>
- <label style="margin-left: 21%;">绱鍑哄簱鏁伴噺:{{orderPickNum}}</label>
- </uni-forms-item>
- <uni-forms-item>
- <label style="margin-left: 0%;">宸ュ崟鍙�:{{orderNo}}</label>
- </uni-forms-item>
- <uni-forms-item>
- <checkbox :checked="isPicking" @click="checkedClick">鏄惁鎷ｉ��</checkbox>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="picking" type="primary" style="margin-left: 0px;">鎷ｉ��</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in boxBarcodes" :key="item.sn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.sn)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍙凤細{{item.orderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.matProductionDate}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.matQty}}</view>
- <view class="uni-note">鏄惁鎷ｉ�夛細{{item.isPicking}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue2" v-model="barcode2" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode2()" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" @input="inputChange2()" v-model="innerboxcode"
- placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="istrue2" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode3" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- // const SixUniTts = uni.requireNativePlugin("SmallSix-SixUniTts")
- export default {
- data() {
- return {
- items: ['鎷ｉ��', '鎷ｉ�夌粍鐩�', '鍏ュ簱'],
- current: 0,
- isPicking: false,
- istrue: false,
- barcode: '',
- materialsns: "",
- boxBarcodes: [],
- sns: [],
- barcodefocus: true,
- totalNum: 0,
- pickNum: 0,
- num: 0,
- orderTotalNum: 0,
- orderPickNum: 0,
- orderNo: "",
- matTotal: [],
- istrue2: false,
- barcode2: '',
- innerboxcode: "",
- sns2: [],
- barcodefocus: true,
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- }
- },
- onLoad(res) {
- this.barcodefocus = false;
- this.istrue = false;
- },
- methods: {
- onClickItem(e) {
- this.barcodeFo = true;
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode3() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- picking() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: "error"
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var params = {
- MainData: {
- "barcode": this.barcode,
- "num": this.num,
- "pickNum": this.pickNum
- },
- DetailData: this.sns
- }
- this.$u.post('/api/StockOperate/MatPicking', params).then(res => {
- if (res.status) {
- uni.$showMsg('鎷ｉ�夋垚鍔�!')
- this.barcode = "";
- this.boxBarcodes = [];
- this.sns = [];
- this.materialsns = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- inputChange(e) {
- this.$nextTick(() => {
- this.istrue = false;
- var matInfo = this.materialsns.split('|');
- if (matInfo.length == 7) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: this.materialsns,
- isPicking: this.isPicking
- }
- var temp = this.boxBarcodes.find(x => x.orderNo == matObj.orderNo);
- if (!temp) {
- var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- if (!tmp) {
- this.matTotal.push({
- matCode: matObj.matCode,
- matQuantity: parseInt(matObj.matQty)
- })
- } else {
- tmp.matQuantity += parseInt(matObj.matQty);
- }
- this.sns.push({
- innerboxcode: this.materialsns,
- isSplit: this.isPicking
- });
- this.boxBarcodes.push(matObj);
- this.isPicking = false;
- setTimeout(this.updateFocus, 100);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- setTimeout(this.updateFocus, 100);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- type: "error"
- })
- setTimeout(this.updateFocus, 100);
- }
- })
- },
- checkedClick() {
- this.isPicking = !this.isPicking;
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- updateFocus() {
- this.materialsns = '';
- if (!this.istrue) {
- this.istrue = true;
- }
- },
- inputChangebarcode() {
- this.boxBarcodes = [];
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- var postData = {
- MainData: {
- "barcode": this.barcode
- }
- };
- this.$u.post('/api/Bill_group_stock/IsAllOutbound', postData).then(res => {
- if (res.status) {
- if (res.data.totalNum == res.data.pickNum) {
- res.data.innerBoxCode.forEach(x => {
- var matInfo = x.split('|');
- if (matInfo.length > 6) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: this.materialsns,
- isPicking: this.isPicking
- }
- this.sns.push({
- innerboxcode: this.materialsns,
- isSplit: this.isPicking
- });
- if (!this.boxBarcodes.find(x => x.orderNo == matObj
- .orderNo)) {
- this.boxBarcodes.push(matObj);
- }
- }
- })
- }
- this.totalNum = res.data.totalNum;
- this.pickNum = res.data.pickNum;
- this.orderPickNum = res.data.orderPickNum;
- this.orderTotalNum = res.data.orderTotalNum;
- this.orderNo = res.data.orderNo;
- }
- })
- this.istrue = true;
- }
- })
- },
- deleteList(res) {
- this.matTotal.map((item, index) => {
- var temp = this.boxBarcodes.find(x => x.sn == res);
- if (temp) {
- if (item.matCode == temp.matCode) {
- if (item.matQuantity - temp.matQty == 0) {
- this.matTotal.splice(index, 1);
- } else {
- item.matQuantity -= temp.matQty;
- }
- }
- }
- })
- this.sns.map((item, index) => {
- if (item.innerboxcode == res) {
- this.sns.splice(index, 1);
- }
- })
- this.boxBarcodes.map((item, index) => {
- if (item.sn == res) {
- this.boxBarcodes.splice(index, 1);
- }
- })
- },
-
- submit() {
- if (this.barcode2 == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: "error"
- })
- return;
- }
- if (this.innerboxcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- this.$u.post('/api/StockOperate/PickingBoxing', {
- MainData: {
- "barcode": this.barcode2,
- "innerboxcode": this.innerboxcode
- },
- DelKeys: this.sns2
- }).then(res => {
- if (res.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.barcode2 = "";
- this.innerboxcode = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChange2(e) {
-
- },
- inputChangebarcode2() {
- this.istrue2 = false;
- this.$nextTick(function(x) {
- if (this.barcode2 != '') {
- this.istrue2 = true;
- }
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productboxing/productboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productboxing/productboxing.vue"
deleted file mode 100644
index 0f4a058..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productboxing/productboxing.vue"
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="true"
- v-model="barcode" @input="barcodeInput" />
- </uni-forms-item>
- <uni-forms-item label="浜у搧鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忎骇鍝佹潯鐮�" ref='midInput' :focus="focus"
- v-model="materSn" @input="snInput" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matInfos" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">瀹夎锛歿{item.safety}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.qty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="(item,index) in sns" :key="item">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">浜у搧鏉＄爜锛歿{item}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
-
- </view>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鎴愬搧缁勭洏', '鎴愬搧鍏ュ簱'],
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true
- }
- },
- onShow() {},
- onLoad(res) {
- this.focus = false;
- this.addressFocus = false;
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- updateFocus() {
- this.$nextTick(() => {
- console.log(1);
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- barcodeFocus() {
- this.barcode = '';
- if (this.focus) {
- this.focus = false;
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceivingOrderInfo', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 2) {
- this.getData();
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- if (this.barcode.length > 0) {
- var param = {
- MainData: {
- "barcode": this.barcode,
- }
- }
- this.$u.post('/api/StockOperate/GetProductByBarcode', param).then(res => {
- if (res.status) {
- this.matInfos = res.data.matTotal;
- this.sns.push(res.data.matInfo);
- }
- this.focus = true;
- })
- } else {
- this.matInfos = [];
- this.sns = [];
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var code = this.materSn;
- var param = {
- MainData: {
- "sn": code,
- }
- }
- this.$u.post('/api/Bill_group_stock_product/GetProductInfoBySn', param).then(res => {
- if (res.status) {
- if (res.data) {
- var tmp = this.sns.find(x => x == code);
- if (!tmp) {
- var matInfo = this.matInfos.find(x => x.matCode == res.data
- .mater_code && x
- .safety == res.data.safety_regulations);
- if (matInfo) {
- matInfo.qty += 1;
- } else {
- this.matInfos.push({
- matCode: res.data.mater_code,
- safety: res.data.safety_regulations,
- qty: 1
- });
- }
- this.sns.push(code);
- this.voiceSpeech('../../static/success.mp3');
- setTimeout(this.updateFocus, 200);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- this.voiceSpeech('../../static/fail.mp3');
- setTimeout(this.updateFocus, 200);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒" + res.message,
- type: "error"
- })
- this.voiceSpeech('../../static/fail.mp3');
- setTimeout(this.updateFocus, 200);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒" + res.message,
- type: "error"
- })
- this.voiceSpeech('../../static/fail.mp3');
- setTimeout(this.updateFocus, 200);
- }
- })
- }
- })
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/ProductRequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- var sn = '';
- this.matInfos.map((item, index) => {
- if (item.innerCode == res) {
- this.matInfos.splice(index, 1);
- sn = item.sn;
- var tmp = this.matTotal.find(x => x.matCode == item.matCode);
- if (tmp) {
- tmp.matQuantity -= parseInt(item.matQty);
- } else {
-
- }
- }
- })
- this.sns.map((item, index) => {
- if (item == res) {
- this.sns.splice(index, 1);
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忎骇鍝佹潯鐮�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/Bill_group_stock_product/ProductBoxing', {
- MainData: {
- "barcode": this.barcode,
- "orderNo": this.orderNo,
- "isFull": this.check
- },
- DetailData: this.matInfos,
- DelKeys: this.sns
- }).then(res => {
- if (res.status) {
- uni.$showMsg('缁勭洏鎴愬姛!')
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- uni.showToast.show({
- title: err.message,
- type: 'error'
- })
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 30px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productoutbound/productoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productoutbound/productoutbound.vue"
deleted file mode 100644
index 8c5c4c4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/productoutbound/productoutbound.vue"
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" style="width: 95%;">
- <view style="margin-top: 10px;margin-left: 20px;">
- <u-sticky offset-top="0" zIndex="999" bgColor="#fff" style="width: 100%;">
- <view style="background-color: #fff; padding-bottom: 20rpx;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="鍑哄簱鍦板潃" style="background-color: #fff;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="outAddress"
- placeholder="璇疯緭鍏ュ嚭搴撳湴鍧�" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
- </view>
- </u-sticky>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in stockInfo" :key="item.id">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="click(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-note">瀹夎锛歿{item.safety_regulations}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="outbound()" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view>
- </view>
- </view>
- <view v-if="current === 1" style="width: 95%;">
- <uni-forms label-width="120" style="margin-top: 20px;margin-left: 20px;">
- <uni-forms-item label="鍑哄簱搴撲綅">
- <uni-easyinput type="text" :focus="!focus" @input="getMatInfo" v-model="startpoint"
- placeholder="璇疯緭鍏ュ嚭搴撳簱浣�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱绔欑偣">
- <uni-easyinput type="text" :focus="focus" v-model="endpoint" placeholder="璇疯緭鍏ュ嚭搴撶珯鐐�"
- ref='midInput' />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="manualOutbound" type="primary" size="default"
- style="margin-top: 2%;">鍙戦�佷换鍔�</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in matInfos" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">搴忓彿锛歿{index}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栧彿锛歿{item.mater_code}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鍚嶇О锛歿{item.mater_name}}</view>
- <view class="uni-title-sub uni-ellipsis-2">瀹夎锛歿{item.safety}}</view>
- <view class="uni-title-sub uni-ellipsis-2">浜у搧鏉＄爜锛歿{item.product_barcode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
-
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['鎵嬪姩鍑哄簱', '鎸囧畾鍑哄簱'],
- current: 0,
- stockInfo: [],
- outItems: [],
- outAddress: "",
- pageNo: 1,
- searchValue: "",
- focus: false,
- startpoint: "",
- endpoint: "",
- matInfos: [],
- }
- },
- onLoad(res) {
- this.getData();
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- search() {
- this.$nextTick(() => {
- this.pageNo = 1;
- this.getData();
- })
- },
- getData() {
- var postData = {
- MainData: {
- system: "KB",
- matCode: this.searchValue
- },
- Extra: this.pageNo
- }
- this.$u.post('/api/VV_StockProduct/GetStockInfo', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.pageNo == 1) {
- this.stockInfo = res.data;
- } else {
- this.stockInfo = this.stockInfo.concat(res.data);
- }
- } else {
- this.$refs.uToast.show({
- title: res.message,
- });
- }
- } else {
- this.stockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- getMatInfo() {
- this.$nextTick(() => {
- if (this.startpoint != "") {
- if (this.startpoint.length == 20) {
- var postData = {
- MainData: {
- locationCode: this.startpoint
- }
- }
- this.$u.post('/api/StockOperate/GetProductMatInfo', postData).then(res => {
- if (res.status) {
- this.matInfos = res.data;
- this.focus = true;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- return;
- }
- })
- } else {
- this.$refs.uToast.show({
- title: "搴撲綅鍙锋壂鎻忛敊璇�",
- type: "error"
- });
- return;
- }
- }
- })
- },
- manualOutbound() {
- if (this.startpoint == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ヨ捣濮嬪湴鍧�",
- type: "error"
- });
- return;
- }
- if (this.endpoint == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- if (this.matInfos.length == 0) {
- this.$refs.uToast.show({
- title: "鏃犲簱瀛樹俊鎭�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationCode": this.startpoint,
- "endPoint": this.endpoint
- },
- }
- this.$u.post('/api/Outbound/ProductOutboundByLocation', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.startpoint = "";
- this.endPoint = "";
- this.matInfos = [];
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- outbound() {
- if (this.outItems.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸嚭搴撶殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.outItems.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍑哄簱鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- if (this.outAddress == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationCode": this.outItems[0].locationNo,
- "endPoint": this.outAddress
- },
- }
-
- this.$u.post('/api/Outbound/ProductOutboundByLocation', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.outAddress = "";
- this.outItems = [];
- this.stockInfo = [];
- this.pageNo = 1;
- this.search();
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- click(e) {
- if (this.outItems.find(x => x.barcode == e.barcode)) {
- this.outItems.map((item, index) => {
- if (item.barcode == e.barcode) {
- this.outItems.splice(index, 1);
- }
- })
- } else {
- this.outItems.push(e);
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .footer {
- // padding-top: 50%;
- }
-
- .footerxy {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- margin-left: 20px;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/handoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/handoutbound.vue"
deleted file mode 100644
index 07854a9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/handoutbound.vue"
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
- <view>
- <u-sticky offset-top="0" zIndex="999" bgColor="#fff" style="width: 100%;">
- <view style="background-color: #fff; padding-bottom: 20rpx;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="鍑哄簱鍦板潃" style="background-color: #fff;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="outAddress"
- placeholder="璇疯緭鍏ュ嚭搴撳湴鍧�" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
- </view>
- </u-sticky>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in stockInfo" :key="item.id">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="click(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="outbound()" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- stockInfo: [],
- outItems: [],
- outAddress: "",
- pageNo: 1,
- searchValue: ""
- }
- },
- onLoad(res) {
- this.getData();
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
-
- },
- methods: {
- search() {
- this.$nextTick(() => {
- this.pageNo = 1;
- this.getData();
- })
- },
- getData() {
- var postData = {
- MainData: {
- system: "ZB",
- matCode: this.searchValue
- },
- Extra: this.pageNo
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfo', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.pageNo == 1) {
- this.stockInfo = res.data;
- } else {
- this.stockInfo = this.stockInfo.concat(res.data);
- }
- }else{
- this.$refs.uToast.show({
- title: res.message,
- });
- }
- }else{
- this.stockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
-
- },
- outbound() {
- if (this.outItems.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸嚭搴撶殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.outItems.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍑哄簱鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- if (this.outAddress == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "id": this.outItems[0].id,
- "endPoint": this.outAddress
- },
- }
-
- this.$u.post('/api/Outbound/HandOutbound', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.outAddress = "";
- this.outItems = [];
- this.stockInfo = [];
- this.pageNo = 1;
- this.search();
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- click(e) {
- if (this.outItems.find(x => x.barcode == e.barcode)) {
- this.outItems.map((item, index) => {
- if (item.barcode == e.barcode) {
- this.outItems.splice(index, 1);
- }
- })
- } else {
- this.outItems.push(e);
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 60px;
- text-align: center;
- z-index: 999;
- left: 40px;
- height: 20%;
- }
-
- .footer {
- // padding-top: 30%;
- }
-
- .body {
- padding-bottom: 80px;
- background-color: #f1f3f4;
- }
-
- .footerxy {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/kbhandoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/kbhandoutbound.vue"
deleted file mode 100644
index 6be41d1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/kbhandoutbound.vue"
+++ /dev/null
@@ -1,254 +0,0 @@
-<template>
- <view>
- <u-sticky offset-top="0" zIndex="999" bgColor="#fff" style="width: 100%;">
- <view style="background-color: #fff; padding-bottom: 20rpx;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="鍑哄簱鍦板潃" style="background-color: #fff;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="outAddress"
- placeholder="璇疯緭鍏ュ嚭搴撳湴鍧�" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
- </view>
- </u-sticky>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in stockInfo" :key="item.id">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="click(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
-
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footer">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="outbound()" type="primary" size="default" style="margin-top: 2%;">鍑哄簱纭</button>
- </u-sticky>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- stockInfo: [],
- outItems: [],
- outAddress: "",
- pageNo: 1,
- searchValue: ""
- }
- },
- onLoad(res) {
- this.getData();
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search() {
- this.$nextTick(() => {
- this.pageNo = 1;
- this.getData();
- })
- },
- getData() {
- var postData = {
- MainData: {
- system: "KB",
- matCode: this.searchValue
- },
- Extra: this.pageNo
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfo', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.pageNo == 1) {
- this.stockInfo = res.data;
- } else {
- this.stockInfo = this.stockInfo.concat(res.data);
- }
- } else {
- this.$refs.uToast.show({
- title: res.message,
- });
- }
- } else {
- this.stockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- outbound() {
- if (this.outItems.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸嚭搴撶殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.outItems.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍑哄簱鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- if (this.outAddress == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "id": this.outItems[0].id,
- "endPoint": this.outAddress
- },
- }
-
- this.$u.post('/api/Outbound/HandOutbound', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.outAddress = "";
- this.outItems = [];
- // this.stockInfo.map((x, index) => {
- // this.stockInfo.splice(index, 1)
- // })
- this.stockInfo = [];
- this.pageNo = 1;
- this.search();
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- click(e) {
- if (this.outItems.find(x => x.barcode == e.barcode)) {
- this.outItems.map((item, index) => {
- if (item.barcode == e.barcode) {
- this.outItems.splice(index, 1);
- }
- })
- } else {
- this.outItems.push(e);
- }
- }
- }
- }
-</script>
-
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 60px;
- text-align: center;
- z-index: 999;
- left: 40px;
- height: 20%;
- }
-
- .body {
- padding-bottom: 80px;
- background-color: #f1f3f4;
- }
-
- .footer {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 10rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/manualoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/manualoutbound.vue"
deleted file mode 100644
index 0ef7909..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/manualoutbound.vue"
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
- <view>
- <view class="header">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="inputChange()" v-model="locationCode" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="true" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍑哄簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <!-- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鍐呯鏍囩锛歿{item.innerBoxCode}}</view> -->
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- locationCode: "",
- matInfo: []
- }
- },
- onLoad(res) {
- //this.hideboard();
- },
- methods: {
- submit() {
- if (this.locationCode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param = {
- MainData: {
- "locationCode": this.locationCode
- }
- };
- this.$u.post('/api/StockOperate/ManualOutbound', param).then(resdt => {
- if (resdt.status) {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "success"
- })
- this.locationCode = "";
- this.matInfo = [];
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChange(e) {
- this.$nextTick(() => {
- if (this.locationCode.length == 0) {
- return;
- }
- this.matInfo = [];
- var param = {
- MainData: {
- "locationCode": this.locationCode
- }
- }
- this.$u.post('/api/StockOperate/GetStockByLocationCode', param).then(result => {
- if (result.status) {
- this.matInfo = result.data;
- } else {
- this.$refs.uToast.show({
- title: result.message,
- type: "error"
- })
- }
- })
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- // padding-top: 30%;
- }
-
- .header {
- width: 100%;
- height: 150px;
- background-color: #ffffff;
- padding: 20rpx 40rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/rawhandoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/rawhandoutbound.vue"
deleted file mode 100644
index 20b48e6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/rawhandoutbound/rawhandoutbound.vue"
+++ /dev/null
@@ -1,611 +0,0 @@
-<template>
- <view>
- <u-sticky offset-top="1" zIndex="999" bgColor="#fff">
- <view style="background-color: #fff; padding-bottom: 20px;">
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- </view>
- </u-sticky>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <u-sticky offset-top="90" zIndex="999" bgColor="#fff">
- <view style="background-color: #fff; ">
- <uni-search-bar @confirm="zbsearch" v-model="zbsearchValue"></uni-search-bar>
- <uni-forms ref="formData" label-width="120">
- <!-- <uni-forms-item label="妤煎眰" style="background-color: #fff;width: 90%;margin-left: 5%;">
- <uni-data-select v-model="floor" :localdata="floorrange"></uni-data-select>
- </uni-forms-item> -->
- <uni-forms-item label="鍑哄簱鍦板潃" style="background-color: #fff;width: 90%;margin-left: 5%;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="zboutAddress"
- placeholder="璇疯緭鍏ュ嚭搴撳湴鍧�" ref='midInput' />
- </uni-forms-item>
-
- <uni-forms-item></uni-forms-item>
- </uni-forms>
- </view>
- </u-sticky>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in zbstockInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="zbclick(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="zboutbound" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle" style="margin: 20px 5%;width: 90%;">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="inputChange" v-model="locationCode" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="true" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍑哄簱</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <u-sticky offset-top="90" zIndex="999" bgColor="#fff">
- <view style="background-color: #fff;">
- <uni-search-bar @confirm="kbsearch" v-model="kbsearchValue"></uni-search-bar>
- <uni-forms ref="formData" label-width="120">
- <uni-forms-item label="鍑哄簱鍦板潃" style="background-color: #fff;width: 90%;margin-left: 5%;">
- <uni-easyinput type="text" maxlength="25" :focus="true" v-model="kboutAddress"
- placeholder="璇疯緭鍏ュ嚭搴撳湴鍧�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item></uni-forms-item>
- </uni-forms>
- </view>
- </u-sticky>
- <uni-list class="body">
- <uni-list-item direction="column" v-for="(item,index) in kbstockInfo" :key="item.id">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="kbclick(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璐т綅缂栧彿锛歿{item.locationNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-note">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="footerxy">
- <u-sticky offset-top="80%" zIndex="999">
- <button @click="kboutbound" type="primary" size="default">鍑哄簱纭</button>
- </u-sticky>
- </view>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms style="margin-top: 30px;margin-left: 5%;width: 90%;" label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="printFloor" :localdata="printFloorRange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <!-- <uni-forms-item :label="tagmatName"></uni-forms-item> -->
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import { config } from '../../common/config.js'
- export default {
- data() {
- return {
- items: ['鏍堟澘鎵嬪姩鍑哄簱', '鏍堟澘鎸囧畾鍑哄簱', '搴撳疂鎵嬪姩鍑哄簱', '鍐呯鎷嗗垎'],
- current: 0,
- zbstockInfo: [],
- zboutItems: [],
- zboutAddress: "",
- zbpageNo: 1,
- zbsearchValue: "",
-
- kbstockInfo: [],
- kboutItems: [],
- kboutAddress: "",
- kbpageNo: 1,
- kbsearchValue: "",
-
- locationCode: "",
- matInfo: null,
-
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: 0,
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- printFloor: "",
- printFloorRange: [],
- }
- },
- mounted() {
- this.printFloorRange = config.printFloorRange;
- if(config.printFloor){
- this.printFloor = config.outboundFloor;
- }
- },
- onLoad(res) {
- this.zbgetData();
- },
- onReachBottom() {
- if (this.current === 0) {
- this.zbpageNo += 1;
- this.zbgetData();
- } else if (this.current === 2) {
- this.kbpageNo += 1;
- this.kbgetData();
- }
- },
- methods: {
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current === 0) {
- this.zbgetData();
- } else if (this.current === 2) {
- this.kbgetData();
- }
- }
- },
-
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printFloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- },
-
- submit() {
- if (this.locationCode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param = {
- MainData: {
- "locationCode": this.locationCode
- }
- };
- this.$u.post('/api/StockOperate/ManualOutbound', param).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- })
- this.locationCode = "";
- this.matInfo = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChange(e) {
- this.$nextTick(() => {
- if (this.locationCode == "") {
- this.matInfo = [];
- return;
- }
- // this.matInfo = [];
- var param = {
- MainData: {
- "locationCode": this.locationCode
- }
- }
- this.$u.post('/api/StockOperate/GetStockByLocationCode', param).then(result => {
- if (result.status) {
- this.matInfo = result.data;
- console.log(this.matInfo);
- } else {
- this.$refs.uToast.show({
- title: result.message,
- type: "error"
- })
- }
- })
- })
- },
-
- zbsearch() {
- this.$nextTick(() => {
- this.zbpageNo = 1;
- this.zbgetData();
- })
- },
- zbgetData() {
- var postData = {
- MainData: {
- system: "ZB",
- matCode: this.zbsearchValue
- },
- Extra: this.zbpageNo
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfo', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.zbpageNo == 1) {
- this.zbstockInfo = res.data;
- } else {
- this.zbstockInfo = this.zbstockInfo.concat(res.data);
- }
- } else {
- this.$refs.uToast.show({
- title: res.message,
- });
- }
- } else {
- this.zbstockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
-
- },
- zboutbound() {
- if (this.zboutItems.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸嚭搴撶殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.zboutItems.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍑哄簱鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- if (this.zboutAddress == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "id": this.zboutItems[0].id,
- "endPoint": this.zboutAddress
- },
- }
-
- this.$u.post('/api/Outbound/HandOutbound', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.zboutAddress = "";
- this.zboutItems = [];
- this.zbstockInfo = [];
- this.zbpageNo = 1;
- this.zbsearch();
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- zbclick(e) {
- if (this.zboutItems.find(x => x.barcode == e.barcode)) {
- this.zboutItems.map((item, index) => {
- if (item.barcode == e.barcode) {
- this.zboutItems.splice(index, 1);
- }
- })
- } else {
- this.zboutItems.push(e);
- }
- },
-
-
- kbsearch() {
- this.$nextTick(() => {
- this.kbpageNo = 1;
- this.kbgetData();
- })
- },
- kbgetData() {
- var postData = {
- MainData: {
- system: "kb",
- matCode: this.kbsearchValue
- },
- Extra: this.kbpageNo
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfo', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.kbpageNo == 1) {
- this.kbstockInfo = res.data;
- } else {
- this.kbstockInfo = this.kbstockInfo.concat(res.data);
- }
- } else {
- this.$refs.uToast.show({
- title: res.message,
- });
- }
- } else {
- this.kbstockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
-
- },
- kboutbound() {
- if (this.kboutItems.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸嚭搴撶殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.kboutItems.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍑哄簱鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- if (this.kboutAddress == "") {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ュ嚭搴撳湴鍧�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "id": this.kboutItems[0].id,
- "endPoint": this.kboutAddress
- },
- }
-
- this.$u.post('/api/Outbound/HandOutbound', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鍑哄簱鎴愬姛",
- type: "success"
- });
- this.kboutAddress = "";
- this.kboutItems = [];
- this.kbstockInfo = [];
- this.kbpageNo = 1;
- this.kbsearch();
- } else {
- this.$refs.uToast.show({
- title: "鍑哄簱澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- kbclick(e) {
- if (this.kboutItems.find(x => x.barcode == e.barcode)) {
- this.kboutItems.map((item, index) => {
- if (item.barcode == e.barcode) {
- this.kboutItems.splice(index, 1);
- }
- })
- } else {
- this.kboutItems.push(e);
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .itemstyle {
- // margin-top: 30px;
- // margin-left: 5%;
- }
-
- .headerstyle {
- width: 100%;
- }
-
- .body {
- padding-bottom: 80px;
- background-color: #f1f3f4;
- }
-
- .footerxy {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/inboundorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/inboundorder.vue"
deleted file mode 100644
index 41845dc..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/inboundorder.vue"
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.inboundOrderNo)" link
- :to="page+item.inboundOrderNo" v-for="item in allReceivingOrders" :key="item.inboundOrderNo">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 鍗曞彿:{{item.inboundOrderNo}} </view>
- <view> 鍒涘缓浜�:{{item.creater}} </view>
- <view> 鏃ユ湡:{{item.createDate}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/raworderboxing/raworderboxing?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- methods: {
- search(res) {
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/InboundOrder/GetInboundOrders', postData).then((res) => {
- if (res.status) {
- if (res.data.length > 0) {
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- } else {
- this.status = 'noMore';
- //this.allReceivingOrders = [];
- this.loadVisible = true;
- }
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/orderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/orderboxing.vue"
deleted file mode 100644
index 8a5773f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/orderboxing.vue"
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0">
- <uni-forms style="margin-top: 30px;margin-left: 20px;width: 100%;" label-width="180">
- <uni-forms-item :label="label">
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="true" v-model="barcode"
- @input="barcodeInput" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus" v-model="materSn"
- @input="snInput" />
- </uni-forms-item>
- <!-- <uni-forms-item style="display: none;" label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="!focus" />
- </uni-forms-item> -->
- <uni-forms-item>
- <checkbox checked="check">鏄惁婊＄洏</checkbox>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="(item,index) in matInfos" :key="item.sn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.sn)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">璁㈠崟鍙凤細{{item.orderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <!-- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.matProductionDate}}</view> -->
- <view class="uni-note">鏁伴噺锛歿{item.matQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- <view v-if="current === 1">
- <uni-forms style="margin-top: 30px;margin-left: 20px;width: 100%;" label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- <view v-if="current === 2">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">鍗曚綅锛歿{item.matUnit}}</view>
- <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.boxQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['缁勭洏', '鍏ュ簱', '鍗曟嵁淇℃伅'],
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true
- }
- },
- onShow() {},
- onLoad(res) {
- this.focus = false;
- this.addressFocus = false;
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- updateFocus() {
- this.$nextTick(() => {
- // this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- barcodeFocus() {
- this.barcode = '';
- if (this.focus) {
- this.focus = false;
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceivingOrderInfo', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 2) {
- this.getData();
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- if (this.barcode.length > 0) {
- if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- type: "error"
- })
- }
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matSn = this.materSn;
- setTimeout(() => {
- this.materSn = "";
- }, 10);
- var matInfo = matSn.split('|');
-
- if (matInfo.length == 7) {
- var matObj = {
- matCode: matInfo[1],
- matProductionDate: matInfo[3],
- matQty: matInfo[5],
- orderNo: matInfo[6],
- sn: matSn
- }
- var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
- if (!temp) {
- var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- if (!tmp) {
- this.matTotal.push({
- matCode: matObj.matCode,
- matQuantity: parseInt(matObj.matQty)
- })
- } else {
- tmp.matQuantity += parseInt(matObj.matQty);
- }
- this.sns.push(matSn);
- this.matInfos.push(matObj);
- setTimeout(this.updateFocus,200);
- setTimeout(()=>{
- this.voiceSpeech('../../static/success.mp3');
- },100);
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閲嶅",
- type: "error"
- })
- setTimeout(this.updateFocus,200);
- setTimeout(()=>{
- this.voiceSpeech('../../static/fail.mp3');
- },100);
- }
- } else {
- this.$refs.uToast.show({
- title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- type: "error"
- })
- setTimeout(this.updateFocus,200);
- setTimeout(()=>{
- this.voiceSpeech('../../static/fail.mp3');
- },100);
- }
- }
- })
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- var sn = '';
- this.matInfos.map((item, index) => {
- if (item.sn == res) {
- this.matInfos.splice(index, 1);
- sn = item.sn;
- var tmp = this.matTotal.find(x => x.matCode == item.matCode);
- if (tmp) {
- tmp.matQuantity -= parseInt(item.matQty);
- } else {
-
- }
- }
- })
- this.sns.map((item, index) => {
- if (item == res) {
- this.sns.splice(index, 1);
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.sns.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/Bill_group_stock/PDA_ScanInStock', {
- MainData: {
- "pallet_barcode": this.barcode,
- "orderNo": this.orderNo,
- "isFull": this.check
- },
- DelKeys: this.sns
- }).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "缁勭洏鎴愬姛",
- type: "success"
- })
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .footer {
- // padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/raworderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/raworderboxing.vue"
deleted file mode 100644
index ae5ce1f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/raworderboxing.vue"
+++ /dev/null
@@ -1,551 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view class="content">
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="180">
- <uni-forms-item :label="label">
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
- v-model="barcode" @input="barcodeInput" />
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩:">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
- v-model="materSn" @input="snInput" />
- </uni-forms-item>
- <!-- <uni-forms-item>
- <checkbox checked="check">鏄惁婊＄洏</checkbox>
- </uni-forms-item> -->
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">缁勭洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <!-- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item> -->
- <uni-list-item direction="column" v-for="(item,index) in matInfos" :key="item.sn">
- <template v-slot:body>
- <view class="uni-list-box">
- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
- @click="deleteList(item.sn)">
- </uni-icons>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
- <view class="uni-note">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <view class="uni-note">鎵规鍙凤細{{item.lotNo}}</view>
- <view class="uni-note">鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
- <view class="uni-note">鏈夋晥鏈燂細{{item.effectiveDate}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
- <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity}}</view>
- <view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view>
- <view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="value" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="true" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['缁勭洏', '鍏ュ簱', '鍗曟嵁淇℃伅'], //, '瑙ｇ洏'
- current: 0,
- matTotal: [],
- matInfos: [],
- orderNo: "",
- label: "",
- orderInfo: [],
- focus: false,
- barcode: "",
- materSn: "",
- sns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- matInfo: [],
- value2: "",
- matTotals: [],
- warehouseId:""
- }
- },
- onShow() {},
- onLoad(res) {
- this.focus = false;
- this.addressFocus = false;
- this.orderNo = res.orderNo;
- this.warehouseId=res.warehouseId;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- //瑙ｇ洏
- releasebox() {
- if (this.value.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.value.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.value
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.value
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.value = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.value.length == 0) {
- return;
- }
- var matInfo = this.value.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
- updateFocus() {
- this.$nextTick(() => {
- this.materSn = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- barcodeFocus() {
- this.barcode = '';
- if (this.focus) {
- this.focus = false;
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo
- },
- }
- this.$u.post('/api/InboundOrderDetail/GetInboundOrderDetails', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 2) {
- this.getData();
- }
- }
- },
- barcodeInput() {
- this.$nextTick(function(x) {
- if (this.barcode.length > 0) {
- // if (this.barcode.substring(0, 1) == 'A' || this.barcode.substring(0, 2) == 'TP') {
- this.focus = true;
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔墭鐩樼爜",
- // type: "error"
- // })
- // }
- }
- })
- },
- snInput() {
- this.$nextTick(() => {
- if (this.materSn != "") {
- this.focus = false;
- var matSn = this.materSn;
- setTimeout(() => {
- this.materSn = "";
- }, 10);
- this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
- if (res.status) {
- // debugger
- // this.matTotal.push({
- // matCode: res.data.materielCode,
- // matQuantity: parseInt(res.data.quantity)
- // });
- // this.sns.push(res.data.serialNumber);
-
- this.matInfos.splice(0, this.matInfos.length);
- this.matInfos.push(res.data);
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
-
-
- // var matInfo = matSn.split('|');
-
- // if (matInfo.length == 7) {
- // var matObj = {
- // matCode: matInfo[1],
- // matProductionDate: matInfo[3],
- // matQty: matInfo[5],
- // orderNo: matInfo[6],
- // sn: matSn
- // }
- // var temp = this.matInfos.find(x => x.orderNo == matObj.orderNo);
- // if (!temp) {
- // var tmp = this.matTotal.find(x => x.matCode == matObj.matCode);
- // if (!tmp) {
- // this.matTotal.push({
- // matCode: matObj.matCode,
- // matQuantity: parseInt(matObj.matQty)
- // })
- // } else {
- // tmp.matQuantity += parseInt(matObj.matQty);
- // }
- // this.sns.push(matSn);
- // this.matInfos.push(matObj);
- // setTimeout(this.updateFocus, 200);
- // setTimeout(() => {
- // this.voiceSpeech('../../static/success.mp3');
- // }, 100);
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閲嶅",
- // type: "error"
- // })
- // setTimeout(this.updateFocus, 200);
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- // }
- // } else {
- // this.$refs.uToast.show({
- // title: "鎵爜閿欒,璇锋壂鎻忔纭唴绠辩爜",
- // type: "error"
- // })
- // setTimeout(this.updateFocus, 200);
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- // }
- }
- })
- },
- inbound() {
- var postData = {
- MainData: {
- "barcode": this.inboundBarcode,
- "startPoint": this.address,
- "warehouseId":this.warehouseId
- }
- }
- this.$u.post('/api/Task/RequestInboundTask', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.inboundBarcode = "";
- this.address = "";
- setTimeout(() => {
- this.addressFocus = false;
- }, 200);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.addressFocus = false;
- this.$nextTick(function(x) {
- if (this.inboundBarcode != '') {
- this.addressFocus = true;
- }
- })
- },
- deleteList(res) {
- var sn = '';
- this.matInfos.map((item, index) => {
- if (item.sn == res) {
- this.matInfos.splice(index, 1);
- sn = item.sn;
- var tmp = this.matTotal.find(x => x.matCode == item.matCode);
- if (tmp) {
- tmp.matQuantity -= parseInt(item.quantity);
- } else {
-
- }
- }
- })
- this.sns.map((item, index) => {
- if (item == res) {
- this.sns.splice(index, 1);
- }
- })
- },
- submit() {
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
- type: 'error'
- })
- return;
- }
- if (this.matInfos.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- this.$u.post('/api/InboundOrder/MaterielGroup', {
- MainData: {
- "palletCode": this.barcode,
- "orderNo": this.orderNo,
- // "isFull": this.check
- "warehouseId":this.warehouseId
- },
- DelKeys: this.sns
- }).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "缁勭洏鎴愬姛",
- type: "success"
- })
- this.focus = false;
- this.barcode = "";
- this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 30px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/releaseboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/releaseboxing.vue"
deleted file mode 100644
index 3207c73..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/raworderboxing/releaseboxing.vue"
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
- <view>
- <view class="header">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="inputChange()" v-model="value" placeholder="璇锋壂鐮�" ref='midInput'
- :focus="true" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- <uni-list class="footer">
- <uni-list-item direction="column" v-if="value2">
- <label>{{value2}}</label>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotal" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- value: "",
- matInfo: [],
- value2: "",
- matTotal:[]
- }
- },
- onLoad(res) {
- //this.hideboard();
- },
- methods: {
- submit() {
- if (this.value.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.value.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.value
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.value
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.value = "";
- this.matInfo = [];
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChange(e) {
- this.$nextTick(() => {
- if (this.value.length == 0) {
- return;
- }
- var matInfo = this.value.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotal = res.data.stockTotal;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotal = res.data.stockTotal;
- // console.log(res.data);
- // console.log(this.matTotal);
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- // padding-top: 30%;
- }
-
- .header {
- width: 100%;
- height: 150px;
- background-color: #ffffff;
- padding: 20rpx 40rpx;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorder.vue"
deleted file mode 100644
index 432feae..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorder.vue"
+++ /dev/null
@@ -1,199 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- <view>
- <navigator :url="page+codes" >
- <button type="primary">纭</button>
- </navigator>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in allReceivingOrders" :key="item.receive_no">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view>
- <checkbox @click="click(item.receive_no)" ></checkbox> 棰嗘枡鍗曞彿:{{item.receive_no}}
- </view>
- <view style="margin-left: 30px;"> 宸ュ崟鍙�:{{item.receive_code}} </view>
- <!-- <view> 鏃ユ湡:{{item.purchase_date}} </view> -->
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/receiveorder/multiplereceiveorderout?receiveCodes=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0,
- receiveCodes: [],
- codes:""
- }
- },
- onShow() {
- this.pageNo = 1;
- this.getData();
- },
- onLoad(res) {
- this.pageNo = 1;
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- click(e) {
- if (this.receiveCodes.find(x => x == e)) {
- this.receiveCodes.map((item, index) => {
- if (item == e) {
- this.receiveCodes.splice(index, 1);
- }
- })
- } else {
- this.receiveCodes.push(e);
- }
- this.codes = encodeURIComponent(JSON.stringify(this.receiveCodes));
- },
- gotoOut() {
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrders', postData).then((res) => {
- if (res.status) {
- if (res.data) {
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- } else {
- this.status = 'noMore';
- this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorderout.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorderout.vue"
deleted file mode 100644
index 116f9ed..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/multiplereceiveorderout.vue"
+++ /dev/null
@@ -1,597 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鍗曟嵁缂栧彿锛�">
- <uni-data-select v-model="orderNo"
- :localdata="orderNosRange"></uni-data-select></uni-forms-item>
- </uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟"></uni-forms-item>
- <uni-forms-item label="鍐呯鐮侊細">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="true"
- v-model="innerCode" @input="innercodeInput" />
- </uni-forms-item>
- <uni-forms-item :label="matCode"></uni-forms-item>
- <uni-forms-item :label="matName"></uni-forms-item>
- <uni-forms-item :label="currentQty"></uni-forms-item>
- <uni-forms-item :label="orderQty"></uni-forms-item>
- <uni-forms-item :label="scanQty"></uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-forms label-width="120">
- <uni-forms-item label="鍖哄煙"><uni-data-select v-model="value"
- :localdata="range"></uni-data-select></uni-forms-item>
- <uni-forms-item label="妤煎眰"><uni-data-select v-model="floor"
- :localdata="floorrange"></uni-data-select></uni-forms-item>
- </uni-forms>
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button>
- <view class="uni-content">
- <view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <!-- <view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view> -->
- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view>
- <view style="font-size: 18px;">鍗曟嵁鏁伴噺锛歿{item.totalQty}}</view>
- <view style="font-size: 18px;">宸插垎閰嶆暟閲忥細{{item.processQty}}</view>
- <view style="font-size: 18px;">鍑哄簱鏁伴噺锛歿{item.outQty}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-model="printfloor"
- :localdata="printfloorrange"></uni-data-select></uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�"
- ref='midInput' @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <uni-forms-item :label="tagmatName"></uni-forms-item>
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default"
- style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 4" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="releasevalue" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="releasefocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default"
- style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotals" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
-
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- items: ['鏉＄爜鎵弿', '鏄庣粏', '鎷嗗垎', '鍏ュ簱'],
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- tagFocus: true,
- numberFocus: false,
- tag: "",
- number: "",
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- value: "KB",
- range: [],
- floor: "",
- floorrange: [],
- orderNos: [],
- orderNosRange: [],
- printfloor: "",
- printfloorrange: [],
- releasefocus: true,
- releasevalue: "",
- matInfo: [],
- matTotals: [],
- value2: "",
- searchValue: ""
- }
- },
- mounted() {
- this.printfloorrange = config.printFloorRange;
- this.floorrange = config.outboundFloorRange;
- if (config.outboundFloor) {
- this.floor = config.outboundFloor;
- }
- if (config.printFloor) {
- this.printfloor = config.printFloor;
- }
- this.range = config.warehouseRange;
- this.endTypeRange = config.outboundAreaRange;
- if (config.outboundArea) {
- this.endType = config.outboundArea;
- }
- if (config.warehouseArea) {
- this.value = config.warehouseArea;
- }
- },
- onLoad(res) {
-
- this.orderNos = JSON.parse(decodeURIComponent(res.receiveCodes));
- for (var i = 0; i < this.orderNos.length; i++) {
- this.orderNosRange.push({
- value: this.orderNos[i],
- text: this.orderNos[i]
- });
- }
- },
- methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- updateFocus() {
- this.$nextTick(() => {
- this.innerCode = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- search() {
- this.getData();
- },
- releasebox() {
- if (this.releasevalue.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.releasevalue.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.releasevalue
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.releasevalue
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.releasevalue = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.releasevalue.length == 0) {
- return;
- }
- var matInfo = this.releasevalue.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
- inbound() {
- if (this.barcode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樺彿",
- type: "error"
- })
- return;
- }
- if (this.address.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.barcode = "";
- this.address = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
-
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNos: JSON.stringify(this.orderNos),
- searchValue: this.searchValue
- },
- }
- this.$u.post('/api/ErpOrder/GetReceiveOrderInfos', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- innercodeInput() {
- this.$nextTick(() => {
- if (this.innerCode == "") {
- return;
- }
- if (this.orderNo == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨棰嗘枡鍗�",
- type: "error"
- })
- this.innerCode = "";
- return;
- }
- var innerCode = this.innerCode;
- setTimeout(() => {
- this.innerCode = "";
- }, 10);
-
- if (innerCode.split('|').length == 7) {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- scanValue: innerCode
- },
- }
- this.$u.post('/api/ErpOrder/UpdateReceiveOrder', postData).then((res) => {
- if (res.status) {
- this.matCode = "鐗╂枡缂栫爜锛�" + res.data.matCode;
- this.matName = "鐗╂枡鍚嶇О锛�" + res.data.matName;
- this.orderQty = "闇�姹傛暟閲忥細" + res.data.orderQty;
- this.currentQty = "宸叉壂鏁伴噺锛�" + res.data.currentQty;
- this.scanQty = "绱鏁伴噺锛�" + res.data.scanQty;
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- // this.innerCode = "";
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
-
- }
- this.numberFocus = true;
- })
- },
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ユ暟閲�",
- type: "error"
- })
- return;
- }
- if (this.printfloor.length <= 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printfloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- outbound(code) {
- if (this.floor == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- if(this.value == ""){
- this.$refs.uToast.show({
- title: "璇烽�夋嫨鍖哄煙",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- matCode: code,
- orderNos: JSON.stringify(this.orderNos),
- system: this.value,
- floor: this.floor
- }
- }
- this.$u.post('/api/ErpOrder/ReceiveOrdersOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorder.vue"
deleted file mode 100644
index f4a6977..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorder.vue"
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
- <view>
- <u-sticky>
- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view>
- </u-sticky>
- <uni-list :border="true">
- <uni-list-item direction="column" clickable @click="groupClick(item.receiveOrderNo)" link
- :to="page+item.receiveOrderNo" v-for="item in allReceivingOrders" :key="item.receiveOrderNo">
- <template v-slot:body>
- <uni-group margin-top="20">
- <view> 鏀惰揣鍗曞彿:{{item.receiveOrderNo}} </view>
- <!-- <view> 璁㈠崟绫诲瀷:{{item.receiveOrderType}} </view>
- <view> 璁㈠崟鐘舵��:{{item.receiveOrderStatus}} </view> -->
- <view> 渚涘簲鍟嗕唬鍙�:{{item.suppliersId}} </view>
- </uni-group>
- </template>
- </uni-list-item>
-
- </uni-list>
- <uni-load-more :status="status" v-if="loadVisible"></uni-load-more>
-
- <u-back-top :scroll-top="scrollTop" top="400"></u-back-top>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- page: "/pages/receiveorder/receiveorderoutbound?orderNo=",
- loadVisible: false,
- searchValue: "",
- status: "more",
- allReceivingOrders: [],
- pageNo: 1,
- scrollTop: 0
- }
- },
- onLoad(res) {
- this.getData();
- },
- onPageScroll(e) {
- this.scrollTop = e.scrollTop;
- },
- onReachBottom() {
- this.pageNo += 1;
- this.getData();
- },
- methods: {
- search(res) {
- this.pageNo = 1;
- this.getData();
- },
- groupClick() {
-
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.searchValue,
- pageNo: this.pageNo
- },
- }
- this.$u.post('/api/ReceiveOrder/GetReceiveOrders', postData).then((res) => {
- if (res.status) {
- if(res.data.length > 0){
- if (this.searchValue == '') {
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- // this.allReceivingOrders = res.data;
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- } else {
- // this.allReceivingOrders = res.data;
- if(postData.MainData.pageNo==1){
- this.allReceivingOrders = [];
- }
- this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
- if (this.allReceivingOrders.length > 3) {
- this.loadVisible = true;
- } else {
- this.loadVisible = false;
- }
- }
- }else{
- this.status = 'noMore';
- //this.allReceivingOrders = [];
- this.loadVisible = true;
- }
-
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- display: flex;
- position: fixed;
- width: 100%;
- top: 10px;
- text-align: center;
- z-index: 999;
- left: 30px;
- height: 20%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorderoutbound.vue"
deleted file mode 100644
index 8c927c3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/receiveorder/receiveorderoutbound.vue"
+++ /dev/null
@@ -1,620 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms style="margin-left: 2%;margin-top: 20px;" label-width="180">
- <uni-forms-item :label="label" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item label="鍐呯鐮侊細" style="margin-top: -20px;">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="focus"
- v-model="innerCode" @input="innercodeInput" />
- </uni-forms-item>
- <uni-forms-item :label="matCode" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="matName" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="currentQty" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="orderQty" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="scanQty" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="remaindQty" style="margin-top: -20px;"></uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <u-sticky>
- <!-- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view> -->
- </u-sticky>
- <!-- <uni-forms label-width="180">
- <uni-forms-item label="鍖哄煙">
- <uni-data-select v-if="show" v-model="value" :localdata="range"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-if="show" v-model="floor" :localdata="floorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍑哄簱鍖哄煙">
- <uni-data-select v-if="show" v-model="endType" :localdata="endTypeRange"></uni-data-select>
- </uni-forms-item>
- </uni-forms> -->
- <uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
- <template v-slot:body>
- <view class="uni-list-box">
- <!-- <button class="button" type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="inputDialogToggle(item.matCode)"><text
- class="button-text">鍑哄簱</text></button> -->
- <!-- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button> -->
- <view class="uni-content">
- <view style="font-size: 18px;">鏀惰揣鍗曞彿锛歿{orderNo}}</view>
- <view style="font-size: 18px;">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
- <view style="font-size: 18px;">鎵规鍙凤細{{item.lotNo}}</view>
- <view style="font-size: 18px;">鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
- <view style="font-size: 18px;">鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- <view>
- <!-- 杈撳叆妗嗙ず渚� -->
- <uni-popup ref="inputDialog" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="杈撳叆鍐呭" :value="outNum" placeholder="璇疯緭鍏ュ唴瀹�"
- @confirm="outbound"></uni-popup-dialog>
- </uni-popup>
- </view>
- </view>
- <view v-if="current === 2" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="妤煎眰">
- <uni-data-select v-if="show" v-model="printfloor"
- :localdata="printfloorrange"></uni-data-select>
- </uni-forms-item>
- <uni-forms-item label="鍐呯鏍囩">
- <uni-easyinput type="text" :focus="tagFocus" v-model="tag" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput'
- @input="tagInput" />
- </uni-forms-item>
- <uni-forms-item :label="tagmatCode"></uni-forms-item>
- <uni-forms-item :label="tagmatName"></uni-forms-item>
- <uni-forms-item :label="tagQty"></uni-forms-item>
- <uni-forms-item label="鎷嗗垎鏁伴噺">
- <uni-easyinput type="number" v-model="number" placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�" ref='midInput'
- :focus="numberFocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="printTag" type="primary" size="default" style="margin-top: 2%;">鎵撳嵃鏍囩</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 3" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="!istrue" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
- ref='midInput' @input="inputChangebarcode" />
- </uni-forms-item>
- <uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="istrue" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 4" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item>
- <uni-easyinput type="text" @input="releaseboxInput" v-model="releasevalue" placeholder="璇锋壂鐮�"
- ref='midInput' :focus="releasefocus" />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="releasebox" type="primary" size="default" style="margin-top: 2%;">瑙ｇ洏</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list>
- <uni-list-item direction="column" v-if="value2">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鎵樼洏鍙凤細{{value2}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- <uni-list-item direction="column" v-for="item in matTotals" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.matQuantity}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
-
- <uni-list-item direction="column" v-for="(item,index) in matInfo" :key="index">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡缂栫爜锛歿{item.matCode}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鐗╂枡鍚嶇О锛歿{item.matName}}
- </view>
- <view class="uni-title-sub uni-ellipsis-2" style="font-size: 1.1em;">
- 鏁伴噺锛歿{item.matQty}}
- </view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- import {
- config
- } from '../../common/config';
- const innerAudioContext = uni.createInnerAudioContext();
- export default {
- data() {
- return {
- show: true,
- items: ['鎵弿', '鏄庣粏'], //, '鎷嗗垎', '鍏ュ簱', '瑙ｇ洏'
- current: 0,
- orderNo: "",
- orderInfo: [],
- label: "",
- innerCode: "",
- matCode: "鐗╂枡缂栫爜锛�",
- matName: "鐗╂枡鍚嶇О锛�",
- orderQty: "闇�姹傛暟閲忥細",
- currentQty: "宸叉壂鏁伴噺锛�",
- scanQty: "绱鏁伴噺锛�",
- remaindQty: "鍓╀綑鏁伴噺锛�",
- tagFocus: true,
- numberFocus: false,
- focus: true,
- tag: "",
- number: "",
- tagmatCode: "鐗╂枡缂栫爜锛�",
- tagmatName: "鐗╂枡鍚嶇О锛�",
- tagQty: "鍖呰鏁伴噺锛�",
- value: "",
- range: [],
- floor: "",
- floorrange: [],
- printfloor: "",
- printfloorrange: [],
- barcode: "",
- address: "",
- istrue: false,
- outNum: 0,
- itemCode: "",
- releasefocus: true,
- releasevalue: "",
- matInfo: [],
- matTotals: [],
- value2: "",
- searchValue: "",
- endType: "",
- endTypeRange: []
- }
- },
-
- onLoad(res) {
- this.range = config.warehouseRange;
- this.endTypeRange = config.outboundAreaRange;
- if (config.outboundArea) {
- this.endType = config.outboundArea;
- }
- if (config.warehouseArea) {
- this.value = config.warehouseArea;
- }
- this.orderNo = res.orderNo;
- this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
- this.getData();
- },
- mounted() {
- this.printfloorrange = config.printFloorRange;
- this.floorrange = config.outboundFloorRange;
- if (config.outboundFloor) {
- this.floor = config.outboundFloor;
- }
- if (config.printFloor) {
- this.printfloor = config.printFloor;
- }
- },
- methods: {
- inputDialogToggle(itemCode) {
- this.itemCode = itemCode;
- this.$refs.inputDialog.open()
- },
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
- search() {
- this.getData();
- },
- releasebox() {
- if (this.releasevalue.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.releasevalue.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.releasevalue
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.releasevalue
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.releasevalue = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.releasevalue.length == 0) {
- return;
- }
- var matInfo = this.releasevalue.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.releasevalue
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
- updateFocus() {
- this.$nextTick(() => {
- this.innerCode = '';
- if (!this.focus) {
- this.focus = true;
- }
- });
- },
- inbound() {
- if (this.barcode.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樺彿",
- type: "error"
- })
- return;
- }
- if (this.address.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓湴鍧�鏉＄爜",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "barcode": this.barcode,
- "startPoint": this.address
- }
- }
- this.$u.post('/api/Inbound/RequestInbound', postData).then(res => {
- if (res.status) {
- uni.$showMsg(res.message);
- this.barcode = "";
- this.address = "";
- this.istrue = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- inputChangebarcode() {
- this.istrue = false;
- this.$nextTick(function(x) {
- if (this.barcode != '') {
- this.istrue = true;
- }
- })
- },
- onClickItem(e) {
- this.focus = false;
- this.addressFocus = false;
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- if (this.current == 1) {
- this.getData();
- }
- }
- },
- getData() {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- searchValue: this.searchValue
- },
- }
- this.$u.post('/api/ReceiveOrderDetail/GetReceiveOrderInfos', postData).then((res) => {
- if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
- this.loadVisible = true;
- }
- }
- })
- },
- innercodeInput() {
- this.$nextTick(() => {
- if (this.innerCode == "") {
- return;
- }
- var innerCode = this.innerCode;
- setTimeout(() => {
- this.innerCode = "";
- }, 10);
-
- // if (innerCode.split('|').length == 7) {
- var postData = {
- MainData: {
- orderNo: this.orderNo,
- scanValue: innerCode
- },
- }
- this.$u.post('/api/ReceiveOrderDetail/AddReceiveOrderDetail?serNum=' + innerCode +
- '&orderNo=' + this.orderNo, postData).then((res) => {
- if (res.status) {
- var remaind = parseInt(res.data.orderQty) - parseInt(res.data.scanQty);
- this.matCode = "鐗╂枡缂栫爜锛�" + res.data.matCode;
- this.matName = "鐗╂枡鍚嶇О锛�" + res.data.matName;
- this.orderQty = "闇�姹傛暟閲忥細" + res.data.orderQty;
- this.currentQty = "宸叉壂鏁伴噺锛�" + res.data.currentQty;
- this.scanQty = "绱鏁伴噺锛�" + res.data.scanQty;
- this.remaindQty = "鍓╀綑鏁伴噺锛�" + remaind;
- if (res.message) {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- return;
- }
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
- } else {
- // this.innerCode = "";
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- // setTimeout(this.updateFocus,200);
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
- }
- })
- // } else {
- // // this.innerCode = "";
- // this.$refs.uToast.show({
- // title: "鍐呯鐮佹壂鎻忛敊璇�",
- // type: "error"
- // })
- // // setTimeout(this.updateFocus,200);
- // setTimeout(() => {
- // this.voiceSpeech('../../static/fail.mp3');
- // }, 100);
- // }
- // this.innerCode = "";
- })
- },
- tagInput() {
- this.$nextTick(() => {
- var tagInfos = this.tag.split('|');
- if (tagInfos.length == 7) {
- this.tagmatCode = "鐗╂枡缂栫爜锛�" + tagInfos[1];
- this.tagQty = "鐗╂枡鏁伴噺锛�" + tagInfos[5];
- } else {
- this.$refs.uToast.show({
- title: "鍐呯鐮佹壂鎻忛敊璇�",
- type: "error"
- })
- }
- this.numberFocus = true;
- })
- },
- printTag() {
- if (this.tag == "") {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: "error"
- })
- return;
- }
- if (this.number <= 0) {
- this.$refs.uToast.show({
- title: "璇疯緭鍏ユ暟閲�",
- type: "error"
- })
- return;
- }
- if (this.printfloor.length <= 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- tag: this.tag,
- number: this.number,
- floor: this.printfloor
- }
- }
- this.$u.post('/api/StockOperate/PrintTag', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎵撳嵃鎴愬姛",
- type: "success"
- })
- this.tagmatCode = "鐗╂枡缂栫爜锛�";
- this.tagQty = "鍖呰鏁伴噺锛�";
- this.tag = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- },
- outbound(val) {
- if (this.floor == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨妤煎眰",
- type: "error"
- })
- return;
- }
- if (this.value == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨鍖哄煙",
- type: "error"
- })
- return;
- }
- if (this.endType == "") {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨鍑哄簱鍖哄煙",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- matCode: this.itemCode,
- orderNo: this.orderNo,
- system: this.value,
- floor: this.floor,
- outNum: val,
- endType: this.endType
- }
- }
- this.$u.post('/api/ErpOrder/ReceiveOrderOutbound', postData).then(res => {
- if (res.status) {
- this.$refs.uToast.show({
- title: "鎴愬姛",
- type: "success"
- })
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/relocation/relocation.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/relocation/relocation.vue"
deleted file mode 100644
index d872f8c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/relocation/relocation.vue"
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
- <view>
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="璧风偣搴撲綅">
- <uni-easyinput type="text" :focus="locationFocus" v-model="fromLocationNo" placeholder="璇疯緭鍏ヨ捣鐐瑰簱浣�"
- ref='midInput' @input="locationNoinputChange()" />
- </uni-forms-item>
- <uni-forms-item label="缁堢偣搴撲綅">
- <uni-easyinput type="text" :focus="!locationFocus" v-model="toLocationNo" placeholder="璇疯緭鍏ョ粓鐐瑰簱浣�"
- ref='midInput' />
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">绉诲簱</button>
- </uni-forms-item>
- </uni-forms>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- fromLocationNo: "",
- toLocationNo: "",
- locationFocus: true
- }
- },
- onLoad(res) {
- },
- methods: {
- submit() {
- if(this.fromLocationNo == ''){
- this.$refs.uToast.show({
- title: "璧风偣搴撲綅涓嶈兘涓虹┖",
- type: "error"
- });
- return;
- }
- if(this.toLocationNo == ''){
- this.$refs.uToast.show({
- title: "缁堢偣搴撲綅涓嶈兘涓虹┖",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "fromLocation": this.fromLocationNo,
- "toLocation": this.toLocationNo
- },
- }
- this.$u.post('/api/Relocation/RelocationTask', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.fromLocationNo = "";
- this.toLocationNo = "";
- this.locationFocus = true;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- locationNoinputChange(){
- this.locationFocus = false;
- this.$nextTick(function(x) {
- if (this.fromLocationNo != '') {
- this.locationFocus = false;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- padding-top: 50%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/printingink/index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/printingink/index.vue"
deleted file mode 100644
index 9b4d0ee..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/printingink/index.vue"
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
- <!-- <u-card :title="title" > -->
- <view class="" slot="body">
- <!-- <view v-for="(item,index) in tree" :key="item.id"> -->
- <u-grid :col="3">
- <u-grid-item @tap="clickCoupon(item.url)" v-for="(item) in tree" :key="item.menuId">
- <u-icon name="coupon" :size="50"></u-icon>
- <view class="grid-text">{{item.menuName}}</view>
- </u-grid-item>
- </u-grid>
- <!-- </view> -->
- <u-toast ref="uToast" />
- </view>
-
- <!-- </u-card> -->
-</template>
-
-<script>
- import {
- config
- } from '../../../common/config.js'
- export default {
- data() {
- return {
- // title: '鎿嶄綔鍔熻兘'
- datas: [],
- tree: [],
- warehouseId: "",
- version: ""
- }
- },
- onShow() {
- // uni.getSystemInfo({
- // success: (res) => {
- // this.version = res.appWgtVersion;
- // // console.log(res);
- // //妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
- // if (res.platform == "android") {
- // this.AndroidCheckUpdate();
- // }
- // }
- // });
- },
- onLoad(res) {
- // var id = this.$mp.query.id;
- // this.warehouseId = this.$mp.query.warehouseId;
- this.warehouseId = res.warehouseId;
- this.getCurrentTree(res.menuId);
- },
- mounted() {
-
- },
- methods: {
- AndroidCheckUpdate: function() {
- var _this = this;
- uni.request({
- url: 'http://10.1.211.101:9004/api/PDA/GetPDAVersion?version=' + this.version,
- method: 'GET',
- data: {},
- success: res => {
- if (res.data.data) {
-
- uni.showToast({
- title: '鏈夋柊鐨勭増鏈彂甯冿紝妫�娴嬪埌鎮ㄧ洰鍓嶄负Wifi杩炴帴锛岀▼搴忓凡鍚姩鑷姩鏇存柊銆傛柊鐗堟湰涓嬭浇瀹屾垚鍚庡皢鑷姩寮瑰嚭瀹夎绋嬪簭銆�',
- mask: false,
- duration: 5000,
- icon: "none"
- });
- var dtask = plus.downloader.createDownload(
- "http://10.1.211.101:9004/api/PDA/DownLoadApp", {},
- function(d, status) {
- // 涓嬭浇瀹屾垚
- if (status == 200) {
- plus.runtime.install(plus.io.convertLocalFileSystemURL(d
- .filename), {}, {}, function(error) {
- uni.showToast({
- title: '瀹夎澶辫触',
- mask: false,
- duration: 1500
- });
- })
- } else {
- uni.showToast({
- title: '鏇存柊澶辫触',
- mask: false,
- duration: 1500
- });
- }
- });
- dtask.start();
- }
- },
- fail: () => {
- console.log('璇锋眰澶辫触')
- },
- complete: () => {}
- });
- },
- getCurrentTree(id) {
- this.$u.post('/api/Sys_Menu/GetTreeMenuPDAStash?ParentId=' + id, {}).then(result => {
- this.tree = result;
- })
- },
- getTree(id, data, isRootId) {
- this.datas.forEach((x) => {
- if (x.pid == id) {
- x.lv = data.lv + 1;
- if (isRootId) {
- x.rootId = id;
- }
- if (!data.children) data.children = [];
- data.children.push(x);
- this.getTree(x.id, x, isRootId);
- }
- });
- },
- getPermission(text) {
- // return true;
- return this.datas.find(x => x.text == text);
- },
- clickCoupon(url) {
- // console.log("clickCoupon")
- if (this.hasLogin()) {
- // this.$u.route(url)
- this.$u.route({
- url: url,
- params: {
- warehouseId: this.warehouseId
- }
- })
- } else {
- this.$t.message.loading('鐧诲綍澶辨晥璇烽噸鏂扮櫥褰�')
- uni.reLaunch({
- url: '/pages/login/login'
- });
- }
- },
- lock() {
- console.log("lock")
- if (this.hasLogin()) {
- this.$u.route("pages/feeding/feeding")
- } else {
- this.$t.message.loading('鐧诲綍澶辨晥璇烽噸鏂扮櫥褰�')
- uni.reLaunch({
- url: '/pages/login/login'
- });
- }
- },
-
- //鍒ゆ柇鏄惁鐧诲綍
- hasLogin() {
- let haslogin = uni.getStorageSync('jo_user')
- if (haslogin == null || haslogin == "") {
- return false
- } else {
- return true
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .grid-text {
- font-size: 28rpx;
- margin-top: 4rpx;
- color: $u-type-info;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorder.vue"
index 29449ab..de09c0a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorder.vue"
@@ -33,6 +33,7 @@
page: "/pages/stash/receiveorderoutbound?orderNo=",
loadVisible: false,
searchValue: "",
+ warehouseId: "",
status: "more",
allReceivingOrders: [],
pageNo: 1,
@@ -40,6 +41,7 @@
}
},
onLoad(res) {
+ this.warehouseId = res.warehouseId;
this.getData();
},
onPageScroll(e) {
@@ -61,7 +63,8 @@
var postData = {
MainData: {
orderNo: this.searchValue,
- pageNo: this.pageNo
+ pageNo: this.pageNo,
+ warehouseId: this.warehouseId,
},
}
this.$u.post('/api/ReceiveOrder/GetReceiveOrders', postData).then((res) => {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/bindstock.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/bindstock.vue"
deleted file mode 100644
index dedaa28..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/bindstock.vue"
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
- <view>
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms class="customcss" label-width="120">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="!barcodefocus" v-model="locationNo" @confirm="submit" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @input="locationNoinputChange()" />
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="barcodefocus" v-model="barcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" @confirm="submit" ref='midInput'/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鎵嬪姩缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- locationNo: "",
- barcode: '',
- barcodefocus: false,
- }
- },
- onLoad(res) {
- uni.hideKeyboard();
- },
- methods: {
- submit() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.barcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationNo": this.locationNo,
- "barcode": this.barcode
- },
- }
- this.$u.post('/api/StockOperate/BindStock', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
-
- locationNoinputChange() {
- this.barcodefocus = false;
- this.$nextTick(function(x) {
- if (this.locationNo != '') {
- this.barcodefocus = true;
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- // padding-top: 50%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/releasestock.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/releasestock.vue"
deleted file mode 100644
index 897cd37..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/releasestock.vue"
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
- <view >
- <uni-forms label-width="120" class="customcss">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" v-model="locationNo" :focus="!barcodefocus" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- @input="locationNoinputChange()" ref='midInput'/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">瑙ｉ櫎缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in stockInfo" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">瀹瑰櫒缂栧彿锛歿{item.palletCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鍚嶇О锛歿{item.mater_name}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-title-sub uni-ellipsis-2">璐т綅缂栧彿锛歿{item.locationCode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- locationNo: "",
- barcode: '',
- barcodefocus: false,
- stockInfo: []
- }
- },
- onLoad(res) {
- },
- methods: {
- submit() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var _this = this;
- var isDelete = false;
- uni.showModal({
- title: "鎻愮ず",
- cancelText:'鍚�',
- confirmText:'鏄�',
- confirmColor:'blue',
- content: "鏄惁鍒犻櫎搴撳瓨?",
- showCancel: true,
- success: function(res) {
- if (res.confirm) {
- isDelete = true;
- } else if (res.cancel) {
- isDelete = false;
- }
- _this.releaseStock(isDelete);
- }
- });
-
- },
- releaseStock(isDelete) {
- var postData = {
- MainData: {
- "locationNo": this.locationNo,
- "barcode": this.barcode
- },
- Extra: isDelete
- }
- this.$u.post('/api/StockOperate/ReleaseStock', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.stockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- updateFocus() {
-
- },
- locationNoinputChange() {
- this.$nextTick(function(x) {
- if (this.locationNo != '') {
- var postData = {
- MainData: {
- "locationCode": this.locationNo
- },
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfoByLocationNo', postData).then((res) => {
- if (res.status) {
- this.stockInfo = res.data;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- background-color: #fff;
- padding: 20rpx 40rpx;
- width: 100%;
- }
-
- .footer {
- // padding-top: 20%;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/stock.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/stock.vue"
deleted file mode 100644
index 387f791..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stock/stock.vue"
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" :focus="!bindbarcodefocus" v-model="bindlocationNo" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- ref='midInput' @input="bindinputChange" />
- </uni-forms-item>
- <uni-forms-item label="鎵樼洏鏉＄爜">
- <uni-easyinput type="text" :focus="bindbarcodefocus" v-model="bindbarcode" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"ref='midInput'/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="bindstock" type="primary" size="default" style="margin-top: 2%;">鎵嬪姩缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- </view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle">
- <uni-forms label-width="120" class="customcss">
- <uni-forms-item label="璐т綅缂栧彿">
- <uni-easyinput type="text" v-model="locationNo" :focus="!barcodefocus" placeholder="璇疯緭鍏ヨ揣浣嶇紪鍙�"
- @input="locationNoinputChange" ref='midInput'/>
- </uni-forms-item>
- <uni-forms-item>
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">瑙ｉ櫎缁戝畾</button>
- </uni-forms-item>
- </uni-forms>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in stockInfo" :key="item.matCode">
- <template v-slot:body>
- <view class="uni-list-box">
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">瀹瑰櫒缂栧彿锛歿{item.palletCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡缂栫爜锛歿{item.matCode}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鐗╂枡鍚嶇О锛歿{item.mater_name}}</view>
- <view class="uni-title-sub uni-ellipsis-2">鏁伴噺锛歿{item.quantity}}</view>
- <view class="uni-title-sub uni-ellipsis-2">璐т綅缂栧彿锛歿{item.locationCode}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
- </view>
- </view>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['搴撳瓨缁戝畾', '搴撳瓨瑙ｇ粦'],
- current: 0,
-
- bindlocationNo: "",
- bindbarcode: '',
- bindbarcodefocus: false,
-
- locationNo: "",
- barcode: '',
- barcodefocus: false,
- stockInfo: []
- }
- },
- onLoad(res) {},
- methods: {
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- },
- bindstock() {
- if (this.bindlocationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- if (this.bindbarcode == "") {
- this.$refs.uToast.show({
- title: "鎵樼洏鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "locationNo": this.bindlocationNo,
- "barcode": this.bindbarcode
- },
- }
- this.$u.post('/api/StockOperate/BindStock', postData).then((res) => {
- if (res.status) {
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.bindlocationNo = "";
- this.bindbarcode = "";
- this.bindbarcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- bindinputChange() {
- this.bindbarcodefocus = false;
- this.$nextTick(function(x) {
- if (this.bindlocationNo != '') {
- this.bindbarcodefocus = true;
- }
- })
- },
-
- submit() {
- if (this.locationNo == "") {
- this.$refs.uToast.show({
- title: "璐т綅鍙蜂笉鑳戒负绌�",
- type: "error"
- });
- return;
- }
- var _this = this;
- var isDelete = false;
- uni.showModal({
- title: "鎻愮ず",
- cancelText:'鍚�',
- confirmText:'鏄�',
- confirmColor:'blue',
- content: "鏄惁鍒犻櫎搴撳瓨?",
- showCancel: true,
- success: function(res) {
- if (res.confirm) {
- isDelete = true;
- } else if (res.cancel) {
- isDelete = false;
- }
- _this.releaseStock(isDelete);
- }
- });
- },
- releaseStock(isDelete) {
- var postData = {
- MainData: {
- "locationNo": this.locationNo,
- "barcode": this.barcode
- },
- Extra: isDelete
- }
- this.$u.post('/api/StockOperate/ReleaseStock', postData).then((res) => {
- if (res.status) {
- this.stockInfo = [];
- this.$refs.uToast.show({
- title: res.message,
- type: "success"
- });
- this.locationNo = "";
- this.barcode = "";
- this.barcodefocus = false;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- },
- locationNoinputChange() {
- this.$nextTick(function(x) {
- if (this.locationNo != '') {
- var postData = {
- MainData: {
- "locationCode": this.locationNo
- },
- }
- this.$u.post('/api/VV_StockGroup/GetStockInfoByLocationNo', postData).then((res) => {
- if (res.status) {
- this.stockInfo = res.data;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- });
- }
- })
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/taskInfo/cancelTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/taskInfo/cancelTask.vue"
deleted file mode 100644
index f64e851..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/taskInfo/cancelTask.vue"
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
- <view>
- <uni-list class="footer">
- <uni-list-item direction="column" v-for="item in taskInfos" :key="item.taskNo">
- <template v-slot:body>
- <view class="uni-list-box">
- <checkbox @click="click(item)"></checkbox>
- <view class="uni-content">
- <view class="uni-title-sub uni-ellipsis-2">浠诲姟鍙凤細{{item.taskNo}}</view>
- <view class="uni-note">鎵樼洏鍙凤細{{item.barcode}}</view>
- <view class="uni-note">璧风偣锛歿{item.startPoint}}</view>
- <view class="uni-note">缁堢偣锛歿{item.endPoint}}</view>
- </view>
- </view>
- </template>
- </uni-list-item>
- </uni-list>
-
- <view style="background-color: #fff; padding: 20rpx,20rpx;" class="customcss">
- <u-sticky offset-top="80%" >
- <button type="primary" @click="cancelTask()">鍙栨秷浠诲姟</button>
- </u-sticky>
- </view>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- taskInfos: [],
- items: [],
- }
- },
- onLoad(res) {
- this.getData();
- },
- methods: {
- getData() {
- this.$u.post('/api/Dt_agvtask/GetTaskInfos', null).then((res) => {
- if (res.status) {
- this.taskInfos = res.data;
- }
- })
- },
- cancelTask() {
- if (this.items.length == 0) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨瑕佸彇娑堢殑鏁版嵁",
- type: "error"
- });
- return;
- }
- if (this.items.length > 1) {
- this.$refs.uToast.show({
- title: "璇烽�夋嫨涓�鏉¤鍙栨秷鐨勬暟鎹�",
- type: "error"
- });
- return;
- }
- var postData = {
- MainData: {
- "taskNo": this.items[0].taskNo,
- },
- }
-
- this.$u.post('/api/Dt_agvtask/CancelTask', postData).then((res) => {
- if (res.status) {
- this.items = [];
- this.$refs.uToast.show({
- title: "鍙栨秷鎴愬姛",
- type: "success"
- });
- this.getData();
- } else {
- this.$refs.uToast.show({
- title: "鍙栨秷澶辫触" + res.message,
- type: "error"
- });
- }
- })
- },
- click(e) {
- if (this.items.find(x => x.taskNo == e.taskNo)) {
- this.items.map((item, index) => {
- if (item.taskNo == e.taskNo) {
- this.items.splice(index, 1);
- }
- })
- } else {
- this.items.push(e);
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-
- .customcss {
- width: 100%;
- height: 140rpx;
- text-align: center;
- position: fixed;
- /*1銆併�恟elative銆戠浉瀵瑰畾浣嶏紱2銆併�恆bsolute銆戠粷瀵瑰畾浣嶏紱3銆併�恌ixed銆戝浐瀹氬畾浣嶏紱4銆併�恠tatic銆戦粯璁ゅ�硷紱5銆併�恠ticky銆戠矘鎬у畾浣嶃��*/
- left: 0px;
- /*瀹氫綅锛氱椤甸潰宸﹁竟0px鐨勪綅缃�*/
- bottom: 0px;
- /*瀹氫綅锛氱椤甸潰搴曢儴0px鐨勪綅缃�*/
- padding-top: 20rpx;
- }
-
- .footer {
- // padding-top: 20%;
- padding-bottom: 72px;
- background-color: #f1f3f4;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/template/tabtemplate.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/template/tabtemplate.vue"
deleted file mode 100644
index 87bec12..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/template/tabtemplate.vue"
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
- <view>
- <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
- </uni-segmented-control>
- <view v-if="current === 0" class="headerstyle">
- <view class="itemstyle"></view>
- </view>
- <view v-if="current === 1" class="headerstyle">
- <view class="itemstyle"></view>
- </view>
-
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- items: ['鍗婃垚鍝佺粍鐩�', '搴撳瓨缁戝畾'],
- current: 0,
- }
- },
- onLoad(res) {},
- methods: {
- onClickItem(e) {
- if (this.current !== e.currentIndex) {
- this.current = e.currentIndex;
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- .content {
- display: flex;
- height: 150px;
- }
-
- .content-text {
- font-size: 14px;
- color: #666;
- }
-
- .itemstyle {
- margin-top: 20px;
- margin-left: 5%;
- }
-
- .headerstyle {
- width: 90%;
- }
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/acrossfloor.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/acrossfloor.vue"
deleted file mode 100644
index 96ebc5d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/acrossfloor.vue"
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
- <view style="padding: 5%;">
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms label-width="120">
- <uni-forms-item label="璧风偣">
- <uni-easyinput type="text" :focus="true" v-model="startpoint" placeholder="璇疯緭鍏ヨ捣鐐瑰湴鍧�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item label="缁堢偣">
- <uni-easyinput type="text" v-model="endpoint" placeholder="璇疯緭鍏ョ粓鐐瑰湴鍧�" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
-
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙戦�佷换鍔�</button>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- istrue: false,
- startpoint: '',
- endpoint: ""
- }
- },
- onLoad(res) {
- // // this.formData.status=res.status
- // this.formData.outID = res.outID
- },
- methods: {
- submit() {
- if(this.startpoint.length == 0){
- this.$refs.uToast.show({
- title: "璇疯緭鍏ヨ捣鐐�",
- type: "error"
- })
- return;
- }
- if(this.endpoint.length == 0){
- this.$refs.uToast.show({
- title: "璇疯緭鍏ョ粓鐐�",
- type: "error"
- })
- return;
- }
- var postData = {
- MainData: {
- "startPoint": this.startpoint,
- "endPoint": this.endpoint
- }
- }
- this.$u.post('/api/Dt_agvtask/AcrossFloorTask', postData).then(res => {
- if (res.status) {
- uni.$showMsg("浠诲姟鍙戦�佹垚鍔�");
- this.startpoint = "";
- this.endpoint = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/qianfushitest.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/qianfushitest.vue"
deleted file mode 100644
index 1e205a8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/test/qianfushitest.vue"
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
- <view style="padding: 5%;">
- <!-- <uni-forms ref="formData" :modelValue="formData" label-width="120"> -->
- <uni-forms label-width="120">
- <uni-forms-item label="璧风偣">
- <uni-easyinput type="text" :focus="true" v-model="startpoint" placeholder="璇疯緭鍏ヨ捣鐐瑰湴鍧�" ref='midInput' />
- </uni-forms-item>
- <uni-forms-item label="缁堢偣">
- <uni-easyinput type="text" v-model="endpoint" placeholder="璇疯緭鍏ョ粓鐐瑰湴鍧�" ref='midInput' />
- </uni-forms-item>
- </uni-forms>
-
- <button @click="submit" type="primary" size="default" style="margin-top: 2%;">鍙戦�佷换鍔�</button>
- <u-toast ref="uToast" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- istrue: false,
- startpoint: '',
- endpoint: ""
- }
- },
- onLoad(res) {
- // // this.formData.status=res.status
- // this.formData.outID = res.outID
- },
- methods: {
- submit() {
- var postData = {
- MainData: {
- "startPoint": this.startpoint,
- "endPoint": this.endpoint
- }
- }
- this.$u.post('/api/standart/sendtask', postData).then(res => {
- if (res.status) {
- uni.$showMsg("浠诲姟鍙戦�佹垚鍔�");
- this.startpoint = "";
- this.endpoint = "";
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- }).catch(err => {
- this.$refs.uToast.show({
- title: err.message,
- type: "error"
- })
- })
- },
- }
- }
-</script>
-
-<style lang="scss">
- @import '@/common/uni-ui.scss';
-
- page {
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
- background-color: #efeff4;
- min-height: 100%;
- height: auto;
- }
-
- .tips {
- color: #67c23a;
- font-size: 14px;
- line-height: 40px;
- text-align: center;
- background-color: #f0f9eb;
- height: 0;
- opacity: 0;
- transform: translateY(-100%);
- transition: all 0.3s;
- }
-
- .tips-ani {
- transform: translateY(0);
- height: 40px;
- opacity: 1;
- }
-
- .content {
- width: 100%;
- display: flex;
- }
-
- .list-picture {
- width: 100%;
- height: 145px;
- }
-
- .thumb-image {
- width: 100%;
- height: 100%;
- }
-
- .ellipsis {
- display: flex;
- overflow: hidden;
- }
-
- .uni-ellipsis-1 {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- .uni-ellipsis-2 {
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
-</style>
--
Gitblit v1.9.3