From b3c20a18f16c7a5bc239d50cc79070a977b4b5e0 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 17 Oct 2018 12:00:03 +0800
Subject: [PATCH] [fix]

---
 .../analysis/templates/riskEvent_detail.html  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index 17a5b34b2..e890e7173 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -50,8 +50,9 @@
                                                 <div class="form-group" ng-if="riskEvent.order_type == 1 || riskEvent.order_type == 5">
                                                     <label class="control-label col-sm-2">Sub Merchant ID</label>
                                                     <div class="col-sm-10">
-                                                        <p class="form-control-static"
-                                                           ng-bind="clientInfo.sub_merchant_id"></p>
+                                                        <p class="form-control-static">
+                                                            {{clientInfo.sub_merchant_id || riskEvent.sub_merchant_id}}
+                                                        </p>
                                                     </div>
                                                 </div>
 
@@ -258,6 +259,31 @@
                                     <div class="panel-heading">RiskEvent Basic Information</div>
                                     <div class="panel-body">
                                         <div class="form-horizontal">
+                                            <div class="form-group"
+                                                 ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
+                                                <label class="control-label col-sm-2"
+                                                       for="order-type-input">Order Type
+                                                </label>
+                                                <div class="col-sm-8">
+                                                    <select class="form-control"
+                                                            name="order_type"
+                                                            disabled
+                                                            ng-model="riskEventEdit.order_type"
+                                                            id="order-type-input"
+                                                            required
+                                                            ng-options="key as value for (key, value) in orderTypes">
+                                                        <option value="">Please Choose</option>
+                                                    </select>
+
+                                                    <div ng-messages="riskEventForm.order_type.$error"
+                                                         ng-if="riskEventForm.order_type.$dirty">
+                                                        <p class="small text-danger"
+                                                           ng-message="required">required field
+                                                        </p>
+                                                    </div>
+                                                </div>
+                                            </div>
+
                                             <div class="form-group"
                                                  ng-if="riskEventEdit.order_type != 5"
                                                  ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
@@ -289,30 +315,6 @@
                                                 </div>
                                             </div>
 
-                                            <div class="form-group"
-                                                 ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
-                                                <label class="control-label col-sm-2"
-                                                       for="order-type-input">Order Type
-                                                </label>
-                                                <div class="col-sm-8">
-                                                    <select class="form-control"
-                                                            name="order_type"
-                                                            ng-model="riskEventEdit.order_type"
-                                                            id="order-type-input"
-                                                            required
-                                                            ng-options="key as value for (key, value) in orderTypes">
-                                                        <option value="">Please Choose</option>
-                                                    </select>
-
-                                                    <div ng-messages="riskEventForm.order_type.$error"
-                                                         ng-if="riskEventForm.order_type.$dirty">
-                                                        <p class="small text-danger"
-                                                           ng-message="required">required field
-                                                        </p>
-                                                    </div>
-                                                </div>
-                                            </div>
-
                                             <div class="form-group"
                                                  ng-if="riskEventEdit.order_type != 4"
                                                  ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">