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

src/assets/styles/mixin.less

@@ -216,7 +216,10 @@
         border-color: @m-blue10;
     }
 }
-
+.dialogTableInput {
+    border: 0;
+    margin-top: 5px;
+}
 .tableConditionInput {
     width: 140px;
     height: 30px;
@@ -910,7 +913,10 @@
         color: @m-blue0  !important;
     }
 }
-
+.dialogTableSelect.ant-select-single {
+    margin-top: 5px;
+    border: 0;
+}
 .shortSelect.ant-select-single:extend(.inlineFormSelect.ant-select-single) {
     margin-right: 0;
 
@@ -3424,11 +3430,12 @@ input:-internal-autofill-selected {
                 .name {
                     min-width: 120px;
                     height: 30px;
+                    line-height: 28px;
                     background: @m-blue28;
                     border: 1px solid @m-black37;
                     .rounded-corners(3px);
                     text-align: center;
-                    font-size: 16px;
+                    font-size: 14px;
                     color: @m-white6;
                 }
 
@@ -3439,7 +3446,7 @@ input:-internal-autofill-selected {
                     background: @m-black38;
                     .rounded-corners(5px);
                     color: @m-blue26;
-                    font-size: 14px;
+                    font-size: 12px;
                     text-align: center;
                 }
             }

src/assets/styles/theme.css

@@ -28,6 +28,7 @@
     --m-grey22: #424E59;
     --m-grey22-hover: rgba(66, 78, 89, .8);
     --m-grey23: #48545F;
+    --m-grey25: #A5CDFF;
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
@@ -69,6 +70,7 @@
     --m-grey62: #08131F;
     --m-grey63: #08131F;
     --m-grey64: #15202B;
+    --m-grey65: #7a8a94;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -192,6 +194,7 @@
     --m-yellow6: #FC9618;
     
     --m-yellow7: #F39730;
+    --m-yellow8: #F39730;
     
     --m-nodata: url("../images/nodata.png");
 
@@ -234,6 +237,7 @@
     --m-grey22: #424E59;
     --m-grey22-hover: rgba(66, 78, 89, .8);
     --m-grey23: #48545F;
+    --m-grey25: #A5CDFF;
     --m-grey26: #343e48;
 
     --m-grey31: #212629;
@@ -275,6 +279,7 @@
     --m-grey62: #08131F;
     --m-grey63: #08131F;
     --m-grey64: #15202B;
+    --m-grey65: #7a8a94;
     /* --m-green1: #e8ffef; */
 
     --m-black0: #242a2e;
@@ -397,6 +402,7 @@
     --m-yellow6: #FC9618;
     
     --m-yellow7: #F39730;
+    --m-yellow8: #F39730;
     --m-nodata: url("../images/nodata.png");
 
     --m-tabbg: url("../images/tabbg.png");
@@ -437,6 +443,7 @@
     --m-grey22: #E4F5FF;  
     --m-grey22-hover: rgba(228, 245, 255, .8);
     --m-grey23: #A5CDFF;
+    --m-grey25: #999999;
     --m-grey26: #5179E2;
 
     --m-grey31: #D6DEE3;
@@ -478,6 +485,7 @@
     --m-grey62: #ffffff;
     --m-grey63: #F6F8FA;
     --m-grey64: #FFFFFF;
+    --m-grey65: #333333;
 
     --m-black0: #F8FBFF;
     --m-black1: #ECF2F5;
@@ -601,6 +609,7 @@
     --m-yellow6: #FC9618;
     
     --m-yellow7: #FFFFFF;
+    --m-yellow8: #F39730;
 
     --m-nodata: url("../images/nodata_white.png");
 

src/assets/styles/variables.less

@@ -33,7 +33,7 @@
 @m-grey22-hover: var(--m-grey22-hover);
 @m-grey23: var(--m-grey23);
 @m-grey24: #444444;
-@m-grey25: #3b444a;
+@m-grey25: var(--m-grey25);
 @m-grey26: var(--m-grey26);
 @m-grey27: #34444E;
 @m-grey28: #36506B;
@@ -78,6 +78,7 @@
 @m-grey62: var(--m-grey62);
 @m-grey63: var(--m-grey63);
 @m-grey64: var(--m-grey64);
+@m-grey65: var(--m-grey65);
 
 @m-black: #000000;
 @m-black0: var(--m-black0);
@@ -232,6 +233,7 @@
 @m-yellow5: var(--m-yellow5);
 @m-yellow6: var(--m-yellow6);
 @m-yellow7: var(--m-yellow7);
+@m-yellow8: var(--m-yellow8);
 
 @m-orange0: #F52929;
 

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/addPermance.vue

@@ -1,14 +1,83 @@
 <template>
-  <!--新增履约模板-->
-  <Drawer :title="'新增履约模板'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <a-spin :spinning="loading">
-
-    </a-spin>
-  </Drawer>
+    <!--新增履约模板-->
+    <Drawer
+        :title="'新增履约模板'"
+        :placement="'right'"
+        :visible="visible"
+        @cancel="cancel"
+        class="top486"
+    >
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form class="inlineForm dialogForm">
+                    <div class="formBar">
+                        <a-row :gutter="24">
+                            <a-col :span="24">
+                                <a-form-item label="模版名称">
+                                    <a-input
+                                        class="commonInput"
+                                        value="30天账期"
+                                        style="width: 260px"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row class="tableTitle">
+                            <a-col :span="7">步骤类型</a-col>
+                            <a-col :span="6">步骤值（%）</a-col>
+                            <a-col :span="7">距离上一步天数</a-col>
+                            <a-col :span="4">操作</a-col>
+                        </a-row>
+                        <a-row class="tableContent">
+                            <a-col :span="7">
+                                <a-select
+                                    class="inlineFormSelect dialogTableSelect"
+                                    style="width: 108px"
+                                    placeholder="请选择"
+                                    v-model:value="form.pay"
+                                >
+                                    <a-select-option key="1" value="1">买方支付</a-select-option>
+                                </a-select>
+                            </a-col>
+                            <a-col :span="6">
+                                <a-input
+                                    class="commonInput dialogTableInput"
+                                    style="width: 100px"
+                                    v-model:value="step1"
+                                ></a-input>
+                            </a-col>
+                            <a-col :span="7">
+                                <a-input
+                                    class="commonInput dialogTableInput"
+                                    style="width: 122px"
+                                    v-model:value="day1"
+                                ></a-input>
+                            </a-col>
+                            <a-col :span="4">
+                                <svg class="icon svg-icon" aria-hidden="true">
+                                    <use xlink:href="#icon-shanchu" />
+                                </svg>
+                                <PlusCircleOutlined />
+                            </a-col>
+                        </a-row>
+                        <div class="noticeTip">
+                            <div>注意事项：</div>
+                            <div>1、买方支付汇总值必须为100%；</div>
+                            <div>2、卖方收款汇总值必须为100%；</div>
+                            <div>3、配置卖方收款之前要有买方支付，且其值不能多于买方支付的值。</div>
+                        </div>
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn">确定</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -96,20 +165,60 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .listed {
-    padding: 18px 20px 0;
+    padding: 18px 10px 0;
     .formBar {
-        height: calc(100% - 120px);
-        padding: 0 20px 0 13px;
-        margin-top: 16px;
-        background: #08131f;
-        border: 1px solid #10202f;
-        .item {
+        height: calc(100% - 70px);
+        padding: 0;
+        .ant-row.tableTitle {
+            .ant-col {
+                height: 40px;
+                line-height: 40px;
+                white-space: nowrap;
+                text-align: center;
+                color: @m-grey1;
+                font-size: 14px;
+                border-right: 1px solid @m-black6;
+                border-top: 1px solid @m-black6;
+                border-bottom: 1px solid @m-black6;
+            }
+            .ant-col:first-child {
+                border-left: 1px solid @m-black6;
+            }
+        }
+        .ant-row.tableContent {
+            .ant-col {
+                height: 40px;
+                line-height: 40px;
+                text-align: center;
+                border-right: 1px solid @m-black6;
+                border-bottom: 1px solid @m-black6;
+                .icon {
+                    color: @m-yellow8;
+                    font-size: 20px;
+                    cursor: pointer;
+                }
+                .anticon {
+                    font-size: 20px;
+                    color: @m-blue0;
+                    margin-left: 14px;
+                    cursor: pointer;
+                }
+            }
+            .ant-col:first-child {
+                border-left: 1px solid @m-black6;
+            }
+        }
+        .noticeTip {
             width: 100%;
-            height: 50px;
-            line-height: 50px;
-            border-bottom: 1px solid #10202f;
-            font-size: 16px;
-            color: #ffffff;
+            margin-top: 15px;
+            .flex;
+            flex-direction: column;
+            > div {
+                height: 30px;
+                line-height: 30px;
+                font-size: 14px;
+                color: @m-grey1;
+            }
         }
     }
 }

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/post-buying/permancePlanTmp.vue

@@ -108,7 +108,7 @@ export default defineComponent({
             line-height: 40px;
             border-bottom: 1px solid @m-blue20;
             color: @m-white11;
-            font-size: 16px;
+            font-size: 14px;
         }
     }
 }

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/post-buying/addPermance.vue

@@ -1,14 +1,83 @@
 <template>
-  <!--新增履约模板-->
-  <Drawer :title="'新增履约模板'"
-          :placement="'right'"
-          :visible="visible"
-          @cancel="cancel"
-          class="top486">
-    <a-spin :spinning="loading">
-
-    </a-spin>
-  </Drawer>
+    <!--新增履约模板-->
+    <Drawer
+        :title="'新增履约模板'"
+        :placement="'right'"
+        :visible="visible"
+        @cancel="cancel"
+        class="top486"
+    >
+        <a-spin :spinning="loading">
+            <div class="listed">
+                <a-form class="inlineForm dialogForm">
+                    <div class="formBar">
+                        <a-row :gutter="24">
+                            <a-col :span="24">
+                                <a-form-item label="模版名称">
+                                    <a-input
+                                        class="commonInput"
+                                        value="30天账期"
+                                        style="width: 260px"
+                                    />
+                                </a-form-item>
+                            </a-col>
+                        </a-row>
+                        <a-row class="tableTitle">
+                            <a-col :span="7">步骤类型</a-col>
+                            <a-col :span="6">步骤值（%）</a-col>
+                            <a-col :span="7">距离上一步天数</a-col>
+                            <a-col :span="4">操作</a-col>
+                        </a-row>
+                        <a-row class="tableContent">
+                            <a-col :span="7">
+                                <a-select
+                                    class="inlineFormSelect dialogTableSelect"
+                                    style="width: 108px"
+                                    placeholder="请选择"
+                                    v-model:value="form.pay"
+                                >
+                                    <a-select-option key="1" value="1">买方支付</a-select-option>
+                                </a-select>
+                            </a-col>
+                            <a-col :span="6">
+                                <a-input
+                                    class="commonInput dialogTableInput"
+                                    style="width: 100px"
+                                    v-model:value="step1"
+                                ></a-input>
+                            </a-col>
+                            <a-col :span="7">
+                                <a-input
+                                    class="commonInput dialogTableInput"
+                                    style="width: 122px"
+                                    v-model:value="day1"
+                                ></a-input>
+                            </a-col>
+                            <a-col :span="4">
+                                <svg class="icon svg-icon" aria-hidden="true">
+                                    <use xlink:href="#icon-shanchu" />
+                                </svg>
+                                <PlusCircleOutlined />
+                            </a-col>
+                        </a-row>
+                        <div class="noticeTip">
+                            <div>注意事项：</div>
+                            <div>1、买方支付汇总值必须为100%；</div>
+                            <div>2、卖方收款汇总值必须为100%；</div>
+                            <div>3、配置卖方收款之前要有买方支付，且其值不能多于买方支付的值。</div>
+                        </div>
+                    </div>
+                    <a-row :gutter="24">
+                        <a-col :span="24" class="fixedBtns">
+                            <a-form-item class="btnCenter">
+                                <a-button class="listedBtn">确定</a-button>
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </div>
+        </a-spin>
+    </Drawer>
 </template>
 
 <script lang="ts">
@@ -16,7 +85,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { Des } from '@/common/components/commonDes';
 import { _closeModal } from '@/common/setup/modal/modal';
 import Drawer from '@/common/components/drawer/index.vue';
-import { PlusOutlined, MinusOutlined, SearchOutlined } from '@ant-design/icons-vue';
+import { PlusOutlined, MinusOutlined, SearchOutlined, PlusCircleOutlined } from '@ant-design/icons-vue';
 import { QueryWrFriendApplyRsp } from '@/services/go/wrtrade/interface';
 import { TempWrOrderQuoteDetail } from '@/views/market/spot_trade/components/post_buying/interface';
 import { queryQueryWrFriend } from '@/services/go/wrtrade';
@@ -29,12 +98,18 @@ interface FriendList extends QueryWrFriendApplyRsp {
 export default defineComponent({
     emits: ['cancel', 'update'],
     name: 'warehouse_receipt_trade_blocs_delisting',
-    components: { Des, Drawer, PlusOutlined, MinusOutlined, SearchOutlined },
+    components: { Des, Drawer, PlusOutlined, MinusOutlined, SearchOutlined, PlusCircleOutlined },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const searchValue = ref<string>('');
         const myFriends = ref<FriendList[]>([]);
+        // 模板字段
+        const form = {
+            pay: '1',
+            step1: '',
+            day1: '',
+        };
         // 查询好友列表
         function queryMyFriend(value?: string) {
             loading.value = true;
@@ -89,6 +164,7 @@ export default defineComponent({
             submit,
             searchValue,
             getViewFriends,
+            form,
         };
     },
 });
@@ -96,20 +172,60 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .listed {
-    padding: 18px 20px 0;
+    padding: 18px 10px 0;
     .formBar {
-        height: calc(100% - 120px);
-        padding: 0 20px 0 13px;
-        margin-top: 16px;
-        background: #08131f;
-        border: 1px solid #10202f;
-        .item {
+        height: calc(100% - 70px);
+        padding: 0;
+        .ant-row.tableTitle {
+            .ant-col {
+                height: 40px;
+                line-height: 40px;
+                white-space: nowrap;
+                text-align: center;
+                color: @m-grey1;
+                font-size: 14px;
+                border-right: 1px solid @m-black6;
+                border-top: 1px solid @m-black6;
+                border-bottom: 1px solid @m-black6;
+            }
+            .ant-col:first-child {
+                border-left: 1px solid @m-black6;
+            }
+        }
+        .ant-row.tableContent {
+            .ant-col {
+                height: 40px;
+                line-height: 40px;
+                text-align: center;
+                border-right: 1px solid @m-black6;
+                border-bottom: 1px solid @m-black6;
+                .icon {
+                    color: @m-yellow8;
+                    font-size: 20px;
+                    cursor: pointer;
+                }
+                .anticon {
+                    font-size: 20px;
+                    color: @m-blue0;
+                    margin-left: 14px;
+                    cursor: pointer;
+                }
+            }
+            .ant-col:first-child {
+                border-left: 1px solid @m-black6;
+            }
+        }
+        .noticeTip {
             width: 100%;
-            height: 50px;
-            line-height: 50px;
-            border-bottom: 1px solid #10202f;
-            font-size: 16px;
-            color: #ffffff;
+            margin-top: 15px;
+            .flex;
+            flex-direction: column;
+            > div {
+                height: 30px;
+                line-height: 30px;
+                font-size: 14px;
+                color: @m-grey1;
+            }
         }
     }
 }

src/views/setting/notice/components/noticeContent.vue

@@ -1,29 +1,30 @@
 <template>
-  <div class="notice-content">
-    <aside>
-      <a-list item-layout="horizontal"
-              :data-source="noticeList">
-        <template #renderItem="{ item }">
-          <a-list-item @click="choose(item)">
-            <a-list-item-meta :description="formatTime(item.createtime)">
-              <template #title>
-                <a :style="{ color: item.readed ? '@m-grey2' : '@m-white1' }"
-                   href="javascript:;">{{ item.title }}</a>
-              </template>
-              <template #avatar>
-                <a-badge :color="item.readed ? '@m-grey2' : 'orange'" />
-              </template>
-            </a-list-item-meta>
-          </a-list-item>
-        </template>
-      </a-list>
-    </aside>
-    <main>
-      <h4>{{ chooseItemNotice.title }}</h4>
-      <p>{{ formatTime(chooseItemNotice.createtime) }}</p>
-      <div>{{ chooseItemNotice.content }}</div>
-    </main>
-  </div>
+    <div class="notice-content">
+        <aside>
+            <a-list item-layout="horizontal" :data-source="noticeList">
+                <template #renderItem="{ item }">
+                    <a-list-item @click="choose(item)">
+                        <a-list-item-meta :description="formatTime(item.createtime)">
+                            <template #title>
+                                <a
+                                    :style="{ color: item.readed ? '@m-grey2' : '@m-white1' }"
+                                    href="javascript:;"
+                                >{{ item.title }}</a>
+                            </template>
+                            <template #avatar>
+                                <a-badge :color="item.readed ? '@m-grey2' : 'orange'" />
+                            </template>
+                        </a-list-item-meta>
+                    </a-list-item>
+                </template>
+            </a-list>
+        </aside>
+        <main>
+            <h4>{{ chooseItemNotice.title }}</h4>
+            <p>{{ formatTime(chooseItemNotice.createtime) }}</p>
+            <div>{{ chooseItemNotice.content }}</div>
+        </main>
+    </div>
 </template>
 
 <script lang="ts">
@@ -84,6 +85,11 @@ export default defineComponent({
         width: 202px;
         height: 619px;
         .ant-list-split {
+            .ant-list-item-meta-title {
+                > a {
+                    color: @m-grey65;
+                }
+            }
             .ant-list-item-meta-description {
                 text-align: right;
                 font-size: 13px;