diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 6b10e906..8fec1895 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -15,6 +15,10 @@
{
"openVueDevtools" : true,
"type" : "uni-app:h5"
+ },
+ {
+ "playground" : "custom",
+ "type" : "uni-app:app-android"
}
]
}
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 83a2cd46..2216cde2 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2187,6 +2187,7 @@ button::after {
.task_item {
margin: 0rpx 10rpx;
+ margin-top: 10rpx;
background-color: #fff;
}
diff --git a/src/mycomponents/job/jobComMainCardAsn.vue b/src/mycomponents/job/jobComMainCardAsn.vue
new file mode 100644
index 00000000..3011c110
--- /dev/null
+++ b/src/mycomponents/job/jobComMainCardAsn.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/job/jobTopAsn.vue b/src/mycomponents/job/jobTopAsn.vue
new file mode 100644
index 00000000..6018f942
--- /dev/null
+++ b/src/mycomponents/job/jobTopAsn.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
new file mode 100644
index 00000000..56f3a287
--- /dev/null
+++ b/src/mycomponents/location/locationCompare.vue
@@ -0,0 +1,84 @@
+
+
+
+
+ {{title}}
+
+ {{recommendLocationCode}}
+ / {{locationCode}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index 84edfb09..1c46f45b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,5 +1,5 @@
{
-
+
"pages": [{
"path": "pages/index/index",
"style": {
@@ -18,8 +18,8 @@
"titleNView": {
// "autoBackButton": "true",
"buttons": [
-
-
+
+
]
}
}
@@ -31,29 +31,29 @@
"enablePullDownRefresh": false,
"titleNView": {
// "autoBackButton": "true",
- // "buttons": [
- // // 右边按钮
- // {
-
- // "float": "right",
- // "fontSize": "58rpx", //按钮上文字的大小
- // "text": "\ue696",
- // "fontSrc": "/static/ali_icon/iconfont.ttf"
-
- // }
- // ]
+ // "buttons": [
+ // // 右边按钮
+ // {
+
+ // "float": "right",
+ // "fontSize": "58rpx", //按钮上文字的大小
+ // "text": "\ue696",
+ // "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ // }
+ // ]
}
}
},
-
+
{
"path": "pages/login/index",
"style": {
"navigationBarTitleText": "登录"
}
},
-
-
+
+
{
"path": "pages/query/item",
"style": {
@@ -86,8 +86,8 @@
}
}
},
-
-
+
+
{
"path": "pages/setter/index",
"style": {
@@ -96,8 +96,8 @@
"titleNView": {
// "autoBackButton": "true",
"buttons": [
-
-
+
+
]
}
}
@@ -119,15 +119,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -154,15 +154,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -189,15 +189,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -235,10 +235,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -262,7 +262,7 @@
"enablePullDownRefresh": true
}
},
-
+
{
"path": "pages/purchaseReturn/job/returnJob",
"style": {
@@ -277,10 +277,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -325,7 +325,7 @@
}
}
},
-
+
{
"path": "pages/inspect/job/inspectDetail",
"style": {
@@ -350,15 +350,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -368,7 +368,7 @@
}
}
},
-
+
{
"path": "pages/putaway/job/putawayDetail",
"style": {
@@ -397,10 +397,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -438,10 +438,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -465,7 +465,7 @@
"enablePullDownRefresh": false
}
},
-
+
{
"path": "pages/issue/job/issueJob",
"style": {
@@ -476,15 +476,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -521,15 +521,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -543,7 +543,7 @@
"path": "pages/productionReceipt/job/productionReceiptDetail",
"style": {
"navigationBarTitleText": "生产收料详细"
-
+
}
},
{
@@ -556,15 +556,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -608,10 +608,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -635,10 +635,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -665,15 +665,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -704,10 +704,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -747,7 +747,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -785,10 +785,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -803,7 +803,7 @@
"style": {
"navigationBarTitleText": "制品收货记录",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -811,7 +811,7 @@
"style": {
"navigationBarTitleText": "制品收货详情",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -827,10 +827,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -845,7 +845,7 @@
"style": {
"navigationBarTitleText": "制品上架详情",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -853,10 +853,10 @@
"style": {
"navigationBarTitleText": "制品上架记录",
"enablePullDownRefresh": false
-
+
}
},
-
+
{
"path": "pages/productPutaway/request/putawayRequest",
"style": {
@@ -871,10 +871,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -889,7 +889,7 @@
"style": {
"navigationBarTitleText": "制品上架申请详情",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -897,10 +897,10 @@
"style": {
"navigationBarTitleText": "制品上架申请创建",
"enablePullDownRefresh": false
-
+
}
},
-
+
{
"path": "pages/productDismantle/job/productDismantleJob",
"style": {
@@ -915,10 +915,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -928,13 +928,13 @@
}
}
},
-
+
{
"path": "pages/productDismantle/job/productDismantleDetail",
"style": {
"navigationBarTitleText": "制品拆解任务详情",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -942,7 +942,7 @@
"style": {
"navigationBarTitleText": "制品拆解记录",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -961,7 +961,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1001,7 +1001,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1025,7 +1025,7 @@
"enablePullDownRefresh": false
}
},
-
+
{
"path": "pages/customerReturn/request/customerReturnRequest",
"style": {
@@ -1042,7 +1042,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1073,7 +1073,7 @@
"enablePullDownRefresh": false
}
},
-
+
{
"path": "pages/scrap/job/scrapJob",
"style": {
@@ -1088,10 +1088,10 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1124,7 +1124,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1162,7 +1162,7 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
"float": "right",
@@ -1173,7 +1173,145 @@
]
}
}
- },{
+ },
+ {
+ "path": "pages/inventoryMove/job/inventoryMoveDetail",
+ "style": {
+ "navigationBarTitleText": "库存转移详细",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/inventoryMove/job/okToHoldMoveJob",
+ "style": {
+ "navigationBarTitleText": "合格转隔离",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/inventoryMove/job/holdToOkMoveJob",
+ "style": {
+ "navigationBarTitleText": "隔离转合格",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/inventoryMove/job/holdToScrapMoveJob",
+ "style": {
+ "navigationBarTitleText": "隔离转报废",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/inventoryMove/job/okToScrapMoveJob",
+ "style": {
+ "navigationBarTitleText": "合格转报废",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "path": "pages/inventoryMove/job/scrapToHoldMoveJob",
+ "style": {
+ "navigationBarTitleText": "报废转隔离",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ // "autoBackButton": "true",
+ "buttons": [
+ // 右边按钮
+ {
+ "float": "right",
+ "fontSize": "58rpx", //按钮上文字的大小
+ "text": "\ue696",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+
+ },
+ {
+ "float": "right",
+ "fontSize": "52rpx", //按钮上文字的大小
+ "text": "\ue6e2",
+ "fontSrc": "/static/ali_icon/iconfont.ttf"
+ }
+ ]
+ }
+ }
+ },
+ {
"path": "pages/inventoryMove/record/moveFreeRecord",
"style": {
"navigationBarTitleText": "库存转移记录",
@@ -1222,7 +1360,7 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
"float": "right",
@@ -1239,7 +1377,7 @@
"style": {
"navigationBarTitleText": "调拨入库详情",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -1260,7 +1398,7 @@
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
"float": "right",
@@ -1272,7 +1410,7 @@
}
}
},
-
+
{
"path": "pages/transfer/record/deliverRecord",
"style": {
@@ -1297,15 +1435,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1320,7 +1458,7 @@
"style": {
"navigationBarTitleText": "盘点详细",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -1328,7 +1466,7 @@
"style": {
"navigationBarTitleText": "按库位盘点",
"enablePullDownRefresh": false
-
+
}
},
{
@@ -1341,15 +1479,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1359,7 +1497,7 @@
}
}
},
-
+
{
"path": "pages/unPlanned/job/receiptJobDetail",
"style": {
@@ -1383,7 +1521,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1407,7 +1545,7 @@
"enablePullDownRefresh": false
}
},
-
+
{
"path": "pages/unPlanned/job/issueJob",
"style": {
@@ -1418,15 +1556,15 @@
"buttons": [
// 右边按钮
{
-
+
"float": "right",
"fontSize": "58rpx", //按钮上文字的大小
"text": "\ue696",
"fontSrc": "/static/ali_icon/iconfont.ttf"
-
+
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1459,7 +1597,7 @@
"fontSrc": "/static/ali_icon/iconfont.ttf"
},
{
-
+
"float": "right",
"fontSize": "52rpx", //按钮上文字的大小
"text": "\ue6e2",
@@ -1483,7 +1621,7 @@
"enablePullDownRefresh": false
}
},
-
+
{
"path": "pages/unPlanned/record/receiptRecord",
"style": {
@@ -1533,8 +1671,8 @@
"enablePullDownRefresh": false
}
}
-
-
+
+
],
"globalStyle": {
"navigationBarTextStyle": "white",
@@ -1563,7 +1701,7 @@
"borderStyle": "black",
"backgroundColor": "",
"list": [{
-
+
"pagePath": "pages/index/index",
"iconPath": "./static/bar/home.png",
"selectedIconPath": "./static/bar/home_p.png",
@@ -1582,4 +1720,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue
index 159898c5..c3a37327 100644
--- a/src/pages/count/job/countDetail.vue
+++ b/src/pages/count/job/countDetail.vue
@@ -68,6 +68,8 @@
import {
calc
} from '@/common/calc.js';
+
+ import { Decimal } from 'decimal.js';//引入
import {
goHome,
@@ -81,7 +83,6 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
@@ -94,7 +95,6 @@
winScanButton,
winScanPack,
comCountDetailCard,
- requiredLocation,
winScanPackAndLocation,
countQtyEdit,
jobTop,
@@ -261,546 +261,546 @@
item.handleQty = new Decimal(0).toNumber();
item.qty = new Decimal(0).toNumber();
for (let detail of item.subList) {
- if (detail!= undefined) {
- if (detail.scaned) {
- item.handleQty = calc.add(item.handleQty, detail.handleQty);
+ if (detail != undefined) {
+ if (detail.scaned) {
+ item.handleQty = calc.add(item.handleQty, detail.handleQty);
+ }
+ item.qty = calc.add(item.qty, detail.qty);
}
- item.qty = calc.add(item.qty, detail.qty);
}
}
- }
- this.$forceUpdate();
- },
+ this.$forceUpdate();
+ },
- updateData() {
- this.calcHandleQty();
- },
+ updateData() {
+ this.calcHandleQty();
+ },
- openScanPopup() {
- let fromlocationCode = '';
- let fromlocationList = [];
- for (var i = 0; i < this.detailSource.length; i++) {
- let item = this.detailSource[i];
- item.subList.forEach(l => {
- //重复的库位不往里面插入
- var location = fromlocationList.find(res => res == l.fromLocationCode)
- if (location == undefined) {
- fromlocationList.push(l.fromLocationCode);
- }
- //来源库位赋默认值
- if (fromlocationCode == '') {
- if (!l.scaned) {
- fromlocationCode = l.fromLocationCode;
+ openScanPopup() {
+ let fromlocationCode = '';
+ let fromlocationList = [];
+ for (var i = 0; i < this.detailSource.length; i++) {
+ let item = this.detailSource[i];
+ item.subList.forEach(l => {
+ //重复的库位不往里面插入
+ var location = fromlocationList.find(res => res == l.fromLocationCode)
+ if (location == undefined) {
+ fromlocationList.push(l.fromLocationCode);
}
- }
- })
- }
- this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
- },
-
- closeScanPopup() {
- if (this.$refs.scanPopup != undefined) {
- this.$refs.scanPopup.closeScanPopup();
- }
- },
+ //来源库位赋默认值
+ if (fromlocationCode == '') {
+ if (!l.scaned) {
+ fromlocationCode = l.fromLocationCode;
+ }
+ }
+ })
+ }
+ this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+ },
- scanPopupGetFocus() {
- if (this.$refs.scanPopup != undefined) {
- this.$refs.scanPopup.packGetFocus();
- }
- },
+ closeScanPopup() {
+ if (this.$refs.scanPopup != undefined) {
+ this.$refs.scanPopup.closeScanPopup();
+ }
+ },
- scanPopupLoseFocus() {
- if (this.$refs.scanPopup != undefined) {
- this.$refs.scanPopup.packLoseFocus();
- }
- },
+ scanPopupGetFocus() {
+ if (this.$refs.scanPopup != undefined) {
+ this.$refs.scanPopup.packGetFocus();
+ }
+ },
- //明盘
- getScanResult(result) {
- if (this.jobContent.isOpenCount) {
- this.getOpenCountResult(result);
- } else {
- this.getUnOpenCountResult(result);
- }
- },
+ scanPopupLoseFocus() {
+ if (this.$refs.scanPopup != undefined) {
+ this.$refs.scanPopup.packLoseFocus();
+ }
+ },
- getOpenCountResult(result) {
- try {
- let that = this;
- that.package = result.package;
- that.label = result.label;
- var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
- if (item == undefined) {
- that.scanByBalance(result);
+ //明盘
+ getScanResult(result) {
+ if (this.jobContent.isOpenCount) {
+ this.getOpenCountResult(result);
} else {
- // let subItem = item.subList.find(item => {
- // if (item.packingNumber == that.label.packingNumber &&
- // item.batch == that.label.batch && item.scaned == true) {
- // return item;
- // }
- // })
- let subItems = item.subList.filter(item => {
- if (item.packingNumber == that.label.packingNumber &&
- item.batch == that.label.batch) {
- return item;
- }
- })
- //有多条：同箱码同批次，但是状态不同
- if (subItems.length > 1) {
- let subItem = subItems.find(r => r.scaned == false)
- if (subItem == undefined) {
- subItem = subItems[0];
- that.editCountResult(item, subItem);
- } else {
- that.scanByBalance(result);
- }
- } else if (subItems.length == 1) {
- let subItem = subItems[0];
- if (subItem.scaned) {
- that.editCountResult(item, subItem);
- // this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
- // "】已经完成盘点,是否要编辑盘点结果?",
- // res => {
- // if (res) {
- // this.currentEditItem = subItem;
- // this.$refs.countQtyEdit.openEditPopup(subItem,
- // item.subList);
- // // this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
- // // item.subList);
- // } else {
- // this.scanPopupGetFocus();
- // }
- // })
- } else {
- that.scanByBalance(result);
- }
- } else if (subItems.length == 0) {
- that.scanByBalance(result);
- }
+ this.getUnOpenCountResult(result);
}
- } catch (e) {
- this.showErrorMessage(e.message)
- }
- },
+ },
- //编辑盘点结果
- editCountResult(item, subItem) {
- let that = this;
- this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
- "】已经完成盘点,是否要编辑盘点结果?",
- res => {
- if (res) {
- this.currentEditItem = subItem;
- this.$refs.countQtyEdit.openEditPopup(subItem,
- item.subList);
- // this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
- // item.subList);
+ getOpenCountResult(result) {
+ try {
+ let that = this;
+ that.package = result.package;
+ that.label = result.label;
+ var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
+ if (item == undefined) {
+ that.scanByBalance(result);
} else {
- this.scanPopupGetFocus();
+ // let subItem = item.subList.find(item => {
+ // if (item.packingNumber == that.label.packingNumber &&
+ // item.batch == that.label.batch && item.scaned == true) {
+ // return item;
+ // }
+ // })
+ let subItems = item.subList.filter(item => {
+ if (item.packingNumber == that.label.packingNumber &&
+ item.batch == that.label.batch) {
+ return item;
+ }
+ })
+ //有多条：同箱码同批次，但是状态不同
+ if (subItems.length > 1) {
+ let subItem = subItems.find(r => r.scaned == false)
+ if (subItem == undefined) {
+ subItem = subItems[0];
+ that.editCountResult(item, subItem);
+ } else {
+ that.scanByBalance(result);
+ }
+ } else if (subItems.length == 1) {
+ let subItem = subItems[0];
+ if (subItem.scaned) {
+ that.editCountResult(item, subItem);
+ // this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+ // "】已经完成盘点,是否要编辑盘点结果?",
+ // res => {
+ // if (res) {
+ // this.currentEditItem = subItem;
+ // this.$refs.countQtyEdit.openEditPopup(subItem,
+ // item.subList);
+ // // this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
+ // // item.subList);
+ // } else {
+ // this.scanPopupGetFocus();
+ // }
+ // })
+ } else {
+ that.scanByBalance(result);
+ }
+ } else if (subItems.length == 0) {
+ that.scanByBalance(result);
+ }
}
- })
- },
+ } catch (e) {
+ this.showErrorMessage(e.message)
+ }
+ },
- getUnOpenCountResult(result) {
- try {
+ //编辑盘点结果
+ editCountResult(item, subItem) {
let that = this;
- that.package = result.package;
- that.label = result.label;
- var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
- if (item == undefined) {
- this.$refs.comMessage.showQuestionMessage("没有物料【" + that.package.itemCode +
- "】的盘点明细,是否继续盘点?",
- res => {
- if (res) {
- that.scanByLabel(result);
- } else {
- this.scanPopupGetFocus();
- }
- })
- } else {
- let subItem = item.subList.find(item => {
- if (item.packingNumber == that.label.packingNumber &&
- item.batch == that.label.batch && item.scaned == true) {
- return item;
+ this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+ "】已经完成盘点,是否要编辑盘点结果?",
+ res => {
+ if (res) {
+ this.currentEditItem = subItem;
+ this.$refs.countQtyEdit.openEditPopup(subItem,
+ item.subList);
+ // this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
+ // item.subList);
+ } else {
+ this.scanPopupGetFocus();
}
})
+ },
- if (subItem != undefined) {
- this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
- "】已经完成盘点,是否要编辑盘点结果?",
+ getUnOpenCountResult(result) {
+ try {
+ let that = this;
+ that.package = result.package;
+ that.label = result.label;
+ var item = this.detailSource.find(r => r.itemCode == that.package.itemCode);
+ if (item == undefined) {
+ this.$refs.comMessage.showQuestionMessage("没有物料【" + that.package.itemCode +
+ "】的盘点明细,是否继续盘点?",
res => {
if (res) {
- this.currentEditItem = subItem;
- this.$refs.countQtyEdit.openEditPopup(subItem,
- item.subList);
+ that.scanByLabel(result);
} else {
this.scanPopupGetFocus();
}
})
} else {
- that.scanByLabel(result);
- }
- }
- } catch (e) {
- this.showErrorMessage(e.message)
- }
- },
+ let subItem = item.subList.find(item => {
+ if (item.packingNumber == that.label.packingNumber &&
+ item.batch == that.label.batch && item.scaned == true) {
+ return item;
+ }
+ })
- //明盘，按库存盘点
- scanByBalance(result) {
- let that = this;
- if (result.balance.length == 0) {
- that.scanPopupLoseFocus()
- that.$refs.comMessage.showQuestionMessage("该包装在来源库位[" + that.fromLocationCode +
- "],未查找到库存,是否继续盘点?",
- res => {
- if (res) {
- that.editInventoryStatus = true;
- let item = that.package;
- item.packingNumber = that.label.packingNumber;
- item.qty = 0
- item.handleQty = Number(that.label.qty);
- item.balanceQty = 0;
- item.inventoryStatus = "OK";
- that.balance = item;
- that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
- null);
+ if (subItem != undefined) {
+ this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+ "】已经完成盘点,是否要编辑盘点结果?",
+ res => {
+ if (res) {
+ this.currentEditItem = subItem;
+ this.$refs.countQtyEdit.openEditPopup(subItem,
+ item.subList);
+ } else {
+ this.scanPopupGetFocus();
+ }
+ })
} else {
- //继续扫描
- that.scanPopupGetFocus();
+ that.scanByLabel(result);
}
- })
- } else if (result.balance.length == 1) {
- this.countByBalance(result.balance[0]);
- } else {
- //有多条库存记录
- this.$refs.balanceSelect.openPopup(result.balance);
- }
- },
+ }
+ } catch (e) {
+ this.showErrorMessage(e.message)
+ }
+ },
- //盲盘，按标签盘点
- scanByLabel(result) {
- let that = this;
- that.scanPopupLoseFocus()
- let item = that.package;
- item.packingNumber = that.label.packingNumber;
- item.qty = 0
- item.handleQty = Number(that.label.qty);
- item.balanceQty = 0;
- item.inventoryStatus = "OK";
- that.balance = item;
- that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
- null);
- },
+ //明盘，按库存盘点
+ scanByBalance(result) {
+ let that = this;
+ if (result.balance.length == 0) {
+ that.scanPopupLoseFocus()
+ that.$refs.comMessage.showQuestionMessage("该包装在来源库位[" + that.fromLocationCode +
+ "],未查找到库存,是否继续盘点?",
+ res => {
+ if (res) {
+ that.editInventoryStatus = true;
+ let item = that.package;
+ item.packingNumber = that.label.packingNumber;
+ item.qty = 0
+ item.handleQty = Number(that.label.qty);
+ item.balanceQty = 0;
+ item.inventoryStatus = "OK";
+ that.balance = item;
+ that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
+ null);
+ } else {
+ //继续扫描
+ that.scanPopupGetFocus();
+ }
+ })
+ } else if (result.balance.length == 1) {
+ this.countByBalance(result.balance[0]);
+ } else {
+ //有多条库存记录
+ this.$refs.balanceSelect.openPopup(result.balance);
+ }
+ },
- selectBalanceItem(balance) {
- this.countByBalance(balance);
- },
+ //盲盘，按标签盘点
+ scanByLabel(result) {
+ let that = this;
+ that.scanPopupLoseFocus()
+ let item = that.package;
+ item.packingNumber = that.label.packingNumber;
+ item.qty = 0
+ item.handleQty = Number(that.label.qty);
+ item.balanceQty = 0;
+ item.inventoryStatus = "OK";
+ that.balance = item;
+ that.$refs.countQtyEdit.openEditPopupShowSeconds(item,
+ null);
+ },
- countByBalance(balance) {
- this.balance = balance;
- // this.balance.qty = 0
- this.balance.handleQty = Number(this.label.qty);
- this.balance.balanceQty = this.balance.qty;
- this.balance.stdPackQty = this.package.stdPackQty;
- this.balance.stdPackUnit = this.package.stdPackUnit;
- this.$refs.countQtyEdit.openEditPopupShowSeconds(this.balance,
- null);
- },
+ selectBalanceItem(balance) {
+ this.countByBalance(balance);
+ },
- editConfirm(qty, inventoryStatus, mode) {
- let that = this;
- //编辑
- if (mode == 'edit') {
- this.currentEditItem.handleQty = qty;
- this.currentEditItem.inventoryStatus = inventoryStatus;
- } else {
- //新增盘点
- //检查物料号是否存在
- var detail = that.detailSource.find(r => r.itemCode == that.label.itemCode);
- if (detail == undefined) {
- //物料号不存在，创建物料号数据添加到列表。设置为已经扫描
- that.addNewItemCodeToList(qty, inventoryStatus)
+ countByBalance(balance) {
+ this.balance = balance;
+ // this.balance.qty = 0
+ this.balance.handleQty = Number(this.label.qty);
+ this.balance.balanceQty = this.balance.qty;
+ this.balance.stdPackQty = this.package.stdPackQty;
+ this.balance.stdPackUnit = this.package.stdPackUnit;
+ this.$refs.countQtyEdit.openEditPopupShowSeconds(this.balance,
+ null);
+ },
+
+ editConfirm(qty, inventoryStatus, mode) {
+ let that = this;
+ //编辑
+ if (mode == 'edit') {
+ this.currentEditItem.handleQty = qty;
+ this.currentEditItem.inventoryStatus = inventoryStatus;
} else {
- var itemEditInfo = detail.subList.find(item => {
- if (item.packingNumber == that.label.packingNumber &&
- item.batch == that.label.batch &&
- item.inventoryStatus == inventoryStatus) {
- return item;
- }
- })
+ //新增盘点
+ //检查物料号是否存在
+ var detail = that.detailSource.find(r => r.itemCode == that.label.itemCode);
+ if (detail == undefined) {
+ //物料号不存在，创建物料号数据添加到列表。设置为已经扫描
+ that.addNewItemCodeToList(qty, inventoryStatus)
+ } else {
+ var itemEditInfo = detail.subList.find(item => {
+ if (item.packingNumber == that.label.packingNumber &&
+ item.batch == that.label.batch &&
+ item.inventoryStatus == inventoryStatus) {
+ return item;
+ }
+ })
- if (itemEditInfo == undefined) {
- //不在任务列表中，提示是否添加到列表
- that.addExistItemCodeToList(detail, qty, inventoryStatus);
- } else { //已经扫描是否编辑
- itemEditInfo.scaned = true;
- itemEditInfo.handleQty = qty;
- itemEditInfo.inventoryStatus = inventoryStatus;
- itemEditInfo.balanceQty = that.balance.qty;
- itemEditInfo.stdPackQty = that.package.stdPackQty;
- itemEditInfo.stdPackUnit = that.package.stdPackUnit;
+ if (itemEditInfo == undefined) {
+ //不在任务列表中，提示是否添加到列表
+ that.addExistItemCodeToList(detail, qty, inventoryStatus);
+ } else { //已经扫描是否编辑
+ itemEditInfo.scaned = true;
+ itemEditInfo.handleQty = qty;
+ itemEditInfo.inventoryStatus = inventoryStatus;
+ itemEditInfo.balanceQty = that.balance.qty;
+ itemEditInfo.stdPackQty = that.package.stdPackQty;
+ itemEditInfo.stdPackUnit = that.package.stdPackUnit;
+ }
}
- }
- setTimeout(r => {
- this.calcHandleQty();
- this.scanPopupGetFocus();
- }, 100)
- }
+ setTimeout(r => {
+ this.calcHandleQty();
+ this.scanPopupGetFocus();
+ }, 100)
+ }
- },
+ },
- openEditConfirm() {
+ openEditConfirm() {
- },
+ },
- unOpenEditConfirm() {
+ unOpenEditConfirm() {
- },
+ },
- editClose() {
- this.scanPopupGetFocus();
- },
+ editClose() {
+ this.scanPopupGetFocus();
+ },
- addNewItemCodeToList(qty, inventoryStatus) {
- this.$refs.comMessage.showQuestionMessage("物料[" + this.package.itemCode + "]不在列表中,是否添加到列表?",
- res => {
- if (res) {
- var item = this.createAddItemInfo(this.balance, this.package);
- let newDetail = this.createAddDetailInfo(qty, inventoryStatus); //
- item.subList.push(newDetail);
- this.detailSource.push(item)
- this.showMessage('添加成功');
- this.updateData()
- this.scanPopupGetFocus();
- }
- })
- },
+ addNewItemCodeToList(qty, inventoryStatus) {
+ this.$refs.comMessage.showQuestionMessage("物料[" + this.package.itemCode + "]不在列表中,是否添加到列表?",
+ res => {
+ if (res) {
+ var item = this.createAddItemInfo(this.balance, this.package);
+ let newDetail = this.createAddDetailInfo(qty, inventoryStatus); //
+ item.subList.push(newDetail);
+ this.detailSource.push(item)
+ this.showMessage('添加成功');
+ this.updateData()
+ this.scanPopupGetFocus();
+ }
+ })
+ },
- addExistItemCodeToList(detail, qty, inventoryStatus) {
- let that = this;
- that.scanPopupLoseFocus();
- this.$refs.comMessage.showQuestionMessage("盘点结果不在明细列表中,是否添加到列表?",
- res => {
- if (res) {
- // detail.qty = calc.add(qty, qty)
- let newDetail = that.createAddDetailInfo(qty, inventoryStatus); //
- detail.subList.push(newDetail);
- this.showMessage('添加成功');
- that.updateData()
- }
- that.scanPopupGetFocus();
- })
- },
+ addExistItemCodeToList(detail, qty, inventoryStatus) {
+ let that = this;
+ that.scanPopupLoseFocus();
+ this.$refs.comMessage.showQuestionMessage("盘点结果不在明细列表中,是否添加到列表?",
+ res => {
+ if (res) {
+ // detail.qty = calc.add(qty, qty)
+ let newDetail = that.createAddDetailInfo(qty, inventoryStatus); //
+ detail.subList.push(newDetail);
+ this.showMessage('添加成功');
+ that.updateData()
+ }
+ that.scanPopupGetFocus();
+ })
+ },
- createAddItemInfo() {
- let item = {
- itemCode: this.package.itemCode,
- itemName: this.package.itemName,
- stdPackQty: this.package.stdPackQty,
- stdPackUnit: this.package.stdPackUnit,
- // qty: Number(qty),
- qty: 0,
- handleQty: 0,
- uom: this.package.uom,
- subList: [],
- }
- return item;
- },
+ createAddItemInfo() {
+ let item = {
+ itemCode: this.package.itemCode,
+ itemName: this.package.itemName,
+ stdPackQty: this.package.stdPackQty,
+ stdPackUnit: this.package.stdPackUnit,
+ // qty: Number(qty),
+ qty: 0,
+ handleQty: 0,
+ uom: this.package.uom,
+ subList: [],
+ }
+ return item;
+ },
- //创建盘盈的明细
- createAddDetailInfo(qty, inventoryStatus) {
- var detail = {
- id: "0", //新增的明细
- scaned: true,
- countDetailNumber: "",
- ownerCode: this.balance.ownerCode,
- packingNumber: this.package.number,
- containerNumber: this.balance.containerNumber,
- batch: this.package.batch,
- inventoryStatus: inventoryStatus,
- itemCode: this.package.itemCode,
- itemName: this.package.itemName,
- itemDesc1: this.package.itemDesc1,
- itemDesc2: this.package.itemDesc2,
- stdPackQty: this.package.stdPackQty,
- stdPackUnit: this.package.stdPackUnit,
- projectCode: "",
- qty: 0,
- handleQty: qty,
- uom: this.package.uom,
- number: this.jobContent.number,
- remark: "",
- countQty: qty,
- balanceQty: this.balance.qty,
- fromLocationCode: this.balance.locationCode,
- creator: this.$store.state.user.id
- }
- return detail;
- },
+ //创建盘盈的明细
+ createAddDetailInfo(qty, inventoryStatus) {
+ var detail = {
+ id: "0", //新增的明细
+ scaned: true,
+ countDetailNumber: "",
+ ownerCode: this.balance.ownerCode,
+ packingNumber: this.package.number,
+ containerNumber: this.balance.containerNumber,
+ batch: this.package.batch,
+ inventoryStatus: inventoryStatus,
+ itemCode: this.package.itemCode,
+ itemName: this.package.itemName,
+ itemDesc1: this.package.itemDesc1,
+ itemDesc2: this.package.itemDesc2,
+ stdPackQty: this.package.stdPackQty,
+ stdPackUnit: this.package.stdPackUnit,
+ projectCode: "",
+ qty: 0,
+ handleQty: qty,
+ uom: this.package.uom,
+ number: this.jobContent.number,
+ remark: "",
+ countQty: qty,
+ balanceQty: this.balance.qty,
+ fromLocationCode: this.balance.locationCode,
+ creator: this.$store.state.user.id
+ }
+ return detail;
+ },
- scanLocationCode(location, code) {
- this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
- this.toLocationCode = code
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- detail.toLocationCode = code
+ scanLocationCode(location, code) {
+ this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+ this.toLocationCode = code
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ detail.toLocationCode = code
+ })
})
})
- })
- },
+ },
- getScanCount() {
- var scanCount = 0;
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- scanCount = scanCount + 1;
- }
+ getScanCount() {
+ var scanCount = 0;
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (detail.scaned) {
+ scanCount = scanCount + 1;
+ }
+ })
})
- })
- return scanCount;
- },
+ return scanCount;
+ },
- getTotalCount() {
- var totalCount = 0;
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- totalCount = totalCount + 1;
+ getTotalCount() {
+ var totalCount = 0;
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ totalCount = totalCount + 1;
+ })
})
- })
- return totalCount;
- },
+ return totalCount;
+ },
- commit() {
- this.scanCount = this.getScanCount();
-
- if (this.scanCount == this.getTotalCount()) {
- this.submitJob();
- } else if (this.scanCount < this.getTotalCount()) {
- //扫描数量小于任务数量，判断是否允许部分提交
- if (this.jobContent.allowPartialComplete == "TRUE") {
- //提交
- this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
- "]总共[" + this
- .getTotalCount() + "],是否把未扫描的盘点数量设置为0?",
- res => {
- if (res) {
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (!detail.scaned) {
- detail.countQty = 0;
- }
+ commit() {
+ this.scanCount = this.getScanCount();
+
+ if (this.scanCount == this.getTotalCount()) {
+ this.submitJob();
+ } else if (this.scanCount < this.getTotalCount()) {
+ //扫描数量小于任务数量，判断是否允许部分提交
+ if (this.jobContent.allowPartialComplete == "TRUE") {
+ //提交
+ this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
+ "]总共[" + this
+ .getTotalCount() + "],是否把未扫描的盘点数量设置为0?",
+ res => {
+ if (res) {
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (!detail.scaned) {
+ detail.countQty = 0;
+ }
+ })
})
- })
- this.submitJob();
- }
- });
+ this.submitJob();
+ }
+ });
- } else {
- //不允许部分提交，提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]总共[" + this
- .getTotalCount() + "]", res => {
- if (res) {
- this.openScanPopup();
- }
- });
+ } else {
+ //不允许部分提交，提示
+ this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ "]总共[" + this
+ .getTotalCount() + "]", res => {
+ if (res) {
+ this.openScanPopup();
+ }
+ });
+ }
}
- }
- },
+ },
- submitJob() {
- uni.showLoading({
- title: "提交中....",
- mask: true
- });
- var params = this.setParams()
- console.log("提交参数", JSON.stringify(params));
- countJobSubmit(params).then(res => {
- uni.hideLoading()
- if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data)
- } else {
- this.showErrorMessage("提交失败[" + res.msg + "]")
- }
- }).catch(error => {
- uni.hideLoading()
- this.showErrorMessage(error)
- })
+ submitJob() {
+ uni.showLoading({
+ title: "提交中....",
+ mask: true
+ });
+ var params = this.setParams()
+ console.log("提交参数", JSON.stringify(params));
+ countJobSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data)
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
- },
+ },
- setParams() {
- var subList = []
- var creator = this.$store.state.user.id
+ setParams() {
+ var subList = []
+ var creator = this.$store.state.user.id
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- detail.countQty = detail.handleQty;
- }
- subList.push(detail)
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (detail.scaned) {
+ detail.countQty = detail.handleQty;
+ }
+ subList.push(detail)
+ })
})
- })
- this.jobContent.subList = subList
- this.jobContent.creator = creator;
- return this.jobContent;
- },
+ this.jobContent.subList = subList
+ this.jobContent.creator = creator;
+ return this.jobContent;
+ },
- showMessage(message) {
- this.$refs.comMessage.showMessage(message, res => {
- if (res) {
- this.afterCloseMessage()
- }
- });
- },
- showErrorMessage(message) {
- this.$refs.comMessage.showErrorMessage(message, res => {
- if (res) {
- this.afterCloseMessage()
- }
- });
- },
+ showMessage(message) {
+ this.$refs.comMessage.showMessage(message, res => {
+ if (res) {
+ this.afterCloseMessage()
+ }
+ });
+ },
+ showErrorMessage(message) {
+ this.$refs.comMessage.showErrorMessage(message, res => {
+ if (res) {
+ this.afterCloseMessage()
+ }
+ });
+ },
- showScanMessage(message) {
- this.$refs.comMessage.showScanMessage(message);
- },
+ showScanMessage(message) {
+ this.$refs.comMessage.showScanMessage(message);
+ },
- afterCloseMessage() {
- this.scanPopupGetFocus();
- },
+ afterCloseMessage() {
+ this.scanPopupGetFocus();
+ },
- closeScanMessage() {
- this.scanPopupGetFocus();
- },
+ closeScanMessage() {
+ this.scanPopupGetFocus();
+ },
- editItem(item) {
- this.currentEditItem = item;
- var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
- this.$refs.countQtyEdit.openEditPopup(item,
- detail.subList);
- },
+ editItem(item) {
+ this.currentEditItem = item;
+ var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
+ this.$refs.countQtyEdit.openEditPopup(item,
+ detail.subList);
+ },
- showCommitSuccessMessage(hint) {
- this.$refs.comMessage.showSuccessMessage(hint, res => {
- navigateBack(1);
- })
- },
- getCountStageName(value) {
- return getCountStageName(value)
- },
- isOpenCount(value) {
- return value == "TRUE" ? "明盘" : "盲盘"
- }
+ showCommitSuccessMessage(hint) {
+ this.$refs.comMessage.showSuccessMessage(hint, res => {
+ navigateBack(1);
+ })
+ },
+ getCountStageName(value) {
+ return getCountStageName(value)
+ },
+ isOpenCount(value) {
+ return value == "TRUE" ? "明盘" : "盲盘"
+ }
- }
+ }
}
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 43386f91..21ef0149 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -18,9 +18,9 @@
-
+
@@ -65,7 +65,7 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+ import locationCompare from '@/mycomponents/location/locationCompare.vue'
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
@@ -73,7 +73,7 @@
components: {
winScanButton,
winScanPackAndLocation,
- requiredLocation,
+ locationCompare,
comDetailCard,
detailInfoPopup
},
@@ -87,9 +87,9 @@
managementList: [],
fromLocationCode: "",
toLocationCode: "",
- toLocationInfo: {},
tolocationTypeList: [],
- jobStatus:""
+ jobStatus:"",
+ jobToLocationCode:""
};
},
onLoad(option) {
@@ -168,10 +168,8 @@
that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode
- that.toLocationCode = that.subList[0].toLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-
- that.getLocationInfo(that.toLocationCode);
} else {
that.showMessage('列表数据为0');
}
@@ -182,16 +180,6 @@
})
},
- getLocationInfo(locationCode) {
- if (locationCode != '') {
- getBasicLocationByCode(locationCode).then(res => {
- if (res.data.list.length > 0) {
- this.toLocationInfo = res.data.list[0]
- }
- })
- }
- },
-
calcHandleQty() {
calcHandleQty(this.detailSource);
this.continueScan();
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 1d212af0..2996e0f0 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -69,7 +69,6 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
@@ -82,7 +81,6 @@
winScanButton,
winScanPack,
comInventoryDetailCard,
- requiredLocation,
winScanPackAndLocation,
detailInfoPopup,
jobTop
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 54822282..494500d2 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -26,9 +26,9 @@
-
+
@@ -81,7 +81,7 @@
} from '@/common/detail.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+ import locationCompare from '@/mycomponents/location/locationCompare.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue'
@@ -92,7 +92,7 @@
components: {
winScanButton,
winScanPackAndLocation,
- requiredLocation,
+ locationCompare,
comDetailCard,
detailInfoPopup,
jobTop
@@ -107,9 +107,9 @@
managementList: [],
fromLocationCode: "",
toLocationCode: "",
- toLocationInfo: {},
tolocationTypeList: [],
- jobStatus:""
+ jobStatus:"",
+ jobToLocationCode: "",
};
},
onLoad(option) {
@@ -182,10 +182,9 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status
that.fromLocationCode = that.subList[0].fromLocationCode
- that.toLocationCode = that.subList[0].toLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
- that.getLocationInfo(that.toLocationCode);
} else {
that.showMessage('列表数据为0');
}
@@ -196,16 +195,6 @@
})
},
- getLocationInfo(locationCode) {
- if (locationCode != '') {
- getBasicLocationByCode(locationCode).then(res => {
- if (res.data.list.length > 0) {
- this.toLocationInfo = res.data.list[0]
- }
- })
- }
- },
-
calcHandleQty() {
calcHandleQty(this.detailSource);
this.continueScan()
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 8cee17d7..6759a483 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -27,9 +27,9 @@
-
+
@@ -74,7 +74,7 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+ import locationCompare from '@/mycomponents/location/locationCompare.vue'
import winScanPack from "@/mycomponents/scan/winScanPack.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import jobTop from '@/mycomponents/job/jobTop.vue'
@@ -86,7 +86,7 @@
components: {
winScanButton,
comDetailCard,
- requiredLocation,
+ locationCompare,
winScanPack,
jobTop,
comProductDetailCard
@@ -103,7 +103,8 @@
detailSource: [], //绑定在页面上的数据源
toLocationTypeList: [],
managementList: [],
- jobStatus:""
+ jobStatus:"",
+ jobToLocationCode:""
};
},
@@ -182,7 +183,7 @@
that.jobContent = res.data;
that.subList = res.data.subList;
that.jobStatus = res.data.status
- that.toLocationCode = that.subList[0].toLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
} else {
diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue
index 91c9dff7..f34e5fc9 100644
--- a/src/pages/productReceipt/record/productReceiptRecord.vue
+++ b/src/pages/productReceipt/record/productReceiptRecord.vue
@@ -78,7 +78,6 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comProductRecord from '@/pages/productReceipt/coms/comProductRecord.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -87,7 +86,6 @@
winScanButton,
winScanPack,
comProductRecord,
- requiredLocation,
comBlankView,
},
data() {
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 976626d7..21ec7a62 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -28,9 +28,9 @@
-
+
@@ -77,7 +77,7 @@
} from '@/common/array.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
- import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+ import locationCompare from '@/mycomponents/location/locationCompare.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
@@ -89,7 +89,7 @@
components: {
winScanButton,
winScanPackAndLocation,
- requiredLocation,
+ locationCompare,
comDetailCard,
detailInfoPopup,
comIssueRequestInfo,
@@ -106,7 +106,8 @@
fromLocationCode: "",
toLocationCode: "",
tolocationTypeList: [],
- jobStatus:""
+ jobStatus:"",
+ jobToLocationCode: "",
};
},
onLoad(option) {
@@ -179,7 +180,7 @@
that.jobStatus = res.data.status
that.subList = res.data.subList;
that.fromLocationCode = that.subList[0].fromLocationCode
- that.toLocationCode = that.subList[0].toLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
// updateTitle(this.jobContent.number);
diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
index 7b545bb6..f22e12d1 100644
--- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -24,7 +24,6 @@