Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -242,6 +242,7 @@
         .ant-table-placeholder {
             border: 0;
             background: @m-black2;
+            min-height: 227px;
         }
     }
     .ant-table-row-expand-icon {
@@ -559,7 +560,7 @@
                 color: @m-blue10;
                 margin-right: 20px;
                 &:hover {
-                    border-color: rgba(@m-blue10, .8);
+                    border-color: @m-blue10-hover;
                 }
             }
         }
@@ -828,8 +829,8 @@
         color: @m-white0;
         .rounded-corners(3px);
         &:hover {
-            background: rgba(@m-blue0, 0.8);
-            color: rgba(@m-white0, 0.8);
+            background: @m-blue0-hover;
+            color: @m-white0-hover;
         }
     }
     .ant-upload-list-item-info {
@@ -938,21 +939,30 @@
 .orange {
     color: @m-orange0;
 }
-.selectBtn.ant-btn {
+.selectBtn.ant-btn,.operBtn.ant-btn {
     margin-left: 10px;
     width: 80px;
     height: 30px;
     line-height: 31px;
     text-align: center;
-    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
+    background: linear-gradient(0deg, @m-grey39 0%, @m-grey40 98%);
     border: 0;
     color: @m-white0;
     font-size: 14px;
     .rounded-corners(3px);
     &:hover,
     &:focus {
-        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
-        color: rgba(@m-white0, 0.8);
+        background: linear-gradient(0deg, @m-grey39-hover 0%, @m-grey40-hover 98%);
+        color: @m-white0-hover;
+        border: 0;
+    }
+}
+.operBtn.ant-btn {
+    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
+        color: @m-white0-hover;
         border: 0;
     }
 }
@@ -971,7 +981,7 @@
     &:hover,
     &:focus {
         background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
-        color: rgba(@m-white0, 0.8);
+        color: @m-white0-hover;
         border: 0;
     }
 }
@@ -995,7 +1005,7 @@
         &:hover,
     &:focus {
         background: linear-gradient(0deg, @m-blue2-hover 0%, @m-blue0-hover 99%);
-        color: rgba(@m-white0, 0.8);
+        color: @m-white0-hover;
         border: 0;
     }
     }
@@ -1017,7 +1027,7 @@
     &:hover,
     &:focus {
         background: linear-gradient(0deg, @m-red9-hover 0%, @m-red10-hover 99%);
-        color: rgba(@m-white0, 0.8);
+        color: @m-white0-hover;
         border: 0;
     }
 }
@@ -1035,7 +1045,7 @@
     &:hover,
     &:focus {
         background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
-        color: rgba(@m-white0, 0.8);
+        color: @m-white0-hover;
         border: 0;
     }
 }
@@ -2333,4 +2343,38 @@ input:-internal-autofill-selected {
 .ant-menu-dark .ant-menu-inline.ant-menu-sub {
     background: @m-black28;
     box-shadow: none;
+}
+
+// 仓单贸易查询条件
+.ant-select-tree-dropdown {
+    background: @m-grey9;
+    box-shadow: none;
+    .ant-select-tree {
+        color: @m-grey1;
+        li {
+            .ant-select-tree-node-content-wrapper {
+                color: @m-grey1;
+            }
+            .ant-select-tree-child-tree {
+                li:hover {
+                    background: @m-blue3;
+                    span {
+                        background: @m-blue3;
+                        color: @m-white0;
+                    }
+                }
+            }
+        }
+    }
+}
+
+// 左侧菜单样式
+.ant-menu-dark .ant-menu-sub .ant-menu-item,
+.ant-menu-dark .ant-menu-sub .ant-menu-item {
+    color: @m-grey34;
+}
+
+.ant-menu-dark .ant-menu-sub .ant-menu-item-selected,
+.ant-menu-dark .ant-menu-sub .ant-menu-item-selected {
+  color: @m-white8;
 }

src/assets/styles/theme.css

@@ -29,6 +29,17 @@
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
+    --m-grey32: #7a8a94;
+    --m-grey33: #88a0ae;
+    --m-grey34: #88A0AE;
+    --m-grey35: #343D46;
+    --m-grey36: #38444F;
+    --m-grey37: transpant;
+    --m-grey38: #88a0ae;
+    --m-grey39: #455773;
+    --m-grey39-hover: rgba(69, 87, 115, .8);
+    --m-grey40: #405066;
+    --m-grey40-hover: rgba(64, 80, 102, .8);
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -39,6 +50,7 @@
     --m-black5: #121415;
     --m-black6: #1B2F41;
     --m-black7: #15293A;
+    --m-black7-hover: rgba(21, 41, 58, .8);
     --m-black8: #212629;
     --m-black9: #161A1C;
     --m-black10: #121618;
@@ -62,6 +74,8 @@
     --m-black28: #000c17;
     --m-black29: #2B3F52;
     --m-black30: #15202B;
+    --m-black31: #0E0E0F;
+    --m-black32: #0E0E0F;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -79,6 +93,7 @@
     --m-blue9: #4179DB;
     --m-blue9-hover: rgba(65, 121, 219, .8);
     --m-blue10: #0C95FF;
+    --m-blue10-hover: rgba(12, 149, 255, .8);
     --m-blue11: #1271BA;
     --m-blue12: #1556B5;
     --m-blue13: #193778;
@@ -96,6 +111,9 @@
     --m-white0-hover: rgba(255, 255, 255, .8);
     --m-white1: #E5E5E5;
     --m-white5: #fffefe;
+    --m-white6: #ffffff;
+    --m-white7: #ffffff;
+    --m-white8: #ffffff;
 
     --m-green0: #1FF195;
     --m-green1: #10251d;
@@ -106,7 +124,7 @@
 /* :root[theme="light"] { */
 :root[theme="light"] { 
     --m-grey0: #5179E2;
-    --m-grey1: #FEFFFF;
+    --m-grey1: #7A8A94;
     --m-grey2: #7A8A94;
     --m-grey5: #B2C4DD;
     --m-grey6: #ffffff;
@@ -135,6 +153,17 @@
     --m-grey26: #5179E2;
 
     --m-grey31: #D6DEE3;
+    --m-grey32: #FEFFFF;
+    --m-grey33: #5E6E78;
+    --m-grey34: #808E97;
+    --m-grey35: #ffffff;
+    --m-grey36: #ffffff;
+    --m-grey37: #CBD7DD;
+    --m-grey38: #7A8A94;
+    --m-grey39: #5179E2;
+    --m-grey39-hover: rgba(81, 121, 226, .8);
+    --m-grey40: #5179E2;
+    --m-grey40-hover: rgba(81, 121, 226, .8);
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;
@@ -144,6 +173,7 @@
     --m-black5: #ECF2F5;
     --m-black6: #DAE5EC;
     --m-black7: #D4E0FF;
+    --m-black7-hover: rgba(212, 224, 255, .8);
     --m-black8: #DAE5EC;
     --m-black9: #e3ebf1;
     --m-black10: #ddebed;
@@ -167,6 +197,8 @@
     --m-black28: #DDE3E8;
     --m-black29: #2B3F52;
     --m-black30: #15202B;
+    --m-black31: #FFFFFF;
+    --m-black32: #CED8E6;
 
     --m-blue0: #5179E2;
     --m-blue0-hover: rgba(81, 121, 226, .8);
@@ -184,6 +216,7 @@
     --m-blue9: #5179E2;
     --m-blue9-hover: rgba(81, 121, 226, .8);
     --m-blue10: #0C95FF;
+    --m-blue10-hover: rgba(12, 149, 255, .8);
     --m-blue11: #ffffff;
     --m-blue12: #D4E0FF;
     --m-blue13: #DEEFFF;
@@ -201,6 +234,9 @@
     --m-white0-hover: rgba(255, 255, 255, .8);
     --m-white1: #333333;
     --m-white5: #FFFFFF;
+    --m-white6: #333333;
+    --m-white7: #718FAE;
+    --m-white8: #ffffff;
 
     --m-green0: #00A843;
     --m-green1: #e8ffef;
@@ -240,6 +276,17 @@
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
+    --m-grey32: #7a8a94;
+    --m-grey33: #88a0ae;
+    --m-grey34: #88A0AE;
+    --m-grey35: #343D46;
+    --m-grey36: #38444F;
+    --m-grey37: transpant;
+    --m-grey38: #88a0ae;
+    --m-grey39: #455773;
+    --m-grey39-hover: rgba(69, 87, 115, .8);
+    --m-grey40: #405066;
+    --m-grey40-hover: rgba(64, 80, 102, .8);
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -250,6 +297,7 @@
     --m-black5: #121415;
     --m-black6: #1B2F41;
     --m-black7: #15293A;
+    --m-black7-hover: rgba(21, 41, 58, .8);
     --m-black8: #212629;
     --m-black9: #161A1C;
     --m-black10: #121618;
@@ -273,6 +321,8 @@
     --m-black28: #000c17;
     --m-black29: #2B3F52;
     --m-black30: #15202B;
+    --m-black31: #0E0E0F;
+    --m-black32: #0E0E0F;
 
     --m-blue0: #3a87f7;
     --m-blue0-hover: rgba(58, 135, 247, .8);
@@ -290,6 +340,7 @@
     --m-blue9: #4179DB;
     --m-blue9-hover: rgba(65, 121, 219, .8);
     --m-blue10: #0C95FF;
+    --m-blue10-hover: rgba(12, 149, 255, .8);
     --m-blue11: #1271BA;
     --m-blue12: #1556B5;
     --m-blue13: #193778;
@@ -307,6 +358,9 @@
     --m-white0-hover: rgba(255, 255, 255, .8);
     --m-white1: #E5E5E5;
     --m-white5: #fffefe;
+    --m-white6: #ffffff;
+    --m-white7: #ffffff;
+    --m-white8: #ffffff;
 
     --m-green0: #1FF195;
     --m-green1: #10251d;

src/assets/styles/variables.less

@@ -39,6 +39,17 @@
 @m-grey29: #4D647A;
 @m-grey30: #223548;
 @m-grey31: var(--m-grey31);
+@m-grey32: var(--m-grey32);
+@m-grey33: var(--m-grey33);
+@m-grey34: var(--m-grey34);
+@m-grey35: var(--m-grey35);
+@m-grey36: var(--m-grey36);
+@m-grey37: var(--m-grey37);
+@m-grey38: var(--m-grey38);
+@m-grey39: var(--m-grey39);
+@m-grey39-hover: var(--m-grey39-hover);
+@m-grey40: var(--m-grey40);
+@m-grey40-hover: var(--m-grey40-hover);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);
@@ -49,6 +60,7 @@
 @m-black5: var(--m-black5);
 @m-black6: var(--m-black6);
 @m-black7: var(--m-black7);
+@m-black7-hover: var(--m-black7-hover);
 @m-black8: var(--m-black8);
 @m-black9: var(--m-black9);
 @m-black10: var(--m-black10);
@@ -72,7 +84,8 @@
 @m-black28: var(--m-black28);
 @m-black29: var(--m-black29);                // 角色详情复选框未选中边框色   白色版本等色值修改
 @m-black30: var(--m-black30);                // 角色详情复选框选中背景色   白色版本等色值修改
-
+@m-black31: var(--m-black31);
+@m-black32: var(--m-black32);
 
 @m-blue0: var(--m-blue0);
 @m-blue0-hover: var(--m-blue0-hover);
@@ -91,6 +104,7 @@
 @m-blue9: var(--m-blue9);
 @m-blue9-hover: var(--m-blue9-hover);
 @m-blue10: var(--m-blue10);
+@m-blue10-hover: var(--m-blue10-hover);
 @m-blue11: var(--m-blue11);
 @m-blue12: var(--m-blue12);
 @m-blue13: var(--m-blue13);                           // 白色版本买卖大厅小行情背景色
@@ -114,6 +128,9 @@
 @m-white3: rgb(54 187 207);
 @m-white4: #FEFEFE;
 @m-white5: var(--m-white5);
+@m-white6: var(--m-white6);
+@m-white7: var(--m-white7);
+@m-white8: var(--m-white8);
 
 
 @m-green0: var(--m-green0);

src/common/components/drawer/index.vue

@@ -112,6 +112,16 @@ export default defineComponent({
         width: 580px !important;
     }
 }
+.bottomWidth {
+    .position(fixed, auto, 0, 0, auto);
+    width: 765px;
+    height: 396px;
+    background: transparent;
+    z-index: 10;
+    .ant-drawer-content-wrapper {
+        width: 765px !important;
+    }
+}
 .tradeDialog {
     .position(fixed, 116px, 0, auto, auto);
     width: 467px;

src/common/components/filter/index.vue

@@ -91,31 +91,4 @@ export default defineComponent({
         margin-left: 10px;
     }
 }
-.selectBtn.ant-btn {
-    margin-left: 10px;
-    width: 80px;
-    height: 30px;
-    line-height: 31px;
-    text-align: center;
-    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
-    border: 0;
-    color: @m-white0;
-    font-size: 14px;
-    .rounded-corners(3px);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
-        color: rgba(@m-white0, 0.8);
-        border: 0;
-    }
-}
-.operBtn.ant-btn:extend(.selectBtn.ant-btn) {
-    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
-        color: rgba(@m-white0, 0.8);
-        border: 0;
-    }
-}
 </style>;

src/common/components/firstMenu/index.vue

@@ -61,45 +61,4 @@ export default defineComponent({
 .noBorderBottom {
     border-bottom: none;
 }
-.first-menu {
-    width: 100%;
-    height: 40px;
-    display: flex;
-    justify-content: space-between;
-    background-color: @m-black1;
-    .a-menu_container {
-        padding-top: 5px;
-        .flex();
-        height: 40px;
-        line-height: 34px;
-        border-bottom: 1px solid @m-blue0 !important;
-        .ant-menu-item {
-            min-width: 120px;
-            height: 34px;
-            line-height: 34px;
-            background: linear-gradient(0deg, #343d46 0%, #38444f 100%);
-            margin-left: 3px;
-            font-size: 16px;
-            columns: @m-grey2;
-            border-radius: 5px 5px 0px 0px;
-            cursor: pointer;
-            font-family: Adobe Heiti Std;
-            font-weight: normal;
-            &:hover {
-                .noBorderBottom;
-            }
-        }
-        .ant-menu-item-active {
-            .noBorderBottom;
-        }
-        .ant-menu-item-selected {
-            .noBorderBottom;
-            color: @m-white0;
-            background: linear-gradient(0deg, #3270d2 0%, #3a87f7 100%);
-            &:hover {
-                color: @m-white0;
-            }
-        }
-    }
-}
 </style>;

src/common/constants/enumsName.ts

@@ -693,7 +693,7 @@ export function getPerformanceStatusName(type: number) {
     let result = '--'
     switch (type) {
         case 1:
-            result = '初始化'
+            result = '待激活'
             break
         case 2:
             result = '正常'
@@ -918,14 +918,14 @@ export function getInterestSettleModeName(type: number) {
 }
 
 //    interestratemode: number;//利率方式 - 1:年利率 2:日利率 3:日固定值
-export function getInterestrateModeName(mode: number ,value: number) {
+export function getInterestrateModeName(mode: number, value: number) {
     let result = "--"
     switch (mode) {  // 1:年利率
         case 1:
             result = (value * 100).toFixed(2).toString()
             break
         case 2: //  2:日利率
-            result =  (value * 10000).toFixed(2).toString()
+            result = (value * 10000).toFixed(2).toString()
             break
         case 3: // 日固定值
             result = value.toFixed(2).toString()

src/layout/components/bottom.vue

@@ -133,6 +133,7 @@ export default defineComponent({
         border-right: 1px solid @m-black2;
     }
     main {
+        max-width: 100%;
         flex: 1;
         .flex;
         flex-direction: column;
@@ -140,14 +141,14 @@ export default defineComponent({
         position: relative;
         .conditionIcon {
             font-size: 16px;
-            color: @m-grey1;
+            color: @m-white0;
             width: 16px;
             cursor: pointer;
             height: 40px;
             line-height: 40px;
             margin-right: 10px;
             &:hover {
-                color: rgba(@m-grey1, 0.8);
+                color: @m-white0-hover
             }
         }
     }

src/layout/components/main.vue

@@ -1,20 +1,21 @@
 <template>
-  <div class="exposure">
-    <div class="first-menu">
-      <a-menu class="a-menu_container"
-              theme="dark"
-              v-model:selectedKeys="selectedKey"
-              @click="selectMenu"
-              mode="horizontal">
-        <a-menu-item :key="String(index)"
-                     v-for="(item, index) in list">{{ item.title}}</a-menu-item>
-      </a-menu>
-      <div class="menu_right">
-        <!-- <slot></slot> -->
-      </div>
+    <div class="exposure">
+        <div class="first-menu">
+            <a-menu
+                class="a-menu_container"
+                theme="dark"
+                v-model:selectedKeys="selectedKey"
+                @click="selectMenu"
+                mode="horizontal"
+            >
+                <a-menu-item :key="String(index)" v-for="(item, index) in list">{{ item.title}}</a-menu-item>
+            </a-menu>
+            <div class="menu_right">
+                <!-- <slot></slot> -->
+            </div>
+        </div>
+        <router-view />
     </div>
-    <router-view />
-  </div>
 </template>
 
 <script lang="ts">
@@ -54,23 +55,26 @@ export default defineComponent({
     height: 40px;
     border-bottom: 1px solid @m-blue0 !important;
     background-color: @m-black1;
+    .flex;
+    justify-content: space-between;
     .a-menu_container {
         padding-top: 5px;
         .flex();
         height: 34px;
         line-height: 34px;
+        background: transparent;
         .ant-menu-item {
             min-width: 120px;
             height: 34px;
             line-height: 34px;
-            background: linear-gradient(0deg, #343d46 0%, #38444f 100%);
+            background: linear-gradient(0deg, @m-grey35 0%, @m-grey36 100%);
             margin-left: 3px;
             font-size: 16px;
-            columns: @m-grey2;
+            color: @m-grey38;
             border-radius: 5px 5px 0px 0px;
             cursor: pointer;
             font-family: Adobe Heiti Std;
-            font-weight: normal;
+            border: 1px solid @m-grey37;
             &:hover {
                 .noBorderBottom;
             }
@@ -81,7 +85,7 @@ export default defineComponent({
         .ant-menu-item-selected {
             .noBorderBottom;
             color: @m-white0;
-            background: linear-gradient(0deg, #3270d2 0%, #3a87f7 100%);
+            background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
             &:hover {
                 color: @m-white0;
             }

src/layout/components/top.vue

@@ -1,24 +1,25 @@
 <template>
-  <a-layout :class="['layout-top', isBottom ? 'layout-top-bottom' : 'layout-top-no-bottom']">
-    <a-layout-header class="m-layout-header">
-      <Header />
-    </a-layout-header>
-    <a-layout class="middleLayout">
-      <a-layout-sider class="m-layout-left"
-                      width="180"
-                      v-model:collapsed="collapsed"
-                      @collapse="collapse"
-                      collapsible>
-        <Menu @chooseMenu="chooseMenu"
-              :collapsed="collapsed" />
-      </a-layout-sider>
-      <a-layout-content :style="{ background: '#0E0E0F', flex: 1, }">
-        <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
-        <!-- <Main /> -->
-        <router-view />
-      </a-layout-content>
+    <a-layout :class="['layout-top', isBottom ? 'layout-top-bottom' : 'layout-top-no-bottom']">
+        <a-layout-header class="m-layout-header">
+            <Header />
+        </a-layout-header>
+        <a-layout class="middleLayout">
+            <a-layout-sider
+                class="m-layout-left"
+                width="180"
+                v-model:collapsed="collapsed"
+                @collapse="collapse"
+                collapsible
+            >
+                <Menu @chooseMenu="chooseMenu" :collapsed="collapsed" />
+            </a-layout-sider>
+            <a-layout-content :style="{ background: '#0E0E0F', flex: 1, }">
+                <!-- <Drawer :title="'挂牌'" :visible="visible"></Drawer> -->
+                <!-- <Main /> -->
+                <router-view />
+            </a-layout-content>
+        </a-layout>
     </a-layout>
-  </a-layout>
 </template>
 <script lang="ts">
 import { defineComponent, ref, provide } from 'vue';
@@ -133,7 +134,7 @@ export default defineComponent({
         height: 40px;
         line-height: 40px;
         background: @m-grey0;
-        color: @m-grey1;
+        color: @m-grey32;
         padding: 0 20px;
         .flex();
         justify-content: space-between;
@@ -204,7 +205,7 @@ export default defineComponent({
         .m-layout-left {
             min-height: calc(100vh - 376px);
             background: @m-black4;
-            border-right: 1px solid @m-black2;
+            border-right: 1px solid @m-black32;
             overflow: hidden;
             .ant-layout-sider-children {
                 ul.ant-menu.ant-menu-inline.left-menu {
@@ -213,7 +214,7 @@ export default defineComponent({
                     li.ant-menu-submenu {
                         padding-bottom: 0;
                         .ant-menu-submenu-title {
-                            color: @m-grey2;
+                            color: @m-grey33;
                             font-size: 16px;
                             height: 60px;
                             line-height: 60px;
@@ -239,9 +240,15 @@ export default defineComponent({
                     }
                     li.ant-menu-submenu-open {
                         .ant-menu-submenu-title {
-                            color: @m-white0;
+                            color: @m-white6;
                             .icon {
-                                color: @m-white0;
+                                color: @m-white7;
+                            }
+                            .ant-menu-submenu-arrow {
+                                &::before,
+                                &::after {
+                                    background: @m-white7;
+                                }
                             }
                         }
                         .ant-menu-sub {
@@ -262,6 +269,7 @@ export default defineComponent({
         }
         .ant-layout-content {
             overflow: hidden;
+            background: @m-black31 !important;
         }
         .ant-menu-vertical {
             .ant-menu-submenu-vertical {

src/services/go/wrtrade/interface.ts

@@ -163,6 +163,7 @@ export interface WrPosition {
     freezeqty: number;//总冻结数量
     modifytime: string;//修改时间(过户时间)
     optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    minivalue: number;
     pledgeqty: number;//质押数量
     querytype: number;//查询类型 1-现货汇总 2-库存汇总(订单汇总) 3-现货明细
     sellexcuteqty: number;//销售履约中数量
@@ -881,30 +882,30 @@ export interface QueryWrOutInApplyReq {
 }
 
 
-export interface WrOutInApply{
-    applyid	:string;//申请单id
-    applystatus	:number;//申请状态 - number;
-//:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
-    applytime	:string;//申请时间
-    applytype	:number;//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
-    deliverygoodscode	:string;//品种代码
-    deliverygoodsid	:number;//品种ID
-    deliverygoodsname	:string;//品种名称
-    enumdicname	:string;//单位名称
-    expresscompany	:string;//物流公司
-    expressnum	:string;//物流单号
-    minivalue	:number;//现货商品最小变动值
-    optioncompare	:string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
-    qty	:number;//数量
-    userid	:number;//用户id
-    warehouseid	:number;//仓库ID
-    warehousename	:string;//仓库名称
-    wrfactortypeid	:string;//仓单要素类型ID(212+Unix秒时间戳(1number;
-//位)+xxxxxx)
-    wrfactortypename	:string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
-    wrstandardcode	:string;//现货商品代码
-    wrstandardid	:number;//现货商品ID
-    wrstandardname	:string;//商品名称
-    wrtypename	:string;//商品
+export interface WrOutInApply {
+    applyid: string;//申请单id
+    applystatus: number;//申请状态 - number;
+    //:预约成功 1:待初审 2:初审通过 3:初审拒绝 4:初审失败 5复审通过 6:复审拒绝 7:复审失败 8:已撤销
+    applytime: string;//申请时间
+    applytype: number;//申请类型 - 1:预约入库 2:预约出库 3:入库注册 4:出库注销
+    deliverygoodscode: string;//品种代码
+    deliverygoodsid: number;//品种ID
+    deliverygoodsname: string;//品种名称
+    enumdicname: string;//单位名称
+    expresscompany: string;//物流公司
+    expressnum: string;//物流单号
+    minivalue: number;//现货商品最小变动值
+    optioncompare: string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    qty: number;//数量
+    userid: number;//用户id
+    warehouseid: number;//仓库ID
+    warehousename: string;//仓库名称
+    wrfactortypeid: string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    wrfactortypename: string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrstandardcode: string;//现货商品代码
+    wrstandardid: number;//现货商品ID
+    wrstandardname: string;//商品名称
+    wrtypename: string;//商品
 }
 

src/views/account/login.vue

@@ -1,48 +1,42 @@
 <template>
-  <div class="login">
-    <a-row type="flex"
-           justify="center"
-           align="middle">
-      <a-col>
-        <div class="login-background">
-          <div id="img">
-            <!-- <img src="./logo.png"
+    <div class="login">
+        <a-row type="flex" justify="center" align="middle">
+            <a-col>
+                <div class="login-background">
+                    <div id="img">
+                        <!-- <img src="./logo.png"
                         alt="" />-->
-          </div>
-        </div>
-        <div class="login-content">
-          <p>账号登录</p>
-          <a-form ref="formDom"
-                  :model="form"
-                  :rules="rules">
-            <a-form-item name="account">
-              <a-input placeholder="用户名/账号/手机号"
-                       v-model:value="form.account">
-                <template #prefix>
-                  <img src="@/assets/images/user.png"
-                       alt />
-                </template>
-              </a-input>
-            </a-form-item>
-            <a-form-item name="password"
-                         class="mb20">
-              <a-input @keyup.enter="loginAction"
-                       placeholder="请输入您的登录密码"
-                       type="password"
-                       v-model:value="form.password">
-                <template #prefix>
-                  <img src="@/assets/images/password.png"
-                       alt />
-                </template>
-              </a-input>
-            </a-form-item>
-            <a-form-item>
-              <div class="login-remember-password">
-                <a-checkbox v-model:checked="form.isRemember">记住账号</a-checkbox>
-                <!-- <router-link to="/resetPassword">忘记密码?</router-link> -->
-              </div>
-            </a-form-item>
-            <!-- <a-form-item>
+                    </div>
+                </div>
+                <div class="login-content">
+                    <p>账号登录</p>
+                    <a-form ref="formDom" :model="form" :rules="rules">
+                        <a-form-item name="account">
+                            <a-input placeholder="用户名/账号/手机号" v-model:value="form.account">
+                                <template #prefix>
+                                    <img src="@/assets/images/user.png" alt />
+                                </template>
+                            </a-input>
+                        </a-form-item>
+                        <a-form-item name="password" class="mb20">
+                            <a-input
+                                @keyup.enter="loginAction"
+                                placeholder="请输入您的登录密码"
+                                type="password"
+                                v-model:value="form.password"
+                            >
+                                <template #prefix>
+                                    <img src="@/assets/images/password.png" alt />
+                                </template>
+                            </a-input>
+                        </a-form-item>
+                        <a-form-item>
+                            <div class="login-remember-password">
+                                <a-checkbox v-model:checked="form.isRemember">记住账号</a-checkbox>
+                                <!-- <router-link to="/resetPassword">忘记密码?</router-link> -->
+                            </div>
+                        </a-form-item>
+                        <!-- <a-form-item>
               <div style="text-align:left">
                 <a-checkbox v-model:checked="form.isRead">
                   我已阅读并同意
@@ -50,16 +44,18 @@
                 <router-link to="/resetPassword">《用户协议》</router-link>
               </div>
                         </a-form-item>-->
-            <a-form-item class="mt20">
-              <a-button @click="loginAction"
-                        :loading="loading"
-                        :disabled="goHomeloading">登录</a-button>
-            </a-form-item>
-          </a-form>
-        </div>
-      </a-col>
-    </a-row>
-  </div>
+                        <a-form-item class="mt20">
+                            <a-button
+                                @click="loginAction"
+                                :loading="loading"
+                                :disabled="goHomeloading"
+                            >登录</a-button>
+                        </a-form-item>
+                    </a-form>
+                </div>
+            </a-col>
+        </a-row>
+    </div>
 </template>
 
 <script lang="ts">
@@ -243,7 +239,7 @@ export default defineComponent({
     background-size: cover;
     div {
         margin-top: 120px;
-        margin-left: 55px;
+        margin-left: 69.5px;
         width: 136px;
         height: 136px;
         min-width: 136px;

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

@@ -1,147 +1,147 @@
 <template>
-  <!-- 修改计划 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改计划"
-           v-if="visible"
-           centered
-           v-model:visible="visible"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit(2)">完成</a-button>
-      <a-button key="cancel"
-                type="primary"
-                :loading="loading"
-                @click="cancel">取消</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="计划类型"
-                       name="ContractType">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      v-model:value="formState.ContractType"
-                      placeholder="请选择计划类型">
-              <a-select-option v-for="item in planTye"
-                               :value="item.enumitemname"
-                               :key="item.autoid">
-                {{item.enumdicname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="计划名称"
-                       name="HedgePlanNo">
-            <a-input class="dialogInput"
-                     v-model:value="formState.HedgePlanNo"
-                     style="width: 200px"
-                     placeholder="请输入计划名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="现货品种"
-                       name="DeliveryGoodsID">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      v-model:value="formState.DeliveryGoodsID"
-                      @change="chooseMG"
-                      placeholder="请选择现货品种">
-              <a-select-option v-for="item in DGList"
-                               :value="item.data.deliverygoodsid"
-                               :key="item.data.deliverygoodsid">
-                {{item.data.deliverygoodsname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="商品"
-                       name="WRStandardID">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      @change="chooseWR"
-                      v-model:value="formState.WRStandardID"
-                      placeholder="请选择商品">
-              <a-select-option v-for="item in gmlist"
-                               :value="item.wrstandardid"
-                               :key="item.wrstandardid">
-                {{item.wrstandardname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="标仓系数"
-                       name="">
-            <a-input class="dialogInput ConvertFactor"
-                     v-model:value="formState.ConvertFactor"
-                     readonly
-                     style="width: 200px"
-                     placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="计划量"
-                       class="relative"
-                       name="PlanQty">
-            <a-input-number class="dialogInput"
+    <!-- 修改计划 -->
+    <a-modal
+        class="commonModal modify-custom"
+        title="修改计划"
+        v-if="visible"
+        centered
+        v-model:visible="visible"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">完成</a-button>
+            <a-button key="cancel" type="primary" :loading="loading" @click="cancel">取消</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="计划类型" name="ContractType">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 200px"
+                            v-model:value="formState.ContractType"
+                            placeholder="请选择计划类型"
+                        >
+                            <a-select-option
+                                v-for="item in planTye"
+                                :value="item.enumitemname"
+                                :key="item.autoid"
+                            >{{item.enumdicname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="计划名称" name="HedgePlanNo">
+                        <a-input
+                            class="dialogInput"
+                            v-model:value="formState.HedgePlanNo"
+                            style="width: 200px"
+                            placeholder="请输入计划名称"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="现货品种" name="DeliveryGoodsID">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 200px"
+                            v-model:value="formState.DeliveryGoodsID"
+                            @change="chooseMG"
+                            placeholder="请选择现货品种"
+                        >
+                            <a-select-option
+                                v-for="item in DGList"
+                                :value="item.data.deliverygoodsid"
+                                :key="item.data.deliverygoodsid"
+                            >{{item.data.deliverygoodsname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="商品" name="WRStandardID">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 200px"
+                            @change="chooseWR"
+                            v-model:value="formState.WRStandardID"
+                            placeholder="请选择商品"
+                        >
+                            <a-select-option
+                                v-for="item in gmlist"
+                                :value="item.wrstandardid"
+                                :key="item.wrstandardid"
+                            >{{item.wrstandardname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="标仓系数" name>
+                        <a-input
+                            class="dialogInput ConvertFactor"
+                            v-model:value="formState.ConvertFactor"
+                            readonly
+                            style="width: 200px"
+                            placeholder="请输入标仓系数"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="计划量" class="relative" name="PlanQty">
+                        <a-input-number
+                            class="dialogInput"
                             style="width: 200px"
                             :min="0"
                             v-model:value="formState.PlanQty"
-                            placeholder="请输入计划量"></a-input-number>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="交易用户"
-                       name="Tradeuserid">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      v-model:value="formState.Tradeuserid"
-                      placeholder="请选择交易用户">
-              <a-select-option v-for="item in tableList"
-                               :value="item.roleid"
-                               :key="item.roleid">
-                {{item.rolename}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="结算币种"
-                       name="Currencyid">
-            <a-select class="inlineFormSelect"
-                      style="width: 200px"
-                      v-model:value="formState.Currencyid"
-                      placeholder="请选择结算币种">
-              <a-select-option v-for="item in priceTyep"
-                               :key="item.enumitemname"
-                               :value="item.enumitemname">
-                {{item.enumdicname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="备注"
-                       class="relative"
-                       name="Remark">
-            <a-input class="dialogInput"
-                     v-model:value="formState.Remark"
-                     style="width: 636px"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+                            placeholder="请输入计划量"
+                        ></a-input-number>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="交易用户" name="Tradeuserid">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 200px"
+                            v-model:value="formState.Tradeuserid"
+                            placeholder="请选择交易用户"
+                        >
+                            <a-select-option
+                                v-for="item in tableList"
+                                :value="item.roleid"
+                                :key="item.roleid"
+                            >{{item.rolename}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="结算币种" name="Currencyid">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 200px"
+                            v-model:value="formState.Currencyid"
+                            placeholder="请选择结算币种"
+                        >
+                            <a-select-option
+                                v-for="item in priceTyep"
+                                :key="item.enumitemname"
+                                :value="item.enumitemname"
+                            >{{item.enumdicname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="备注" class="relative" name="Remark">
+                        <a-input
+                            class="dialogInput"
+                            v-model:value="formState.Remark"
+                            style="width: 636px"
+                            placeholder="请输入备注"
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -259,8 +259,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {

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

@@ -1,268 +1,291 @@
 <template>
-  <!-- 修改客户资料 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改客户资料"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
+    <!-- 修改客户资料 -->
+    <a-modal
+        class="commonModal modify-custom"
+        title="修改客户资料"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button
+                key="submit"
                 class="cancelBtn"
                 :loading="loading"
                 :disabled="loading"
-                @click="submit(1)">保存草稿
-      </a-button>
-      <a-button key="submit"
+                @click="submit(1)"
+            >保存草稿</a-button>
+            <a-button
+                key="submit"
                 type="primary"
                 :loading="loading"
                 :disabled="loading"
-                @click="submit(2)">提交修改</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <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-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="企业简称"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <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"
-                       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="营业执照">
-              <UploadImg :visible="visible"
-                         :imgList="attachmentImgList"
-                         @upload="attachmentUpload" />
-            </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>
+                @click="submit(2)"
+            >提交修改</a-button>
         </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="请输入姓名" />
-            </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="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="cardbackphotourl">
-              <UploadImg :visible="visible"
-                         :imgList="cardfrontImgList"
-                         @upload="cardfrontUpload" />
-            </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">
-              <UploadImg :visible="visible"
-                         :imgList="cardbackImgList"
-                         @upload="cardbackUpload" />
-            </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"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </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>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <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-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称" name="customername">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.customername"
+                                style="width: 200px"
+                                placeholder="请输入企业名称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="企业简称" name="nickname">
+                            <a-input
+                                class="dialogInput"
+                                style="width: 200px"
+                                v-model:value="formState.nickname"
+                                placeholder="请输入企业简称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <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"
+                                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="营业执照">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="attachmentImgList"
+                                @upload="attachmentUpload"
+                            />
+                        </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="请输入姓名"
+                            />
+                        </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="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="cardbackphotourl">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="cardfrontImgList"
+                                @upload="cardfrontUpload"
+                            />
+                        </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">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="cardbackImgList"
+                                @upload="cardbackUpload"
+                            />
+                        </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"
+                            v-model:value="formState.provinceid"
+                            @change="getCityList"
+                            placeholder="请选择省"
+                        >
+                            <a-select-option
+                                v-for="item in provinceList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            style="width: 205px"
+                            v-model:value="formState.cityid"
+                            @change="getDistrictList"
+                            placeholder="请选择市"
+                        >
+                            <a-select-option
+                                v-for="item in cityList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            v-model:value="formState.districtid"
+                            style="width: 205px"
+                            placeholder="请选择县(区)"
+                        >
+                            <a-select-option
+                                v-for="item in districtList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</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>
 </template>
 
 <script lang="ts">
@@ -420,8 +443,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {

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

@@ -1,281 +1,305 @@
 <template>
-  <!-- 新增现货品种 -->
-  <a-modal class="commonModal addSpotVariety"
-           wrapClassName=""
-           title="新增现货品种"
-           v-model:visible="visible"
-           @cancel="closeAction"
-           centered
-           :maskClosable="false"
-           width="850px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种名称"
-                         name="deliverygoodsname">
-              <a-input class="dialogInput"
-                       v-model:value="formState.deliverygoodsname"
-                       style="width: 200px"
-                       placeholder="请输入现货品种名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种代码"
-                         name="deliverygoodscode">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.deliverygoodscode"
-                       placeholder="请输入现货品种代码" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="单位"
-                         name="unitid">
-              <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"
-                                 :key="item.enumitemname">
-                  {{item.enumdicname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="remark">
-              <a-input class="dialogInput"
-                       v-model:value="formState.remark"
-                       style="width: 588px"
-                       placeholder="请输入备注" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>商品信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              商品
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              标仓系数
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.gldwrstandards"
-                    :key="domain.index + 'domain'">
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index, 'wrstandardname', ]"
-                           :rules="rules.gldwrstandards.wrstandardname">
-                <a-input class="dialogInput"
-                         v-model:value="domain.wrstandardname"
-                         placeholder="请输入商品"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index,'unitid' ]"
-                           :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"
-                                   :key="item.enumitemname">
-                    {{item.enumdicname}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index,'convertfactor']"
-                           :rules="rules.gldwrstandards.convertfactor">
-                <a-input class="dialogInput"
-                         v-model:value="domain.convertfactor"
-                         type="number"
-                         placeholder="请输入标仓系数"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6"
-                   class="tc">
-              <a-button class="plusBtn"
-                        @click="deleteOne('gldwrstandards', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('gldwrstandards')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>品牌信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle dialogRowTitle2">
-          <a-col :span="12">
-            <span>
-              <span class="red">*</span>
-              品牌
-            </span>
-          </a-col>
-          <a-col :span="12">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.glddgfactoryItems"
-                    :key="domain.index + 'domain'">
-            <a-col :span="12">
-              <a-form-item :name="['glddgfactoryItems',index,'dgfactoryitemvalue']"
-                           :rules="rules.glddgfactoryItems.dgfactoryitemvalue">
-                <a-input class="dialogInput"
-                         v-model:value="domain.dgfactoryitemvalue"
-                         placeholder="请输入品牌"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-button class="plusBtn"
-                        @click="deleteOne('glddgfactoryItems', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('glddgfactoryItems')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>套保品种信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              套保品种
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              套保系数
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.wrsconvertdetails"
-                    :key="domain.index + 'domain'">
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails',index,'middlegoodsid']"
-                           :rules="rules.wrsconvertdetails.middlegoodsid">
-                <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"
-                                   :key="item.goodsgroupid">
-                    {{item.goodsgroupname}}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails', index, 'unitidName']">
-                <a-input class="dialogInput"
-                         readonly
-                         v-model:value="domain.unitidName"
-                         placeholder="选择套保品种后自动填入"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails', index, 'convertratio']"
-                           :rules="rules.wrsconvertdetails.convertratio">
-                <a-input class="dialogInput"
-                         v-model:value="domain.convertratio"
-                         type="number"
-                         placeholder="请输入套保系数"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6"
-                   class="tc">
-              <a-button class="plusBtn"
-                        @click="deleteOne('wrsconvertdetails', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('wrsconvertdetails')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 新增现货品种 -->
+    <a-modal
+        class="commonModal addSpotVariety"
+        wrapClassName
+        title="新增现货品种"
+        v-model:visible="visible"
+        @cancel="closeAction"
+        centered
+        :maskClosable="false"
+        width="850px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="现货品种名称" name="deliverygoodsname">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.deliverygoodsname"
+                                style="width: 200px"
+                                placeholder="请输入现货品种名称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种代码" name="deliverygoodscode">
+                            <a-input
+                                class="dialogInput"
+                                style="width: 200px"
+                                v-model:value="formState.deliverygoodscode"
+                                placeholder="请输入现货品种代码"
+                            />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="单位" name="unitid">
+                            <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"
+                                    :key="item.enumitemname"
+                                >{{item.enumdicname}}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="remark">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.remark"
+                                style="width: 588px"
+                                placeholder="请输入备注"
+                            />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>商品信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            商品
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            单位
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            标仓系数
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.gldwrstandards"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index, 'wrstandardname', ]"
+                                :rules="rules.gldwrstandards.wrstandardname"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.wrstandardname"
+                                    placeholder="请输入商品"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index,'unitid' ]"
+                                :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"
+                                        :key="item.enumitemname"
+                                    >{{item.enumdicname}}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index,'convertfactor']"
+                                :rules="rules.gldwrstandards.convertfactor"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.convertfactor"
+                                    type="number"
+                                    placeholder="请输入标仓系数"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6" class="tc">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('gldwrstandards', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('gldwrstandards')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>品牌信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle dialogRowTitle2">
+                    <a-col :span="12">
+                        <span>
+                            <span class="red">*</span>
+                            品牌
+                        </span>
+                    </a-col>
+                    <a-col :span="12">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.glddgfactoryItems"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="12">
+                            <a-form-item
+                                :name="['glddgfactoryItems',index,'dgfactoryitemvalue']"
+                                :rules="rules.glddgfactoryItems.dgfactoryitemvalue"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.dgfactoryitemvalue"
+                                    placeholder="请输入品牌"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('glddgfactoryItems', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('glddgfactoryItems')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>套保品种信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            套保品种
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            单位
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            套保系数
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.wrsconvertdetails"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['wrsconvertdetails',index,'middlegoodsid']"
+                                :rules="rules.wrsconvertdetails.middlegoodsid"
+                            >
+                                <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"
+                                        :key="item.goodsgroupid"
+                                    >{{item.goodsgroupname}}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item :name="['wrsconvertdetails', index, 'unitidName']">
+                                <a-input
+                                    class="dialogInput"
+                                    readonly
+                                    v-model:value="domain.unitidName"
+                                    placeholder="选择套保品种后自动填入"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['wrsconvertdetails', index, 'convertratio']"
+                                :rules="rules.wrsconvertdetails.convertratio"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.convertratio"
+                                    type="number"
+                                    placeholder="请输入套保系数"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6" class="tc">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('wrsconvertdetails', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('wrsconvertdetails')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -437,8 +461,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {
@@ -468,9 +492,9 @@ export default defineComponent({
         }
         &:hover,
         &:focus {
-            background: rgba(@m-blue0, 0.8);
+            background: @m-blue0-hover;
             .anticon {
-                color: rgba(@m-white0, 0.8);
+                color: @m-white0-hover;
             }
         }
     }

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

@@ -1,71 +1,71 @@
 <template>
-  <!-- 修改套保品种 -->
-  <a-modal class="commonModal fieldsetForm modify-custom"
-           title="修改套保品种"
-           v-if="visible"
-           v-model:visible="visible"
-           :loading="loading"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-spin :spinning="loading">
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
-        <fieldset class="formFieldSet">
-          <legend>基本信息</legend>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="套保品种名称">
-                <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="单位">
-                <span class="white">{{getGoodsUnitEnumItemName(selctedMG.mg.goodsunitid)}}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="当前套保比例">
-                <span class="white">{{(selctedMG.mg.needhedgeratio * 100).toFixed(2)}}%</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="修改后套保比例"
-                           name="needhedgeratio"
-                           class="relative">
-                <a-input-number class="dialogInput"
-                                style="width: 200px"
-                                type="number"
-                                :min="0"
-                                placeholder="请输入套保比例"
-                                v-model:value="formState.needhedgeratio" />
-                <div class="backUnit">%</div>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </fieldset>
-        <fieldset class="formFieldSet">
-          <legend>其他信息</legend>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="备注">
-                <span class="white">{{selctedMG.mg.remark}}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </fieldset>
-      </a-form>
-    </a-spin>
-  </a-modal>
+    <!-- 修改套保品种 -->
+    <a-modal
+        class="commonModal fieldsetForm modify-custom"
+        title="修改套保品种"
+        v-if="visible"
+        v-model:visible="visible"
+        :loading="loading"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-spin :spinning="loading">
+            <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+                <fieldset class="formFieldSet">
+                    <legend>基本信息</legend>
+                    <a-row :gutter="24">
+                        <a-col :span="12">
+                            <a-form-item label="套保品种名称">
+                                <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="单位">
+                                <span
+                                    class="white"
+                                >{{getGoodsUnitEnumItemName(selctedMG.mg.goodsunitid)}}</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="当前套保比例">
+                                <span
+                                    class="white"
+                                >{{(selctedMG.mg.needhedgeratio * 100).toFixed(2)}}%</span>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-form-item label="修改后套保比例" name="needhedgeratio" class="relative">
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 200px"
+                                    type="number"
+                                    :min="0"
+                                    placeholder="请输入套保比例"
+                                    v-model:value="formState.needhedgeratio"
+                                />
+                                <div class="backUnit">%</div>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </fieldset>
+                <fieldset class="formFieldSet">
+                    <legend>其他信息</legend>
+                    <a-row :gutter="24">
+                        <a-col :span="24">
+                            <a-form-item label="备注">
+                                <span class="white">{{selctedMG.mg.remark}}</span>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </fieldset>
+            </a-form>
+        </a-spin>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -151,8 +151,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {

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

@@ -1,282 +1,305 @@
 <template>
-  <!-- 修改现货品种 -->
-  <a-modal class="commonModal addSpotVariety"
-           title="修改现货品种"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成
-      </a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种名称"
-                         name="deliverygoodsname">
-              <a-input class="dialogInput"
-                       v-model:value="formState.deliverygoodsname"
-                       style="width: 200px"
-                       placeholder="请输入现货品种名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种代码"
-                         name="deliverygoodscode">
-              <a-input class="dialogInput"
-                       readonly
-                       style="width: 200px"
-                       v-model:value="formState.deliverygoodscode"
-                       placeholder="请输入现货品种代码" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="单位"
-                         name="unitid">
-              <a-select class="inlineFormSelect"
-                        style="width: 200px"
-                        v-model:value="formState.unitid"
-                        placeholder="请选择单位">
-                <a-select-option v-for="item in unitList"
-                                 :value="item.enumitemname"
-                                 :key="item.autoid">
-                  {{ item.enumdicname }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="remark">
-              <a-input class="dialogInput"
-                       v-model:value="formState.remark"
-                       style="width: 588px"
-                       placeholder="请输入备注" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>商品信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              商品
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              标仓系数
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.gldwrstandards"
-                    :key="domain.index + 'domain'">
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index, 'wrstandardname', ]"
-                           :rules="rules.gldwrstandards.wrstandardname">
-                <a-input class="dialogInput"
-                         v-model:value="domain.wrstandardname"
-                         placeholder="请输入商品"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index,'unitid' ]"
-                           :rules="rules.gldwrstandards.unitid">
-                <a-select class="inlineFormSelect"
-                          v-model:value="domain.unitid"
-                          placeholder="请选择单位">
-                  <a-select-option v-for="item in unitList"
-                                   :value="item.enumitemname"
-                                   :key="item.autoid">
-                    {{ item.enumdicname }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['gldwrstandards',index,'convertfactor']"
-                           :rules="rules.gldwrstandards.convertfactor">
-                <a-input-number class="dialogInput"
+    <!-- 修改现货品种 -->
+    <a-modal
+        class="commonModal addSpotVariety"
+        title="修改现货品种"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="现货品种名称" name="deliverygoodsname">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.deliverygoodsname"
                                 style="width: 200px"
-                                :min="0"
-                                v-model:value="domain.convertfactor"
-                                placeholder="请输入标仓系数"></a-input-number>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6"
-                   class="tc">
-              <a-button class="plusBtn"
-                        @click="deleteOne('gldwrstandards', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('gldwrstandards')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>品牌信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle dialogRowTitle2">
-          <a-col :span="12">
-            <span>
-              <span class="red">*</span>
-              品牌
-            </span>
-          </a-col>
-          <a-col :span="12">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.glddgfactoryItems"
-                    :key="domain.index + 'domain'">
-            <a-col :span="12">
-              <a-form-item :name="['glddgfactoryItems',index,'dgfactoryitemvalue']"
-                           :rules="rules.glddgfactoryItems.dgfactoryitemvalue">
-                <a-input class="dialogInput"
-                         v-model:value="domain.dgfactoryitemvalue"
-                         placeholder="请输入品牌"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-button class="plusBtn"
-                        @click="deleteOne('glddgfactoryItems', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('glddgfactoryItems')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>套保品种信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              套保品种
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              <span class="red">*</span>
-              套保系数
-            </span>
-          </a-col>
-          <a-col :span="6">
-            <span>
-              操作
-            </span>
-          </a-col>
-          <template v-for="(domain, index) in formState.wrsconvertdetails"
-                    :key="domain.index + 'domain'">
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails',index,'middlegoodsid']"
-                           :rules="rules.wrsconvertdetails.middlegoodsid">
-                <a-select class="inlineFormSelect"
-                          @change="middleChange(domain.middlegoodsid, domain)"
-                          v-model:value="domain.middlegoodsid"
-                          placeholder="请选择套保品种">
-                  <a-select-option v-for="item in goodsGroup"
-                                   :value="item.goodsgroupid"
-                                   :key="item.goodsgroupid">
-                    {{ item.goodsgroupname }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails', index, 'unitidName']">
-                <a-input class="dialogInput"
-                         readonly
-                         v-model:value="domain.unitidName"
-                         placeholder="选择套保品种后自动填入"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item :name="['wrsconvertdetails', index, 'convertratio']"
-                           :rules="rules.wrsconvertdetails.convertratio">
-                <a-input-number class="dialogInput"
+                                placeholder="请输入现货品种名称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种代码" name="deliverygoodscode">
+                            <a-input
+                                class="dialogInput"
+                                readonly
                                 style="width: 200px"
-                                :min="0"
-                                v-model:value="domain.convertratio"
-                                placeholder="请输入套保系数"></a-input-number>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6"
-                   class="tc">
-              <a-button class="plusBtn"
-                        @click="deleteOne('wrsconvertdetails', index)"
-                        v-if="index > 0">
-                <template #icon>
-                  <MinusOutlined />
-                </template>
-              </a-button>
-              <a-button class="minusBtn"
-                        @click="addOne('wrsconvertdetails')">
-                <template #icon>
-                  <PlusOutlined />
-                </template>
-              </a-button>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+                                v-model:value="formState.deliverygoodscode"
+                                placeholder="请输入现货品种代码"
+                            />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="单位" name="unitid">
+                            <a-select
+                                class="inlineFormSelect"
+                                style="width: 200px"
+                                v-model:value="formState.unitid"
+                                placeholder="请选择单位"
+                            >
+                                <a-select-option
+                                    v-for="item in unitList"
+                                    :value="item.enumitemname"
+                                    :key="item.autoid"
+                                >{{ item.enumdicname }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="remark">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.remark"
+                                style="width: 588px"
+                                placeholder="请输入备注"
+                            />
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>商品信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            商品
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            单位
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            标仓系数
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.gldwrstandards"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index, 'wrstandardname', ]"
+                                :rules="rules.gldwrstandards.wrstandardname"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.wrstandardname"
+                                    placeholder="请输入商品"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index,'unitid' ]"
+                                :rules="rules.gldwrstandards.unitid"
+                            >
+                                <a-select
+                                    class="inlineFormSelect"
+                                    v-model:value="domain.unitid"
+                                    placeholder="请选择单位"
+                                >
+                                    <a-select-option
+                                        v-for="item in unitList"
+                                        :value="item.enumitemname"
+                                        :key="item.autoid"
+                                    >{{ item.enumdicname }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['gldwrstandards',index,'convertfactor']"
+                                :rules="rules.gldwrstandards.convertfactor"
+                            >
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 200px"
+                                    :min="0"
+                                    v-model:value="domain.convertfactor"
+                                    placeholder="请输入标仓系数"
+                                ></a-input-number>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6" class="tc">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('gldwrstandards', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('gldwrstandards')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>品牌信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle dialogRowTitle2">
+                    <a-col :span="12">
+                        <span>
+                            <span class="red">*</span>
+                            品牌
+                        </span>
+                    </a-col>
+                    <a-col :span="12">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.glddgfactoryItems"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="12">
+                            <a-form-item
+                                :name="['glddgfactoryItems',index,'dgfactoryitemvalue']"
+                                :rules="rules.glddgfactoryItems.dgfactoryitemvalue"
+                            >
+                                <a-input
+                                    class="dialogInput"
+                                    v-model:value="domain.dgfactoryitemvalue"
+                                    placeholder="请输入品牌"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="12">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('glddgfactoryItems', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('glddgfactoryItems')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>套保品种信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            套保品种
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            单位
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>
+                            <span class="red">*</span>
+                            套保系数
+                        </span>
+                    </a-col>
+                    <a-col :span="6">
+                        <span>操作</span>
+                    </a-col>
+                    <template
+                        v-for="(domain, index) in formState.wrsconvertdetails"
+                        :key="domain.index + 'domain'"
+                    >
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['wrsconvertdetails',index,'middlegoodsid']"
+                                :rules="rules.wrsconvertdetails.middlegoodsid"
+                            >
+                                <a-select
+                                    class="inlineFormSelect"
+                                    @change="middleChange(domain.middlegoodsid, domain)"
+                                    v-model:value="domain.middlegoodsid"
+                                    placeholder="请选择套保品种"
+                                >
+                                    <a-select-option
+                                        v-for="item in goodsGroup"
+                                        :value="item.goodsgroupid"
+                                        :key="item.goodsgroupid"
+                                    >{{ item.goodsgroupname }}</a-select-option>
+                                </a-select>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item :name="['wrsconvertdetails', index, 'unitidName']">
+                                <a-input
+                                    class="dialogInput"
+                                    readonly
+                                    v-model:value="domain.unitidName"
+                                    placeholder="选择套保品种后自动填入"
+                                ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6">
+                            <a-form-item
+                                :name="['wrsconvertdetails', index, 'convertratio']"
+                                :rules="rules.wrsconvertdetails.convertratio"
+                            >
+                                <a-input-number
+                                    class="dialogInput"
+                                    style="width: 200px"
+                                    :min="0"
+                                    v-model:value="domain.convertratio"
+                                    placeholder="请输入套保系数"
+                                ></a-input-number>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="6" class="tc">
+                            <a-button
+                                class="plusBtn"
+                                @click="deleteOne('wrsconvertdetails', index)"
+                                v-if="index > 0"
+                            >
+                                <template #icon>
+                                    <MinusOutlined />
+                                </template>
+                            </a-button>
+                            <a-button class="minusBtn" @click="addOne('wrsconvertdetails')">
+                                <template #icon>
+                                    <PlusOutlined />
+                                </template>
+                            </a-button>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -484,8 +507,8 @@ export default defineComponent({
             .rounded-corners(3px);
 
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
 
@@ -520,10 +543,10 @@ export default defineComponent({
 
         &:hover,
         &:focus {
-            background: rgba(@m-blue0, 0.8);
+            background: @m-blue0-hover;
 
             .anticon {
-                color: rgba(@m-white0, 0.8);
+                color: @m-white0-hover;
             }
         }
     }

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

@@ -1,151 +1,122 @@
 <template>
-  <!-- 现货品种详情 -->
-  <a-modal class="commonModal spot-detail"
-           title="详情"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成
-      </a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种名称"
-                         name="deliverygoodsname">
-              <span class="white">{{ formatValue(selectedRow.data.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="现货品种代码"
-                         name="deliverygoodscode">
-              <span class="white">{{ formatValue(selectedRow.data.deliverygoodscode) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="单位"
-                         name="unitid">
-              <span class="white">{{ formatValue(selectedRow.data.enumdicname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="状态"
-                         name="unitid">
-              <span class="green">{{ getValidName(selectedRow.data.isvalid) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注"
-                         name="remark">
-              <span class="white">{{ formatValue(selectedRow.data.remark) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>商品信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="8">
-            <span>
-              商品
-            </span>
-          </a-col>
-          <a-col :span="8">
-            <span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="8">
-            <span>
-              标仓系数
-            </span>
-          </a-col>
-          <template v-for="item in selectedRow.gmlist"
-                    :key="item.wrstandardid">
-            <a-col :span="8"
-                   class="bt1">
-              <div class="white">{{ item.wrstandardname }}</div>
-            </a-col>
-            <a-col :span="8">
-              <div class="white">{{ item.enumdicname }}</div>
-            </a-col>
-            <a-col :span="8">
-              <div class="white">{{ item.convertfactor }}</div>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>品牌信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle dialogRowTitle2">
-          <a-col :span="24">
-            <span>
-              品牌
-            </span>
-          </a-col>
-          <template v-for="item in selectedRow.gblist"
-                    :key="item.brandid">
-            <a-col :span="24"
-                   class="bt1">
-              <div class="white">{{ item.brandname }}</div>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>套保品种信息</legend>
-        <a-row :gutter="24"
-               class="dialogRowTitle">
-          <a-col :span="8">
-            <span>
-              套保品种
-            </span>
-          </a-col>
-          <a-col :span="8">
-            <span>
-              单位
-            </span>
-          </a-col>
-          <a-col :span="8">
-            <span>
-              套保系数
-            </span>
-          </a-col>
-          <template v-for="item in selectedRow.mgList"
-                    :key="item.mg.middlegoodsid">
-            <a-col :span="8"
-                   class="bt1">
-              <div class="white">{{ item.mg.middlegoodsname }}</div>
-            </a-col>
-            <a-col :span="8">
-              <div class="white">{{ item.mg.enumdicname }}</div>
-            </a-col>
-            <a-col :span="8">
-              <div class="white">{{ item.mg.needhedgeratio }}</div>
-            </a-col>
-          </template>
-        </a-row>
-      </fieldset>
-    </a-form>
-  </a-modal>
+    <!-- 现货品种详情 -->
+    <a-modal
+        class="commonModal spot-detail"
+        title="详情"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <fieldset class="formFieldSet">
+                <legend>基本信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="现货品种名称" name="deliverygoodsname">
+                            <span
+                                class="white"
+                            >{{ formatValue(selectedRow.data.deliverygoodsname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="现货品种代码" name="deliverygoodscode">
+                            <span
+                                class="white"
+                            >{{ formatValue(selectedRow.data.deliverygoodscode) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="单位" name="unitid">
+                            <span class="white">{{ formatValue(selectedRow.data.enumdicname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="状态" name="unitid">
+                            <span class="green">{{ getValidName(selectedRow.data.isvalid) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="24">
+                        <a-form-item label="备注" name="remark">
+                            <span class="white">{{ formatValue(selectedRow.data.remark) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>商品信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="8">
+                        <span>商品</span>
+                    </a-col>
+                    <a-col :span="8">
+                        <span>单位</span>
+                    </a-col>
+                    <a-col :span="8">
+                        <span>标仓系数</span>
+                    </a-col>
+                    <template v-for="item in selectedRow.gmlist" :key="item.wrstandardid">
+                        <a-col :span="8" class="bt1">
+                            <div class="white">{{ item.wrstandardname }}</div>
+                        </a-col>
+                        <a-col :span="8">
+                            <div class="white">{{ item.enumdicname }}</div>
+                        </a-col>
+                        <a-col :span="8">
+                            <div class="white">{{ item.convertfactor }}</div>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>品牌信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle dialogRowTitle2">
+                    <a-col :span="24">
+                        <span>品牌</span>
+                    </a-col>
+                    <template v-for="item in selectedRow.gblist" :key="item.brandid">
+                        <a-col :span="24" class="bt1">
+                            <div class="white">{{ item.brandname }}</div>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>套保品种信息</legend>
+                <a-row :gutter="24" class="dialogRowTitle">
+                    <a-col :span="8">
+                        <span>套保品种</span>
+                    </a-col>
+                    <a-col :span="8">
+                        <span>单位</span>
+                    </a-col>
+                    <a-col :span="8">
+                        <span>套保系数</span>
+                    </a-col>
+                    <template v-for="item in selectedRow.mgList" :key="item.mg.middlegoodsid">
+                        <a-col :span="8" class="bt1">
+                            <div class="white">{{ item.mg.middlegoodsname }}</div>
+                        </a-col>
+                        <a-col :span="8">
+                            <div class="white">{{ item.mg.enumdicname }}</div>
+                        </a-col>
+                        <a-col :span="8">
+                            <div class="white">{{ item.mg.needhedgeratio }}</div>
+                        </a-col>
+                    </template>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -208,8 +179,8 @@ export default defineComponent({
             .rounded-corners(3px);
 
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
 

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

@@ -1,134 +1,139 @@
 <template>
-  <!-- 新增仓库信息 -->
-  <a-modal class="add-warehouse commonModal"
-           title="新增仓库信息"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="仓库类型"
-                       name="warehousetype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.warehousetype"
-                      placeholder="请选择仓库类型">
-              <a-select-option v-for="item in warehouseType"
-                               :key="item.enumitemname"
-                               :value="item.enumitemname">
-                {{item.enumdicname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="仓库名称"
-                       name="warehousename">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.warehousename"
-                     placeholder="请输入仓库名称" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="仓库简称"
-                       name="warehousecode">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.warehousecode"
-                     placeholder="请输入仓库简称" />
-          </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-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="联系电话"
-                       name="contactnum">
-            <a-input class="dialogInput"
-                     style="width: 200px"
-                     v-model:value="formState.contactnum"
-                     placeholder="请输入联系电话" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="所在地区">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="详细地址"
-                       name="address">
-            <a-input class="dialogInput"
-                     v-model:value="formState.address"
-                     style="width: 635px"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+    <!-- 新增仓库信息 -->
+    <a-modal
+        class="add-warehouse commonModal"
+        title="新增仓库信息"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="cancel">取消</a-button>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="仓库类型" name="warehousetype">
+                        <a-select
+                            class="typeSelect"
+                            style="width: 200px"
+                            v-model:value="formState.warehousetype"
+                            placeholder="请选择仓库类型"
+                        >
+                            <a-select-option
+                                v-for="item in warehouseType"
+                                :key="item.enumitemname"
+                                :value="item.enumitemname"
+                            >{{item.enumdicname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="仓库名称" name="warehousename">
+                        <a-input
+                            class="dialogInput"
+                            style="width: 200px"
+                            v-model:value="formState.warehousename"
+                            placeholder="请输入仓库名称"
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="仓库简称" name="warehousecode">
+                        <a-input
+                            class="dialogInput"
+                            style="width: 200px"
+                            v-model:value="formState.warehousecode"
+                            placeholder="请输入仓库简称"
+                        />
+                    </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-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="联系电话" name="contactnum">
+                        <a-input
+                            class="dialogInput"
+                            style="width: 200px"
+                            v-model:value="formState.contactnum"
+                            placeholder="请输入联系电话"
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="所在地区">
+                        <a-select
+                            class="inlineFormSelect"
+                            style="width: 205px"
+                            v-model:value="formState.provinceid"
+                            @change="getCityList"
+                            placeholder="请选择省"
+                        >
+                            <a-select-option
+                                v-for="item in provinceList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{item.divisionname}}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            style="width: 205px"
+                            v-model:value="formState.cityid"
+                            @change="getDistrictList"
+                            placeholder="请选择市"
+                        >
+                            <a-select-option
+                                v-for="item in cityList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{item.divisionname}}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            v-model:value="formState.districtid"
+                            style="width: 205px"
+                            placeholder="请选择县(区)"
+                        >
+                            <a-select-option
+                                v-for="item in districtList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{item.divisionname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="详细地址" name="address">
+                        <a-input
+                            class="dialogInput"
+                            v-model:value="formState.address"
+                            style="width: 635px"
+                            placeholder="请输入详细地址"
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -217,8 +222,8 @@ export default defineComponent({
         color: @m-white0;
         .rounded-corners(3px);
         &:hover {
-            background: rgba(@m-blue0, 0);
-            color: rgba(@m-white0, 0.8);
+            background: @m-blue0-hover;
+            color: @m-white0-hover;
         }
     }
     .look {

src/views/market/spot_trade/components/buy-sell-market/components/delisting/index.vue

@@ -295,8 +295,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/index.vue

@@ -341,8 +341,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -227,14 +227,5 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-// .buy-sell-market {
-//     .ant-row.buySellHall {
-//         .ant-col:first-child {
-//             background: rgba(@m-green0, 0.1);
-//         }
-//         .ant-col:last-child {
-//             background: rgba(@m-red1, 0.1);
-//         }
-//     }
-// }
+
 </style>

src/views/market/spot_trade/components/detail/index.vue

@@ -1,27 +1,35 @@
 <template>
-    <!-- 买卖大厅详情 -->
-    <Drawer :title="'详情'" :placement="'right'" :visible="visible" class="top" @cancel="cancel">
-        <div class="detailCont">
-            <div class="rows">
-                <div class="row" v-for="item in lstitem" :key="item.name">
-                    <div class="left">{{item.name}}</div>
-                    <div class="right">{{item.value}}</div>
-                </div>
-            </div>
-            <div class="ruleTitle">履约规则：</div>
-            <div class="rulesCont">
-                <a-row>
-                    <a-col :span="12" v-for="item in lststep" :key="item.autoid">
-                        <div class="line">
-                            <div class="no">{{item.autoid}}</div>
-                            <div class="name">{{item.steptypename}}</div>
-                            <div class="time">T+{{item.stepvalue}}</div>
-                        </div>
-                    </a-col>
-                </a-row>
-            </div>
+  <!-- 买卖大厅详情 -->
+  <Drawer :title="'详情'"
+          :placement="'right'"
+          :visible="visible"
+          class="top"
+          @cancel="cancel">
+    <div class="detailCont">
+      <div class="rows">
+        <div class="row"
+             v-for="item in lstitem"
+             :key="item.name">
+          <div class="left">{{item.name}}</div>
+          <div class="right">{{item.value}}</div>
         </div>
-    </Drawer>
+      </div>
+      <div class="ruleTitle">履约规则：</div>
+      <div class="rulesCont">
+        <a-row>
+          <a-col :span="24"
+                 v-for="(item, index) in lststep"
+                 :key="item.autoid">
+            <div class="line">
+              <div class="no">{{index + 1}}</div>
+              <div class="name">{{item.steptypename}}</div>
+              <div class="time">{{item.stepdate}}</div>
+            </div>
+          </a-col>
+        </a-row>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -163,11 +171,11 @@ export default defineComponent({
             margin-right: 8px;
         }
     }
-    .ant-col:nth-child(even) {
-        padding-left: 10px !important;
-    }
-    .ant-col:nth-child(odd) {
-        padding-right: 10px !important;
-    }
+    // .ant-col:nth-child(even) {
+    //     padding-left: 10px !important;
+    // }
+    // .ant-col:nth-child(odd) {
+    //     padding-right: 10px !important;
+    // }
 }
 </style>

src/views/market/spot_trade/components/post_buying/index.vue

@@ -48,7 +48,7 @@
                    v-if="isFloat()">
               <a-form-item label="估算价"
                            name="PriceMove">
-                <span>估算价估算价</span>
+                <span class="white">{{getPrice()}}</span>
               </a-form-item>
             </a-col>
 
@@ -76,12 +76,12 @@
             <a-col :span="24"
                    class="mt-10">
               <a-form-item>
-                <a-slider ::min="0"
+                <a-slider :min="0"
                           v-model:value="formState.OrderQty"
-                          :max="99999999"
+                          :max="getMaxNum()"
                           class="formSlider" />
                 <div class="unit">
-                  <span>{{selectedRow.minivalue}}</span>
+                  <span>{{getMaxNum() ? selectedRow.minivalue : 0}}</span>
                   <span>{{getMaxNum()}}{{selectedRow.enumdicname}}</span>
                 </div>
               </a-form-item>
@@ -149,7 +149,7 @@ import Drawer from '@/common/components/drawer/index.vue';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
 import { hdWROrder } from '@/services/proto/warehousetrade';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import {DGFactoryItems, WRGoodsInfo} from '@/services/proto/warehousetrade/interface';
+import { DGFactoryItems, WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 import { getAccountTypeList, getUserId } from '@/services/bus/account';
 import { v4 as uuidv4 } from 'uuid';
 import moment, { Moment } from 'moment';
@@ -157,7 +157,7 @@ import { getMarketRunByTradeMode } from '@/services/bus/market';
 import { WrOrderQuote } from '@/services/go/wrtrade/interface';
 import { handleForm, handleNumAndPrice } from './setup';
 import { validateAction } from '@/common/setup/form';
-import {FormParam, TempWrOrderQuoteDetail} from './interface';
+import { FormParam, TempWrOrderQuoteDetail } from './interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleIs } from '../buy-sell-market/setup';
 import { BuyOrSell } from '@/common/constants/enumCommon';
@@ -195,12 +195,11 @@ export default defineComponent({
         }
         formState.DeliveryMonth = props.selectedRow.deliverymonth ? moment(props.selectedRow.deliverymonth) : props.time;
 
-        const { getMaxNum, getMoney, getMargin } = handleNumAndPrice(props.enumName, props.selectedRow);
+        const { getMaxNum, getMoney, getMargin, getPrice } = handleNumAndPrice(props.enumName, props.selectedRow);
         function submit() {
             const marketInfo = getMarketRunByTradeMode(17);
             if (marketInfo) {
                 validateAction<FormParam>(formRef, formState).then((res) => {
-
                     // 现在增加一种挂牌求购的情况
                     // 这种求购模式会生成一种仓单贸易商品
 
@@ -253,15 +252,14 @@ export default defineComponent({
                         HasWr: isWR(), // 无仓单挂牌  是否有无仓单
                         DeliveryMonth: isWR() ? '' : moment(res.DeliveryMonth).format('YYYY-MM'),
                         FactoryItems: props.selectedRow.wrResult.flatMap((it) => {
-                                return {
-                                    DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
-                                    DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
-                                    ItemTypeMode: 1, // uint32 要素项类型模式
-                                }
-                            }
-                        ) // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
+                            return {
+                                DGFactoryItemTypeID: it.dgfactoryitemtypeid, // uint64 要素项类型ID
+                                DGFactoryItemID: it.dgfactoryitemid, // uint64 预约要素项类型值
+                                ItemTypeMode: 1, // uint32 要素项类型模式
+                            };
+                        }), // DGFactoryItems 要素类型明细集合(没有仓单要素ID填写)
                     };
-                    debugger
+                    debugger;
                     requestResultLoadingAndInfo(hdWROrder, param, loading, ['求购成功', '求购失败:']).then(() => {
                         cancel(true);
                     });
@@ -283,6 +281,7 @@ export default defineComponent({
             getMargin,
             getSelectedAccount,
             getCanUseMoney,
+            getPrice,
         };
     },
 });
@@ -313,8 +312,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/market/spot_trade/components/post_buying/setup.ts

@@ -43,9 +43,21 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
     function getMaxNum() {
         // 可用资金
         const canUseMoney = Number(getCanUseMoney(getSelectedAccount() as AccountListItem))
+        const { buymarginvalue } = rules[0]
         // 挂牌最大数量=可用资金/(买方履约保证金比例*挂牌价格)
-        const margin = marginMethod() ? (buymarginvalue * formState.FixedPrice) : (buymarginvalue + formState.FixedPrice)
-        return Math.floor(canUseMoney / margin)
+        let result = 0
+        if (isFloat()) {
+            const price = getPrice()
+            if (price !== '--') {
+                result = canUseMoney / (Number(price) * buymarginvalue)
+            }
+        } else {
+            const margin = marginMethod() ? (buymarginvalue * formState.FixedPrice) : (buymarginvalue + formState.FixedPrice)
+            if (margin) {
+                result = Math.floor(canUseMoney / margin)
+            }
+        }
+        return +result.toFixed(0)
     }
     //  摘牌金额
     function getMoney() {
@@ -72,5 +84,13 @@ export function handleNumAndPrice(enumName: EnumRouterName, selectedRow: WrOrder
         const margin = marginMethod() ? (buymarginvalue * getMoney()) : (buymarginvalue + getMoney())
         return Number((margin).toFixed(2))
     }
-    return { getMaxNum, getMoney, getMargin }
+    function getPrice() {
+        let result = '--'
+        const goodsPrice = getGoodsPrice()
+        if (goodsPrice.value && goodsPrice.value !== '--') {   // 有实时行情价格
+            result = ((goodsPrice.value as number) + formState.PriceMove).toFixed(2)
+        }
+        return result
+    }
+    return { getMaxNum, getMoney, getMargin, getPrice }
 }

src/views/market/warehouseTrade/components/delisting/index.vue

@@ -133,8 +133,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/market/warehouseTrade/components/listed/index.vue

@@ -133,8 +133,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/market/warehouseTrade/index.vue

@@ -129,7 +129,7 @@ export default defineComponent({
         cursor: pointer;
         .position(absolute, 8px, 14px, auto, auto);
         &:hover {
-            color: rgba(@m-blue0, 0.8);
+            color: @m-blue0-hover;
         }
     }
     .topBar {

src/views/order/performance_information/components/components/breach_contract/index.vue

@@ -36,14 +36,14 @@
                 <span class="white">{{selectedRow.relatedorderid}}</span>
               </a-form-item>
             </a-col>
-<!--            <a-col :span="24">-->
-<!--              <a-form-item label="附件"-->
-<!--                           name="url">-->
-<!--                <UploadImg :visible="visible"-->
-<!--                           :imgList="uploadImgList"-->
-<!--                           @upload="uploadImgAction" />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="24">-->
+            <!--              <a-form-item label="附件"-->
+            <!--                           name="url">-->
+            <!--                <UploadImg :visible="visible"-->
+            <!--                           :imgList="uploadImgList"-->
+            <!--                           @upload="uploadImgAction" />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="24">
               <a-form-item label="备注"
                            name="remark">
@@ -82,13 +82,13 @@ import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
 import UploadImg from '@/common/components/uploadImg/index.vue';
 import { getUploadImg } from '@/common/setup/upload';
-import {PerformanceContractedApplyReq, PerformanceDelayApplyReq} from '@/services/proto/performance/interface';
-import {getSelectedAccount, getSelectedAccountId, getUserId} from '@/services/bus/account';
+import { PerformanceContractedApplyReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
+import { getSelectedAccount, getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceContractedApply, performanceDelayApply } from '@/services/proto/performance';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
-import Long from "long";
+import Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_breach_contract,
@@ -115,12 +115,12 @@ export default defineComponent({
                 // 违约申请
                 const paramReq: PerformanceContractedApplyReq = {
                     PerformancePlanID: Long.fromString(props.selectedRow.performanceplanid), // uint64 履约计划ID
-                    BreachType: props.selectedRow.buyaccountid === getSelectedAccountId() ? 2: 1, // uint32 违约方类型 买履约是2 卖履约是1 （刘工说是黄工说的 ）
+                    BreachType: props.selectedRow.buyaccountid === getSelectedAccountId() ? 2 : 1, // uint32 违约方类型 买履约是2 卖履约是1 （刘工说是黄工说的 ）
                     Applicant: getUserId(), // uint64 违约申请人
                     ApplyRemark: param.remark, // string 申请备注
-                    Attachment: "" // string 附件
+                    Attachment: '', // string 附件
                 };
-                requestResultLoadingAndInfo(performanceContractedApply, paramReq, loading, ['违约成功', '违约失败:']).then(() => {
+                requestResultLoadingAndInfo(performanceContractedApply, paramReq, loading, ['申请违约成功', '申请违约失败:']).then(() => {
                     cancel(true);
                 });
             });

src/views/order/performance_information/components/components/detail/index.vue

@@ -1,28 +1,33 @@
 <template>
-  <!-- 履约明细-->
-  <Drawer :title="'履约明细'"
-          :placement="'bottom'"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed">
-      <div class="condition">
-        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
-        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
-      </div>
-      <a-table class="dialogTable"
-               :columns="columns"
-               :data-source="performancePlanStepList"
-               :pagination="false">
-        <template #isauto="{ text }">
-          <span>{{text ? '是' : '否'}}</span>
-        </template>
-        <template #handlestatus="{ text }">
-          <span>{{getStatus(text)}}</span>
-        </template>
-      </a-table>
-    </div>
-  </Drawer>
+    <!-- 履约明细-->
+    <Drawer
+        :title="'履约明细'"
+        :placement="'right'"
+        class="bottomWidth"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed">
+            <div class="condition">
+                <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+                <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+            </div>
+            <a-table
+                class="dialogTable"
+                :columns="columns"
+                :data-source="performancePlanStepList"
+                :pagination="false"
+            >
+                <template #isauto="{ text }">
+                    <span>{{text ? '是' : '否'}}</span>
+                </template>
+                <template #handlestatus="{ text }">
+                    <span>{{getStatus(text)}}</span>
+                </template>
+            </a-table>
+        </div>
+    </Drawer>
 </template>
 
 <script lang="ts">

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/index.vue

@@ -71,7 +71,7 @@
                                 v-model:value="formState.DelistMinQty"
                                 style="width: 140px" />
                 <span class="input-enumdicname">{{selectedRow.enumdicname}}</span>
-                <div class="tip">最小单位：1{{selectedRow.enumdicname}}</div>
+                <div class="tip">最小单位：{{selectedRow.minivalue}}{{selectedRow.enumdicname}}</div>
               </a-form-item>
             </a-col>
           </a-row>
@@ -353,8 +353,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/components/listed/setup.ts

@@ -92,10 +92,10 @@ export function handleNumAndPrice() {
     // 履约保证金
     function getMargin() {
         if (hasRules()) {
-            const { sellmarginvalue, buymarginalgorithm } = getRules()[0]
-            // 浮动价 履约保证金=估算总额*买方履约保证金比例
-            // 一口价 履约保证金=挂牌金额*买方履约保证金比例
-            const margin = buymarginalgorithm === 1 ? getMoney() * sellmarginvalue : getMoney() + sellmarginvalue
+            const { sellmarginvalue2, sellmarginalgorithm } = getRules()[0]
+            // 浮动价 履约保证金=估算总额*卖方履约保证金比例
+            // 一口价 履约保证金=挂牌金额*卖方履约保证金比例
+            const margin = sellmarginalgorithm === 1 ? getMoney() * sellmarginvalue2 : getMoney() + sellmarginvalue2
             return Number(margin.toFixed(2))
         } else {
             return 0

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_order_summary/index.vue

@@ -13,12 +13,12 @@
              rowKey="key"
              :data-source="tableList">
       <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }" >
+      <template #expandedRowRender="{ record }">
         <BtnList :btnList="btnList"
                  class="btn-list-sticky"
                  :record="record"
-                 @click="openComponent" 
-                 v-if="record.enalbeqty > 0"/>
+                 @click="openComponent"
+                 v-if="record.enalbeqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing.vue

@@ -133,8 +133,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/order/spot_warran/components/spot_warrant_inventory_summary/components/listing/index.vue

@@ -193,8 +193,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -173,7 +173,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, PropType, ref } from 'vue';
+import { defineComponent, onBeforeUnmount, onMounted, onUnmounted, PropType, ref } from 'vue';
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryWrPositionReq, WrHoldLB, WrPosition } from '@/services/go/wrtrade/interface';
@@ -352,8 +352,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -5,7 +5,7 @@ import { getRules } from '@/services/bus/rules';
 import { Goods } from "@/services/go/ermcp/goodsInfo/interface";
 import { WrHoldLB } from "@/services/go/wrtrade/interface";
 import { RuleObject } from 'ant-design-vue/lib/form/interface';
-import { reactive, ref, UnwrapRef } from "vue";
+import { onBeforeUnmount, reactive, ref, UnwrapRef } from "vue";
 import { ListingForm } from "./interface";
 
 const formState: UnwrapRef<ListingForm> = reactive({
@@ -47,6 +47,9 @@ export function handleForm(data: WrHoldLB) {
         PriceMove: [{ required: true, message: '请输入升贴水', trigger: 'blur', type: 'number', }],
         goodsid: [{ required: true, validator: v_group, }],
     }
+    onBeforeUnmount(() => {
+        formRef.value.resetFields();
+    });
     return { rules, formState, formRef }
 }
 

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -201,8 +201,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/order/spot_warran/components/spot_warrant_spot_details/index.vue

@@ -18,7 +18,7 @@
                  :record="record"
                  class="btn-list-sticky"
                  @click="openComponent"
-                 v-if="record.enalbeqty > 0" />
+                 v-if="record.enableqty > 0" />
       </template>
     </a-table>
     <component :is="componentId"

src/views/order/spot_warran/components/spot_warrant_spot_summary/components/index.vue

@@ -72,8 +72,8 @@ export default defineComponent({
             font-size: 14px;
             color: @m-blue0;
             &:hover {
-                background: rgba(@m-black7, 0.8);
-                color: rgba(@m-blue0, 0.8);
+                background: @m-black7-hover;
+                color: @m-blue0-hover;
             }
         }
         .conditionBtn + .conditionBtn {

src/views/platinum/platinum_agreement/compoments/modify/index.vue

@@ -1,62 +1,59 @@
 <template>
-  <!-- 修改协议 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改协议"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit(2)">修改</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="协议编号">
-            <span class="white">{{formState.agreementno}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="协议名称"
-                       name="agreementname">
-            <a-input class="dialogInput"
-                     v-model:value="formState.agreementname"
-                     style="width: 200px"
-                     placeholder="请输入协议名称" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="协议类型">
-            <span class="white">{{getAgreementTypeName(formState.agreementtype)}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="签署频率"
-                       name="agreementname">
-            <span class="white">{{getRate()}}</span>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="协议内容"
-                       name="agreementcontent">
-            <a-textarea class="dialogInput"
-                        v-model:value="formState.agreementcontent"
-                        style="width: 635px"
-                        placeholder="请输入协议内容"
-                        :autosize="{ minRows: 8, maxRows: 24 }" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+    <!-- 修改协议 -->
+    <a-modal
+        class="commonModal modify-custom"
+        title="修改协议"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">修改</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="协议编号">
+                        <span class="white">{{formState.agreementno}}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="协议名称" name="agreementname">
+                        <a-input
+                            class="dialogInput"
+                            v-model:value="formState.agreementname"
+                            style="width: 200px"
+                            placeholder="请输入协议名称"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="协议类型">
+                        <span class="white">{{getAgreementTypeName(formState.agreementtype)}}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="签署频率" name="agreementname">
+                        <span class="white">{{getRate()}}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="协议内容" name="agreementcontent">
+                        <a-textarea
+                            class="dialogInput"
+                            v-model:value="formState.agreementcontent"
+                            style="width: 635px"
+                            placeholder="请输入协议内容"
+                            :autosize="{ minRows: 8, maxRows: 24 }"
+                        />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -140,8 +137,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {

src/views/platinum/platinum_customer_info/compoments/modify/index.vue

@@ -1,43 +1,40 @@
 <template>
-  <!-- 修改客户资料 -->
-  <a-modal class="commonModal modify-custom"
-           title="修改客户资料"
-           v-if="visible"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <!-- <a-button key="submit"
+    <!-- 修改客户资料 -->
+    <a-modal
+        class="commonModal modify-custom"
+        title="修改客户资料"
+        v-if="visible"
+        v-model:visible="visible"
+        centered
+        :maskClosable="false"
+        @cancel="cancel"
+        width="890px"
+    >
+        <template #footer>
+            <!-- <a-button key="submit"
                 class="cancelBtn"
                 @click="submit(1)">保存草稿
-      </a-button> -->
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit(2)">提交修改</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="24">
-          <a-form-item label="所属机构"
-                       name="areaid">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.areaid"
-                      placeholder="请选择所属机构">
-              <a-select-option v-for="item in areaList"
-                               :key="item.userid">
-                {{item.accountname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <!-- <a-col :span="12">
+            </a-button>-->
+            <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">提交修改</a-button>
+        </template>
+        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="所属机构" name="areaid">
+                        <a-select
+                            class="typeSelect"
+                            style="width: 200px"
+                            v-model:value="formState.areaid"
+                            placeholder="请选择所属机构"
+                        >
+                            <a-select-option
+                                v-for="item in areaList"
+                                :key="item.userid"
+                            >{{item.accountname}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <!-- <a-col :span="12">
           <a-form-item label="登录账号"
                        name="logincode">
             <a-input class="dialogInput"
@@ -54,243 +51,268 @@
                      style="width: 200px"
                      placeholder="请选择登录密码" />
           </a-form-item>
-        </a-col> -->
-        <a-col :span="12">
-          <a-form-item label="客户类型"
-                       name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option v-for="item in userinfotypeList"
-                               :value="item.key"
-                               :key="item.key">
-                {{item.name}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="企业简称"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <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"
-                       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="营业执照">
-              <UploadImg :visible="visible"
-                         :imgList="attachmentImgList"
-                         @upload="attachmentUpload" />
-            </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="请输入姓名" />
-            </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="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="cardbackphotourl">
-              <UploadImg :visible="visible"
-                         :imgList="cardfrontImgList"
-                         @upload="cardfrontUpload" />
-            </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">
-              <UploadImg :visible="visible"
-                         :imgList="cardbackImgList"
-                         @upload="cardbackUpload" />
-            </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"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{ item.divisionname }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="&nbsp;"
-                       name="ipaddress">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.ipaddress"
-                     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>
+                </a-col>-->
+                <a-col :span="12">
+                    <a-form-item label="客户类型" name="userinfotype">
+                        <a-select
+                            class="typeSelect"
+                            style="width: 200px"
+                            v-model:value="formState.userinfotype"
+                            placeholder="请选择客户类型"
+                        >
+                            <a-select-option
+                                v-for="item in userinfotypeList"
+                                :value="item.key"
+                                :key="item.key"
+                            >{{item.name}}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称" name="customername">
+                            <a-input
+                                class="dialogInput"
+                                v-model:value="formState.customername"
+                                style="width: 200px"
+                                placeholder="请输入企业名称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="企业简称" name="nickname">
+                            <a-input
+                                class="dialogInput"
+                                style="width: 200px"
+                                v-model:value="formState.nickname"
+                                placeholder="请输入企业简称"
+                            />
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <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"
+                                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="营业执照">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="attachmentImgList"
+                                @upload="attachmentUpload"
+                            />
+                        </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="请输入姓名"
+                            />
+                        </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="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="cardbackphotourl">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="cardfrontImgList"
+                                @upload="cardfrontUpload"
+                            />
+                        </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">
+                            <UploadImg
+                                :visible="visible"
+                                :imgList="cardbackImgList"
+                                @upload="cardbackUpload"
+                            />
+                        </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"
+                            v-model:value="formState.provinceid"
+                            @change="getCityList"
+                            placeholder="请选择省"
+                        >
+                            <a-select-option
+                                v-for="item in provinceList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            style="width: 205px"
+                            v-model:value="formState.cityid"
+                            @change="getDistrictList"
+                            placeholder="请选择市"
+                        >
+                            <a-select-option
+                                v-for="item in cityList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                        <a-select
+                            class="inlineFormSelect ml9"
+                            v-model:value="formState.districtid"
+                            style="width: 205px"
+                            placeholder="请选择县(区)"
+                        >
+                            <a-select-option
+                                v-for="item in districtList"
+                                :key="item.autoid"
+                                :value="item.autoid"
+                            >{{ item.divisionname }}</a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="&nbsp;" name="ipaddress">
+                        <a-input
+                            class="dialogInput"
+                            style="width: 635px"
+                            v-model:value="formState.ipaddress"
+                            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>
 </template>
 
 <script lang="ts">
@@ -457,8 +479,8 @@ export default defineComponent({
             color: @m-white0;
             .rounded-corners(3px);
             &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
+                background: @m-blue0-hover;
+                color: @m-white0-hover;
             }
         }
         .look {