update

src/business/bargain/index.ts

@@ -13,7 +13,7 @@ import Long from 'long'
 /**
  * 我的询价
  */
-export function useBargain(type: 0 | 1) {
+export function useBargain() {
     const { getUserId } = useLoginStore()
     const { dataList, total, pageIndex, pageSize } = useDataTable<Ermcp.MyBargainApplyRsp | Ermcp.MyDelistingApplyRsp>()
     const loading = shallowRef(false)
@@ -58,7 +58,7 @@ export function useBargain(type: 0 | 1) {
 
         const [buyOrSell, applyStatus] = selectList
         const param: Ermcp.MyBargainApplyReq | Ermcp.MyDelistingApplyReq = {
-            type,
+            type: 0,
             page: pageIndex.value,
             pagesize: pageSize.value,
             userid: getUserId(),
@@ -112,9 +112,9 @@ export function useBargain(type: 0 | 1) {
 }
 
 /**
- * 我的询价-求购
+ * 询价消息-买方询价
  */
-export function useBuyBargain(type: 0 | 1) {
+export function useBuyBargain() {
     const { getUserId } = useLoginStore()
     const { dataList, total, pageIndex, pageSize } = useDataTable<Ermcp.MyBargainApplyRsp>()
     const loading = shallowRef(false)
@@ -143,12 +143,12 @@ export function useBuyBargain(type: 0 | 1) {
         },
     ]
 
-    // 获取我的询价列表
+    // 获取询价列表
     const getBargainOrderList = () => {
         loading.value = true
         return queryMyBargainApply({
             data: {
-                type,
+                type: 1,
                 page: pageIndex.value,
                 pagesize: pageSize.value,
                 userid: getUserId(),
@@ -178,9 +178,9 @@ export function useBuyBargain(type: 0 | 1) {
 }
 
 /**
- * 我的询价-出售
+ * 询价消息-卖方询价
  */
-export function useSellBargain(type: 0 | 1) {
+export function useSellBargain() {
     const { getUserId } = useLoginStore()
     const { dataList, total, pageIndex, pageSize } = useDataTable<Ermcp.MyDelistingApplyRsp>()
     const loading = shallowRef(false)
@@ -209,12 +209,12 @@ export function useSellBargain(type: 0 | 1) {
         },
     ]
 
-    // 获取我的询价列表
+    // 获取询价列表
     const getBargainOrderList = () => {
         loading.value = true
         return queryMyDelistingApply({
             data: {
-                type,
+                type: 1,
                 page: pageIndex.value,
                 pagesize: pageSize.value,
                 userid: getUserId(),

src/components/base/modal/index.vue

@@ -1,6 +1,6 @@
 <!-- 基础模态框组件 -->
 <template>
-    <teleport :to="teleport">
+    <teleport :to="teleportTo">
         <div class="app-modal" v-bind="$attrs" :style="modalStyles" v-show="visible">
             <div :class="['app-modal__mask', transitionClass]" :style="transitionStyles"></div>
             <div :class="['app-modal__wrapper', direction]" @click.self="onMask">
@@ -35,7 +35,7 @@ export default defineComponent({
             default: true,
         },
         // 窗口插入到指定元素
-        teleport: {
+        teleportTo: {
             type: String,
             default: 'body',
         },

src/packages/mobile/views/home/components/market/index.vue

@@ -5,7 +5,7 @@
       <Grid :column-num="3" style="margin-bottom: .2rem;">
         <GridItem icon="photo-o" text="商品" :to="{ name: 'order' }" v-for="index in 6" :key="index" />
       </Grid>
-      <app-table :data-list="quoteDayList" v-model:columns="columns" @row-click="rowClick">
+      <app-table :data="quoteDayList" v-model:columns="columns" @row-click="rowClick">
         <template #expandRow>
           扩展
         </template>

src/packages/pc/views/bargain/buy/index.vue

@@ -41,7 +41,7 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useBuyBargain(1)
+const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useBuyBargain()
 
 // “待确认”有操作 ”同意“、”拒绝“
 const handleTableButtons = (row: Ermcp.MyBargainApplyRsp) => {

src/packages/pc/views/bargain/sell/index.vue

@@ -37,7 +37,7 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useSellBargain(1)
+const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useSellBargain()
 
 // “待确认”有操作 ”同意“、”拒绝“
 const handleTableButtons = (row: Ermcp.MyDelistingApplyRsp) => {

src/packages/pc/views/order/main/components/details/index.vue

@@ -22,7 +22,7 @@
                 <el-descriptions-item label="买方联络信息">{{ selectedRow.buyerinfo }}</el-descriptions-item>
                 <el-descriptions-item label="卖方联络信息">{{ selectedRow.sellerinfo }}</el-descriptions-item>
             </el-descriptions>
-            <app-table :data="dataList" :columns="columns" :show-header="false" :row-style="rowStyle">
+            <app-table :data="dataList" :columns="columns" :show-header="false" :row-style="rowStyle" border>
                 <!-- 步骤值 -->
                 <template #stepvalue="{ value }">
                     {{ (value * 100).toFixed(1) }}

src/packages/pc/views/trade/bargain/index.vue

@@ -41,7 +41,7 @@ import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useBargain(0)
+const { loading, dataList, total, pageIndex, pageSize, columns, selectList, buttonList, getBargainOrderList } = useBargain()
 
 // “待确认”状态 有撤销按钮
 const handleTableButtons = (row: Ermcp.MyBargainApplyRsp | Ermcp.MyDelistingApplyRsp) => {

src/packages/pc/views/trade/delisting/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 挂牌大厅-我的摘牌-详情 -->
 <template>
-    <teleport :to="teleport">
+    <teleport :to="teleportTo">
         <app-view class="app-details" v-bind="$attrs">
             <template #header>
                 <el-button @click="$emit('closed')">返回</el-button>
@@ -69,7 +69,7 @@ import { PropType } from 'vue'
 import { BuyOrSell } from '@/constants/order'
 
 defineProps({
-    teleport: {
+    teleportTo: {
         type: String as PropType<'#appPageTeleport' | '#appMainTeleport'>,
         default: '#appPageTeleport'
     },

src/packages/pc/views/trade/purchase/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 挂牌大厅-我的求购-详情 -->
 <template>
-    <teleport :to="teleport">
+    <teleport :to="teleportTo">
         <app-view class="app-details" v-bind="$attrs">
             <template #header>
                 <el-button @click="$emit('closed')">返回</el-button>
@@ -70,21 +70,62 @@
                     </table>
                 </div>
             </div>
+            <div class="property">
+                <h1>询价信息</h1>
+                <app-table :data="dataList" v-model:columns="columns" :show-header="false" border>
+                    <!-- 申请状态 -->
+                    <template #applystatus="{ value }">
+                        {{ getApplyStatusName(value) }}
+                    </template>
+                    <!-- 总价 -->
+                    <template #applyprice="{ row }">
+                        {{ row.zscurrencytypedisplayunit + formatDecimal(row.applyprice) }}
+                    </template>
+                </app-table>
+            </div>
         </app-view>
     </teleport>
 </template>
 
 <script lang="ts" setup>
-import { PropType } from 'vue'
+import { PropType, shallowRef } from 'vue'
+import { formatDecimal } from '@/filters'
+import { getApplyStatusName } from '@/constants/order'
+import { useLoginStore } from '@/stores'
+import { queryMyDelistingApply } from '@/services/api/trade'
+import AppTable from '@pc/components/base/table/index.vue'
 
-defineProps({
-    teleport: {
+const props = defineProps({
+    teleportTo: {
         type: String as PropType<'#appPageTeleport' | '#appMainTeleport'>,
         default: '#appPageTeleport'
     },
     selectedRow: {
         type: Object as PropType<Ermcp.MyBuyOrderRsp>,
-        default: () => ({})
+        required: true
+    },
+})
+
+const { getUserId } = useLoginStore()
+const dataList = shallowRef<Ermcp.MyDelistingApplyRsp[]>([])
+const columns = shallowRef<Ermcp.TableColumn[]>([
+    { prop: 'selldelistingapplyid', label: '询价单号', show: true },
+    { prop: 'sellusername', label: '卖方', show: true },
+    { prop: 'goodsno', label: '商品编号', show: true },
+    { prop: 'applyqty', label: '申请重量', show: true },
+    { prop: 'applyprice', label: '总价', show: true },
+    { prop: 'applystatus', label: '申请状态', show: true },
+    { prop: 'applytime', label: '申请时间', show: true },
+])
+
+queryMyDelistingApply({
+    data: {
+        type: 1,
+        userid: getUserId(),
+        buywrtradeorderid: props.selectedRow.wrtradeorderid
+    },
+    success: (res) => {
+        dataList.value = res.data
     },
 })
 </script>

src/packages/pc/views/trade/sale/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 挂牌大厅-我的出售-详情 -->
 <template>
-    <teleport :to="teleport">
+    <teleport :to="teleportTo">
         <app-view class="app-details" v-bind="$attrs">
             <template #header>
                 <el-button @click="$emit('closed')">返回</el-button>
@@ -58,24 +58,60 @@
                     </table>
                 </div>
             </div>
-            <div class="property" style="line-height:normal">
+            <div class="property">
                 <h1>询价信息</h1>
+                <app-table :data="dataList" v-model:columns="columns" :show-header="false" border>
+                    <!-- 申请状态 -->
+                    <template #applystatus="{ value }">
+                        {{ getApplyStatusName(value) }}
+                    </template>
+                    <!-- 价格 -->
+                    <template #applyprice="{ row }">
+                        {{ row.zscurrencytypedisplayunit + formatDecimal(row.applyprice) }}
+                    </template>
+                </app-table>
             </div>
         </app-view>
     </teleport>
 </template>
 
 <script lang="ts" setup>
-import { PropType } from 'vue'
+import { PropType, shallowRef } from 'vue'
+import { formatDecimal } from '@/filters'
+import { getApplyStatusName } from '@/constants/order'
+import { useLoginStore } from '@/stores'
+import { queryMyBargainApply } from '@/services/api/trade'
+import AppTable from '@pc/components/base/table/index.vue'
 
-defineProps({
-    teleport: {
+const props = defineProps({
+    teleportTo: {
         type: String as PropType<'#appPageTeleport' | '#appMainTeleport'>,
         default: '#appPageTeleport'
     },
     selectedRow: {
         type: Object as PropType<Ermcp.MySellOrderRsp>,
-        default: () => ({})
+        required: true
+    },
+})
+
+const { getUserId } = useLoginStore()
+const dataList = shallowRef<Ermcp.MyBargainApplyRsp[]>([])
+const columns = shallowRef<Ermcp.TableColumn[]>([
+    { prop: 'wrbargainid', label: '询价单号', show: true },
+    { prop: 'buyusername', label: '买方', show: true },
+    { prop: 'applyprice', label: '价格', show: true },
+    { prop: 'applystatus', label: '申请状态', show: true },
+    { prop: 'applytime', label: '申请时间', show: true },
+])
+
+queryMyBargainApply({
+    data: {
+        type: 1,
+        userid: getUserId(),
+        wrtradeorderid: props.selectedRow.wrtradeorderid
+    },
+    success: (res) => {
+        dataList.value = res.data
     },
 })
 </script>

src/packages/pc/views/warehousing/goods/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 商品详情 -->
 <template>
-    <teleport :to="teleport">
+    <teleport :to="teleportTo">
         <app-view class="app-details" v-bind="$attrs">
             <template #header>
                 <div v-if="details">
@@ -129,7 +129,7 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const props = defineProps({
-    teleport: {
+    teleportTo: {
         type: String as PropType<'#appPageTeleport' | '#appMainTeleport'>,
         default: '#appPageTeleport'
     },

src/services/api/trade/index.ts

@@ -103,14 +103,14 @@ export function queryMyDeListing(params: HttpRequest<{ req: Ermcp.MyDeListingReq
 }
 
 /**
- * 查询我的询价-求购
+ * 查询询价-求购
  */
 export function queryMyBargainApply(params: HttpRequest<{ req: Ermcp.MyBargainApplyReq, rsp: Ermcp.MyBargainApplyRsp[] }>) {
     return httpRequest('/Guangzuan/QueryMyBargainApply', 'get', params);
 }
 
 /**
- * 查询我的询价-出售
+ * 查询询价-出售
  */
 export function queryMyDelistingApply(params: HttpRequest<{ req: Ermcp.MyDelistingApplyReq, rsp: Ermcp.MyDelistingApplyRsp[] }>) {
     return httpRequest('/Guangzuan/QueryMyDelistingApply', 'get', params);

src/types/ermcp/trade.d.ts

@@ -533,6 +533,7 @@ declare namespace Ermcp {
         applystatus: number; // 申请状态 - 1:待确认 2:已确认 3:已拒绝 4:已撤销 5:系统撤销 6:处理失败 7:确认中
         applytime: string; // 申请时间
         buyorsell: number; // 买卖 - 0:买 1:卖
+        buyusername: string; // 买方
         confirmprice: number; // 可接受价格(拒绝时填写)-作废
         confirmqty: number; // 可接受数量(拒绝时填写)-作废
         confirmremark: string; // 确认备注