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

src/assets/styles/mixin.less

@@ -251,6 +251,11 @@
             background: @m-black2;
         }
     }
+    .ant-table-row-expand-icon {
+        border-color: @m-grey17;
+        background-color: transparent;
+        color:  @m-grey17;
+    }
 }
 // 弹窗表格
 .dialogTable {
@@ -613,6 +618,11 @@
         .ant-upload-list-item-name {
             color: @m-white0;
         }
+        .ant-upload-list-item-card-actions  {
+            .anticon {
+                color: @m-white0;
+            }
+        }
         &:hover {
             background: transparent;
             .anticon-loading,.anticon-paper-clip {
@@ -621,6 +631,11 @@
             .ant-upload-list-item-name {
                 color: @m-blue0;
             }
+            .ant-upload-list-item-card-actions  {
+                .anticon {
+                    color: @m-blue0;
+                }
+            }
         }
     }
     .look {
@@ -779,39 +794,44 @@
         border: 0;
     }
 }
-.hiddenFirstCol {
-    .ant-table {
-        .ant-table-content {
-            .ant-table-scroll {
-                .ant-table-hide-scrollbar {
-                    .ant-table-fixed {
-                        .ant-table-thead {
-                            .ant-table-expand-icon-th {
-                                display: none;
-                            }
-                        }
-                    }
-                }
-            }
-            .ant-table-body {
-                table {
-                    .ant-table-thead {
-                        .ant-table-expand-icon-th {
-                            display: none;
-                        }
-                    }
-                    .ant-table-tbody {
-                        .ant-table-row {
-                            .ant-table-row-expand-icon-cell {
-                                display: none;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
+// .hiddenFirstCol {
+//     .ant-table {
+//         .ant-table-content {
+//             .ant-table-scroll {
+//                 .ant-table-hide-scrollbar {
+//                     .ant-table-fixed {
+//                         .ant-table-thead {
+//                             .ant-table-expand-icon-th {
+//                                 width: 0 !important;
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//             .ant-table-body {
+//                 table {
+//                     .ant-table-thead {
+//                         .ant-table-expand-icon-th {
+//                             width: 0 !important;
+//                         }
+//                     }
+//                     .ant-table-tbody {
+//                         .ant-table-row {
+//                             .ant-table-row-expand-icon-cell {
+//                                 width: 0 !important;
+//                             }
+//                         }
+//                         tr.ant-table-expanded-row {
+//                             td:first-child {
+//                                 width: 0 !important;
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//         }
+//     }
+// }
 
 .to {
     font-size: 14px;
@@ -1303,3 +1323,4 @@ input:-internal-autofill-selected {
   .ant-spin-container::after,.ant-drawer-content {
       background-color: transparent;
   }
+

src/common/components/uploadImg/index.vue

@@ -65,4 +65,12 @@ export default defineComponent({
         };
     },
 });
-</script>
+</script>
+<style lang="less">
+.upload {
+    .ant-upload-list {
+        max-width: calc(100% - 80px);
+    }
+}
+</style
+>;

src/views/information/account_info/list/account_info_business/index.vue

@@ -154,6 +154,9 @@ export default defineComponent({
     .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;
         padding-right: 43px;
+        .btnPrimary.ant-btn {
+          margin-top: -3px;
+        }
     }
     .ant-row.headRow {
         .ant-col:nth-child(2) {

src/views/information/account_info/list/account_info_futures/index.vue

@@ -163,6 +163,9 @@ export default defineComponent({
     .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;
         padding-right: 43px;
+        .btnPrimary.ant-btn {
+          margin-top: -3px;
+        }
     }
     .ant-row.headRow {
         .ant-col:nth-child(2) {

src/views/information/account_info/list/account_info_manager/index.vue

@@ -175,6 +175,9 @@ export default defineComponent({
     .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;
         padding-right: 43px;
+        .btnPrimary.ant-btn {
+          margin-top: -3px;
+        }
     }
     .ant-row.headRow {
         .ant-col:nth-child(2) {

src/views/information/account_info/list/account_info_trade/index.vue

@@ -192,10 +192,17 @@ export default defineComponent({
             height: 26px;
             line-height: 26px;
         }
+        // .operBtn.ant-btn {
+        //   margin-top: 0;
+        //   margin-left: 0;
+        // }
     }
     .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;
         padding-right: 43px;
+        .btnPrimary.ant-btn {
+          margin-top: -3px;
+        }
     }
     .ant-row.headRow {
         .ant-col:nth-child(2) {

src/views/information/custom/compoments/add/index.vue

@@ -312,7 +312,7 @@ export default defineComponent({
                     userid: 1, // 写死 必填
                     memberareaid: getUserId(),
                     userinfotype: Number(param.userinfotype),
-                    username: param.customername,
+                    username: param.userinfotype === '2' ? param.customername : param.username,
                     userstate: OperateType, // 1： 保存草稿 2： 新增
 
                     // 以上必填

src/views/information/custom/compoments/detail/index.vue

@@ -27,8 +27,9 @@
                        v-if="selectedRow.userinfotype === '2'">
             <span class="white">{{ formatValue(selectedRow.customername)}}</span>
           </a-form-item>
-          <a-form-item label="姓名">
-            <span class="white">{{ formatValue(selectedRow.customername)}}</span>
+          <a-form-item label="姓名"
+                       v-if="selectedRow.userinfotype !== '2'">
+            <span class="white">{{ formatValue(selectedRow.username)}}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -114,36 +115,36 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="身份证号码">
-              <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="手机号码">
-              <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
+              <span class="white">{{ formatValue(selectedRow.mobilephone) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="身份证正面照">
-              <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.cardfrontphotourl) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="邮箱">
-              <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
+              <span class="white">{{ formatValue(selectedRow.email) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="身份证反面照">
-              <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.cardbackphotourl) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="联系电话">
-              <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
+              <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/information/goods/components/add/index.vue

@@ -47,6 +47,7 @@
               <a-select class="inlineFormSelect"
                         style="width: 200px"
                         v-model:value="formState.unitid"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         placeholder="请选择单位">
                 <a-select-option v-for="item in unitList"
                                  :value="item.enumitemname"
@@ -111,6 +112,7 @@
                            :rules="rules.gldwrstandards.unitid">
                 <a-select class="inlineFormSelect"
                           v-model:value="domain.unitid"
+                          :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                           placeholder="请选择单位">
                   <a-select-option v-for="item in unitList"
                                    :value="item.enumitemname"
@@ -226,6 +228,7 @@
                 <a-select class="inlineFormSelect"
                           @change="middleChange(domain.middlegoodsid, domain)"
                           v-model:value="domain.middlegoodsid"
+                          :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                           placeholder="请选择套保品种">
                   <a-select-option v-for="item in goodsGroup"
                                    :value="item.goodsgroupid"

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

@@ -38,6 +38,7 @@
               <a-select class="inlineFormSelect"
                         style="width: 200px"
                         @change="contractChange"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.ContractType"
                         placeholder="请选择合同类型">
                 <a-select-option v-for="item in contractType"
@@ -53,6 +54,7 @@
                          name="BizType">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.BizType"
                         placeholder="请选择业务类型">
                 <a-select-option v-for="item in businessType"
@@ -69,6 +71,7 @@
                            name="BuyUserID">
                 <a-select class="inlineFormSelect"
                           style="width: 200px"
+                          :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                           v-model:value="formState.BuyUserID"
                           placeholder="请选择客户">
                   <!-- 客户资料列表 正常 -->
@@ -98,6 +101,7 @@
                 <a-select class="inlineFormSelect"
                           v-model:value="formState.SellUserID"
                           style="width: 200px"
+                          :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                           placeholder="请选择客户">
                   <!-- 客户资料列表 正常 -->
                   <a-select-option :value="item.userid"
@@ -111,6 +115,7 @@
           </template>
           <a-col :span="12">
             <a-form-item label="合同附件"
+                         class="checkboxGroupItem"
                          name="ContractAttachment">
               <UploadImg :visible="visible"
                          @upload="uploadImgAction" />
@@ -127,6 +132,7 @@
               <a-select class="inlineFormSelect"
                         style="width: 200px"
                         @change="deliveryGoodsChange"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.DeliveryGoodsID"
                         placeholder="请选择现货品种">
                 <a-select-option v-for="item in deliveryGoodsList"
@@ -142,6 +148,7 @@
                          name="WrStandardID">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         @change="WrStandardChange"
                         v-model:value="formState.WrStandardID"
                         placeholder="请选择品类">
@@ -158,6 +165,7 @@
                          name="SpotGoodsBrandID">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.SpotGoodsBrandID"
                         placeholder="请选择品牌">
                 <a-select-option v-for="item in gblist"
@@ -197,6 +205,7 @@
                          name="PriceType">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.PriceType"
                         placeholder="请选择定价类型">
                 <a-select-option v-for="item in priceType"
@@ -213,6 +222,7 @@
               <a-select class="inlineFormSelect"
                         v-model:value="formState.CurrencyID"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         placeholder="请选择结算币种">
                 <a-select-option v-for="item in payCurrency"
                                  :key="item.enumdicid"
@@ -250,6 +260,7 @@
                 <a-select class="inlineFormSelect"
                           v-model:value="formState.GoodsID"
                           style="width: 200px"
+                          :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                           placeholder="请选择点价合约">
                   <a-select-option v-for="item in goodsList"
                                    :key="item.goodsid"
@@ -347,6 +358,7 @@
               <a-select class="inlineFormSelect"
                         v-model:value="formState.SaleUserID"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         placeholder="请选择业务员">
                 <a-select-option v-for="item in businesserList"
                                  :key="item.loginid"
@@ -364,6 +376,7 @@
               <a-select class="inlineFormSelect"
                         v-model:value="formState.MerUserID"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         placeholder="请选择跟单员">
                 <a-select-option v-for="item in merchandiserList"
                                  :key="item.loginid"
@@ -378,6 +391,7 @@
                          name="TradeUserID">
               <a-select class="inlineFormSelect"
                         style="width: 200px"
+                        :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
                         v-model:value="formState.TradeUserID"
                         placeholder="请选择期货账户">
                 <a-select-option v-for="item in traderList"

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -13,7 +13,7 @@
                :customRow="Rowclick"
                rowKey="key"
                :data-source="tableList"
-               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
+               :scroll="{ x: '100%', y: 'calc(100vh - 153px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />