diff --git a/common/directory.js b/common/directory.js
index af8e4037..4ad973c2 100644
--- a/common/directory.js
+++ b/common/directory.js
@@ -14,6 +14,7 @@ let scrapReasonList = [];
let inspectFailedReasonList = [];
let nextActionList = [];
let inspectTypeList = [];
+let sampleMethodList = [];
// 获取业务类型字典项
@@ -45,6 +46,7 @@ export function clearCacheData() {
inspectFailedReasonList = [];
nextActionList = [];
inspectTypeList = [];
+ sampleMethodList =[]
}
//获取字典信息
@@ -385,4 +387,22 @@ export function getInspectType(value) {
}
return resultInfo
}
+//获取抽检方式
+export function getSampleMethod(value) {
+ var resultInfo = "";
+ if (sampleMethodList.length == 0) {
+ sampleMethodList = getDirectoryInfo("sample_method")
+ }
+ if (sampleMethodList.length > 0) {
+ for (let item of sampleMethodList) {
+ if (item.value == value) {
+ resultInfo = item.label
+ break;
+ }
+ }
+ }
+ return resultInfo
+}
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a71ca8f6..97a1cee9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -272,7 +272,7 @@
types:["job_status","location_type","item_status","uom",
"inventory_status","container_type","pack_unit","unplanned_receipt_reason",
"unplanned_issue_reason","scrap_reason","inspect_failed_reason",
- "request_status","inspect_type","next_action"]
+ "request_status","inspect_type","next_action","sample_method"]
}
getDictionaryItem(params).then(res => {
if (res.data.length > 0) {
diff --git a/pages/inspect/coms/inspectInfoPopup.vue b/pages/inspect/coms/inspectInfoPopup.vue
index 8a73d011..e022fe0f 100644
--- a/pages/inspect/coms/inspectInfoPopup.vue
+++ b/pages/inspect/coms/inspectInfoPopup.vue
@@ -38,7 +38,7 @@
检验类型 :
- {{dataContent.inspectType}}
+ {{getInspectType(dataContent.inspectType)}}
下一步检验动作 :
@@ -46,11 +46,11 @@
抽检方式 :
- {{dataContent.sampleMethod}}
+ {{getSampleMethod(dataContent.sampleMethod)}}
计量单位 :
- {{dataContent.uom}}
+ {{getUnitInfo(dataContent.uom)}}
收货数量 :
@@ -70,6 +70,10 @@
diff --git a/pages/productionReturn/request/returnToStoreRequestSubmit.vue b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
index 5ab26580..31e04a0c 100644
--- a/pages/productionReturn/request/returnToStoreRequestSubmit.vue
+++ b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
@@ -23,7 +23,7 @@
-
+