From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js | 543 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 542 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
index 348f5ee..ae5f214 100644
--- a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
+++ b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
@@ -370,6 +370,7 @@
console.error('Error loading custom styles');
});
}
+<<<<<<< HEAD
}
//鍒濆鍖�
@@ -907,4 +908,544 @@
// });
// this.dispatchEvent(evt);
}
-}
\ No newline at end of file
+}
+=======
+ }
+
+ //鍒濆鍖�
+ connectedCallback() {
+ init({ arrType: this.arrType, eSetId: this.eSetId })
+ .then((result) => {
+ this.isNoteStay = result.isNoteStay;
+ this.arrController = result.arrGoodCon;
+ console.log('this.arrController:' + this.arrController);
+ if (result.result == 'Success') {
+ this.saveFLGbln = result.saveFLGbln;
+ this.returnFLGbln = result.returnFLGbln;
+ this.coc = result.coc;
+ this.cocId = result.coc.Id;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ this.showSpinner = false;
+ this.showPage = true;
+ } else {
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ this.showSpinner = false;
+ this.showPage = true;
+ console.log('error:' + result.errorMsg);
+ this.showMyToast(
+ '鍒濆鍖栭〉闈㈠け璐�',
+ result.errorMsg,
+ 'error'
+ );
+ }
+ })
+ .catch((error) => {
+ this.showSpinner = false;
+ this.showPage = true;
+ console.log('error:' + JSON.stringify(error));
+ this.showMyToast(
+ '鍒濆鍖栭〉闈㈠け璐�',
+ JSON.stringify(error),
+ 'error'
+ );
+ });
+ }
+
+ //barcode change
+ barcodeChange(event) {
+ this.barcode = event.detail.value;
+ }
+
+ //鏍规嵁barcode鎼滅储
+ barcodeEntrys() {
+ this.showSpinner = true;
+ searchProduct({
+ barcode: this.barcode,
+ arrControllerStr: this.arrController
+ })
+ .then((result) => {
+ this.arrController = result.arrGoodCon;
+ if (result.result == 'Success') {
+ this.saveFLGbln = result.saveFLGbln;
+ this.returnFLGbln = result.returnFLGbln;
+ this.coc = result.coc;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ this.consumableInventory = result.consumableInventory;
+ this.detailsSummary = result.detailsSummary;
+ for (var i in this.detailsSummary) {
+ if (this.detailsSummary[i].Prod != null) {
+ this.detailsSummary[i]['recordId'] =
+ this.detailsSummary[i].Prod.Id;
+ this.detailsSummary[i]['assetModelNo'] =
+ this.detailsSummary[i].Prod.Asset_Model_No__c;
+ this.detailsSummary[i]['prodName'] =
+ this.detailsSummary[i].Prod.Name__c;
+ }
+ }
+ console.log(
+ 'this.detailsSummary:' +
+ JSON.stringify(this.detailsSummary)
+ );
+ this.consumableorderdetailsRecords =
+ result.consumableorderdetailsRecords;
+ var consumableorderdetailsRecordsview = [];
+ for (var i in this.consumableorderdetailsRecords) {
+ this.consumableorderdetailsRecords[i]['dataType'] =
+ 'DataileRecords';
+ consumableorderdetailsRecordsview.push(
+ this.consumableorderdetailsRecords[i]
+ );
+ }
+ for (var i in this.consumableInventory) {
+ this.consumableInventory[i]['dataType'] = 'Inventory';
+ consumableorderdetailsRecordsview.push(
+ this.consumableInventory[i]
+ );
+ }
+ this.consumableorderdetailsRecordsview =
+ consumableorderdetailsRecordsview;
+ for (var i in this.consumableorderdetailsRecordsview) {
+ if (
+ this.consumableorderdetailsRecordsview[i].Prod !=
+ null
+ ) {
+ this.consumableorderdetailsRecordsview[i][
+ 'recordId'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].Prod.Id;
+ this.consumableorderdetailsRecordsview[i][
+ 'prodName'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].Prod.Name__c;
+ }
+ if (
+ this.consumableorderdetailsRecordsview[i][
+ 'dataType'
+ ] == 'Inventory'
+ ) {
+ this.consumableorderdetailsRecordsview[i][
+ 'barCode'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].barCodeNo;
+ } else if (
+ this.consumableorderdetailsRecordsview[i].esd !=
+ null
+ ) {
+ this.consumableorderdetailsRecordsview[i][
+ 'barCode'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].esd.Bar_Code__c;
+ }
+ if (
+ this.consumableorderdetailsRecordsview[i].esd !=
+ null
+ ) {
+ this.consumableorderdetailsRecordsview[i][
+ 'productPackingListManual'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].esd.ProductPacking_list_manual__c;
+ this.consumableorderdetailsRecordsview[i][
+ 'status'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].esd.CFDA_Status__c;
+ this.consumableorderdetailsRecordsview[i][
+ 'reportProductApprobation'
+ ] =
+ this.consumableorderdetailsRecordsview[
+ i
+ ].esd.Report_Product_Approbation__c;
+ }
+ }
+ console.log(
+ 'len1:' + this.consumableorderdetailsRecords.length
+ );
+ console.log(
+ 'len2:' + this.consumableorderdetailsRecordsview.length
+ );
+ console.log(
+ 'this.consumableorderdetailsRecordsview:' +
+ JSON.stringify(
+ this.consumableorderdetailsRecordsview
+ )
+ );
+ this.showGoodsofReturnList = result.showGoodsofReturnList;
+ var showGoodsofReturnListView = [];
+ for (var i in this.showGoodsofReturnList) {
+ this.showGoodsofReturnList[i]['dataType'] =
+ 'GoodsoOfReturn';
+ showGoodsofReturnListView.push(
+ this.showGoodsofReturnList[i]
+ );
+ }
+ for (var i in this.consumableInventory) {
+ this.consumableInventory[i]['dataType'] = 'Inventory';
+ showGoodsofReturnListView.push(
+ this.consumableInventory[i]
+ );
+ }
+ this.showGoodsofReturnListView = showGoodsofReturnListView;
+ for (var i in this.showGoodsofReturnListView) {
+ if (this.showGoodsofReturnListView[i].Prod != null) {
+ this.showGoodsofReturnListView[i]['prodName'] =
+ this.showGoodsofReturnListView[i].Prod.Name__c;
+ }
+ if (
+ this.showGoodsofReturnListView[i]['dataType'] ==
+ 'Inventory'
+ ) {
+ this.showGoodsofReturnListView[i]['barCode'] =
+ this.showGoodsofReturnListView[i].barCodeNo;
+ } else if (
+ this.showGoodsofReturnListView[i].esd != null
+ ) {
+ this.showGoodsofReturnListView[i]['barCode'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Bar_Code__c;
+ }
+ if (this.showGoodsofReturnListView[i].esd != null) {
+ if (
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Shipment_order__c != '' &&
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Shipment_order__c != null
+ ) {
+ this.showGoodsofReturnListView[i]['recordId'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Consumable_Shipment_order__c;
+ this.showGoodsofReturnListView[i]['orderUrl'] =
+ '/lexsummonscreat?ESetid=' +
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Shipment_order__c;
+ this.showGoodsofReturnListView[i]['orderNo'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Consumable_Shipment_order__r.Name;
+ } else if (
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Sale_order__c != '' &&
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Sale_order__c != null
+ ) {
+ this.showGoodsofReturnListView[i]['recordId'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Consumable_Sale_order__c;
+ this.showGoodsofReturnListView[i]['orderUrl'] =
+ '/lexsummonscreat?ESetid=' +
+ this.showGoodsofReturnListView[i].esd
+ .Consumable_Sale_order__c;
+ this.showGoodsofReturnListView[i]['orderNo'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Consumable_Sale_order__r.Name;
+ }
+ this.showGoodsofReturnListView[i]['prodOutDate'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Product_OutDate__c;
+ this.showGoodsofReturnListView[i][
+ 'summonsForDirctionDet'
+ ] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.SummonsForDirction_det__c;
+ this.showGoodsofReturnListView[i]['hospitalName'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.HospItal_Name__c;
+ this.showGoodsofReturnListView[i]['orderDealer'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Order_Dealer_Info__c;
+ this.showGoodsofReturnListView[i][
+ 'sterilizationLimit'
+ ] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Sterilization_limit__c;
+ this.showGoodsofReturnListView[i]['boxPiece'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Box_Piece__c;
+ this.showGoodsofReturnListView[i]['returnCount'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Rrturn_count__c;
+ console.log(
+ 'returnCount:' +
+ this.showGoodsofReturnListView[i].esd
+ .Rrturn_count__c
+ );
+ this.showGoodsofReturnListView[i]['returnReason'] =
+ this.showGoodsofReturnListView[
+ i
+ ].esd.Return_reason__c;
+ }
+ }
+ console.log('len1:' + this.showGoodsofReturnList.length);
+ console.log(
+ 'len2:' + this.showGoodsofReturnListView.length
+ );
+ console.log(
+ 'this.showGoodsofReturnListView:' +
+ JSON.stringify(this.showGoodsofReturnListView)
+ );
+ // this.consumableInventory = result.consumableInventory;
+ // for(var i in this.consumableInventory){
+ // if(this.consumableInventory[i].Prod != null){
+ // this.consumableInventory[i]['recordId'] = this.consumableInventory[i].Prod.Id;
+ // this.consumableInventory[i]['prodName'] = this.consumableInventory[i].Prod.Name__c;
+ // }
+ // }
+ console.log(
+ 'this.consumableInventory:' +
+ JSON.stringify(this.consumableInventory)
+ );
+ this.consumableorderdetailsRecordserror =
+ result.consumableorderdetailsRecordserror;
+ for (var i in this.consumableorderdetailsRecordserror) {
+ if (
+ this.consumableorderdetailsRecordserror[i].Prod !=
+ null
+ ) {
+ this.consumableorderdetailsRecordserror[i][
+ 'recordId'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].Prod.Id;
+ this.consumableorderdetailsRecordserror[i][
+ 'prodName'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].Prod.Name__c;
+ }
+ if (
+ this.consumableorderdetailsRecordserror[i].esd !=
+ null
+ ) {
+ this.consumableorderdetailsRecordserror[i][
+ 'consumableOrderMinor'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].esd.Consumable_order_minor__c;
+ if (
+ this.consumableorderdetailsRecordserror[i].esd
+ .Consumable_order_minor__c != null
+ ) {
+ this.consumableorderdetailsRecordserror[i][
+ 'consumableOrderMinorName'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].esd.Consumable_order_minor__r.Name;
+ this.consumableorderdetailsRecordserror[i][
+ 'consumableOrderUrl'
+ ] =
+ '/s/detail/' +
+ this.consumableorderdetailsRecordserror[i]
+ .esd.Consumable_order_minor__c;
+ }
+ this.consumableorderdetailsRecordserror[i][
+ 'barCode'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].esd.Bar_Code__c;
+ this.consumableorderdetailsRecordserror[i][
+ 'boxPiece'
+ ] =
+ this.consumableorderdetailsRecordserror[
+ i
+ ].esd.Box_Piece__c;
+ }
+ }
+ console.log(
+ 'this.consumableorderdetailsRecordserror:' +
+ JSON.stringify(
+ this.consumableorderdetailsRecordserror
+ )
+ );
+ this.showSpinner = false;
+ if (this.errorMsgs.length < 1) {
+ this.showMyToast('鑾峰彇鎴愬姛', '', 'success');
+ }
+ } else {
+ this.showSpinner = false;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ console.log('error:' + result.errorMsg);
+ this.showMyToast('鑾峰彇澶辫触', result.errorMsg, 'error');
+ }
+ })
+ .catch((error) => {
+ this.showSpinner = false;
+ console.log('error:' + error);
+ this.showMyToast('鑾峰彇澶辫触', error, 'error');
+ });
+ }
+
+ //杩斿搧鏁伴噺change
+ returnCountChange(event) {
+ var value = event.detail.data.value;
+ var boxPrice = event.detail.data.boxPrice;
+ var recordId = event.detail.data.recordId;
+ console.log('杩斿搧鏁伴噺:' + value + boxPrice + '---' + recordId);
+ for (var i in this.showGoodsofReturnList) {
+ if (this.showGoodsofReturnList[i]['recordId'] == recordId) {
+ if (this.showGoodsofReturnList[i].canEdit) {
+ this.showGoodsofReturnList[i].esd.Rrturn_count__c = 1;
+ this.showGoodsofReturnList[i]['returnCount'] =
+ this.showGoodsofReturnList[i].esd.Rrturn_count__c;
+ } else {
+ this.showGoodsofReturnList[i].esd.Rrturn_count__c = value;
+ this.showGoodsofReturnList[i]['returnCount'] =
+ this.showGoodsofReturnList[i].esd.Rrturn_count__c;
+ }
+ }
+ }
+ }
+
+ //杩斿搧鍘熷洜change
+ returnReasonChange(event) {
+ var recordId = event.detail.data.recordId;
+ var value = event.detail.data.value;
+ console.log('杩斿搧鍘熷洜:' + value + '---' + recordId);
+ for (var i in this.showGoodsofReturnList) {
+ if (this.showGoodsofReturnList[i]['recordId'] == recordId) {
+ this.showGoodsofReturnList[i].esd.Return_reason__c = value;
+ this.showGoodsofReturnList[i]['returnReason'] =
+ this.showGoodsofReturnList[i].esd.Return_reason__c;
+ }
+ }
+ }
+
+ // 鍒拌揣纭
+ arriveGoodsConfim() {
+ this.showSpinner = true;
+ arriveGoodsConfim({ arrControllerStr: this.arrController })
+ .then((result) => {
+ this.arrController = result.arrGoodCon;
+ if (result.result == 'Success') {
+ this.showSpinner = false;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ var url = result.url;
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ } else {
+ this.showSpinner = false;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ console.log('error1:' + result.errorMsg);
+ this.showMyToast('鍒拌揣纭澶辫触', result.errorMsg, 'error');
+ }
+ })
+ .catch((error) => {
+ this.showSpinner = false;
+ console.log('error2:' + error);
+ this.showMyToast('鍒拌揣纭澶辫触', error, 'error');
+ });
+ }
+
+ // 鐧诲綍杩斿搧
+ updateGoodsOfReturn() {
+ this.showSpinner = true;
+ updateGoodsOfReturn({
+ arrControllerStr: this.arrController,
+ showGoodsofReturnListStr: JSON.stringify(this.showGoodsofReturnList)
+ })
+ .then((result) => {
+ this.showSpinner = false;
+ this.arrController = result.arrGoodCon;
+ if (result.result == 'Success') {
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ var url = result.url;
+ const config = {
+ type: 'standard__webPage',
+ attributes: {
+ url: url
+ }
+ };
+ this[NavigationMixin.Navigate](config);
+ } else {
+ console.log('error1:' + result.errorMsg);
+ this.showSpinner = false;
+ this.warningMsgs = result.warningMsgList;
+ this.errorMsgs = result.errorMsgList;
+ if (result.errorMsg.includes('鏃犳硶淇濆瓨姝よ褰�')) {
+ result.errorMsg = '鏃犳硶淇濆瓨璁板綍';
+ }
+ this.showMyToast('鐧诲綍杩斿搧澶辫触', result.errorMsg, 'error');
+ }
+ })
+ .catch((error) => {
+ this.showSpinner = false;
+ console.log('error2:' + JSON.stringify(error));
+ this.showMyToast('鐧诲綍杩斿搧澶辫触', error, 'error');
+ });
+ }
+
+ showMyToast(title, message, variant) {
+ console.log('show custom message');
+ var iconName = '';
+ var content = '';
+ if (variant == 'success') {
+ iconName = 'utility:check';
+ } else {
+ iconName = 'utility:error';
+ }
+ if (message != '') {
+ content =
+ '<h2><strong>' +
+ title +
+ '<strong/></h2><h5>' +
+ message +
+ '</h5>';
+ } else {
+ content = '<h2><strong>' + title + '<strong/></h2>';
+ }
+ this.template
+ .querySelector('c-common-toast')
+ .showToast(variant, content, iconName, 10000);
+ // var mode;
+ // if(this.isNoteStay){
+ // mode ='sticky';
+ // }else{
+ // mode = 'dismissable';
+ // }
+ // const evt = new ShowToastEvent({
+ // title: title,
+ // message: message,
+ // variant: variant,
+ // mode: mode
+ // });
+ // this.dispatchEvent(evt);
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1