Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/packages/mobile/views/ballot/detail/components/delisting/index.vue

@@ -14,7 +14,7 @@
             </Field>
             <Field label="最大申购量">
                 <template #input>
-                    <span>{{ detail.buymaxqty }}</span>
+                    <span>{{ detail.maxbuyqty }}</span>
                 </template>
             </Field>
             <Field label="预售定金">
@@ -62,11 +62,11 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
     OrderQty: [{
         validator: (val) => {
             if (val) {
-                const buymaxqty = props.detail.buymaxqty
-                if (val <= buymaxqty) {
+                const maxbuyqty = props.detail.maxbuyqty
+                if (val <= maxbuyqty) {
                     return true
                 }
-                return '委托数量不能大于' + buymaxqty
+                return '委托数量不能大于' + maxbuyqty
             }
             return '请输入认购数量'
         }

src/packages/pc/views/account/receipt/components/edit/index.vue

@@ -1,8 +1,8 @@
 <!-- 账户管理-发票信息管理-编辑 -->
 <template>
-    <app-drawer :title="selectedRow?.autoid ? '修改发票' : '新增发票'" :width="460" v-model:show="show" :loading="loading"
+    <app-drawer :title="selectedRow?.autoid ? '修改发票' : '新增发票'" :width="800" v-model:show="show" :loading="loading"
         :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item label="发票类型" prop="ReceiptType">
                 <el-radio-group v-model="formData.ReceiptType">
                     <el-radio :label="1">个人</el-radio>

src/packages/pc/views/account/receipt/index.vue

@@ -59,7 +59,7 @@ filterOptons.buttonList = [
     {
         lable: '新增发票', className: 'el-button--primary', onClick: () => {
             selectedRow.value = undefined
-            openComponent('new')
+            openComponent('edit')
         }
     },
 ]

src/packages/pc/views/market/trade/presell/ballot/detail/delisting/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易市场-预售转让-预售中签-详情-我要认购 -->
 <template>
-    <app-drawer title="我要认购" v-model:show="show" :width="400" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="我要认购" v-model:show="show" :width="800" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item label="发行价">
                 <span>{{ selectedRow.refprice }}</span>
             </el-form-item>
@@ -10,7 +10,7 @@
                     v-model="formData.OrderQty" />
             </el-form-item>
             <el-form-item label="最大申购量">
-                <span>{{ selectedRow.buymaxqty }}</span>
+                <span>{{ selectedRow.maxbuyqty }}</span>
             </el-form-item>
             <el-form-item label="预售定金">
                 <span>{{ deposit }}</span>
@@ -68,11 +68,11 @@ const formRules: FormRules = {
         required: true,
         validator: (rule, value, callback) => {
             if (value) {
-                const buymaxqty = props.selectedRow.buymaxqty
-                if (value <= buymaxqty) {
+                const maxbuyqty = props.selectedRow.maxbuyqty
+                if (value <= maxbuyqty) {
                     callback()
                 } else {
-                    callback(new Error('认购数量不能大于' + buymaxqty))
+                    callback(new Error('认购数量不能大于' + maxbuyqty))
                 }
             } else {
                 callback(new Error('请输入认购数量'))

src/packages/pc/views/market/trade/spot/order/delisting/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易市场-仓单交易-买卖大厅-摘牌 -->
 <template>
-    <app-drawer title="摘牌" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="摘牌" v-model:show="show" :width="800" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item label="挂牌方">
                 <span>{{ quoteDetail.username }}</span>
             </el-form-item>

src/packages/pc/views/market/trade/spot/order/listing/index.vue

@@ -1,7 +1,7 @@
 <!-- 交易市场-仓单交易-买卖大厅-挂牌 -->
 <template>
-    <app-drawer title="挂牌" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="挂牌" v-model:show="show" :width="800" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item prop="PerformanceTemplateID" label="履约方式">
                 <Performance :market-id="17201" tmptype="0,2" v-model="formData.PerformanceTemplateID" />
             </el-form-item>

src/types/model/presale.d.ts

@@ -23,6 +23,7 @@ declare namespace Model {
         goodsid: number; // 商品ID
         goodsname: string; // 期货合约名称
         marketid: number; // 预售市场ID - 根据预售模式选择市场
+        maxbuyqty: number; // 购买上限 [71] - 0为不限
         pictureurls: string; // 详情图片(逗号分隔)(宽：1125)
         presaledamount: number; // 已预售总金额(预售结束时更新)71-委托时更新
         presaledepositalgorithm: number; // 预售定金方式(48) - 1：比率 2：固定