xxxx

src/packages/pc/views/footer/goods/order/index.vue

@@ -14,8 +14,10 @@
             {{ formatDate(value) }}
         </template>
         <!-- 展开行 -->
-        <template #expand>
-            <el-button type="danger" @click="openComponent('cancel')">撤销</el-button>
+        <template #expand="{ row }">
+            <div class="buttonbar">
+                <el-button type="danger" size="small" @click="showComponent('cancel', row)">撤销</el-button>
+            </div>
         </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
@@ -50,7 +52,8 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
     run()
 })
 
-const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.TradeOrderDetailRsp>({ rowKey: 'orderid' })
+const { rowKey, expandKeys, rowClick } = useComposeTable<Model.TradeOrderDetailRsp>({ rowKey: 'orderid' })
+const selectedRow = shallowRef<Model.TradeOrderDetailRsp>()
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '订单合约' },
@@ -62,4 +65,9 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'ordertime', label: '委托时间' },
     { prop: 'orderstatus', label: '状态' }
 ])
+
+const showComponent = (componentName: string, row: Model.TradeOrderDetailRsp) => {
+    selectedRow.value = row
+    openComponent(componentName)
+}
 </script>

src/packages/pc/views/footer/spot/order/index.vue

@@ -18,8 +18,10 @@
             {{ formatDate(value) }}
         </template>
         <!-- 展开行 -->
-        <template #expand >
-            <el-button type="danger" @click="openComponent('cancel')">撤销</el-button>
+        <template #expand="{ row }">
+            <div class="buttonbar">
+                <el-button type="danger" size="small" @click="showComponent('cancel', row)">撤销</el-button>
+            </div>
         </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
@@ -56,7 +58,8 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
     run()
 })
 
-const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.WrOrderDetailRsp>({ rowKey: 'wrtradeorderid' })
+const { rowKey, expandKeys, rowClick } = useComposeTable<Model.WrOrderDetailRsp>({ rowKey: 'wrtradeorderid' })
+const selectedRow = shallowRef<Model.WrOrderDetailRsp>()
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'wrtradeorderid', label: '挂牌单号' },
@@ -73,4 +76,9 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'ordertime', label: '挂牌时间' }
 ])
 
+const showComponent = (componentName: string, row: Model.WrOrderDetailRsp) => {
+    selectedRow.value = row
+    openComponent(componentName)
+}
+
 </script>

src/packages/pc/views/footer/spot/position/components/listing/index.vue

@@ -1,25 +1,25 @@
 <!-- 现货仓单-现货明细-挂牌 -->
 <template>
     <app-drawer title="挂牌" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" label-position="left" :model="formData"
+        <el-form ref="formRef" class="el-form--vertical" label-width="120px" label-position="left" :model="formData"
             :rules="formRules">
             <el-form-item label="商品代码/名称">
-                
+                <span>{{selectedRow.wrstandardcode}}/{{ selectedRow.wrstandardname }}</span>
             </el-form-item>
-            <el-form-item label="仓库">
-                
+            <el-form-item label="仓库" >
+                <span>{{selectedRow.warehousename}}</span>
             </el-form-item>
             <el-form-item label="库存量">
-                
+                <span>{{selectedRow.qty}}</span>
             </el-form-item>
             <el-form-item label="冻结量">
-                
+                <span>{{selectedRow.freezerqty}}</span>
             </el-form-item>
             <el-form-item label="可用量">
-                
+                <span>{{selectedRow.enableqty}}</span>
             </el-form-item>
             <el-form-item prop="OrderQty" label="挂牌数量">
-                <el-input-number placeholder="请输入挂牌数量" v-model="formData.OrderQty" />
+                <el-input-number placeholder="请输入挂牌数量" v-model="formData.OrderQty" :max="selectedRow.enableqty" min="0" />
             </el-form-item>
             <el-form-item prop="FixedPrice" label="挂牌价格">
                 <el-input-number placeholder="请输入挂牌价格" v-model="formData.FixedPrice" />
@@ -27,7 +27,7 @@
         </el-form>
         <template #footer>
             <el-button type="primary" @click="formSubmit">提交</el-button>
-            <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="danger" @click="onCancel(false)">取消</el-button>
         </template>
     </app-drawer>
 </template>
@@ -45,6 +45,8 @@ const props = defineProps({
     }
 })
 
+console.log(props.selectedRow)
+
 const { formData, listingSubmit, loading } = useHdWROrder()
 const show = ref(true)
 const refresh = ref(false)
@@ -59,14 +61,8 @@ const formRules: FormRules = {
     }],
     OrderQty: [{
         message: '请输入数量',
-        validator: (val) => {
-            // if (val) {
-            //     if (val > props.selectedRow.enableqty) {
-            //         return '可用数量不足'
-            //     }
-            //     return true
-            // }
-            return false
+        validator: () => {
+            return !!formData.OrderQty
         }
     }],
 }

src/packages/pc/views/footer/spot/position/index.vue

@@ -6,9 +6,11 @@
             {{ formatDate(value) }}
         </template>
         <!-- 展开行 -->
-        <template #expand>
-            <el-button type="primary" @click="openComponent('listing')">挂牌</el-button>
-            <el-button type="danger" @click="openComponent('pickup')">提货</el-button>
+        <template #expand="{ row }">
+            <div class="buttonbar">
+                <el-button type="primary" size="small" @click="showComponent('listing', row)">挂牌</el-button>
+                <el-button type="danger" size="small" @click="showComponent('pickup', row)">提货</el-button>
+            </div>
         </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
@@ -39,7 +41,8 @@ defineProps({
     code: String
 })
 
-const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.HoldLBRsp>({ rowKey: 'ladingbillid' })
+const { rowKey, expandKeys, rowClick } = useComposeTable<Model.HoldLBRsp>({ rowKey: 'ladingbillid' })
+const selectedRow = shallowRef<Model.HoldLBRsp>()
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'wrholdeno', label: '仓单编号' },
@@ -53,4 +56,9 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'createtime', label: '过户时间' }
 ])
 
+const showComponent = (componentName: string, row: Model.HoldLBRsp) => {
+    selectedRow.value = row
+    openComponent(componentName)
+}
+
 </script>