From 744f42c5496e656a1f9927740a3b37c0b97a6cba Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:34:12 +0800
Subject: [PATCH] lexcommunityupload0714

---
 force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js | 1040 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 734 insertions(+), 306 deletions(-)

diff --git a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
index 796a99c..348f5ee 100644
--- a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
+++ b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.js
@@ -1,4 +1,4 @@
-import { LightningElement,wire,track } from 'lwc';
+import { LightningElement, wire, track } from 'lwc';
 import { CurrentPageReference } from 'lightning/navigation';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import { NavigationMixin } from 'lightning/navigation';
@@ -6,9 +6,9 @@
 import searchProduct from '@salesforce/apex/LexArriveGoodsController.searchProduct';
 import arriveGoodsConfim from '@salesforce/apex/LexArriveGoodsController.arriveGoodsConfim';
 import updateGoodsOfReturn from '@salesforce/apex/LexArriveGoodsController.updateGoodsOfReturn';
-//table css 
-import { loadStyle } from "lightning/platformResourceLoader";
-import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";
+//table css
+import { loadStyle } from 'lightning/platformResourceLoader';
+import WrappedHeaderTable from '@salesforce/resourceUrl/lexdatatable';
 
 export default class LexArriveGoods extends NavigationMixin(LightningElement) {
     //椤甸潰鍙橀噺
@@ -43,97 +43,302 @@
     @track isNoteStay = true;
 
     //鏄惁鏈夎鍛�
-    get hasWarning(){
-        if(this.warningMsgs == null || this.warningMsgs.length == 0){
+    get hasWarning() {
+        if (this.warningMsgs == null || this.warningMsgs.length == 0) {
             return false;
         }
-        if(this.warningMsgs.length > 0){
+        if (this.warningMsgs.length > 0) {
             return true;
         }
     }
 
     //鏄惁鏈夐敊璇�
-    get hasError(){
-        if(this.errorMsgs == null || this.errorMsgs.length == 0){
+    get hasError() {
+        if (this.errorMsgs == null || this.errorMsgs.length == 0) {
             return false;
         }
-        if(this.errorMsgs.length > 0){
+        if (this.errorMsgs.length > 0) {
             return true;
         }
     }
 
     //鏈鍒拌揣浜у搧姹囨�籧ols
     @track currentArrProdCols = [
-        {label:'浜у搧鍨嬪彿' , fieldName:'assetModelNo', hideDefaultActions: true,wrapText:true,initialWidth:220},
-        {label:'浜у搧鍚嶇О' , fieldName:'prodName', hideDefaultActions: true,wrapText:true},
-        {label:'鍒拌揣鏁伴噺' , fieldName:'arrivedCount', hideDefaultActions: true,wrapText:true,initialWidth:220,cellAttributes: { alignment: "right" }},
-        {label:'鍒拌揣閲戦' ,type:'number',typeAttributes:{minimumFractionDigits: 2}, fieldName:'arriveAmount', hideDefaultActions: true,wrapText:true,initialWidth:220,cellAttributes: { alignment: "right" }}
+        {
+            label: '浜у搧鍨嬪彿',
+            fieldName: 'assetModelNo',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 220
+        },
+        {
+            label: '浜у搧鍚嶇О',
+            fieldName: 'prodName',
+            hideDefaultActions: true,
+            wrapText: true
+        },
+        {
+            label: '鍒拌揣鏁伴噺',
+            fieldName: 'arrivedCount',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 220,
+            cellAttributes: { alignment: 'right' }
+        },
+        {
+            label: '鍒拌揣閲戦',
+            type: 'number',
+            typeAttributes: { minimumFractionDigits: 2 },
+            fieldName: 'arriveAmount',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 220,
+            cellAttributes: { alignment: 'right' }
+        }
     ];
     //鍒拌揣鏄庣粏cols
     @track arrDetailCols = [
-        {label:'娑堣�楀搧鍚嶇О' , fieldName:'prodName', hideDefaultActions: true,wrapText:true},
-        {label:'瑙勬牸' , fieldName:'productPackingListManual', hideDefaultActions: true,wrapText:true,initialWidth:55,cellAttributes: { alignment: "right" }},
-        {label:'CFDA鐘舵��' , fieldName:'status', hideDefaultActions: true,wrapText:true,initialWidth:120},
-        {label:'娉ㄥ唽璇佺紪鐮佸彿' , fieldName:'reportProductApprobation', hideDefaultActions: true,wrapText:true,initialWidth:190},
-        {label:'娉ㄥ唽璇佹晥鏈�' , fieldName:'ReportProductExpirationDate', hideDefaultActions: true,wrapText:true,initialWidth:110},
-        {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,wrapText:true,initialWidth:400}
+        {
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'prodName',
+            hideDefaultActions: true,
+            wrapText: true
+        },
+        {
+            label: '瑙勬牸',
+            fieldName: 'productPackingListManual',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 55,
+            cellAttributes: { alignment: 'right' }
+        },
+        {
+            label: 'CFDA鐘舵��',
+            fieldName: 'status',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 120
+        },
+        {
+            label: '娉ㄥ唽璇佺紪鐮佸彿',
+            fieldName: 'reportProductApprobation',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 190
+        },
+        {
+            label: '娉ㄥ唽璇佹晥鏈�',
+            fieldName: 'ReportProductExpirationDate',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 110
+        },
+        {
+            label: 'BarCode',
+            fieldName: 'barCode',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 400
+        }
     ];
     //杩斿搧鏄庣粏cols
-    get returnDetailCols(){
+    get returnDetailCols() {
         var cols = [];
-        cols.push({label:'鍑哄簱鍗�',fieldName:'orderUrl',type:'url',typeAttributes:{label:{fieldName:'orderNo'},target: "_blank"},hideDefaultActions: true,wrapText:true,initialWidth:180});
-        // cols.push({label:'鍑哄簱鍗�' , fieldName:'orderNo', hideDefaultActions: true});
-        cols.push({label:'鍑哄簱鏃�' , fieldName:'prodOutDate',wrapText:true, hideDefaultActions: true,initialWidth:110});
-        cols.push({label:'娑堣�楀搧鍚嶇О' , fieldName:'prodName',wrapText:true, hideDefaultActions: true,wrapText:true,initialWidth:190});
-        cols.push({label:'鍑哄簱鐩殑' , fieldName:'summonsForDirctionDet',wrapText:true, hideDefaultActions: true,initialWidth:130});
-        cols.push({label:'瀹㈡埛鍚�' , fieldName:'hospitalName', hideDefaultActions: true,wrapText:true,initialWidth:130});
-        cols.push({label:'缁忛攢鍟�' , fieldName:'orderDealer', hideDefaultActions: true,wrapText:true,initialWidth:100});
-        cols.push({label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,wrapText:true,initialWidth:230});
-        cols.push({label:'浣跨敤鏈熼檺' , fieldName:'sterilizationLimit', hideDefaultActions: true,wrapText:true,initialWidth:110});
-        cols.push({label:'鍗曚綅' , fieldName:'boxPiece', hideDefaultActions: true,wrapText:true,initialWidth:50});
         cols.push({
-            label:'杩斿搧鏁伴噺',
-            type: "customReturnGoodInput",
+            label: '鍑哄簱鍗�',
+            fieldName: 'orderUrl',
+            type: 'url',
             typeAttributes: {
-                inputValue: { fieldName: "returnCount" },
-                boxPrice: { fieldName: "boxPiece" },
-                recordId: { fieldName: "recordId" }
+                label: { fieldName: 'orderNo' },
+                target: '_blank'
             },
-            hideDefaultActions: true,wrapText:true,initialWidth:100});
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 95
+        });
+        // cols.push({label:'鍑哄簱鍗�' , fieldName:'orderNo', hideDefaultActions: true});
         cols.push({
-            label:'杩斿搧鍘熷洜',
-            type: "customTableInput",
+            label: '鍑哄簱鏃�',
+            fieldName: 'prodOutDate',
+            wrapText: true,
+            hideDefaultActions: true,
+            initialWidth: 110
+        });
+        cols.push({
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'prodName',
+            wrapText: true,
+            hideDefaultActions: true,
+            wrapText: true
+            // initialWidth: 190
+        });
+        cols.push({
+            label: '鍑哄簱鐩殑',
+            fieldName: 'summonsForDirctionDet',
+            wrapText: true,
+            hideDefaultActions: true,
+            initialWidth: 85
+        });
+        cols.push({
+            label: '瀹㈡埛鍚�',
+            fieldName: 'hospitalName',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 85
+        });
+        cols.push({
+            label: '缁忛攢鍟�',
+            fieldName: 'orderDealer',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 100
+        });
+        cols.push({
+            label: 'BarCode',
+            fieldName: 'barCode',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 230
+        });
+        cols.push({
+            label: '浣跨敤鏈熼檺',
+            fieldName: 'sterilizationLimit',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 110
+        });
+        cols.push({
+            label: '鍗曚綅',
+            fieldName: 'boxPiece',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 50
+        });
+        cols.push({
+            label: '杩斿搧鏁伴噺',
+            type: 'customReturnGoodInput',
             typeAttributes: {
-                    recordId: { fieldName: "recordId" },
-                    inputValue: { fieldName: "returnReason" },
-                    valueType: 'Text'
-                },
-            hideDefaultActions: true,wrapText:true,initialWidth:150});
-            // cols.push({label:'杩斿搧鍘熷洜' , fieldName:'returnReason', hideDefaultActions: true});
+                inputValue: { fieldName: 'returnCount' },
+                boxPrice: { fieldName: 'boxPiece' },
+                recordId: { fieldName: 'recordId' }
+            },
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 100
+        });
+        cols.push({
+            label: '杩斿搧鍘熷洜',
+            type: 'customTableInput',
+            typeAttributes: {
+                recordId: { fieldName: 'recordId' },
+                inputValue: { fieldName: 'returnReason' },
+                valueType: 'Text'
+            },
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 150
+        });
+        // cols.push({label:'杩斿搧鍘熷洜' , fieldName:'returnReason', hideDefaultActions: true});
         return cols;
     }
     //鍏ュ簱鏄庣粏cols
-    get inDetailCols(){
+    get inDetailCols() {
         var cols = [];
-        cols.push({label:'娑堣�楀搧鍚嶇О' , fieldName:'prodName', hideDefaultActions: true,wrapText:true});
-        cols.push({label:'BarCode' , fieldName:'barCodeNo', hideDefaultActions: true,wrapText:true,initialWidth:500});
-        cols.push({label:'浣跨敤鏈熼檺' , fieldName:'sterilizationlimitDate', hideDefaultActions: true,wrapText:true,initialWidth:100});
-        cols.push({label:'serialNoorLotNo' , fieldName:'serialNoorLotNo', hideDefaultActions: true,wrapText:true,initialWidth:140});
-        cols.push({label:'tracingCode' , fieldName:'tracingCodeNo', hideDefaultActions: true,wrapText:true,initialWidth:140});
-        if(this.returnFLGbln){
-            cols.push({label:'杩斿搧鍘熷洜' , fieldName:'ReturnReason', hideDefaultActions: true,wrapText:true,initialWidth:150});
+        cols.push({
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'prodName',
+            hideDefaultActions: true,
+            wrapText: true
+        });
+        cols.push({
+            label: 'BarCode',
+            fieldName: 'barCodeNo',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 500
+        });
+        cols.push({
+            label: '浣跨敤鏈熼檺',
+            fieldName: 'sterilizationlimitDate',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 100
+        });
+        cols.push({
+            label: 'serialNoorLotNo',
+            fieldName: 'serialNoorLotNo',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 140
+        });
+        cols.push({
+            label: 'tracingCode',
+            fieldName: 'tracingCodeNo',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 140
+        });
+        if (this.returnFLGbln) {
+            cols.push({
+                label: '杩斿搧鍘熷洜',
+                fieldName: 'ReturnReason',
+                hideDefaultActions: true,
+                wrapText: true,
+                initialWidth: 150
+            });
         }
         return cols;
     }
     //閿欒鏄庣粏cols
     @track errorDetailCols = [
         // {label:'娑堣�楀搧璁㈠崟' , fieldName:'consumableOrderMinor', hideDefaultActions: true,wrapText:true},
-        {label:'娑堣�楀搧璁㈠崟',fieldName:'consumableOrderUrl',type:'url',typeAttributes:{label:{fieldName:'consumableOrderMinorName'},target: "_blank"},hideDefaultActions: true,wrapText:true,initialWidth:180},
-        {label:'娑堣�楀搧鍚嶇О' , fieldName:'prodName', hideDefaultActions: true,wrapText:true},
-        {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,wrapText:true,initialWidth:400},
-        {label:'鍗曚綅' , fieldName:'boxPiece', hideDefaultActions: true,wrapText:true,initialWidth:60},
-        {label:'鏁伴噺' , fieldName:'intMark', hideDefaultActions: true,wrapText:true,initialWidth:100,cellAttributes: { alignment: "right" }},
-        {label:'閿欒鍘熷洜' , fieldName:'ErrorReason', hideDefaultActions: true,initialWidth:280,wrapText:true}
+        {
+            label: '娑堣�楀搧璁㈠崟',
+            fieldName: 'consumableOrderUrl',
+            type: 'url',
+            typeAttributes: {
+                label: { fieldName: 'consumableOrderMinorName' },
+                target: '_blank'
+            },
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 180
+        },
+        {
+            label: '娑堣�楀搧鍚嶇О',
+            fieldName: 'prodName',
+            hideDefaultActions: true,
+            wrapText: true
+        },
+        {
+            label: 'BarCode',
+            fieldName: 'barCode',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 400
+        },
+        {
+            label: '鍗曚綅',
+            fieldName: 'boxPiece',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 60
+        },
+        {
+            label: '鏁伴噺',
+            fieldName: 'intMark',
+            hideDefaultActions: true,
+            wrapText: true,
+            initialWidth: 100,
+            cellAttributes: { alignment: 'right' }
+        },
+        {
+            label: '閿欒鍘熷洜',
+            fieldName: 'ErrorReason',
+            hideDefaultActions: true,
+            initialWidth: 280,
+            wrapText: true
+        }
     ];
 
     // 鑾峰彇鍙傛暟
@@ -146,325 +351,548 @@
         }
     }
 
-    get showOrderDetail(){
-        if(this.eSetId != '' && this.eSetId != null){
+    get showOrderDetail() {
+        if (this.eSetId != '' && this.eSetId != null) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }
 
-    renderedCallback(){ 
+    renderedCallback() {
         if (!this.stylesLoaded) {
             Promise.all([loadStyle(this, WrappedHeaderTable)])
                 .then(() => {
-                    console.log("Custom styles loaded");
+                    console.log('Custom styles loaded');
                     this.stylesLoaded = true;
                 })
                 .catch((error) => {
-                    console.error("Error loading custom styles");
+                    console.error('Error loading custom styles');
                 });
         }
     }
 
     //鍒濆鍖�
-    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;
+    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;
-            }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');
-        })
+                console.log('error:' + JSON.stringify(error));
+                this.showMyToast(
+                    '鍒濆鍖栭〉闈㈠け璐�',
+                    JSON.stringify(error),
+                    'error'
+                );
+            });
     }
 
     //barcode change
-    barcodeChange(event){
+    barcodeChange(event) {
         this.barcode = event.detail.value;
     }
 
     //鏍规嵁barcode鎼滅储
-    barcodeEntrys(){
+    barcodeEntrys() {
         this.showSpinner = true;
         searchProduct({
-            barcode : this.barcode,
-            arrControllerStr : this.arrController
+            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;
+            .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;
                         }
-                        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;
+                    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]
+                        );
                     }
-                    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;
+                    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;
                         }
-                        this.consumableorderdetailsRecordserror[i]['barCode'] = this.consumableorderdetailsRecordserror[i].esd.Bar_Code__c;
-                        this.consumableorderdetailsRecordserror[i]['boxPiece'] = this.consumableorderdetailsRecordserror[i].esd.Box_Piece__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');
                 }
-                console.log('this.consumableorderdetailsRecordserror:'+JSON.stringify(this.consumableorderdetailsRecordserror));
+            })
+            .catch((error) => {
                 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');
-        })
+                console.log('error:' + error);
+                this.showMyToast('鑾峰彇澶辫触', error, 'error');
+            });
     }
 
     //杩斿搧鏁伴噺change
-    returnCountChange(event){
+    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){
+        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]['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;
+                    this.showGoodsofReturnList[i]['returnCount'] =
+                        this.showGoodsofReturnList[i].esd.Rrturn_count__c;
                 }
             }
         }
     }
 
     //杩斿搧鍘熷洜change
-    returnReasonChange(event){
+    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){
+        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;
+                this.showGoodsofReturnList[i]['returnReason'] =
+                    this.showGoodsofReturnList[i].esd.Return_reason__c;
             }
         }
     }
 
     // 鍒拌揣纭
-    arriveGoodsConfim(){
+    arriveGoodsConfim() {
         this.showSpinner = true;
-        arriveGoodsConfim({arrControllerStr : this.arrController})
-        .then(result=>{
-            this.arrController = result.arrGoodCon;
-            if(result.result == 'Success'){
+        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;
-                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');
-        })
+                console.log('error2:' + error);
+                this.showMyToast('鍒拌揣纭澶辫触', error, 'error');
+            });
     }
 
     // 鐧诲綍杩斿搧
-    updateGoodsOfReturn(){
+    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);
+        updateGoodsOfReturn({
+            arrControllerStr: this.arrController,
+            showGoodsofReturnListStr: JSON.stringify(this.showGoodsofReturnList)
+        })
+            .then((result) => {
                 this.showSpinner = false;
-                this.warningMsgs = result.warningMsgList;
-                this.errorMsgs = result.errorMsgList;
-                if(result.errorMsg.includes('鏃犳硶淇濆瓨姝よ褰�')){
-                    result.errorMsg = '鏃犳硶淇濆瓨璁板綍';
+                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');
                 }
-                this.showMyToast('鐧诲綍杩斿搧澶辫触',result.errorMsg,'error');
-            }
-        })
-        .catch(error=>{
-            this.showSpinner = false;
-            console.log("error2:"+JSON.stringify(error));
-            this.showMyToast('鐧诲綍杩斿搧澶辫触',error,'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 (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>';
+        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);
+        this.template
+            .querySelector('c-common-toast')
+            .showToast(variant, content, iconName, 10000);
         // var mode;
         // if(this.isNoteStay){
         //     mode ='sticky';
@@ -478,5 +906,5 @@
         //     mode: mode
         // });
         // this.dispatchEvent(evt);
-     }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1