worker 赋值为中文登录名字

fe/PDA/mycomponents/coms/task/comScanPutaway.vue

@@ -253,7 +253,7 @@
 						};
 						r.qty.uom = r.basicUom,
 							r.toLocationCode = that.locationCode;
-						r.worker = localStorage.userName
+						r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					})
 					this.$emit('confirm', this.itemList, this.locationCode)
 				}

fe/PDA/mycomponents/scan/comScanReplen.vue

@@ -264,7 +264,7 @@
 						};
 						r.qty.uom = r.basicUom,
 							r.toLocationCode = that.locationCode;
-						r.worker = localStorage.userName
+						r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					})
 					this.closeScanPopup();
 					this.$emit('confirm', this.prodLine, this.itemList)

fe/PDA/pages/inventory/comTransfer.vue

@@ -349,7 +349,7 @@
 					mask: true
 				});
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -363,7 +363,7 @@
 					r.toLocationCode = that.toLocationCode;
 					r.toLocationErpCode = this.toLocationErpCode
 
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					item.details.push(r);
 				})
 

fe/PDA/pages/inventory/createTP.vue

@@ -164,7 +164,7 @@
 					mask: true
 				});
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: "",
 					jobNumber: "",
 					supplierCode: "",
@@ -175,7 +175,7 @@
 
 				that.itemList.forEach(r => {
 					r.toContainerCode = that.toContainerCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					item.details.push(r);
 				})
 

fe/PDA/pages/inventory/hold.vue

@@ -248,7 +248,7 @@
 					mask: true
 				});
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -274,7 +274,7 @@
 						status: 2,
 						locationCode: that.toLocationCode,
 						reasonCode: '0',
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					}
 					item.details.push(detail);
 				})
@@ -301,7 +301,7 @@
 				});
 
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",

fe/PDA/pages/inventory/merge.vue

@@ -272,7 +272,7 @@
 			handleInventoryTransfer() {
 				let that = this;
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: "",
 					jobNumber: "",
 					supplierCode: "",
@@ -284,7 +284,7 @@
 				that.itemList.forEach(r => {
 					r.toContainerCode = that.toContainerCode;
 					r.containerCode = that.toContainerCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					item.details.push(r);
 				})
 				let params = JSON.stringify(item);

fe/PDA/pages/inventory/productionReturn_detail.vue

@@ -336,7 +336,7 @@
 					r.handledBatch = r.recommendBatch;
 					r.handledLot = r.recommendLot;
 					r.handledLocationCode = r.recommendLocationCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 
 				let params = JSON.stringify(this.dataContent);

fe/PDA/pages/inventory/scrap.vue

@@ -354,7 +354,7 @@
 				});
 				let that = this;
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					company: localStorage.company,
 					jobNumber: "",
@@ -367,7 +367,7 @@
 				that.itemList.forEach(r => {
 					r.toLocationCode = that.toLocationCode
 					r.toLocationErpCode = that.toLocationErpCode
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					r.reasonCode = this.scrapReason
 					item.details.push(r);
 				})

fe/PDA/pages/inventory/transferIssue_detail.vue

@@ -299,7 +299,7 @@
 					r.handledBatch = r.recommendBatch;
 					r.handledLot = r.recommendLot;
 					r.handledLocationCode = r.recommendLocationCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 
 				let params = JSON.stringify(this.detail);

fe/PDA/pages/inventory/transferReceipt_detail.vue

@@ -293,7 +293,7 @@
 					r.handledBatch = r.recommendBatch;
 					r.handledLot = r.recommendLot;
 					r.handledLocationCode = r.recommendLocationCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 
 				let params = JSON.stringify(this.detail);

fe/PDA/pages/inventory/unissue.vue

@@ -242,7 +242,7 @@
 					mask: true
 				});
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -264,7 +264,7 @@
 						status: r.status,
 						locationCode: r.locationCode,
 						reasonCode: that.issueReason,
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					}
 					item.details.push(detail);
 				})

fe/PDA/pages/inventory/unpick.vue

@@ -120,7 +120,7 @@
 					mask: true
 				});
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -131,7 +131,7 @@
 
 				items.forEach(r => {
 					r.toContainerCode = '';
-					r.worker = localStorage.userName;
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
 					item.details.push(r);
 				})
 

fe/PDA/pages/inventory/unreceipt.vue

@@ -206,7 +206,7 @@
 				});
 
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN == "" ?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -231,7 +231,7 @@
 						locationCode: that.toLocationCode,
 						reasonCode: that.receiptReason,
 						inventoryStatus: 2,
-						worker: localStorage.userName
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					}
 					item.details.push(detail);
 				})

fe/PDA/pages/login/index.vue

@@ -187,7 +187,11 @@
 				localStorage.setItem('company', this.$companyCode);
 				localStorage.setItem('warehouseCode', this.$warehouseCode);
 				var decode = jwtDecode(localStorage.getItem('token_type'))
-				localStorage.setItem('userId', decode.sub);
+				if(decode){
+					var userName_CN = decode['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'];
+					localStorage.setItem('userId', decode.sub);
+					localStorage.setItem('userName_CN', userName_CN);
+				}
 			},
 			clearStorage(res) {
 				sessionStorage.setItem('isLogin', 0); //登录判断

fe/PDA/pages/putaway/dyPutaway.vue

@@ -127,7 +127,7 @@
 					mask: true
 				})
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					company: localStorage.company,
 					warehouseCode: localStorage.warehouseCode,
 					details: that.itemList

fe/PDA/pages/putaway/purchasePutaway.vue

@@ -441,7 +441,7 @@
 
 				let item = {
 					number: "",
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					jobNumber: "",
 					details: []
 				}

fe/PDA/pages/putaway/putaway.vue

@@ -126,7 +126,7 @@
 					mask: true
 				})
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					company: localStorage.company,
 					warehouseCode: localStorage.warehouseCode,
 					details: that.itemList

fe/PDA/pages/putaway/rapReceipt.vue

@@ -276,7 +276,7 @@
 					mask: true
 				})
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					// details: that.itemList
 				};
 				that.itemList.forEach(r => {

fe/PDA/pages/putaway/semiPutaway.vue

@@ -393,7 +393,7 @@
 
 				let item = {
 					number: "",
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN,
 					jobNumber: "",
 					putawayType: 2,
 

fe/PDA/pages/return/returnToWarehouse.vue

@@ -492,7 +492,7 @@
 				let that = this;
 				let item = {
 					number: "",
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					putawayType: 2,
 					details: []
 				}

fe/PDA/pages/store/deliverFG.vue

@@ -185,7 +185,7 @@
 					title: "提交中..."
 				});
 				let deliverItem = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					Company: localStorage.company,
 					company: localStorage.company,
@@ -217,7 +217,7 @@
 
 						fromStatus: data.status,
 						toStatus: data.status,
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					};
 
 					deliverItem.details[i] = detail;

fe/PDA/pages/store/deliverRaw.vue

@@ -424,7 +424,7 @@
 					jobNumber: '',
 					deliverPlanNumber: '',
 					deliverRequestNumber: '',
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					details: []
 				}
@@ -442,7 +442,7 @@
 						r.handledFromLocationErpCode = that.toLocation.erpLocationCode;
 						r.handledQty =r.qty;
 						r.recommendQty =r.handledQty;
-						r.worker = localStorage.userName
+						r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 						item.details.push(r);
 					})
 				})

fe/PDA/pages/store/deliverTF.vue

@@ -140,7 +140,7 @@
 				});
 
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					jobNumber: "",
 					supplierCode: "",
@@ -162,7 +162,7 @@
 					r.toContainerCode = r.containerCode;
 					r.fromWarehouseCode = r.warehouseCode;
 					r.toWarehouseCode = that.location.warehouseCode;
-					r.worker = localStorage.userName;
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
 					item.details.push(r);
 				})
 

fe/PDA/pages/store/issueDirect.vue

@@ -454,7 +454,7 @@
 					let item = {
 						company: localStorage.company,
 						number: "",
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 						warehouseCode: localStorage.warehouseCode,
 						jobNumber: "abc",
 						useOnTheWayLocation: false,

fe/PDA/pages/store/receipt.vue

@@ -376,7 +376,7 @@
 				});
 
 				let receiptItem = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					number: "",
 					productionPlanNumber: "",
@@ -405,7 +405,7 @@
 						shift: r.shift,
 						prodLine: r.prodLine,
 						status: 2,
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 						// bomVersion: r.bomVersion
 					};
 					receiptItem.details[i] = detail;

fe/PDA/pages/store/recycle.vue

@@ -318,9 +318,9 @@
 				});
 
 				let receiptItem = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: "",
-					number: localStorage.userName,
+					number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					productionPlanNumber: "",
 					jobNumber: "",
 					completeTime: new Date(),
@@ -347,7 +347,7 @@
 						shift: r.shift,
 						prodLine: r.prodLine,
 						status: 2,
-						worker: localStorage.userName
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 						// bomVersion: r.bomVersion
 					};
 					receiptItem.details[i] = detail;

fe/PDA/pages/store/tjReceipt.vue

@@ -185,7 +185,7 @@
 				})
 				 
 				let receiptItem = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
 					number: "",
 					productionPlanNumber: "",
@@ -251,7 +251,7 @@
 							bomVersion: '',
 							locationCode: this.prodLine.productLocation,
 							rawLocation: this.prodLine.rawLocation, //线边
-							worker: localStorage.userName,
+							worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 							status: 2 //默认赋值成合格
 							// locationCode: that.prodLine.value,
 							// rawLocation: that.prodLine.value1,

fe/PDA/pages/store/tjRecycle.vue

@@ -298,9 +298,9 @@
 				});
 
 				let receiptItem = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					warehouseCode: localStorage.warehouseCode,
-					number: localStorage.userName,
+					number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					productionPlanNumber: "",
 					jobNumber: "",
 					completeTime: new Date(),
@@ -326,7 +326,7 @@
 						rawLocation: r.rawLocation,
 						shift: r.shift,
 						prodLine: r.prodLine,
-						worker: localStorage.userName,
+						worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 						// bomVersion: r.bomVersion
 					};
 					receiptItem.details[i] = detail;

fe/PDA/pages/task/Inspect_detail.vue

@@ -375,7 +375,7 @@
 						r.notPassedQty = r.failedQty;
 					}
 					r.nextAction = that.summaryDetail.nextAction;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 
 				let params = JSON.stringify(that.datacontent);

fe/PDA/pages/task/Inspect_summary.vue

@@ -547,7 +547,7 @@
 					r.notPassedQty = that.nextStep === "整批不合格" ? r.receiveQty.qty : 0; //最终不合格数量;
 					r.nextAction = that.summaryDetail.nextAction;
 					// sumGoodQty = sumGoodQty + r.receiveQty.qty;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 
 				// that.summaryDetail.goodQty = sumGoodQty;

fe/PDA/pages/task/countByItem.vue

@@ -207,7 +207,7 @@
 					"partCondition": itemList,
 					"locCondition": lList,
 					"statusList": sList,
-					"worker": localStorage.userName,
+					"worker": localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					"warehouseCode": localStorage.warehouseCode,
 				}
 

fe/PDA/pages/task/countByLocation.vue

@@ -224,7 +224,7 @@
 					"partCondition": iList,
 					"locCondition": lList,
 					"statusList": sList,
-					"worker": localStorage.userName,
+					"worker": localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					"warehouseCode": localStorage.warehouseCode,
 				}
 

fe/PDA/pages/task/issue_detail.vue

@@ -527,7 +527,7 @@
 				item.scanPackingCode = this.currentScanLebel.data.code;
 				item.scanLot = this.currentScanLebel.data.lot;
 
-				item.worker = localStorage.userName;
+				item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
 				item.uom = balanceItem.uom;
 
 				this.details.sort(compareDesc('scanDate')); //按扫描信息排
@@ -623,7 +623,7 @@
 					title: "提交中...",
 					mask: true
 				});
-				that.datacontent.worker = localStorage.userName;
+				that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
 				that.datacontent.details = that.details;
 				let params = JSON.stringify(that.datacontent);
 				finshIssueJob(that.id, params)

fe/PDA/pages/task/putaway_detail.vue

@@ -328,7 +328,7 @@
 					r.handledBatch = r.recommendBatch;
 					r.handledLot = r.recommendLot;
 					r.handledQty = r.recommendQty;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 				});
 				let params = JSON.stringify(that.datacontent);
 				console.log(params);

fe/PDA/pages/task/receipt_result.vue

@@ -204,7 +204,7 @@
 				//赋值
 				that.receiptJob.details.forEach(r => {
 					r.handledToLocationCode = r.recommendToLocationCode;
-					r.worker = localStorage.userName
+					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
 					if (r.purchaseReceiptInspectStatus == 1) {
 						r.handledArriveDate = new Date(); //
 						r.purchaseReceiptInspectStatus = 4; //未收货

fe/PDA/pages/task/replen.vue

@@ -118,7 +118,7 @@
 					mask: true
 				})
 				let item = {
-					worker: localStorage.userName,
+					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
 					company: localStorage.company,
 					details: that.itemList
 				};