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

src/common/constants/enumsName.ts

@@ -323,3 +323,58 @@ export function getContractName(type: number): string {
     return result
 }
 
+//委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)
+export function getOrderStatusName(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 12:
+            result = "经过摘牌";
+            break
+        case 13:
+            result = "冻结成功";
+            break
+        case 14:
+            result = "通道已撤";
+            break
+        case 15:
+            result = "通道部成部撤";
+            break
+        case 16:
+            result = "成交失败违约";
+            break
+    }
+    return result
+}

src/views/platinum/platinum_customer_info/compoments/common-detail/index.vue

@@ -69,7 +69,7 @@ export default defineComponent({
                     { label: '身份证反面照', value: formatValue(getImgName(data.cardbackphotourl)), className: 'blue' },
                     { label: '邮箱', value: formatValue(data.email) },
                     { label: '联系电话', value: formatValue(data.telphone) },
-                    { label: '通讯地址', value: formatValue(data.address) },
+                    { label: '通讯地址', value: formatValue(data.provincename + data.cityname + data.districtname + data.address) },
                     { label: '备注', value: formatValue(data.remark) },
                     { label: '所属', value: formatValue(data.parentusername) },
                     { label: '状态', value: getStatusName(data.status) },
@@ -88,7 +88,7 @@ export default defineComponent({
                     { label: '联系人手机号', value: formatValue(data.mobile) },
                     { label: '联系电话', value: formatValue(data.telphone) },
                     { label: '状态', value: getStatusName(data.status), className: 'green' },
-                    { label: '通讯地址', value: formatValue(data.address) },
+                    { label: '通讯地址', value: formatValue(data.provincename + data.cityname + data.districtname + data.address) },
                     { label: '备注', value: formatValue(data.remark) },
                     { label: '所属', value: formatValue(data.parentusername) },
                 ];

src/views/platinum/platinum_document_query/list/order/index.vue

@@ -20,6 +20,11 @@
         <template #userinfotype="{ record }">
           <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
         </template>
+          <!-- 委托状态 -->
+          <template #orderstatus="{ record }">
+              <a>{{ getOrderStatusName(record.orderstatus) }}</a>
+          </template>
+
       </a-table>
     </contextMenu>
     <!-- <ControlModal :selectedRow="selectedRow" /> -->
@@ -33,6 +38,7 @@ import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { QueryTradeOrderDetailReq } from '@/services/go/ermcp/qhj/interface';
 import { getUserId } from '@/services/bus/account';
+import {getOrderStatusName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'platinum_document_query_order',
@@ -77,6 +83,7 @@ export default defineComponent({
             loading,
             tableList,
             btnClick,
+            getOrderStatusName,
         };
     },
 });