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

src/assets/styles/mixin.less

@@ -2154,7 +2154,7 @@ input:-internal-autofill-selected {
 .noData {
     width: 80px;
     height: 80px;
-    background: url(../images/nodata.png) center center no-repeat;
+    background: @m-nodata center center no-repeat;
     background-size: cover;
 }
 
@@ -2162,7 +2162,7 @@ input:-internal-autofill-selected {
     .ant-empty-image {
         width: 80px;
         height: 80px;
-        background: url(../images/nodata.png) center center no-repeat;
+        background: @m-nodata center center no-repeat;
         background-size: cover;
         .ant-empty-img-simple {
             display: none;

src/assets/styles/theme.css

@@ -119,6 +119,8 @@
     --m-green1: #10251d;
 
     --m-red2: #271112;
+    
+    --m-nodata: url("../images/nodata.png");
 } 
 /* 白色主题 */
 /* :root[theme="light"] { */
@@ -242,6 +244,8 @@
     --m-green1: #e8ffef;
 
     --m-red2: #ffe2e2;
+
+    --m-nodata: url("../images/nodata_white.png");
 }
 
 /* 黑色主题 */
@@ -366,5 +370,7 @@
     --m-green1: #10251d;
 
     --m-red2: #271112;
+
+    --m-nodata: url("../images/nodata.png");
 }
 

src/assets/styles/variables.less

@@ -156,6 +156,8 @@
 @m-red10: #FB7F75;
 @m-red10-hover: rgba(@m-red10, .8);
 
+@m-nodata: var(--m-nodata);
+
 @m-yellow0: #FF9600;
 @m-yellow1: #FC9618;
 @m-yellow2: #ffae00;

src/common/constants/enumsName.ts

@@ -637,9 +637,10 @@ export function getWrOrderTypeName(buyOrSell: number, wrTradeType: number) {
 
 /**
  * 履约类型 - 0:通用 1:交割 2:仓单贸易 3:预售集采 4:竞拍-降价式 (无仓单) 5:挂牌期权 6:竞拍-降价式 7:竞拍-竞价式 8:竞拍-大宗式 9:荷兰式 10:法币C2C 11:报价系统 12:挂牌系统
+ * /-仓单预售 1-仓单贸易
  * @param type
  */
-export function getPerformanceTypeName(type: number) {
+export function getPerformanceTypeName(type: number, haswr: number) {
     let result = '--'
     switch (type) {
         case 0:
@@ -650,6 +651,11 @@ export function getPerformanceTypeName(type: number) {
             break
         case 2:
             result = '预售仓单'
+            if(haswr === 1){
+                result = '仓单贸易'
+            }else{
+                result = '仓单预售'
+            }
             break
         case 3:
             result = '预售采集'

src/views/account/login.vue

@@ -149,7 +149,7 @@ export default defineComponent({
             const img = document.querySelector('#logo_img') || document.createElement('img');
             const obj = {
                 id: 'logo_img',
-                src: './logo.png',
+                src: './wrLogo.png',
             };
             Object.assign(img, obj);
             document.querySelector('#img')?.appendChild(img);
@@ -239,7 +239,8 @@ export default defineComponent({
     background-size: cover;
     div {
         margin-top: 120px;
-        margin-left: 69.5px;
+        // margin-left: 69.5px; // 企业风管logo
+        margin-left: 33px; // 云融
         width: 136px;
         height: 136px;
         min-width: 136px;

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

@@ -1,35 +1,41 @@
 <template>
-  <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
-  <a-table :columns="handleColumn(columns)"
-           :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           :expandIcon="expandIcon"
-           :expandIconAsCell="false"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- ,  -->
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               class="btn-list-sticky"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " "}}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :buyOrSell="BuyOrSell.buy"
-             :enumName="enumName"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
+    <a-table
+        :columns="handleColumn(columns)"
+        :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        :expandIcon="expandIcon"
+        :expandIconAsCell="false"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- ,  -->
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList
+                :btnList="btnList"
+                :record="record"
+                class="btn-list-sticky"
+                @click="openComponent"
+            />
+        </template>
+        <template #username="{text, record }">
+            <span>{{record.userid + " "}}{{text}}</span>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :buyOrSell="BuyOrSell.buy"
+        :enumName="enumName"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">
@@ -127,5 +133,8 @@ export default defineComponent({
 </script>
 <style lang="less">
 .buy-sell-market {
+    .btnDeafault.ant-btn {
+        height: 30px;
+    }
 }
 </style>

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

@@ -1,33 +1,35 @@
 <template>
-  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
-  <a-table :columns="handleColumn(columns)"
-           :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           :expandIcon="expandIcon"
-           :expandIconAsCell="false"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " " }}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :enumName="enumName"
-             :buyOrSell="BuyOrSell.sell"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
+    <a-table
+        :columns="handleColumn(columns)"
+        :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        :expandIcon="expandIcon"
+        :expandIconAsCell="false"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+        </template>
+        <template #username="{text, record }">
+            <span>{{record.userid + " " }}{{text}}</span>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :enumName="enumName"
+        :buyOrSell="BuyOrSell.sell"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">
@@ -128,5 +130,8 @@ export default defineComponent({
 </script>
 <style lang="less">
 .buy-sell-market {
+    .btnDeafault.ant-btn {
+        height: 30px;
+    }
 }
 </style>

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

@@ -1,52 +1,56 @@
 <template>
-  <!-- 报表通用过滤 -->
-  <div class="filterTable">
-    <div class="filter-custom-table">
-      <a-tree-select v-model:value="selectedFT"
-                     @change="changeFT"
-                     style="width: 200px"
-                     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                     :tree-data="FtDeliveryGoods"
-                     placeholder="全部商品"
-                     :showCheckedStrategy="ALL"
-                     tree-default-expand-all>
-      </a-tree-select>
-      <a-select label-in-value
+    <!-- 报表通用过滤 -->
+    <div class="filterTable">
+        <div class="filter-custom-table">
+            <a-tree-select
+                v-model:value="selectedFT"
+                @change="changeFT"
+                style="width: 200px"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                :tree-data="FtDeliveryGoods"
+                placeholder="全部商品"
+                :showCheckedStrategy="ALL"
+                tree-default-expand-all
+            ></a-tree-select>
+            <a-select
+                label-in-value
                 class="conditionSelect"
                 v-for="(item, index) in wrLsit"
                 :key="index + '11'"
                 style="width: 120px"
                 v-model:value="item.selected"
-                :placeholder="`全部${item.itemtypename}`">
-        <a-select-option v-for="sub in item.itemlst"
-                         :key="sub.dgfactoryitemid">
-          {{sub.dgfactoryitemvalue}}
-        </a-select-option>
-      </a-select>
-      <a-space direction="vertical"
-               v-if="!isWR()">
-        <a-month-picker :allowClear="false"
-                        placeholder="全部交收月"
-                        v-model:value="time"
-                        class="commonDatePicker conditionPicker allDatePicker" />
-      </a-space>
-      <a-select class="conditionSelect"
+                :placeholder="`全部${item.itemtypename}`"
+            >
+                <a-select-option
+                    v-for="sub in item.itemlst"
+                    :key="sub.dgfactoryitemid"
+                >{{sub.dgfactoryitemvalue}}</a-select-option>
+            </a-select>
+            <a-space direction="vertical" v-if="!isWR()">
+                <a-month-picker
+                    :allowClear="false"
+                    placeholder="全部交收月"
+                    v-model:value="time"
+                    class="commonDatePicker conditionPicker allDatePicker"
+                />
+            </a-space>
+            <a-select
+                class="conditionSelect"
                 v-if="isFloat()"
                 :style="{width: '180px', maxHeight: '400px', overflow: 'auto' }"
                 @change="goodsChange"
-                placeholder="全部期货合约">
-        <a-select-option v-for="item in goodsList"
-                         :value="item.goodsid"
-                         :key="item.goodsid">{{item.goodscode}}({{item.goodsname}})
-        </a-select-option>
-      </a-select>
-      <a-button class="selectBtn"
-                @click="search(true)">筛选</a-button>
-      <a-button class="selectBtn"
-                @click="listingAction">挂牌求购
-      </a-button>
+                placeholder="全部期货合约"
+            >
+                <a-select-option
+                    v-for="item in goodsList"
+                    :value="item.goodsid"
+                    :key="item.goodsid"
+                >{{item.goodscode}}({{item.goodsname}})</a-select-option>
+            </a-select>
+            <a-button class="selectBtn" @click="search(true)">筛选</a-button>
+            <a-button class="selectBtn" @click="listingAction">挂牌求购</a-button>
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">
@@ -217,15 +221,22 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.allDatePicker{
+.allDatePicker.ant-calendar-picker {
     cursor: pointer;
     min-width: 120px;
     height: 30px;
     padding: 0 8px;
-    background: var(--m-grey9);
+    background: @m-grey9;
     border: none;
     border-radius: 3px 3px 3px 3px;
-    color: var(--m-grey10);
+    color: @m-grey10;
+    .ant-input {
+        width: 104px;
+        &::placeholder {
+            color: @m-grey10;
+            font-size: 14px;
+        }
+    }
 }
 </style>;
 

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

@@ -21,7 +21,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr) }}</a>
       </template>
 
       <!-- 付款方式 -->

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

@@ -22,7 +22,7 @@
       </template>
       <!-- 履约类型 -->
       <template #performancetype="{ record }">
-        <a>{{ getPerformanceTypeName(record.performancetype) }}</a>
+        <a>{{ getPerformanceTypeName(record.performancetype, record.haswr)}}</a>
       </template>
 
       <!-- 付款方式 -->