Selaa lähdekoodia

合并代码,解决冲突

huangbin 4 vuotta sitten
vanhempi
commit
4920774453

+ 25 - 0
src/assets/styles/mixin.less

@@ -3628,4 +3628,29 @@ input:-internal-autofill-selected {
     position: absolute;
     top: 15px;
     left: -66px;
+}
+
+// 审核拒绝失败原因
+.toolTipTableColumn {
+    .ant-tooltip-content {
+        border: 1px solid @m-grey23;
+        box-shadow: 0px 10px 10px 0px @m-boxShadow;
+        .rounded-corners(5px);
+        .ant-tooltip-arrow {
+            .ant-tooltip-arrow-content {
+                border-top-color: @m-grey22;
+                border-left-color: @m-grey22;
+                border: 1PX solid @m-grey23;
+                border-bottom: 0;
+                border-right: 0;
+                background: @m-grey22;
+            }
+        }
+        .ant-tooltip-inner {
+            border-image-width: 0;
+            background: @m-grey22;
+            color: @m-grey1;
+            padding: 5px 10px;
+        }
+    }
 }

+ 19 - 0
src/views/order/commodity_contract/components/commodity_contract_bargain/index.vue

@@ -23,6 +23,23 @@
       <template #applytime="{ text }">
         <span>{{ formatTime(text) }}</span>
       </template>
+      <template #transferamount="{ record }">
+        <div>
+          <!-- 审核拒绝 -->
+          <a-tooltip placement="bottom"
+                     v-if="record.applystatus === 4"
+                     overlayClassName="toolTipTableColumn">
+            <template #title>
+              <span>{{ getScfContractStatusName(text) }}</span>
+            </template>
+            <span
+                  :class="record.applystatus === 4 ? 'red' : 'white'">{{ record.transferamount }}</span>
+            <ExclamationCircleOutlined class="ml10 red"
+                                       v-if="record.applystatus === 4" />
+          </a-tooltip>
+          <span v-else>{{ record.transferamount }}</span>
+        </div>
+      </template>
       <template #buyorsell="{ text }">
         <span>{{ getBuyOrSellName(text) }}</span>
       </template>
@@ -61,10 +78,12 @@ import { ref } from 'vue';
 import { ApplyType } from '@/common/constants/enumCommon';
 import { getBuyOrSellName, getScfContractStatusName } from '@/common/constants/enumsName';
 import { getAccoutIdList } from '@/services/bus/account';
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 
 export default defineComponent({
     name: 'commodity_contract_bargain',
     components: {
+        ExclamationCircleOutlined,
         BtnList,
         commodity_contract_bargain_submit_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_submit_order/index.vue')),
         commodity_contract_bargain_cancel_order: defineAsyncComponent(() => import('./components/commodity_contract_bargain_cancel_order/index.vue')),