xxxx

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

@@ -5,10 +5,6 @@
         <template #reqtime="{ value }">
             {{ formatDate(value) }}
         </template>
-         <!-- 展开行 -->
-         <template #expand="{ }">
-            <el-button type="primary">主要按钮</el-button>
-        </template>
     </app-table>
 </template>
 

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

@@ -14,7 +14,7 @@
             {{ formatDate(value) }}
         </template>
         <!-- 展开行 -->
-        <template #expand >
+        <template #expand>
             <el-button type="danger" @click="openComponent('cancel')">撤销</el-button>
         </template>
     </app-table>

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

@@ -1,13 +1,28 @@
-<!-- 资金信息-资金汇总-充值 -->
+<!-- 现货仓单-现货明细-挂牌 -->
 <template>
-    <app-drawer title="充值" v-model:show="show" :loading="loading" :refresh="refresh">
+    <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"
             :rules="formRules">
-            <el-form-item prop="Amount" label="充值金额">
-                <el-input-number placeholder="请输入" v-model="formData.Amount" />
+            <el-form-item label="商品代码/名称">
+                
             </el-form-item>
-            <el-form-item label="凭证">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" />
+            <el-form-item label="仓库">
+                
+            </el-form-item>
+            <el-form-item label="库存量">
+                
+            </el-form-item>
+            <el-form-item label="冻结量">
+                
+            </el-form-item>
+            <el-form-item label="可用量">
+                
+            </el-form-item>
+            <el-form-item prop="OrderQty" label="挂牌数量">
+                <el-input-number placeholder="请输入挂牌数量" v-model="formData.OrderQty" />
+            </el-form-item>
+            <el-form-item prop="FixedPrice" label="挂牌价格">
+                <el-input-number placeholder="请输入挂牌价格" v-model="formData.FixedPrice" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -20,31 +35,40 @@
 <script lang="ts" setup>
 import { ref, PropType } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
-import { useDoDeposit } from '@/business/bank'
+import { useHdWROrder } from '@/business/trade'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
-import AppUpload from '@pc/components/base/upload/index.vue'
 
 const props = defineProps({
     selectedRow: {
-        type: Object as PropType<Model.TaAccountsRsp>,
+        type: Object as PropType<Model.HoldLBRsp>,
         required: true
     }
 })
 
-console.log(props.selectedRow)
-
-const { formData, onSubmit, extendInfo, loading } = useDoDeposit(props.selectedRow.userid)
+const { formData, listingSubmit, loading } = useHdWROrder()
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
 
 const formRules: FormRules = {
-    Amount: [{ required: true, message: '请输入充值金额' }],
-}
-
-const onUploadChange = (file: { filePath: string }) => {
-    console.log(file.filePath)
-    extendInfo.certificate_photo_url = file.filePath
+    FixedPrice: [{
+        message: '请输入价格',
+        validator: () => {
+            return !!formData.FixedPrice
+        }
+    }],
+    OrderQty: [{
+        message: '请输入数量',
+        validator: (val) => {
+            // if (val) {
+            //     if (val > props.selectedRow.enableqty) {
+            //         return '可用数量不足'
+            //     }
+            //     return true
+            // }
+            return false
+        }
+    }],
 }
 
 const onCancel = (isRefresh = false) => {
@@ -53,19 +77,18 @@ const onCancel = (isRefresh = false) => {
 }
 
 const formSubmit = () => {
-    formRef.value?.validate((valid) => {
-        if (valid) {
-            if (formData.CusBankID) {
-                onSubmit().then(() => {
-                    ElMessage.success('提交成功')
-                    onCancel(true)
-                }).catch((err) => {
-                    ElMessage.error('提交失败:' + err)
-                })
-            } else {
-                ElMessage.error('未签约')
-            }
-        }
+    const { wrstandardid, subnum, deliverygoodsid, ladingbillid = '0', wrfactortypeid = '0' } = props.selectedRow ?? {}
+    formData.WRStandardID = wrstandardid
+    formData.DeliveryGoodsID = deliverygoodsid
+    formData.LadingBillId = ladingbillid
+    formData.WRFactorTypeId = wrfactortypeid
+    formData.SubNum = subnum
+
+    listingSubmit().then(() => {
+        ElMessage.success('挂牌成功')
+        onCancel(true)
+    }).catch((err) => {
+        ElMessage.error('挂牌失败:' + err)
     })
 }
 </script>

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

@@ -1,4 +1,4 @@
-<!-- 资金信息-资金汇总-充值 -->
+<!-- 现货仓单-现货明细-提货 -->
 <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"