From ed5c96b08aa240052db4f2e34c9289c831755c8b Mon Sep 17 00:00:00 2001
From: hanxuntao <641739520@qq.com>
Date: Thu, 16 Feb 2023 16:35:35 +0800
Subject: [PATCH] 1

---
 .../MsInfoClient/MsInfoClientMinIndex.js      | 23 +++++++++---
 .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js          | 37 ++++++++++++-------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
index a49888e6..0faa6a1e 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientMinIndex.js
@@ -19,6 +19,9 @@ Ext.extend(Shipping.MsInfoClientMinIndex, Ext.Panel, {
 
     //需求编号：SR2017061200005-1
     initUIComponents: function () {
+
+        this.opform = getUrlParam('opform');
+        _thisclientmin = this;
         this.formname = "formInfoClientMinIndex"; //页面名称
         //定义数据集
         this.storectndisp = Ext.create('DsExt.ux.RefTableStore', {
@@ -171,12 +174,20 @@ Ext.extend(Shipping.MsInfoClientMinIndex, Ext.Panel, {
         ////////////////////////////////////////////////
 
         this.gridList.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
-            //this.SelectedRecord = record;
-            //this.OprationStatus = 'edit';
-            //var openSet = "height=700, width=1200, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2
-            //var openType = "_blank";
-            //var openUrl = "/MvcShipping/MsInfoClient/Edit";
-            //window.open(openUrl, openType, openSet);
+            if (_thisclientmin.opform =='opseaeedit') {
+                _thisclientmin.ParentWin = window.parent.opener._thisseaeedit;
+                var recordCustCode = Ext.create('DsShipping.ux.CustomRefModel', {
+                    GId: NewGuid(),
+                    CustCode: record.data.SHORTNAME,
+                    CustName: record.data.SHORTNAME,
+                    CodeAndName: record.data.SHORTNAME
+                });
+
+                _thisclientmin.ParentWin.storeCustCode.add(recordCustCode);
+                _thisclientmin.ParentWin.formHead.getForm().findField('CUSTOMERNAME').setValue(record.data.SHORTNAME);
+                window.closeAction = 'destroy';
+                window.close();
+            }
         }, this);
 
         this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) {
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index dd21500f..e8aaca25 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -1677,26 +1677,31 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             clicksToEdit: 1
         });
 
+        Ext.grid.RowNumberer = Ext.extend(Ext.grid.RowNumberer, {
+            locked: true,
+            width: 40
+        });
+
         this.initctncolumns = [{
             sortable: true,
             dataIndex: 'CTN_ID',
             header: Zi.LAN.CTN_ID, //'编号',
-            hidden: true,
+            //hidden: true,
             width: 0
         }, {
             sortable: true,
             dataIndex: 'BSNO',
             header: Zi.LAN.BSNO2, //'业务编号',
-            hidden: true,
+            //hidden: true,
+            width: 0
+            },
+
+            {
+            sortable: true,
+            dataIndex: 'CTNCODE',
+            header: Zi.LAN.CTNCODE, //'序号',
             width: 0
             },
-            new Ext.grid.RowNumberer(),
-            //{
-            //sortable: true,
-            //dataIndex: 'CTNCODE',
-            //header: Zi.LAN.CTNCODE, //'序号',
-            //width: 30
-            //},
 
 
             {
@@ -10792,7 +10797,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             sortable: true,
             dataIndex: 'CTN_ID',
             header: Zi.LAN.CTN_ID, //'编号',
-            hidden: true,
+            //hidden: true,
             width: 0
         }, {
             sortable: true,
@@ -10800,12 +10805,14 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
             header: Zi.LAN.BSNO2, //'业务编号',
             hidden: true,
             width: 0
-        }, {
+            },
+            {
             sortable: true,
             dataIndex: 'CTNCODE',
             header: Zi.LAN.CTNCODE, //'序号',
-            width: 30
-        }, {
+                width: 0
+            },
+            {
             dataIndex: 'CTNALL',
             header: Zi.LAN.CTNALL, //'箱型',
             width: 65,
@@ -12264,6 +12271,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
         });
         this.gridList.reconfigure(this.storeBodyList, this.ctncolumns);
         this.gridListshow.reconfigure(this.storeBodyList, this.ctncolumnsshow);
+        this.gridList.columns[1] = new Ext.grid.RowNumberer();
+        this.gridListshow.columns[1] = new Ext.grid.RowNumberer();
 
         this.storeShipper.on('beforeload', function (store) {
             var CUSTOMERNAME = this.formHead.getForm().findField('CUSTOMERNAME').getValue();
@@ -20677,7 +20686,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
         var openSet = "height=440, width=890, toolbar=no, menubar=no,scrollbars=no, resizable=no,location=no, status=no,Top= " + (screen.height - 440) / 2 + ",Left= " + (screen.width - 890) / 2
         var openType = "_blank";
         //        var openUrl = "../../MvcShipping/MsOpLetter/TruckFeeIndex?bsno=" + this.strBSNO + "&oplb=" + this.stroplb + "&type=" + type;
-        var openUrl = "../../MvcShipping/MsInfoClient/MinIndex";
+        var openUrl = "../../MvcShipping/MsInfoClient/MinIndex?opform=opseaeedit";
 
         window.open(openUrl, openType, openSet);
     },