diff --git a/src/common/directory.js b/src/common/directory.js
index e21c2b51..502af6e7 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -24,6 +24,7 @@ let locationAreaTypeList = [];
let businessList = [];
let countScopeTypeList = [];
let priorityList = []
+let shiftList = []
@@ -68,6 +69,7 @@ export function clearCacheData() {
businessList = []
countScopeTypeList = []
priorityList = []
+ shiftList = []
}
//获取字典信息
@@ -75,6 +77,7 @@ export function getDirectoryInfo(type) {
var result = [];
var list = uni.getStorageSync("dictionary")
+ console.log(455,uni.getStorageSync("dictionary"))
if (list != undefined && list.length > 0) {
for (let item of list) {
if (item.type == type) {
@@ -690,4 +693,21 @@ export function getDeliverMethod(value) {
}
}
return resultInfo
+}
+//获取班次
+export function getShiftName(value) {
+ var resultInfo = "";
+ if (shiftList.length == 0) {
+ shiftList = getDirectoryInfo("shift")
+ }
+ console.log(333,shiftList)
+ if (shiftList.length > 0) {
+ for (let item of shiftList) {
+ if (item.value == value) {
+ resultInfo = item.label
+ break;
+ }
+ }
+ }
+ return resultInfo
}
\ No newline at end of file
diff --git a/src/mycomponents/balance/shift.vue b/src/mycomponents/balance/shift.vue
index af509ce9..fd9c1ff9 100644
--- a/src/mycomponents/balance/shift.vue
+++ b/src/mycomponents/balance/shift.vue
@@ -1,7 +1,7 @@
{{title}}
- {{shift}}
+ {{handleGetShiftName()}}
@@ -9,6 +9,10 @@
import {
getSwitchInfoByCode
} from '@/common/basic.js';
+
+ import {
+ getShiftName
+ } from '@/common/directory.js';
export default {
components: {
},
@@ -35,7 +39,10 @@ import {
mounted() {
},
methods: {
-
+ handleGetShiftName(){
+ console.log(99,getShiftName(this.shift))
+ return getShiftName(this.shift)
+ }
}
}
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
index a19b1279..ee12d3ae 100644
--- a/src/mycomponents/item/item.vue
+++ b/src/mycomponents/item/item.vue
@@ -6,9 +6,9 @@
{{dataContent.itemCode}}
- {{dataContent.itemName}}
+ {{dataContent.itemName}}
|
- {{dataContent.itemDesc1}}
+ {{dataContent.itemDesc1}}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e62d5805..aca3c477 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -364,7 +364,7 @@
"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_scope_type","priority",
- "receive_status",'deliver_method','duty','duty_details'
+ "receive_status",'deliver_method','duty','duty_details','shift'
]
}
getDictionaryItem(params).then(res => {