li.shaoyi 2 年之前
父节点
当前提交
6b31013db9

+ 0 - 1
oem/gcszt/config/router.json

@@ -129,7 +129,6 @@
                                 "sort": 2,
                                 "title": "月清挂牌",
                                 "code": "market_trade_goods_50103",
-                                "hidden": true,
                                 "component": "views/market/trade/goods/list/index.vue"
                             }
                         ]

二进制
oem/gcszt/logo/logo-horizontal.png


+ 1 - 1
public/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "多元世纪交易中心",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.169:8080/cfg?key=test_169",
   "tradeChannel": "ws",
   "modules": [
     "register",

+ 22 - 5
src/constants/order.ts

@@ -106,7 +106,7 @@ export function getWrTradeTypeList() {
  */
 export function getWRPriceTypeList() {
     return [
-        { label: '一口价', value: WrPriceType.Fix},
+        { label: '一口价', value: WrPriceType.Fix },
         { label: '浮动价', value: WrPriceType.Float },
     ]
 }
@@ -117,7 +117,7 @@ export function getWRPriceTypeList() {
  */
 export function getPaymentTypeList() {
     return [
-        { label: '冻结', value: PaymentType.Freeze},
+        { label: '冻结', value: PaymentType.Freeze },
         { label: '扣款', value: PaymentType.Blance },
     ]
 }
@@ -450,7 +450,7 @@ export function getListingSelectTypeName(value: number) {
  * 获取交收单状态2类型列表
  * @returns 
  */
- export function getDeliveryStatusList() {
+export function getDeliveryStatusList() {
     return getEnumTypeList('deliveryStatus')
 }
 
@@ -467,7 +467,7 @@ export function getDeliveryStatusName(value: number) {
  * 获取付款方式类型列表
  * @returns 
  */
- export function getDeliveryPayModeList() {
+export function getDeliveryPayModeList() {
     return getEnumTypeList('deliveryPayMode')
 }
 
@@ -484,7 +484,7 @@ export function getDeliveryPayModeName(value: number) {
  * 获取确认状态类型列表
  * @returns 
  */
- export function getConfirmStatusList() {
+export function getConfirmStatusList() {
     return getEnumTypeList('confirmStatus')
 }
 
@@ -537,4 +537,21 @@ export function getOperateTypeName(value: number) {
  */
 export function getOperateTypeSearchList() {
     return getEnumTypeList('operatetypesearch')
+}
+
+/**
+ * 获取过户申请状态列表
+ * @returns 
+ */
+export function getTransferApplyStatusList() {
+    return getEnumTypeList('transferapplystatus')
+}
+
+/**
+ * 获取过户申请状态名称
+ * @returns 
+ */
+export function getTransferApplyStatusName(value: number) {
+    const enums = getTransferApplyStatusList()
+    return getEnumTypeName(enums, value)
 }

二进制
src/packages/gcszt/assets/images/login-logo.png


+ 1 - 5
src/packages/gcszt/views/user/login/index.less

@@ -3,11 +3,7 @@
 
     &-logo {
         img {
-            height: 1.6rem;
+            height: 1.3rem;
         }
     }
-
-    &-form {
-        box-shadow: 0 0 .72rem 0 rgba(0, 0, 0, .15);
-    }
 }

+ 6 - 1
src/packages/pc/views/footer/inout/in/index.vue

@@ -2,10 +2,14 @@
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey"
         :expand-row-keys="expandKeys" @row-click="rowClick">
+        <!-- 状态 -->
+        <template #transferapplystatus="{ value }">
+            {{ getTransferApplyStatusName(value) }}
+        </template>
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar" v-if="row.transferapplystatus === 2">
-                <el-button type="primary" @click="showComponent('confirm', row)">确认</el-button>
+                <el-button type="primary" size="small" @click="showComponent('confirm', row)">确认</el-button>
             </div>
         </template>
         <template #footer>
@@ -20,6 +24,7 @@ import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
+import { getTransferApplyStatusName } from '@/constants/order'
 import { queryInTradePositionTransfer } from '@/services/api/transfer'
 import AppTable from '@pc/components/base/table/index.vue'
 

+ 5 - 0
src/packages/pc/views/footer/inout/out/index.vue

@@ -6,6 +6,10 @@
                 <el-button type="primary" size="small" @click="openComponent('add')">新增</el-button>
             </div>
         </template>
+        <!-- 状态 -->
+        <template #transferapplystatus="{ value }">
+            {{ getTransferApplyStatusName(value) }}
+        </template>
         <template #footer>
             <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
         </template>
@@ -16,6 +20,7 @@
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
+import { getTransferApplyStatusName } from '@/constants/order'
 import { queryOutTradepositiontransfer } from '@/services/api/transfer'
 import AppTable from '@pc/components/base/table/index.vue'
 

+ 1 - 1
src/stores/modules/enum.ts

@@ -12,7 +12,7 @@ export interface EnumType {
     disabled?: boolean;
 }
 
-const enumKeys = ['confirmStatus', 'executetype', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus'] as const
+const enumKeys = ['confirmStatus', 'executetype', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'transferapplystatus'] as const
 
 const enumMap = new Map<typeof enumKeys[number], ShallowRef<Model.EnumRsp[]>>()