Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/components/commonDes/commonDes.vue

@@ -5,7 +5,7 @@
     <a-descriptions-item v-for="(item, i) in list"
                          :key="i + 'des'"
                          :label="item.label">
-      {{item.value}}
+      <span class="white">{{item.value}}</span>
     </a-descriptions-item>
     <a-descriptions-item v-if="slotDesName"
                          :label="slotDesName">

src/views/information/account_info/compoments/detail-business/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 账号详情-->
-  <a-modal class="add-custom custom-detail"
+  <a-modal class="commonModal custom-detail"
            title="账户明细"
            v-model:visible="visible"
            centered
@@ -27,8 +27,13 @@
             </a-col>
           </a-row>
         </a-checkbox-group>
+<<<<<<< HEAD
+      </Des>
+      <!-- <a-row :gutter="24">
+=======
       </Des> -->
       <a-row :gutter="24">
+>>>>>>> e29e164b2d8593fdcda06ef0111c8f6d22d2cec9
         <a-col :span="12">
           <a-form-item label="登录账号"
                        name="">
@@ -63,7 +68,7 @@
             </a-checkbox-group>
           </a-form-item>
         </a-col>
-      </a-row>
+      </a-row> -->
     </a-form>
   </a-modal>
 </template>
@@ -120,5 +125,20 @@ export default defineComponent({
     .ant-form.inlineForm {
         margin-top: 20px;
     }
+    .ant-descriptions.commom-des {
+      .ant-descriptions-item-label {
+            display: inline-block;
+            width: 130px;
+            line-height: 30px;
+            padding-left: 16px;
+            color: @m-grey1;
+            &::after{
+              content: ''
+            }
+      }
+      .ant-descriptions-item-content {
+
+      }
+    }
 }
 </style>;

src/views/information/spot-contract/components/check/index.vue

@@ -279,9 +279,25 @@ export default defineComponent({
                     okText: '审核通过',
                     cancelText: '取消',
                     onOk() {
-                        const reqParam: SpotContractOperateReq = {
+
+                        // 为什么不删 因为以后可能又改回来
+                        // const reqParam: SpotContractOperateReq = {
+                        //     SpotContractID: props.selectedRow.spotcontractid,
+                        //     OperateType: 3,
+                        //     Remark: param.Remark,
+                        //     Info: {
+                        //         BizType: props.selectedRow.biztype,
+                        //         MerUserID: param.MerUserID as number, //    跟单员ID
+                        //         SaleUserID: param.SaleUserID as number, //   业务员ID
+                        //         TradeUserID: param.TradeUserID as number, //  交易员ID
+                        //         Remark: param.Remark,
+                        //         UserID: getUserId(),
+                        //     },
+                        // };
+
+                        const reqParam: GldErmcpSpotContractOperateReq = {
                             SpotContractID: props.selectedRow.spotcontractid,
-                            OperateType: 3,
+                            OperateType: 4,
                             Remark: param.Remark,
                             Info: {
                                 BizType: props.selectedRow.biztype,
@@ -290,11 +306,14 @@ export default defineComponent({
                                 TradeUserID: param.TradeUserID as number, //  交易员ID
                                 Remark: param.Remark,
                                 UserID: getUserId(),
+                                CurrencyID: props.selectedRow.currencyid,  // 币种id
                             },
                         };
                         // Fixme 6/4 代码修改
                         // 审核通过 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
-                        requestResultLoadingAndInfo(spotContractStatus, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
+                        // Fixme 6/9 代码修改
+                        // 审核通过 GldErmcpSpotContractOperateReq 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
+                        requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
                             context.emit('refresh');
                             cancel();
                         });