diff --git a/src/common/directory.js b/src/common/directory.js
index fcdfc188..e922c360 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -1,6 +1,6 @@
let jobStatusList = [];
let itemStatusList = [];
-let itemTypeList =[];
+let itemTypeList = [];
let locationTypeList = [];
let uomList = [];
let inventoryStatusList = [];
@@ -20,7 +20,8 @@ let sampleMethodList = [];
let transferModeList = [];
let countStageList = [];
let locationAreaTypeList = [];
-let businessList=[]
+let businessList = [];
+let countScopeTypeList = [];
@@ -41,7 +42,7 @@ export function getBusinessTypeDesc(type) {
export function clearCacheData() {
jobStatusList = [];
itemStatusList = [];
- itemTypeList =[];
+ itemTypeList = [];
locationTypeList = [];
uomList = [];
inventoryStatusList = [];
@@ -60,8 +61,9 @@ export function clearCacheData() {
sampleMethodList = [];
transferModeList = [];
countStageList = [];
- locationAreaTypeList=[]
- businessList=[]
+ locationAreaTypeList = []
+ businessList = []
+ countScopeTypeList = []
}
//获取字典信息
@@ -233,7 +235,7 @@ export function getBusinessTypeName(code) {
if (businessList.length == 0) {
businessList = uni.getStorageSync("businessType")
}
-
+
for (let item of businessList) {
if (item.code == code) {
resultInfo = item
@@ -319,6 +321,24 @@ export function getUomInfo(value) {
return resultInfo
}
+//获取盘点范围类型
+export function getCountScopeType(value) {
+ var resultInfo = "";
+ if (countStageList.length == 0) {
+ countStageList = getDirectoryInfo("count_scope_type")
+ }
+ if (countStageList.length > 0) {
+ for (let item of countStageList) {
+ if (item.value == value) {
+ resultInfo = item
+ break;
+ }
+ }
+ }
+ return resultInfo
+}
+
+
//获取包装单位
export function getPackUnitInfo(value) {
var resultInfo = "";
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 5a5c1777..b15bb0fa 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -107,12 +107,14 @@
},
mounted() {
- if (this.detailOptions.length == 0) {
- this.detailOptions = getDetailOption();
- }
- if (this.scanOptions.length == 0) {
- this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
- }
+ // if (this.detailOptions.length == 0) {
+ // this.detailOptions = getDetailOption();
+ // }
+ // if (this.scanOptions.length == 0) {
+ // this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
+ // }
+
+ this.showLocation();
},
methods: {
diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue
new file mode 100644
index 00000000..6351ba08
--- /dev/null
+++ b/src/mycomponents/package/PackageAndItemCard.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index 394a3799..925108d0 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -9,8 +9,8 @@
-
- /
+
+ /
{{ calc(dataContent.qty,dataContent.packQty)}}
@@ -73,6 +73,10 @@
objTextStyle: {
type: Object,
default: null
+ },
+ isShowPackCount: {
+ type: Boolean,
+ default: true
}
},
watch: {
diff --git a/src/pages.json b/src/pages.json
index 8637d870..3f08e9c1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1887,6 +1887,43 @@
}
},
+
+ {
+ "path": "pages/count/job/fuzzyCountJob",
+ "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/count/job/fuzzyCountDetail",
+ "style": {
+ "navigationBarTitleText": "盲盘明细",
+ "enablePullDownRefresh": false
+
+ }
+ },
{
"path": "pages/count/record/countRecord",
"style": {
diff --git a/src/pages/count/coms/comFuzzyCountJobCard.vue b/src/pages/count/coms/comFuzzyCountJobCard.vue
new file mode 100644
index 00000000..bbb0adf1
--- /dev/null
+++ b/src/pages/count/coms/comFuzzyCountJobCard.vue
@@ -0,0 +1,53 @@
+
+
+
+ 盘点计划
+ {{dataContent.planNumber}}
+
+
+
+
+ {{getCountScopeName(range.type)}}
+ {{range.value}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
new file mode 100644
index 00000000..fe787179
--- /dev/null
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -0,0 +1,495 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
new file mode 100644
index 00000000..1115de97
--- /dev/null
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -0,0 +1,448 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 9396f0d2..31ee48d0 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -362,7 +362,7 @@
"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
- "count_stage", "inspect_result", "area_type"
+ "count_stage", "inspect_result", "area_type","count_scope_type"
]
}
getDictionaryItem(params).then(res => {
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 75e09df1..a40d2002 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -1,6 +1,5 @@
-