update

src/packages/mobile/views/credit/signin/index.vue

@@ -86,7 +86,7 @@
                         <Button type="primary" round @click="toPurchase">去完成</Button>
                     </div>
                 </dd>
-                <!-- <dd class="list-item">
+                <dd class="list-item">
                     <div class="list-item__title">
                         <div class="title-icon">
                             <img src="@mobile/assets/icons/goods.png" />
@@ -99,7 +99,7 @@
                     <div class="list-item__button">
                         <Button type="primary" round @click="toSupplyDemand">去完成</Button>
                     </div>
-                </dd> -->
+                </dd>
             </dl>
         </div>
         <app-register-code v-model:show="showQRCode" :text="userAccount.refernum" />

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

@@ -46,12 +46,12 @@ const tabList: Tabbar[] = [
     icon: 'icon-purchase',
     activeIcon: 'icon-purchase-active',
   },
-  // {
-  //   name: 'supplyDemand',
-  //   label: '供求',
-  //   icon: 'icon-supply-demand',
-  //   activeIcon: 'icon-supply-demand-active',
-  // },
+  {
+    name: 'supplyDemand',
+    label: '供求',
+    icon: 'icon-supply-demand',
+    activeIcon: 'icon-supply-demand-active',
+  },
   {
     name: 'mine',
     label: '我的',

src/packages/mobile/views/mine/wareorder/list/components/holdlb/index.vue

@@ -26,7 +26,7 @@
                         </table>
                     </div>
                     <div class="section-item__btnbar">
-                        <!-- <Button size="small" round @click="listing(item)">挂牌</Button> -->
+                        <Button size="small" round @click="listing(item)">挂牌</Button>
                         <Button size="small" round @click="pickup(item)">提货</Button>
                     </div>
                 </li>
@@ -64,10 +64,10 @@ const pickup = (item: Model.HoldLBRsp) => {
     openComponent('pickup')
 }
 
-// const listing = (item: Model.HoldLBRsp) => {
-//     selectedRow.value = item
-//     openComponent('listing')
-// }
+const listing = (item: Model.HoldLBRsp) => {
+    selectedRow.value = item
+    openComponent('listing')
+}
 
 const onRefresh = (finish: () => void) => {
     /// 查询未完成

src/packages/mobile/views/supply-demand/detail/components/delisting/index.vue

@@ -17,12 +17,17 @@
                     <span>{{ quoteDetail.orderqty }}</span>
                 </template>
             </Field>
-            <Field name="WRFactorTypeId" :rules="formRules.WRFactorTypeId" label="现货仓单" is-link
+            <!-- <Field name="WRFactorTypeId" :rules="formRules.WRFactorTypeId" label="现货仓单" is-link
                 v-if="buyorsell === BuyOrSell.Sell">
                 <template #input>
                     <app-select :options="dataList" :optionProps="{ label: 'wrholdeno', value: 'wrid' }"
                         @confirm="onConfirm" />
                 </template>
+            </Field> -->
+            <Field label="可用数量" v-if="buyorsell === BuyOrSell.Sell">
+                <template #input>
+                    <span>{{ selectedRow?.enableqty ?? 0 }}</span>
+                </template>
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="摘牌数量">
                 <template #input>
@@ -56,7 +61,7 @@ import { queryHoldLB } from '@/services/api/order'
 import { useHdWRDealOrder } from '@/business/trade'
 import Long from 'long'
 import AppPopup from '@mobile/components/base/popup/index.vue'
-import AppSelect from '@mobile/components/base/select/index.vue'
+//import AppSelect from '@mobile/components/base/select/index.vue'
 
 const props = defineProps({
     quoteItem: {
@@ -79,8 +84,8 @@ const { formData, formSubmit } = useHdWRDealOrder()
 const formRef = shallowRef<FormInstance>()
 const refresh = shallowRef(false) // 是否刷新父组件数据
 const showModal = shallowRef(true)
-const dataList = shallowRef<Model.HoldLBRsp[]>([]) //现货仓单列表
-const selectedRow = shallowRef<Model.HoldLBRsp>() //选择的仓单
+//const dataList = shallowRef<Model.HoldLBRsp[]>([]) //现货仓单列表
+const selectedRow = shallowRef<Model.HoldLBRsp>() //选中的现货仓单
 
 // 货款金额
 const amount = computed(() => {
@@ -89,12 +94,6 @@ const amount = computed(() => {
     return (OrderQty * fixedprice).toFixed(2)
 })
 
-// 关闭弹窗
-const closed = (isRefresh = false) => {
-    refresh.value = isRefresh
-    showModal.value = false
-}
-
 // 表单验证规则
 const formRules: { [key in keyof Proto.HdWRDealOrderReq]?: FieldRule[] } = {
     WRFactorTypeId: [{
@@ -107,21 +106,31 @@ const formRules: { [key in keyof Proto.HdWRDealOrderReq]?: FieldRule[] } = {
         message: '请输入数量',
         validator: (val) => {
             if (val) {
-                if (val <= props.quoteDetail.orderqty) {
-                    return true
+                const { enableqty = 0 } = selectedRow.value ?? {}
+                if (val > props.quoteDetail.orderqty) {
+                    return '剩余数量不足'
+                }
+                if (val > enableqty) {
+                    return '可用数量不足'
                 }
-                return '可用数量不足'
+                return true
             }
             return false
         }
     }],
 }
 
-// 选择仓单
-const onConfirm = (value: string) => {
-    selectedRow.value = dataList.value.find((e) => e.wrid === value)
-    formRef.value?.validate('WRFactorTypeId')
-    formRef.value?.validate('OrderQty')
+// // 选择仓单
+// const onConfirm = (value: string) => {
+//     selectedRow.value = dataList.value.find((e) => e.wrid === value)
+//     formRef.value?.validate('WRFactorTypeId')
+//     formRef.value?.validate('OrderQty')
+// }
+
+// 关闭弹窗
+const closed = (isRefresh = false) => {
+    refresh.value = isRefresh
+    showModal.value = false
 }
 
 // 提交摘牌
@@ -157,10 +166,10 @@ const onSubmit = () => {
 queryHoldLB({
     data: {
         accountid: firstAccountId.value,
-        wrstandardid: props.quoteItem.wrstandardid
+        wrfactortypeid: props.quoteItem.wrfactortypeid
     },
     success: (res) => {
-        dataList.value = res.data
+        selectedRow.value = res.data[0]
     }
 })
 

src/packages/mobile/views/supply-demand/detail/components/listing/index.vue

@@ -2,7 +2,7 @@
     <app-popup class="supply-demand-listing" :title="buyorsell === BuyOrSell.Sell ? '我要卖' : '我要买'" v-model:show="showModal"
         :refresh="refresh">
         <Form class="supply-demand-listing__form" ref="formRef" @submit="onSubmit">
-            <Field name="FixedPrice" :rules="formRules.FixedPrice" label="价格">
+            <Field name="FixedPrice" :rules="formRules.FixedPrice" label="挂牌价格">
                 <template #input>
                     <Stepper v-model="formData.FixedPrice" :default-value="quoteItem.spotgoodsprice" theme="round"
                         :auto-fixed="false" button-size="22" />
@@ -15,12 +15,12 @@
                         @confirm="onConfirm" />
                 </template>
             </Field> -->
-            <Field label="剩余数量" v-if="buyorsell === BuyOrSell.Sell">
+            <Field label="可用数量" v-if="buyorsell === BuyOrSell.Sell">
                 <template #input>
                     <span>{{ selectedRow?.enableqty ?? 0 }}</span>
                 </template>
             </Field>
-            <Field name="OrderQty" :rules="formRules.OrderQty" label="数量">
+            <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌数量">
                 <template #input>
                     <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :auto-fixed="false" integer />
                 </template>
@@ -96,7 +96,7 @@ const formRules: { [key in keyof Proto.HdWROrderReq]?: FieldRule[] } = {
                 if (props.buyorsell === BuyOrSell.Buy || val <= enableqty) {
                     return true
                 }
-                return enableqty ? '数量不能大于 ' + enableqty : '可用数量不足'
+                return '可用数量不足'
             }
             return false
         }

src/services/http/index@next.ts

@@ -127,9 +127,10 @@ interface RequestOptions<Req, Rsp> {
 
 function useRequest<Req extends object, Rsp>(runAsync: (params: Req) => Promise<Rsp>, options: RequestOptions<Req, Rsp>) {
     const loading = ref(false)
-
+    const data = ref<Rsp>()
+    const { dataList, filters, total, pageIndex, pageSize, pageCount } = useDataTable<Rsp>()
     if (options.pagination) {
-        const { dataList, filters, total, pageIndex, pageSize, pageCount } = useDataTable<Rsp>()
+
 
         const defaultParams = {
             page: pageIndex.value,
@@ -137,19 +138,18 @@ function useRequest<Req extends object, Rsp>(runAsync: (params: Req) => Promise<
             ...options.params
         }
 
-        const run = (payload: Partial<Req> = {}) => {
-            runAsync({ ...options.params, ...payload }).then((res) => {
-                if (Array.isArray(res)) {
-                    dataList.value = res
-                }
-                options.onSuccess && options.onSuccess(res)
-            })
-        }
-    } else {
-        const data = ref<Rsp>()
 
     }
 
+    const run = (payload: Partial<Req> = {}) => {
+        runAsync({ ...options.params, ...payload }).then((res) => {
+            if (Array.isArray(res)) {
+                dataList.value = res
+            }
+            options.onSuccess && options.onSuccess(res)
+        })
+    }
+
 
 
     const cancel = () => {