commit 一些ui问题bug解决提交

src/common/constants/enumsName.ts

@@ -279,3 +279,47 @@ export function getRegularStateName(type: number): string {
     return result
 }
 
+//1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 10:已注销 11:已关闭 99:未提交
+export function getContractName(type: number): string {
+    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 99:
+            result = "未提交";
+            break
+    }
+    return result
+}
+

src/services/go/ermcp/qhj/interface.ts

@@ -290,8 +290,7 @@ export interface QhjContract {
     scfcontractid	:string;//SCF合同ID(31number;
 //+Unix秒时间戳(1number;
 //位)+xxxxxx)
-    scfcontractstatus	:number;//合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 1number;
-//:已注销 11:已关闭 99:未提交
+    scfcontractstatus	:number;//合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 10:已注销 11:已关闭 99:未提交
     scfcontracttype	:number;//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单
     totalinterest	:number;//已计总利息(利息)
     tradedate	:string;//交易日

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -24,7 +24,7 @@
           <a>{{ getStatusName(text) }}</a>
         </template>
         <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
+          <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
         </template>
         <!-- 客户名称 -->
         <template #customername="{ record }">

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -23,9 +23,9 @@
         <template #status="{ text }">
           <a>{{ getStatusName(text) }}</a>
         </template>
-        <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
-        </template>
+          <template #cardtype="{ text }">
+              <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
+          </template>
         <!-- 客户名称 -->
         <template #customername="{ record }">
           <a>{{ record.username }}</a>

src/views/platinum/platinum_customer_info/list/unsubmit/index.vue

@@ -26,9 +26,9 @@
         <template #status="{ text }">
           <a>{{ getStatusName(text) }}</a>
         </template>
-        <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
-        </template>
+          <template #cardtype="{ text }">
+              <a>{{ text === 0 ? "" : getCardTypeEnumItemName(text) }}</a>
+          </template>
       </a-table>
     </contextMenu>
     <Middle :selectedRow="selectedRow"

src/views/platinum/platinum_financing_information/list/tab/index.vue

@@ -15,6 +15,11 @@
           <BtnList :btnList="firstBtn"
                    @onClick="btnClick(record)" />
         </template>
+          <!-- 物流信息 -->
+          <template #scfcontractstatus="{ record }">
+              <a>{{ getContractName(record.scfcontractstatus) }}</a>
+          </template>
+
       </a-table>
     </contextMenu>
     <Detail :selectedRow="selectedRow" />
@@ -29,6 +34,7 @@ import Filter from './compoments/filter/index.vue';
 import Detail from './compoments/detail/index.vue';
 import { QhjContract } from '@/services/go/ermcp/qhj/interface';
 import { queryContract } from '@/services/go/ermcp/qhj';
+import {getContractName} from "@/common/constants/enumsName";
 // import ControlModal from './compoments/controlModal/index.vue';
 
 export default defineComponent({
@@ -61,6 +67,7 @@ export default defineComponent({
             updateColumn,
             queryTable,
             btnClick,
+            getContractName,
         };
     },
 });

src/views/platinum/platinum_pick_query/list/tab/compoments/common-detail/index.vue

@@ -34,11 +34,11 @@ export default defineComponent({
                     { label: '提货商品', value: formatValue(data.pickupgoodsname) },
                     { label: '提货数量', value: formatValue(data.pickupgoodsqty) },
                     { label: '交易商品', value: formatValue(data.goodsname) },
-                    { label: '商品数量', value: formatValue(data.qty) },
+                    { label: '商品数量', value: formatValue(data.qty + data.enumdicname) },
                     { label: '收货方式', value: formatValue(getTakeStateName(data.takemode)) },
                     { label: '提货人/收货人', value: formatValue(data.recivername) },
-                    { label: '提货地址/收货地址', value: formatValue(data.address) },
-                    { label: '物流信息', value: formatValue(data.expresscompany) },
+                    { label: '提货地址/收货地址', value: formatValue(data.provincename + data.cityname + data.districtname + data.address) },
+                    { label: '物流信息', value: formatValue(data.expresscompany + "-" + data.expressnum) },
                     { label: '状态', value: getPickUpStateName(data.takeorderstatus) },
                     { label: '申请时间', value: formatValue(data.updatetime) },
                 ];

src/views/platinum/platinum_pick_query/list/tab/index.vue

@@ -24,6 +24,21 @@
           <a>{{ getTakeStateName(record.takemode)}}</a>
         </template>
 
+          <!-- 物流信息 -->
+          <template #expresscompany="{ record }">
+              <a>{{ record.expresscompany + "-" + record.expressnum}}</a>
+          </template>
+
+          <!-- 商品数量 -->
+          <template #qty="{ record }">
+              <a>{{ record.qty + record.enumdicname}}</a>
+          </template>
+
+          <!-- 地址 -->
+          <template #address="{ record }">
+              <a>{{ record.provincename + record.cityname + record.districtname + record.address}}</a>
+          </template>
+
         <template #userinfotype="{ record }">
           <a>{{ record.userinfotype === 1 ? '个人' : '企业' }}</a>
         </template>