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

src/assets/styles/mixin.less

@@ -151,7 +151,7 @@
     }
 }
 .commonInput {
-    background: #15202B;
+    background: @m-grey21;
     border: 1px solid @m-grey14;
     border-radius: 3px;
     color: #E5E5E5;
@@ -445,7 +445,7 @@
     .ant-select-selector {
         height: 30px;
         padding: 0 8px;
-        background: #15202B;
+        background: @m-grey21;
         border: 1px solid #0C95FF;
         border-radius: 3px;
         color: #E5E5E5;
@@ -464,7 +464,7 @@
     .ant-select-selector {
         height: 30px;
         padding: 0 8px;
-        background: #15202B;
+        background: @m-grey21;
         border: 0;
         color: #E5E5E5;
         .ant-select-selection-placeholder {
@@ -495,7 +495,7 @@
     .ant-select-selector {
         height: 30px;
         padding: 0 8px;
-        background: #15202B;
+        background: @m-grey21;
         border: 0;
         color: #E5E5E5;
         .ant-select-selection-placeholder {
@@ -510,7 +510,7 @@
 }
 
 .dialogInput {
-    background: #15202B;
+    background: @m-grey21;
     border: 1px solid @m-grey14;
     border-radius: 3px;
     color: #E5E5E5;
@@ -521,6 +521,11 @@
     .ant-input-suffix {
         color: #E5E5E5;
     }
+    .ant-input-suffix {
+        .ant-input-password-icon {
+            color: #E5E5E5;
+        }
+    }
     &:hover,&:focus {
         border-color: @m-blue10;
     }
@@ -679,32 +684,46 @@
         border: 0;
     }
     }
-    .btnDanger.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
-        background: linear-gradient(0deg, @m-red0, @m-red1);
-        color: @m-white0;
-        font-size: 14px;
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-red0-hover 0%, @m-red1-hover 99%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
-    }
-    .btnDeafault.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
-        background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-        color: @m-white0;
-        font-size: 14px;
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
-    }
     .ant-btn+.ant-btn {
         margin-left: 10px;
     }
 }
+.btnDanger.ant-btn{
+    margin-left: 10px;
+    width: 80px;
+    height: 26px;
+    line-height: 27px;
+    text-align: center;
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    background: linear-gradient(0deg, @m-red0 0%, @m-red1 99%);
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-red0-hover 0%, @m-red1-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+.btnDeafault.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 26px;
+    line-height: 27px;
+    text-align: center;
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
 .hiddenFirstCol {
     .ant-table {
         .ant-table-content {
@@ -737,7 +756,8 @@
 
 .filterTable {
     display: inline-flex;
-    width: 100%;
+    width: calc(100% - 3px);
+    padding-left: 3px;
 }
 
 .ant-row.dialogRowTitle {
@@ -971,4 +991,172 @@
             }
         }
     }
+}
+
+.tltLeft {
+    font-size: 16px;
+    text-align: left;
+    .icon {
+        font-size: 20px;
+        fill: @m-blue0;
+        margin-right: 10px;
+    }
+}
+
+.ant-collapse.spotCollapse.ant-collapse-borderless {
+    margin-top: 10px;
+    background-color: transparent;
+    .ant-collapse-item {
+        border-bottom: 0;
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+            border-bottom: 1px solid @m-grey18;
+            padding: 10px 8px 10px 44px;
+            height: 43px;
+            .ant-collapse-arrow {
+                fill: @m-grey17;
+                width: 16px;
+                height: 16px;
+                font-size: 16px;
+                left: 0;
+            }
+        }
+        .ant-collapse-content {
+            .ant-collapse-content-box {
+                padding: 0 0 0 30px;
+                background-color: transparent;
+                .ant-row.contRow {
+                    width: 100%;
+                    height: 40px;
+                    line-height: 40px;
+                    font-size: 16px;
+                    color: @m-white1;
+                    margin-bottom: 10px;
+                    background: #0f161c;
+                    border: 1px solid #172b56;
+                    border-radius: 3px;
+                    padding-left: 14px;
+                    padding-right: 12px;
+                    .ant-col:last-child {
+                        text-align: right;
+                    }
+                    .ant-col:first-child {
+                        text-align: left;
+                    }
+                }
+                .contRow:first-child {
+                    margin-top: 9px;
+                }
+                .contRow:last-child {
+                    margin-bottom: 20px;
+                }
+            }
+        }
+    }
+}
+.ant-collapse.busyCollapse.ant-collapse-borderless {
+    margin-top: 10px;
+    background: #0f161c;
+    border: 1px solid #172b56;
+    .rounded-corners(3px);
+    .ant-collapse-item {
+        border-bottom: 0;
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+            border-bottom: 0;
+            padding: 0;
+            line-height: 43px;
+            .ant-collapse-arrow {
+                fill: @m-grey17;
+                width: 16px;
+                height: 16px;
+                font-size: 16px;
+                left: 0;
+            }
+            .ant-row.contRow {
+                width: 100%;
+                // height: 40px;
+                line-height: 40px;
+                font-size: 16px;
+                color: @m-white1;
+                margin-bottom: 10px;
+                // background: #0f161c;
+                border: 0 !important;
+                // border-radius: 3px;
+                padding-left: 14px;
+                padding-right: 12px;
+                .ant-col:last-child {
+                    text-align: right;
+                }
+                .ant-col:first-child {
+                    text-align: left;
+                }
+            }
+            .contRow:first-child {
+                margin-top: 0 !important;
+            }
+            .contRow:last-child {
+                margin-bottom: 0 !important;
+            }
+        }
+        .ant-collapse-content.ant-collapse-content-active {
+            .ant-collapse-content-box {
+                padding: 0 0 0 30px;
+                background-color: transparent;
+                .btn-list {
+                    width: calc(100% - 10px);
+                    justify-content: flex-end;
+                    padding-right: 10px;
+                    padding-bottom: 10px;
+                }
+            }
+        }
+    }
+}
+.ant-row.headRow {
+    .ant-col:first-child {
+        text-align: left;
+    }
+    .ant-col:nth-child(3) {
+        text-align: right;
+    }
+}
+
+// 输入框自动填充背景色和字体颜色
+input:-webkit-autofill,
+textarea:-webkit-autofill,
+select:-webkit-autofill,
+.dialogInput:-webkit-autofill {
+    box-shadow: inset 0 0 0 1000px @m-grey21;
+    -webkit-text-fill-color: #e5e5e5;
+}
+input:-internal-autofill-selected {
+    background-color: @m-grey21 !important;
+}
+
+.ant-checkbox-group.commonCheckboxGroup {
+    .ant-checkbox-wrapper {
+        color: @m-white0;
+        font-size: 14px;
+        .ant-checkbox {
+            margin-right: 2px;
+            .ant-checkbox-inner {
+                background: #15202B;
+                border: 1px solid #2B3F52;
+                border-radius: 3px;
+            }
+        }
+        .ant-checkbox.ant-checkbox-checked {
+            .ant-checkbox-inner {
+                &::after {
+                    border-color: #3A87F7;
+                }
+            }
+        }
+        span+span {
+            margin-right: 15px;
+        }
+    }
 }

src/views/business/plan/components/add/index.vue

@@ -1,17 +1,80 @@
 <template>
   <!-- 新增计划 -->
-  <a-modal class="add-custom"
-           title="新增计划"
+  <a-modal class="commonModal"
+           title="新增套保计划"
            v-model:visible="visible"
            @cancel="cancel"
            width="890px">
     <template #footer>
       <a-button key="submit"
+                class="cancelBtn"
+                    @click="cancel">保存草稿
+          </a-button>
+      <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="submit">提交审核</a-button>
     </template>
-
+    <a-form class="inlineForm"
+            ref="formRef">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="计划类型"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择计划类型">
+              <a-select-option value="1">
+                客户一
+              </a-select-option>
+              <a-select-option value="2">
+                客户二
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+          <a-col :span="12">
+            <a-form-item label="计划名称"
+                         name="">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       placeholder="请输入计划名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种"
+                         name="">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       placeholder="请输入现货品种" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="标仓系数"
+                         name="">
+              <span class="white">1</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="计划量"
+                         class="relative"
+                         name="">
+             <a-input class="dialogInput" 
+                      style="width: 200px" 
+                      placeholder="请输入计划量" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="备注"
+                         class="relative"
+                         name="">
+             <a-input class="dialogInput" 
+                      style="width: 636px" 
+                      placeholder="请输入备注" />
+            </a-form-item>
+          </a-col>
+      </a-row>
+    </a-form>
   </a-modal>
 </template>
 

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 新增客户资料 -->
+  <!-- 新增账户 -->
   <a-modal class="add-custom"
-           title="新增客户资料"
+           title="新增账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered
@@ -19,249 +19,60 @@
             :rules="rules">
       <a-row :gutter="24">
         <a-col :span="12">
-          <a-form-item label="客户类型"
+          <a-form-item label="账户角色"
                        name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1">
-                个人
-              </a-select-option>
-              <a-select-option value="2">
-                企业
-              </a-select-option>
-            </a-select>
+            <a-checkbox-group class="commonCheckboxGroup" v-model:value="formState.warehousetype">
+              <a-row>
+                <a-col :span="12">
+                  <a-checkbox value="A">业务员</a-checkbox>
+                </a-col>
+                <a-col :span="12">
+                  <a-checkbox value="B">跟单员</a-checkbox>
+                </a-col>
+              </a-row>
+            </a-checkbox-group>
           </a-form-item>
         </a-col>
-        <template v-if="!isPersonal()">
           <a-col :span="12">
-            <a-form-item label="企业名称"
+            <a-form-item label="账户名称"
                          name="customername">
               <a-input class="dialogInput"
                        v-model:value="formState.customername"
                        style="width: 200px"
-                       placeholder="请输入企业名称" />
+                       placeholder="请输入账户名称" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="企业简称"
+            <a-form-item label="登录账号"
                          name="nickname">
               <a-input class="dialogInput"
                        style="width: 200px"
                        v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
+                       placeholder="请输入登录账号" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="证件类型"
+            <a-form-item label="登录密码"
                          name="cardtype">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.cardtype"
-                        style="width: 200px"
-                        placeholder="请选择证件类型">
-                <a-select-option :value="item.enumitemname"
-                                 v-for="item in cardTypeList"
-                                 :key="item.autoid">
-                  {{item.enumdicname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="法定代表人"
-                         name="legalpersonname">
-              <a-input class="dialogInput"
+              <!-- <a-input class="dialogInput"
                        style="width: 200px"
                        v-model:value="formState.legalpersonname"
-                       placeholder="请输入法定代表人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入证件号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="纳税人识别号"
-                         name="taxpayernum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.taxpayernum"
-                       placeholder="请输入纳税人识别号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="营业执照">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人"
-                         name="contactname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.contactname"
-                       placeholder="请输入联系人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人手机号"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入联系人手机号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-        </template>
-        <template v-else>
-          <a-col :span="12">
-            <a-form-item label="姓名"
-                         name="username">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.username"
-                       placeholder="请输入姓名" />
+                       placeholder="请输入登录密码" /> -->
+              <a-input-password class="dialogInput" 
+                      style="width: 200px" 
+                      v-model:value="formState.legalpersonname" 
+                      placeholder="请输入登录密码" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入身份证号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="手机号码"
-                         name="mobilephone">
+                         name="legalpersonname">
               <a-input class="dialogInput"
                        style="width: 200px"
-                       v-model:value="formState.mobilephone"
+                       v-model:value="formState.legalpersonname"
                        placeholder="请输入手机号码" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证正面照"
-                         name="cardbackphotourl">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="邮箱"
-                         name="email">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.email"
-                       placeholder="请输入邮箱" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="身份证反面照"
-                         name="cardfrontphotourl">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item>
-              &nbsp;
-            </a-form-item>
-          </a-col>
-        </template>
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      placeholder="请选择省">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml10"
-                      style="width: 205px"
-                      placeholder="请选择市">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml10"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option value="1">
-                客户一
-              </a-select-option>
-              <a-select-option value="2">
-                客户二
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="&nbsp;"
-                       name="cardaddress">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.cardaddress"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="备注"
-                       name="remark">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.remark"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
       </a-row>
     </a-form>
   </a-modal>

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

@@ -66,13 +66,13 @@
             </a-col>
           </a-row>
         </template>
-        <a-collapse class="spotCollapse"
+        <a-collapse class="busyCollapse"
                     v-for="(item, i) in merchandiserList"
                     :key="i + '11'"
                     :bordered="false">
           <a-collapse-panel :show-arrow="false">
             <template #header>
-              <a-row class="headRow">
+              <a-row class="contRow">
                 <a-col :span="12">{{item.accountname}}-{{item.logincode}}</a-col>
                 <a-col :span="12">{{getLoginStatus(item.loginstatus)}}</a-col>
               </a-row>
@@ -125,5 +125,30 @@ export default defineComponent({
 
 <style lang="less">
 .account_info_business {
+    .tltLeft {
+        padding-left: 12px;
+    }
+    .btn-list {
+      .btnPrimary.ant-btn {
+        height: 26px;
+        line-height: 26px;
+      }
+    }
+    .ant-collapse.spotCollapse.ant-collapse-borderless {
+        padding-left: 43px;
+        padding-right: 43px;
+    }
+    .ant-row.headRow {
+        .ant-col:nth-child(2) {
+            text-align: right;
+            .operBtn.ant-btn {
+                float: right;
+                margin-top: -3px;
+                margin-bottom: 10px;
+                height: 26px;
+                line-height: 27px;
+            }
+        }
+    }
 }
 </style>

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

@@ -35,13 +35,13 @@
             </a-col>
           </a-row>
         </template>
-        <a-collapse class="spotCollapse"
+        <a-collapse class="busyCollapse"
                     v-for="(item, i) in traderList"
                     :key="i + '11'"
                     :bordered="false">
           <a-collapse-panel :show-arrow="false">
             <template #header>
-              <a-row class="headRow">
+              <a-row class="contRow">
                 <a-col :span="12">{{item.rolename}}</a-col>
                 <a-col :span="12">{{getAccountStatus(item.accountstatus)}}</a-col>
               </a-row>
@@ -96,5 +96,30 @@ export default defineComponent({
 
 <style lang="less">
 .account_info_trade {
+  .tltLeft {
+        padding-left: 12px;
+  }
+  .btn-list {
+    .btnPrimary.ant-btn {
+      height: 26px;
+      line-height: 26px;
+    }
+  }
+  .ant-collapse.spotCollapse.ant-collapse-borderless {
+        padding-left: 43px;
+        padding-right: 43px;
+    }
+    .ant-row.headRow {
+        .ant-col:nth-child(2) {
+            text-align: right;
+            .operBtn.ant-btn {
+                float: right;
+                margin-top: -3px;
+                margin-bottom: 10px;
+                height: 26px;
+                line-height: 27px;
+            }
+        }
+    }
 }
 </style>

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

@@ -270,64 +270,57 @@ export default defineComponent({
         }
     }
 }
-.ant-collapse.spotCollapse.ant-collapse-borderless {
-    margin-top: 10px;
-    background-color: transparent;
-    .ant-collapse-item {
-        border-bottom: 0;
-        .ant-collapse-header {
-            color: @m-grey17;
-            font-size: 14px;
-            border-bottom: 1px solid @m-grey18;
-            padding: 10px 8px 10px 44px;
-            height: 43px;
-            .ant-collapse-arrow {
-                fill: @m-grey17;
-                width: 16px;
-                height: 16px;
-                font-size: 16px;
-                left: 0;
-            }
-        }
-        .ant-collapse-content {
-            .ant-collapse-content-box {
-                padding: 0 0 0 30px;
-                background-color: transparent;
-                .ant-row.contRow {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    font-size: 16px;
-                    color: @m-white1;
-                    margin-bottom: 10px;
-                    background: #0f161c;
-                    border: 1px solid #172b56;
-                    border-radius: 3px;
-                    padding-left: 14px;
-                    padding-right: 12px;
-                    .ant-col:last-child {
-                        text-align: right;
-                    }
-                    .ant-col:first-child {
-                        text-align: left;
-                    }
-                }
-                .contRow:first-child {
-                    margin-top: 9px;
-                }
-                .contRow:last-child {
-                    margin-bottom: 20px;
-                }
-            }
-        }
-    }
-}
-.ant-row.headRow {
-    .ant-col:first-child {
-        text-align: left;
-    }
-    .ant-col:nth-child(3) {
-        text-align: right;
-    }
-}
+// .ant-collapse.spotCollapse.ant-collapse-borderless {
+//     margin-top: 10px;
+//     background-color: transparent;
+//     .ant-collapse-item {
+//         border-bottom: 0;
+//         .ant-collapse-header {
+//             color: @m-grey17;
+//             font-size: 14px;
+//             border-bottom: 1px solid @m-grey18;
+//             padding: 10px 8px 10px 44px;
+//             height: 43px;
+//             .ant-collapse-arrow {
+//                 fill: @m-grey17;
+//                 width: 16px;
+//                 height: 16px;
+//                 font-size: 16px;
+//                 left: 0;
+//             }
+//         }
+//         .ant-collapse-content {
+//             .ant-collapse-content-box {
+//                 padding: 0 0 0 30px;
+//                 background-color: transparent;
+//                 .ant-row.contRow {
+//                     width: 100%;
+//                     height: 40px;
+//                     line-height: 40px;
+//                     font-size: 16px;
+//                     color: @m-white1;
+//                     margin-bottom: 10px;
+//                     background: #0f161c;
+//                     border: 1px solid #172b56;
+//                     border-radius: 3px;
+//                     padding-left: 14px;
+//                     padding-right: 12px;
+//                     .ant-col:last-child {
+//                         text-align: right;
+//                     }
+//                     .ant-col:first-child {
+//                         text-align: left;
+//                     }
+//                 }
+//                 .contRow:first-child {
+//                     margin-top: 9px;
+//                 }
+//                 .contRow:last-child {
+//                     margin-bottom: 20px;
+//                 }
+//             }
+//         }
+//     }
+// }
+
 </style>;

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

@@ -179,18 +179,15 @@ export default defineComponent({
             align-self: center;
             align-items: center;
         }
-        .tltLeft {
-            font-size: 16px;
-            .icon {
-                font-size: 20px;
-                fill: @m-blue0;
-                margin-right: 10px;
-            }
-        }
+
         .tltBtns {
             .ant-btn + .ant-btn {
                 margin-left: 10px;
             }
+            .btnPrimary.ant-btn {
+              height: 26px;
+              line-height: 27px;
+            }
         }
     }
     .spotCont {
@@ -252,58 +249,6 @@ export default defineComponent({
         }
     }
 }
-.ant-collapse.spotCollapse.ant-collapse-borderless {
-    margin-top: 10px;
-    background-color: transparent;
-    .ant-collapse-item {
-        border-bottom: 0;
-        .ant-collapse-header {
-            color: @m-grey17;
-            font-size: 14px;
-            border-bottom: 1px solid @m-grey18;
-            padding: 10px 8px 10px 44px;
-            height: 43px;
-            .ant-collapse-arrow {
-                fill: @m-grey17;
-                width: 16px;
-                height: 16px;
-                font-size: 16px;
-                left: 0;
-            }
-        }
-        .ant-collapse-content {
-            .ant-collapse-content-box {
-                padding: 0 0 0 30px;
-                background-color: transparent;
-                .ant-row.contRow {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    font-size: 16px;
-                    color: @m-white1;
-                    margin-bottom: 10px;
-                    background: #0f161c;
-                    border: 1px solid #172b56;
-                    border-radius: 3px;
-                    padding-left: 14px;
-                    padding-right: 12px;
-                    .ant-col:last-child {
-                        text-align: right;
-                    }
-                    .ant-col:first-child {
-                        text-align: left;
-                    }
-                }
-                .contRow:first-child {
-                    margin-top: 9px;
-                }
-                .contRow:last-child {
-                    margin-bottom: 20px;
-                }
-            }
-        }
-    }
-}
 .ant-row.headRow {
     .ant-col:first-child {
         text-align: left;

src/views/information/warehouse-info/compoments/recover/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 恢复仓库信息-->
-    <a-modal class="modify-custom"
+    <a-modal class="commonModal modify-custom"
              title="恢复仓库信息"
              v-model:visible="visible"
              centered