Handy_Cao 2 năm trước cách đây
mục cha
commit
1fd2a3814c

+ 2 - 2
src/packages/mobile/views/order/delivery/components/offline/detail/Index.vue

@@ -10,8 +10,8 @@
                     <Cell title="商品代码/名称" :value="selectedRow.goodsnamedisplay" />
                     <Cell title="交收方向" :value="selectedRow.buyorselldisplay" />
                     <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <Cell title="交收价格" :value="selectedRow.deliveryprice" />
-                    <Cell title="交收货款" :value="selectedRow.deliveryamount" />
+                    <Cell title="交收价格" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryprice" />
+                    <Cell title="交收货款" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryamount" />
                     <Cell title="交收对手方" :value="selectedRow.matchusername" />
                     <Cell title="交收信息" :value="selectedRow.deliveryinfo" />
                     <Cell title="申请时间" :value="selectedRow.reqtime" />

+ 1 - 1
src/packages/mobile/views/order/performance/components/detail/Index.vue

@@ -16,7 +16,7 @@
                     <Cell title="卖方" :value="selectedRow.sellusername" />
                     <Cell title="买方已付" :value="formatDecimal(selectedRow.buypaidamount)" />
                     <Cell title="卖方已收" :value="formatDecimal(selectedRow.sellreceivedamount)" />
-                    <Cell title="当前步骤" :value="selectedRow.curstepname" />
+                    <Cell title="当前步骤" :value="handleNoneValue(selectedRow.curstepname)" />
                     <Cell title="步骤到期时间" :value="formatDate(selectedRow.curstepdeadline)" />
                     <Cell title="开始时间" :value="formatDate(selectedRow.starttime)" />
                     <Cell title="关联单号" :value="selectedRow.relatedorderid" />

+ 1 - 1
src/packages/mobile/views/order/position/components/transfer/listing/Index.vue

@@ -35,7 +35,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" :min="quote?.limitdown"
-                                :max="quote?.limitup" :decimal-length="2" :auto-fixed="false" button-size="22" />
+                                :max="quote?.limitup" :step="Math.pow(10, -selectedRow.decimalplace)" :decimal-length="selectedRow.decimalplace" :auto-fixed="false" button-size="22" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="转让数量">

+ 2 - 2
src/packages/pc/views/account/sign/components/sign/index.vue

@@ -10,13 +10,13 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="银行卡号" prop="BankAccountNo">
-                <el-input name="BankAccountNo" placeholder="银行卡账户名" v-model="formData.BankAccountNo" :rules="formRules.BankAccountNo"/>
+                <el-input name="BankAccountNo" placeholder="银行卡账户名" :maxlength="30" v-model="formData.BankAccountNo" :rules="formRules.BankAccountNo"/>
             </el-form-item>
             <el-form-item label="姓名" prop="BankAccountName">
                 <el-input name="BankAccountName" readonly placeholder="银行卡账户名" v-model="formData.BankAccountName" :rules="formRules.BankAccountName"/>
             </el-form-item>
             <el-form-item label="支行名称" prop="BranchBankName">
-                <el-input name="BranchBankName" placeholder="请输入银行卡支行名称" v-model="formData.OpenBankName" :rules="formRules.OpenBankName"/>
+                <el-input name="BranchBankName" placeholder="请输入银行卡支行名称" :maxlength="20" v-model="formData.OpenBankName" :rules="formRules.OpenBankName"/>
             </el-form-item>
         </el-form>
         <template #footer>

+ 1 - 1
src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -4,7 +4,7 @@
         <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="请输入" :precision="2" v-model="formData.Amount" />
+                <el-input-number placeholder="请输入" :max="9999999999" :precision="2" v-model="formData.Amount" />
             </el-form-item>
             <el-form-item label="凭证">
                 <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" />

+ 3 - 3
src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -5,17 +5,17 @@
             <el-form-item label="资金账号">
                 <span>{{ accountStore.currentAccountId }}</span>
             </el-form-item>
-            <el-form-item label="账户余额">
+            <el-form-item label="可用余额">
                 <span>{{ accountStore.currentAccount.currentbalance?.toFixed(2) }}</span>
             </el-form-item>
             <el-form-item label="出金金额" prop="Amount">
-                <el-input type="number" placeholder="请输入出金金额" :precision="2" v-model="formData.Amount" />
+                <el-input-number placeholder="请输入出金金额" :precision="2" v-model="formData.Amount" />
             </el-form-item>
             <!-- <el-form-item label="金额大写">
                 <span>壹万元</span>
             </el-form-item> -->
             <el-form-item class="el-form-item--row" label="备注" prop="Remark">
-                <el-input type="textarea" :rows="3" v-model="formData.Remark" />
+                <el-input type="textarea" :maxlength="50" :rows="3" v-model="formData.Remark" />
             </el-form-item>
         </el-form>
         <template #footer>

+ 1 - 1
src/services/http/index.ts

@@ -243,7 +243,7 @@ export default new (class {
                     return Promise.resolve(res as T)
                 }
                 const { getErrorInfoByCode } = useErrorInfoStore()
-                const msg = getErrorInfoByCode(res.RetCode)
+                const msg = getErrorInfoByCode([6003, 6007].includes(res.status) ? res.status : res.RetCode)
                 const error = String(res.RetDesc || res.RetCode || res.Status)
                 return Promise.reject(msg ?? error)
             }

+ 2 - 0
src/types/model/transfer.d.ts

@@ -33,11 +33,13 @@ declare namespace Model {
         depositremain: number; // 未付定金
         goodscode: string; // 期货合约代码(内部)
         goodsid: number; // 商品Id
+        decimalplace: number; // 行情小数位
         goodsname: string; // 期货合约名称
         goodsnamedisplay: string; // 商品名称
         lasttradedate: string; // 最后交易日期
         paystatus: number; // 支付状态 -1:待支付 2:已支付
         presaleprice: number; // 发售价(49)
+        quoteminunit: number; // 行情小数位
         relatedgoodsid: number; // 关联交易合约ID
         sellname: string; // 客户名称(企业名称)
         transferdeposit: number; // 转让定金(49)