下拉多选修正

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/BondInvestmentModel.java

@@ -70,6 +70,8 @@ public class BondInvestmentModel {
     //账务机构名
     private String accountOrgnName;
     //经营机构编号
+    private String[] manageOrgnNos;
+    //经营机构编号
     private String manageOrgnNo;
     //经营机构名
     private String manageOrgnName;
@@ -352,6 +354,14 @@ public class BondInvestmentModel {
         this.accountOrgnName = accountOrgnName;
     }
 
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
     public String getManageOrgnNo() {
         return manageOrgnNo;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/CustomerTableModel.java

@@ -16,6 +16,8 @@ public class CustomerTableModel {
     // 交易对手名称
     private String tradeCntrptyName;
     // 交易对手大类
+    private String[] tradeCntrptyDivisions;
+    // 交易对手大类
     private String tradeCntrptyDivision;
     // 交易对手大类描述
     private String tradeCntrptyDivisionDesc;
@@ -28,10 +30,14 @@ public class CustomerTableModel {
     // 交易对手证件号码
     private String customerLicenceNo;
     // 企业规模代码
+    private String[] entScaleCodes;
+    // 企业规模代码
     private String entScaleCode;
     // 企业规模
     private String entScaleDesc;
     // 行业代码
+    private String[] industryCodes;
+    // 行业代码
     private String industryCode;
     // 行业名称
     private String industryName;
@@ -108,6 +114,14 @@ public class CustomerTableModel {
         this.tradeCntrptyName = tradeCntrptyName;
     }
 
+    public String[] getTradeCntrptyDivisions() {
+        return tradeCntrptyDivisions;
+    }
+
+    public void setTradeCntrptyDivisions(String[] tradeCntrptyDivisions) {
+        this.tradeCntrptyDivisions = tradeCntrptyDivisions;
+    }
+
     public String getTradeCntrptyDivision() {
         return tradeCntrptyDivision;
     }
@@ -156,6 +170,14 @@ public class CustomerTableModel {
         this.customerLicenceNo = customerLicenceNo;
     }
 
+    public String[] getEntScaleCodes() {
+        return entScaleCodes;
+    }
+
+    public void setEntScaleCodes(String[] entScaleCodes) {
+        this.entScaleCodes = entScaleCodes;
+    }
+
     public String getEntScaleCode() {
         return entScaleCode;
     }
@@ -172,6 +194,14 @@ public class CustomerTableModel {
         this.entScaleDesc = entScaleDesc;
     }
 
+    public String[] getIndustryCodes() {
+        return industryCodes;
+    }
+
+    public void setIndustryCodes(String[] industryCodes) {
+        this.industryCodes = industryCodes;
+    }
+
     public String getIndustryCode() {
         return industryCode;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/GuaranteeTableModel.java

@@ -28,6 +28,8 @@ public class GuaranteeTableModel {
     //担保金额
     private String guaranteeAmt;
     //缓释品类型代码
+    private String[] mitigationProdTypes;
+    //缓释品类型代码
     private String mitigationProdType;
     //借款合同编号
     private String contractNo;
@@ -138,6 +140,14 @@ public class GuaranteeTableModel {
         this.guaranteeAmt = guaranteeAmt;
     }
 
+    public String[] getMitigationProdTypes() {
+        return mitigationProdTypes;
+    }
+
+    public void setMitigationProdTypes(String[] mitigationProdTypes) {
+        this.mitigationProdTypes = mitigationProdTypes;
+    }
+
     public String getMitigationProdType() {
         return mitigationProdType;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/InterbankDepositOrLendingTableModel.java

@@ -60,6 +60,8 @@ public class InterbankDepositOrLendingTableModel {
     //账务机构名
     private String financialOrgnName;
     //经营机构编号
+    private String[] manageOrgnNos;
+    //经营机构编号
     private String manageOrgnNo;
     //经营机构名
     private String manageOrgnName;
@@ -300,6 +302,14 @@ public class InterbankDepositOrLendingTableModel {
         this.financialOrgnName = financialOrgnName;
     }
 
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
     public String getManageOrgnNo() {
         return manageOrgnNo;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/NonStandardInvestmentModel.java

@@ -38,7 +38,9 @@ public class NonStandardInvestmentModel {
     // 账务机构名称
     private String accountOrgnName;
     // 经营机构编号
-    private String mgmtBranchNo;
+    private String[] manageOrgnNos;
+    // 经营机构编号
+    private String manageOrgnNo;
     // 经营机构名称
     private String manageOrgnName;
     // 账簿类型
@@ -214,12 +216,20 @@ public class NonStandardInvestmentModel {
         this.accountOrgnName = accountOrgnName;
     }
 
-    public String getMgmtBranchNo() {
-        return mgmtBranchNo;
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
+    public String getManageOrgnNo() {
+        return manageOrgnNo;
     }
 
-    public void setMgmtBranchNo(String mgmtBranchNo) {
-        this.mgmtBranchNo = mgmtBranchNo;
+    public void setManageOrgnNo(String manageOrgnNo) {
+        this.manageOrgnNo = manageOrgnNo;
     }
 
     public String getManageOrgnName() {

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/OffCreditCardModel.java

@@ -70,6 +70,8 @@ public class OffCreditCardModel {
     //账务机构名
     private String accountOrgnName;
     //经营机构编号
+    private String[] manageOrgnNos;
+    //经营机构编号
     private String manageOrgnNo;
     //经营机构名
     private String manageOrgnName;
@@ -318,6 +320,14 @@ public class OffCreditCardModel {
         this.accountOrgnName = accountOrgnName;
     }
 
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
     public String getManageOrgnNo() {
         return manageOrgnNo;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/model/OnCreditCardModel.java

@@ -68,6 +68,8 @@ public class OnCreditCardModel {
     //账务机构名
     private String accountOrgnName;
     //经营机构编号
+    private String[] manageOrgnNos;
+    //经营机构编号
     private String manageOrgnNo;
     //经营机构名
     private String manageOrgnName;
@@ -328,6 +330,14 @@ public class OnCreditCardModel {
         this.productName = productName;
     }
 
+    public String[] getManageOrgnNos() {
+        return manageOrgnNos;
+    }
+
+    public void setManageOrgnNos(String[] manageOrgnNos) {
+        this.manageOrgnNos = manageOrgnNos;
+    }
+
     public String getAccountOrgnNo() {
         return accountOrgnNo;
     }

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/BondInvestmentMapper.xml

@@ -63,8 +63,10 @@
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and  MANAGE_ORGN_NO  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="model.securityCode != null and '' != model.securityCode">
                 and SECURITY_CODE like concat(concat('%',#{model.securityCode}),'%')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/CustomerTableMapper.xml

@@ -46,14 +46,20 @@
             <if test="model.tradeCntrptyDocumentNo != null and '' != model.tradeCntrptyDocumentNo">
                 and TRADE_CNTRPTY_DOCUMENT_NO like concat(concat('%',#{model.tradeCntrptyDocumentNo}),'%')
             </if>
-            <if test="model.tradeCntrptyDivision != null and '' != model.tradeCntrptyDivision">
-                and TRADE_CNTRPTY_DIVISION like concat(concat('%',#{model.tradeCntrptyDivision}),'%')
+            <if test="model.tradeCntrptyDivisions != null and '' != model.tradeCntrptyDivisions">
+                <foreach collection="model.tradeCntrptyDivisions" item="item" open="and TRADE_CNTRPTY_DIVISION  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
-            <if test="model.entScaleDesc != null and '' != model.entScaleDesc">
-                and ENT_SCALE_DESC like concat(concat('%',#{model.entScaleDesc}),'%')
+            <if test="model.entScaleCode != null and '' != model.entScaleCode">
+                <foreach collection="model.entScaleCode" item="item" open="and ENT_SCALE_CODE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
-            <if test="model.industryCode != null and '' != model.industryCode">
-                and INDUSTRY_CODE like concat(concat('%',#{model.industryCode}),'%')
+            <if test="model.industryCodes != null and '' != model.industryCodes">
+                <foreach collection="model.industryCodes" item="item" open="and INDUSTRY_CODE  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             order by CORE_CLIENT_NO ASC
         </where>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/GuaranteeTableMapper.xml

@@ -68,7 +68,7 @@
         RELATED_DEBTITEM_NO                 AS   relatedDebtitemNo,
         GUARANTEE_AMT                       AS   guaranteeAmt
         from RWA_BDM_OBJ_CONF_SILVER_GUARANTEE
-            <where>
+             <where>
                 <if test="model.mitigationProdNo != null and '' != model.mitigationProdNo">
                     and MITIGATION_PROD_NO = #{model.mitigationProdNo}
                 </if>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/InterbankDepositOrLendingTableMapper.xml

@@ -52,8 +52,10 @@
             <if test="model.clientName != null and '' != model.clientName">
                 and CLIENT_NAME like concat(concat('%',#{model.clientName}),'%')
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and MANAGE_ORGN_NO  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/NonStandardInvestmentMapper.xml

@@ -57,12 +57,14 @@
             <if test="model.clientName != null and '' != model.clientName">
                 and CLIENT_NAME like concat(concat('%',#{model.clientName}),'%')
             </if>
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and MANAGE_ORGN_NO  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
-            </if>
             order by DEBTITEM_NO ASC
         </where>
     </select>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OffCreditCardMapper.xml

@@ -58,8 +58,10 @@
             <if test="model.clientName != null and '' != model.clientName">
                 and CLIENT_NAME like concat(concat('%',#{model.clientName}),'%')
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and MANAGE_ORGN_NO  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')

Procedure/backend/project/src/main/java/com/sundata/product/rwa/interfacedatasheet/mybatis/OnCreditCardMapper.xml

@@ -64,8 +64,10 @@
             <if test="model.productName != null and '' != model.productName">
                 and PRODUCT_NAME like concat(concat('%',#{model.productName}),'%')
             </if>
-            <if test="model.manageOrgnNo != null and '' != model.manageOrgnNo">
-                and MANAGE_ORGN_NO like concat(concat('%',#{model.manageOrgnNo}),'%')
+            <if test="model.manageOrgnNos != null and '' != model.manageOrgnNos">
+                <foreach collection="model.manageOrgnNos" item="item" open="and MANAGE_ORGN_NO  in ( " separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             order by DEBTITEM_NO ASC
         </where>

Procedure/backend/project/src/main/java/com/sundata/product/rwa/rwacalcconfigdataparam/action/BusinessAction.java

@@ -208,7 +208,7 @@ public class BusinessAction extends BaseAction {
      */
     @RequestMapping({"isNotExist"})
     public void isNotExist(HttpServletRequest request, HttpServletResponse response, @RequestBody BusinessModel model) {
-        if (null != model && !model.getBusinessCode().isEmpty()){
+        if (null != model && null != model.getBusinessCode() && !model.getBusinessCode().isEmpty()){
             BusinessModel checkModel = businessService.selectRowData(model);
             if (null != checkModel) {
                 sendData(response,"该代码已存在");

Procedure/frontend/projectb/src/pages/product/dataquality/datascopemanage.tsx

@@ -268,8 +268,8 @@ const datascopemanage : React.FC<widowRush> = (prop:widowRush) => {
               successMessage=""
               onClick={
                 ()=>{ 
-                  fillInActionRef.current?.cancelEditable(paramIndex);
-                  fillInActionRef.current?.startEditable(paramIndex);
+                  // fillInActionRef.current?.cancelEditable(paramIndex);
+                  fillInActionRef.current?.startEditable(record.fieldRelationNo);
                } }
             >
               编辑

Procedure/frontend/projectb/src/pages/project/dataquality/BondInvestment.tsx

@@ -43,7 +43,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '计算实例号',
           dataIndex: 'calcIndex',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
         },
@@ -51,7 +51,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '起始数据日期',
           dataIndex: 'startDate',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
         },
@@ -59,7 +59,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '截止数据日期',
           dataIndex: 'endDate',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
         },
@@ -67,7 +67,7 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '年月',
           dataIndex: 'yearMonth',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
           },
@@ -269,7 +269,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '产品名称', 
           dataIndex: 'productName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -278,7 +277,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '证券代码',
           dataIndex: 'securityCode',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -287,7 +285,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '证券名称',
           dataIndex: 'securityName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -384,13 +381,19 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '经营机构名称',
           dataIndex: 'manageOrgnName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
+        },
+        {
+          title: '经营机构',
+          dataIndex: 'manageOrgnNos',
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
           order:-7,
           valueType: "treeSelect",
-          request: () => fetchDict(''),
+          request: () => fetchDict('org'),
           fieldProps: {
           treeDefaultExpandAll: true,
           treeCheckable:true,
@@ -399,7 +402,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '核心客户号',
           dataIndex: 'coreClientNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -408,7 +410,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '客户编号',
           dataIndex: 'clientNo',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -417,7 +418,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
        {
           title: '客户名称',
           dataIndex: 'clientName',
-          search: false,
           hideInTable: false,
           width:150,
           ellipsis:true,
@@ -454,15 +454,6 @@ const BondInvestment : React.FC<widowRush> = (prop:widowRush) => {
           >
             全部导出
           </SDButton>,
-          <SDButton
-          key="import"
-          successMessage=''
-          onClick={() => {
-            setImportVisible(true);
-          }}
-        >
-          导入数据
-        </SDButton>,
         ]}
          actionRef={actionRef}
          formRef={formRef}

Procedure/frontend/projectb/src/pages/project/dataquality/CustomerTable.tsx

@@ -114,7 +114,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
         },
         {
           title: '交易对手大类', 
-          dataIndex: 'tradeCntrptyDivision',
+          dataIndex: 'tradeCntrptyDivisions',
           hideInTable: true,
           width:150,
           ellipsis:true,
@@ -123,7 +123,16 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
           request: () => fetchDict('CUST_TYPE_LV02'),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
+        },
         },
+        {
+          title: '交易对手大类', 
+          dataIndex: 'tradeCntrptyDivision',
+          search:false,
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '交易对手大类', 
@@ -183,6 +192,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
           request: () => fetchDict('CUST_ENT_TYPE'),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
         },
           order:-6,
         },
@@ -211,6 +221,7 @@ const CustomerTable : React.FC<widowRush> = (prop:widowRush) => {
           request: () => fetchDict(''),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
           },
           order:-7,
         },

Procedure/frontend/projectb/src/pages/project/dataquality/GuaranteeTable.tsx

@@ -116,7 +116,7 @@ const GuaranteeTable : React.FC<widowRush> = (prop:widowRush) => {
         },
         {
           title: '缓释品类型', 
-          dataIndex: 'mitigationProdType',
+          dataIndex: 'mitigationProdTypes',
           hideInTable: false,
           width:150,
           ellipsis:true,

Procedure/frontend/projectb/src/pages/project/dataquality/InterbankDepositOrLendingTable.tsx

@@ -335,6 +335,20 @@ const InterbankDepositOrLendingTable : React.FC<widowRush> = (prop:widowRush) =>
           ellipsis:true,
           order:-5
         },
+        {
+          title: '经营机构编号',
+          dataIndex: 'mgmtBranchNos',
+          hideInTable: false,
+          width:150,
+          ellipsis:true,
+          order:-5,
+          valueType: 'treeSelect',
+          request: () => fetchDict('org'),
+          fieldProps: {
+           treeDefaultExpandAll: true,
+           treeCheckable:true,
+          },
+        },
         {
           title: '经营机构编名称',
           dataIndex: 'mgmtBranchName',

Procedure/frontend/projectb/src/pages/project/dataquality/NonStandardInvestment.tsx

@@ -41,8 +41,8 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
         {
           title: '计算实例号',
           dataIndex: 'calcIndex',
-          //search: true,
-          hideInTable: false,
+          search: false,
+          hideInTable: true,
           width:150,
           ellipsis:true
         },
@@ -50,30 +50,40 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           title: '起始数据日期',
           dataIndex: 'startDate',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '截止数据日期',
           dataIndex: 'endDate',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '年月',
           dataIndex: 'yearMonth',
           search: false,
-          hideInTable: false,
+          hideInTable: true,
+          width:150,
+          ellipsis:true,
           },
         {
           title: '数据日期',
           dataIndex: 'dataDate',
           hideInTable: false,
           order:-1,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '债项编号', 
           dataIndex: 'debtitemNo', // 查询结果中的隐藏列 
           hideInTable: false,
+          width:150,
+          ellipsis:true,
           order:-2,
         },
         {
@@ -81,102 +91,136 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           dataIndex: 'ccy',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '币种',
           dataIndex: 'ccyDesc',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '资产余额',
           dataIndex: 'assetBal',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '应收利息',
           dataIndex: 'receivableInt',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '应计利息',
           dataIndex: 'accrInt',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '利息调整',
           dataIndex: 'intAdj',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '公允价值变动',
           dataIndex: 'fairValueChange',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '计提准备金',
           dataIndex: 'provisionReserve',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '本金科目号',
           dataIndex: 'prinAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '应收利息科目号',
           dataIndex: 'receivableIntAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '应计利息科目号',
           dataIndex: 'accrIntAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '利息调整科目号',
           dataIndex: 'intAdjAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '公允价值变动科目号',
           dataIndex: 'fairValueChangeAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '准备金科目号',
           dataIndex: 'reserveAccountNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '产品编号', 
           dataIndex: 'productNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '产品名称', 
           dataIndex: 'productName',
           order:-6,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '资产类型代码',
           dataIndex: 'assetType',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '资产类型',
@@ -188,12 +232,16 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
           },
+          width:150,
+          ellipsis:true,
         },
         {
           title: '产品类型代码',
           dataIndex: 'prodType',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '产品类型',
@@ -205,24 +253,32 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
           },
+          width:150,
+          ellipsis:true,
         },
         {
           title: '生效日',
           dataIndex: 'effectDate',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '到期日',
           dataIndex: 'expiryDate',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '表内外标识代码',
           dataIndex: 'onbalshOffbalshFlag',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '表内外标识',
@@ -234,12 +290,16 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
           },
+          width:150,
+          ellipsis:true,
         },
         {
           title: '账簿类型代码',
           dataIndex: 'accountBookType',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '账簿类型',
@@ -251,34 +311,44 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
           },
+          width:150,
+          ellipsis:true,
         },
         {
           title: '账务机构编号',
           dataIndex: 'accountOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '账务机构名称',
           dataIndex: 'accountOrgnName',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '经营机构编号',
-          dataIndex: 'mgmtBranchNo',
+          dataIndex: 'manageOrgnNo',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '经营机构名称',
           dataIndex: 'manageOrgnName',
           search: false,
           hideInTable: false,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '经营机构',
-          dataIndex: 'mgmtBranchNo',
+          dataIndex: 'manageOrgnNos',
           hideInTable: true,
           order:-7,
           valueType: 'treeSelect',
@@ -286,27 +356,32 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           fieldProps: {
            treeDefaultExpandAll: true,
           },
+          width:150,
+          ellipsis:true,
         },
         {
           title: '核心客户号',
           dataIndex: 'coreClientNo',
-          search: false,
           hideInTable: false,
           order:-3,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '客户编号',
           dataIndex: 'clientNo',
-          search: false,
           hideInTable: false,
           order:-4,
+          width:150,
+          ellipsis:true,
         },
         {
           title: '客户名称',
           dataIndex: 'clientName',
-          search: false,
           hideInTable: false,
           order:-5,
+          width:150,
+          ellipsis:true,
         },
         
       ];
@@ -334,20 +409,6 @@ const NonStandardInvestment : React.FC<widowRush> = (prop:widowRush) => {
           >
             全部导出
           </SDButton>,
-          <SDButton
-          key="import"
-          successMessage=''
-          onClick={() => {
-            // if (selectedRows === undefined || selectedRows.length < 1) {
-            //   baseFun.warning('请先选择要倒出的模板');
-            //   return;
-            // }
-            setImportVisible(true);
-            //baseFun.info('处理完成');
-          }}
-        >
-          导入数据
-        </SDButton>,
         ]}
          actionRef={actionRef}
          formRef={formRef}

Procedure/frontend/projectb/src/pages/project/dataquality/OffCreditCard.tsx

@@ -349,13 +349,14 @@ const OffCreditCard : React.FC<widowRush> = (prop:widowRush) => {
           hideInTable: false,
         },
         {
-          title: '经营机构编名称',
-          dataIndex: 'manageOrgnNo',
+          title: '经营机构编',
+          dataIndex: 'manageOrgnNos',
           hideInTable: true,
           valueType: 'treeSelect',
           request: () => fetchDict('org'),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
           },
           order:-5
         },

Procedure/frontend/projectb/src/pages/project/dataquality/OnCreditCard.tsx

@@ -333,12 +333,13 @@ const OnCreditCard : React.FC<widowRush> = (prop:widowRush) => {
         },
         {
           title: '经营机构编名称',
-          dataIndex: 'manageOrgnNo',
+          dataIndex: 'manageOrgnNos',
           hideInTable: true,
           valueType: 'treeSelect',
           request: () => fetchDict('org'),
           fieldProps: {
            treeDefaultExpandAll: true,
+           treeCheckable:true,
           },
           order:-7
         },

Procedure/frontend/projectb/src/pages/rwa_calc_config_dataparam/bussiness.tsx

@@ -272,7 +272,7 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
             const detailData = await product_modifyone1(record.productNo);
             productDetailRef.current?.setFieldsValue(detailData);
             const detailList = await product_querylist(record.productNo);
-            setMockDetailData(detailList)
+            setMockDetailData(detailList);
           } }
           >
           查看
@@ -507,7 +507,8 @@ const bussiness : React.FC<widowRush> = (prop:widowRush) => {
       <SDModalForm 
       title={'产品列表'} 
       visible={productDetailList} 
-      editType={editType} 
+      editType={editType}
+      formRef={productDetailRef}
       onVisibleChange={() => { setProductDetailList(false);}
     }>
      <SDFormText name="productNo"   label="产品代码"  />

Procedure/frontend/projectb/src/services/rwa/dataquality/BondInvestment.ts

@@ -71,6 +71,8 @@ export type SysListModel = {
     //账务机构名
     accountOrgnName?:string;
     //经营机构编号
+    manageOrgnNos?:string[];
+    //经营机构编号
     manageOrgnNo?:string;
     //经营机构名
     manageOrgnName?:string;

Procedure/frontend/projectb/src/services/rwa/dataquality/CustomerTable.ts

@@ -17,6 +17,8 @@ export type SysListModel = {
     // 交易对手名称
     tradeCntrptyName?:string;
     // 交易对手大类
+    tradeCntrptyDivisions?:string[];
+    // 交易对手大类
     tradeCntrptyDivision?:string;
     // 交易对手大类描述
     tradeCntrptyDivisionDesc?:string;
@@ -29,10 +31,14 @@ export type SysListModel = {
     // 交易对手证件号码
     customerLicenceNo?:string;
     // 企业规模代码
+    entScaleCodes?:string[];
+    // 企业规模代码
     entScaleCode?:string;
     // 企业规模
     entScaleDesc?:string;
     // 行业代码
+    industryCodes?:string[];
+    // 行业代码
     industryCode?:string;
     // 行业名称
     industryName?:string;

Procedure/frontend/projectb/src/services/rwa/dataquality/GuaranteeTable.ts

@@ -21,6 +21,8 @@ export type SysListModel = {
     //担保金额
     guaranteeAmt?:string;
     //缓释品类型代码
+    mitigationProdTypes?:string[];
+    //缓释品类型代码
     mitigationProdType?:string;
     //借款合同编号
     contractNo?:string;

Procedure/frontend/projectb/src/services/rwa/dataquality/InterbankDepositOrLendingTable.ts

@@ -53,6 +53,8 @@ export type SysListModel = {
     //账务机构名
     financialOrgnName?:string;
     //经营机构编号
+    manageOrgnNos?:string[];
+    //经营机构编号
     manageOrgnNo?:string;
     //经营机构名
     manageOrgnName?:string;

Procedure/frontend/projectb/src/services/rwa/dataquality/NonStandardInvestment.ts

@@ -31,7 +31,9 @@ export type SysListModel = {
     // 账务机构名称
     accountOrgnName?:string;
     // 经营机构编号
-    mgmtBranchNo?:string;
+    manageOrgnNos?:string[];
+    // 经营机构编号
+    manageOrgnNo?:string;
     // 经营机构名称
     manageOrgnName?:string;
     // 账簿类型

Procedure/frontend/projectb/src/services/rwa/dataquality/OffCreditCard.ts

@@ -63,6 +63,8 @@ export type SysListModel = {
     //账务机构名
     accountOrgnName?:string;
     //经营机构编号
+    manageOrgnNos?:string[];
+    //经营机构编号
     manageOrgnNo?:string;
     //经营机构名
     manageOrgnName?:string;

Procedure/frontend/projectb/src/services/rwa/dataquality/OnCreditCard.ts

@@ -61,6 +61,8 @@ export type SysListModel = {
     //账务机构名
     accountOrgnName?:string;
     //经营机构编号
+    manageOrgnNos?:string[];
+    //经营机构编号
     manageOrgnNo?:string;
     //经营机构名
     manageOrgnName?:string;