Merge remote-tracking branch 'origin/master'

src/assets/styles/theme.css

@@ -124,6 +124,7 @@
     --m-grey15-hover: rgba(114, 124, 152, .8);
     --m-grey16: #727C98;
     --m-grey16-hover: rgba(114, 124, 152, .8);
+    --m-grey17: #808E97;
     --m-grey18: #FFFFFF; /* #ECF2F5 */
     --m-grey19: #F6F8FA;
     --m-grey20: #DAE5EC;
@@ -228,6 +229,7 @@
     --m-grey15-hover: rgba(69, 87, 115, .8);
     --m-grey16: #405066;
     --m-grey16-hover: rgba(64, 80, 102, .8);
+    --m-grey17: #556772;
     --m-grey18: #1D2327;
     --m-grey19: #162534;
     --m-grey20: #1B2A38;

src/assets/styles/variables.less

@@ -23,7 +23,7 @@
 @m-grey15-hover: var(--m-grey15-hover);
 @m-grey16: var(--m-grey16);
 @m-grey16-hover: var(--m-grey16-hover);
-@m-grey17: #556772;                         // orderTable颜色没用到
+@m-grey17: var(--m-grey17);
 @m-grey18: var(--m-grey18);
 @m-grey19: var(--m-grey19);
 @m-grey20: var(--m-grey20);

src/layout/components/header.vue

@@ -1,65 +1,62 @@
 <template>
-  <!-- 风险管理 -->
+    <!-- 风险管理 -->
 
-  <div v-if="isOemByEnum(OemType.manager)">
-    <img src="../../assets/images/logoHeader.png" />
-    <span>深圳市多元世纪信息技术股份有限公司</span>
-  </div>
-  <!-- 云融 -->
+    <div v-if="isOemByEnum(OemType.manager)">
+        <img src="../../assets/images/logoHeader.png" />
+        <span>深圳市多元世纪信息技术股份有限公司</span>
+    </div>
+    <!-- 云融 -->
 
-  <div v-else-if="isOemByEnum(OemType.wrspot)">
-    <img src="../../assets/images/headLogo.jpg" />
-    <span>云融</span>
-  </div>
-  <div v-else>
-    <img src="../../assets/images/logoHeader.png" />
-    <span>深圳市多元世纪信息技术股份有限公司</span>
-  </div>
-  <div class="m-layout-header-right">
-    <div @click="openDrawer">
-      <span>{{ getUserName() }}，您好！</span>
+    <div v-else-if="isOemByEnum(OemType.wrspot)">
+        <img src="../../assets/images/headLogo.jpg" />
+        <span>云融</span>
+    </div>
+    <div v-else>
+        <img src="../../assets/images/logoHeader.png" />
+        <span>深圳市多元世纪信息技术股份有限公司</span>
     </div>
-    <div class="relative">
-      <!-- <a-input-search ref="userNameInput"
+    <div class="m-layout-header-right">
+        <div @click="openDrawer">
+            <span>{{ getUserName() }}，您好！</span>
+        </div>
+        <div class="relative">
+            <!-- <a-input-search ref="userNameInput"
                           class="searchInput"
                           readonly
                           placeholder="请输入代码/名称"
                           @pressEnter="search">
             </a-input-search>-->
-      <!-- <a-icon type="search" /> -->
-    </div>
-    <div class="news-container">
-      <a-badge @click="openNotice"
-               :dot="getUnReadNoticeLength() > 0">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-xiaoxi" />
-        </svg>
-      </a-badge>
-    </div>
-    <div>
-      <a-popover v-model:visible="visible"
-                 trigger="click"
-                 placement="bottomRight">
-        <template #content>
-          <div v-for="item in setMenu"
-               class="popItem"
-               @click="chooseSetMenu(item.path)"
-               :key="item.path">{{ item.name }}</div>
-        </template>
-        <a-avatar :size="24">
-          <template #icon>
-            <!-- <SettingFilled /> -->
-            <svg class="icon svg-icon"
-                 aria-hidden="true">
-              <use xlink:href="#icon-yonghu4" />
-            </svg>
-          </template>
-        </a-avatar>
-      </a-popover>
-      <Setting />
+            <!-- <a-icon type="search" /> -->
+        </div>
+        <div class="news-container">
+            <a-badge @click="openNotice" :dot="getUnReadNoticeLength() > 0">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-xiaoxi" />
+                </svg>
+            </a-badge>
+        </div>
+        <div>
+            <a-popover v-model:visible="visible" trigger="click" placement="bottomRight">
+                <template #content>
+                    <div
+                        v-for="item in setMenu"
+                        class="popItem"
+                        @click="chooseSetMenu(item.path)"
+                        :key="item.path"
+                    >{{ item.name }}</div>
+                </template>
+                <a-avatar :size="24">
+                    <template #icon>
+                        <!-- <SettingFilled /> -->
+                        <svg class="icon svg-icon" aria-hidden="true">
+                            <use xlink:href="#icon-yonghu4" />
+                        </svg>
+                    </template>
+                </a-avatar>
+            </a-popover>
+            <Setting />
+        </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts">
@@ -87,8 +84,8 @@ const setFn = () => {
         // { name: '手机号码绑定/解绑', path: 'phone' },
         // { name: '关于我们', path: 'aboutUs' },
         { name: '退出', path: 'logout' },
-        // { name: '白主题', path: ThemeEnum.light },
-        // { name: '黑主题', path: ThemeEnum.dark },
+        { name: '白主题', path: ThemeEnum.light },
+        { name: '黑主题', path: ThemeEnum.dark },
     ];
     const { openAction } = openModal('logout');
     function chooseSetMenu(path: string) {

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

@@ -1,73 +1,28 @@
 <template>
-    <!-- 履约明细-->
-    <Drawer :title="'履约明细'" :placement="'bottom'" :visible="visible" @cancel="cancel">
-        <!-- <div class="listed">
+  <!-- 履约明细-->
+  <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>
-        </div>-->
-        <div class="performanceSteps">
-            <a-steps v-model:current="current" class="commonSteps" direction="vertical">
-                <a-step status="finish">
-                    <template #title>
-                        <div class="block">
-                            <div class="line">
-                                <div class="num">1</div>
-                                <div class="desc">买方30%货款</div>
-                                <div class="day">T+30</div>
-                                <CaretRightOutlined class="arrowRight" />
-                            </div>
-                            <div class="tip">已完成</div>
-                        </div>
-                    </template>
-                </a-step>
-                <a-step status="finish">
-                    <template #title>
-                        <div class="block">
-                            <div class="line">
-                                <div class="num">2</div>
-                                <div class="desc">卖方发货</div>
-                                <div class="day">T+3</div>
-                                <CaretRightOutlined class="arrowRight" />
-                            </div>
-                            <div class="tip">已完成</div>
-                        </div>
-                    </template>
-                </a-step>
-                <a-step status="process">
-                    <template #title>
-                        <div class="block">
-                            <div class="line">
-                                <div class="num">3</div>
-                                <div class="desc">买方70%货款</div>
-                                <div class="day">T+10</div>
-                                <CaretRightOutlined class="arrowRight" />
-                            </div>
-                            <div class="tip">2日后扣款</div>
-                        </div>
-                    </template>
-                </a-step>
-                <a-step status="wait">
-                    <template #title>
-                        <div class="block">
-                            <div class="line">
-                                <div class="num">4</div>
-                                <div class="desc">卖方开票</div>
-                                <div class="day">T+1</div>
-                                <CaretRightOutlined class="arrowRight" />
-                            </div>
-                            <div class="tip">未开始</div>
-                        </div>
-                    </template>
-                </a-step>
-            </a-steps>
-            <div class="btns">
-                <a-button class="closeBtn" @click="cancel">关闭</a-button>
-            </div>
-        </div>
-    </Drawer>
+      <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">
@@ -91,6 +46,16 @@ import { WRGoodsInfo } from '@/services/proto/warehousetrade/interface';
 import { CaretRightOutlined } from '@ant-design/icons-vue';
 import { handlePerformancePlanStep } from '../setup';
 
+const columns = [
+    { title: '履约步骤', dataIndex: 'steptypename', key: 'steptypename', align: 'center' },
+    // { title: '天数', dataIndex: 'applytime', key: 'applytime', align: 'center' },
+    { title: '剩余天数', dataIndex: 'remaindays', key: 'remaindays', align: 'center' },
+    { title: '步骤值（%）', dataIndex: 'stepvalue', key: 'stepvalue', align: 'center' },
+    { title: '距离上一步', dataIndex: 'stepdays', key: 'stepdays', align: 'center' },
+    { title: '自动', dataIndex: 'isauto', key: 'isauto', align: 'center', slots: { customRender: 'isauto' } },
+    { title: '当前状态', dataIndex: 'handlestatus', key: 'handlestatus', align: 'center', slots: { customRender: 'handlestatus' } },
+];
+
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_detail,
     components: { Drawer, CaretRightOutlined },
@@ -107,12 +72,79 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
-        const { performancePlanStep } = handlePerformancePlanStep(props.selectedRow);
-        const current = ref<number>(0);
+        const { performancePlanStepList } = handlePerformancePlanStep(props.selectedRow);
+        function getStatus(type: number) {
+            //处理状态 - 1:开始 2:结束 3:冻结请求 4:冻结返回成功 5:冻结返回失败 6:扣款请求 7:扣款返回成功 8:扣款返回失败 9:仓单转移请求 1number;
+            //:仓单转移返回成功 11:仓单转移返回失败 12:加钱请求 13:加钱返回成功 14:加钱返回失败 15:解冻仓单头寸请求 16:解冻仓单头寸返回成功 17:解冻仓单头寸返回失败 18:解冻库位请求 19:解冻库位返回成功 2number;
+            //:解冻库位返回失败
+            let result = '--';
+            switch (type) {
+                case 1:
+                    result = '开始';
+                    break;
+                case 2:
+                    result = '结束';
+                    break;
+                case 3:
+                    result = '冻结请求';
+                    break;
+                case 4:
+                    result = '冻结返回成功';
+                    break;
+                case 5:
+                    result = '冻结返回失败';
+                    break;
+                case 6:
+                    result = '扣款请求';
+                    break;
+                case 7:
+                    result = '扣款返回成功';
+                    break;
+                case 8:
+                    result = '扣款返回失败';
+                    break;
+                case 9:
+                    result = '仓单转移请求';
+                    break;
+                case 10:
+                    result = '仓单转移返回成功';
+                    break;
+                case 11:
+                    result = '仓单转移返回失败';
+                    break;
+                case 12:
+                    result = '加钱请求';
+                    break;
+                case 13:
+                    result = '加钱返回成功';
+                    break;
+                case 14:
+                    result = '加钱返回失败';
+                    break;
+                case 15:
+                    result = '解冻仓单头寸请求';
+                    break;
+                case 16:
+                    result = '解冻仓单头寸返回成功';
+                    break;
+                case 17:
+                    result = '解冻仓单头寸返回失败';
+                    break;
+                case 18:
+                    result = '解冻库位请求';
+                    break;
+                case 19:
+                    result = '解冻库位返回成功';
+                    break;
+            }
+            return result;
+        }
         return {
             visible,
             cancel,
-            current,
+            performancePlanStepList,
+            columns,
+            getStatus,
         };
     },
 });

src/views/order/performance_information/components/components/setup.ts

@@ -1,20 +1,21 @@
 import { queryWrPerformancePlanStep } from "@/services/go/wrtrade";
 import { QueryWrPerformancePlanStepReq, WrPerformancePlan, WrPerformancePlanStep } from "@/services/go/wrtrade/interface";
 import { ref } from "vue";
-import Long from "long";
 
 // 获取当前履约步骤
 export function handlePerformancePlanStep(selectedRow: WrPerformancePlan) {
     const performancePlanStep = ref<WrPerformancePlanStep>()
+    const performancePlanStepList = ref<WrPerformancePlanStep[]>([])
 
     const stepamount = ref<string>('--')
     const param: QueryWrPerformancePlanStepReq = { planid: selectedRow.performanceplanid, curstepid: selectedRow.curstepid }
     queryWrPerformancePlanStep(param).then(res => {
         console.log('获取当前履约步骤', res)
         if (res.length) {
+            performancePlanStepList.value = res;
             performancePlanStep.value = res[0]
             stepamount.value = res[0].stepamount.toFixed(2).toString()
         }
     })
-    return { performancePlanStep , stepamount}
+    return { performancePlanStep, stepamount, performancePlanStepList }
 }