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

src/packages/mobile/components/modules/quote/price/index.vue

@@ -6,7 +6,7 @@
                     <span :class="quote.lastColor">{{ handleNumberValue(quote.last) }}</span>
                 </div>
                 <div class="bottom-content">
-                    <span :class="quote.lastColor">{{ handleNumberValue(quote.rise.toFixed(quote.decimalplace)) }}</span>
+                    <span :class="quote.lastColor">{{ quote.rise.toFixed(quote.decimalplace) }}</span>
                     <span :class="quote.lastColor">{{ parsePercent(quote.change) }}</span>
                 </div>
             </div>

src/packages/mobile/views/order/list/components/goodstrade/detail/Index.vue

@@ -10,7 +10,7 @@
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
                     <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
-                    <Cell title="成交数量" :value="formatDecimal(selectedRow.tradeqty)" />
+                    <Cell title="成交数量" :value="selectedRow.tradeqty" />
                     <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
                     <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
                     <Cell title="平仓损益" :value="formatDecimal(selectedRow.closepl)" />

src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue

@@ -32,7 +32,7 @@
                         </li>
                         <li>
                             <span>成交数量</span>
-                            <span>{{ formatDecimal(item.tradeqty) }}</span>
+                            <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
                             <span>平仓盈亏</span>

src/packages/mobile/views/order/list/components/listingorder/detail/Index.vue

@@ -20,7 +20,7 @@
                     <Cell title="委托单号" :value="selectedRow.wrtradeorderid" />
                 </CellGroup>
             </div>
-            <template #footer v-if="selectedRow.wrtradeorderstatus === 3 || selectedRow.wrtradeorderstatus === 7">
+            <template #footer v-if="[3, 7].includes(selectedRow.wrtradeorderstatus)">
                 <Button type="primary" block round @click="onCancelSumit">撤销</Button>
             </template>
         </app-view>

src/packages/mobile/views/order/list/components/listingorder/list/Index.vue

@@ -39,7 +39,7 @@
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
-                    <Button size="small" v-if="(item.wrtradeorderstatus === 3 || item.wrtradeorderstatus === 7)"
+                    <Button size="small" v-if="[3, 7].includes(item.wrtradeorderstatus)"
                         @click="onCancelSumit(item)" round>撤销</Button>
                 </div>
             </div>

src/packages/mobile/views/order/list/components/transferorder/list/Index.vue

@@ -34,7 +34,7 @@
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
-                    <Button size="small" @click="cancel(item)" round>撤销</Button>
+                    <Button size="small" @click="cancel(item)" v-if="[3, 7].includes(item.orderstatus)" round>撤销</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/performance/Index.vue

@@ -46,7 +46,7 @@
                             </li>
                             <li>
                                 <span>当前步骤</span>
-                                <span>{{ item.curstepname }}</span>
+                                <span>{{ handleNoneValue(item.curstepname) }}</span>
                             </li>
                             <li>
                                 <span>卖方已收</span>
@@ -59,8 +59,8 @@
                         </ul>
                     </div>
                     <div class="g-order-list__btnbar">
-                        <Button size="small" @click="showComponent('breach', item)" round>违约</Button>
-                        <Button size="small" @click="showComponent('modify', item)" round>修改</Button>
+                        <Button size="small" v-if="![6, 7].includes(item.performancestatus)" @click="showComponent('breach', item)" round>违约</Button>
+                        <Button size="small" v-if="![6, 7].includes(item.performancestatus)" @click="showComponent('modify', item)" round>修改</Button>
                         <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     </div>
                 </div>
@@ -77,7 +77,7 @@ import { Tab, Tabs, Button } from 'vant'
 import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
 import { queryPerformancePlan } from '@/services/api/performance'
-import { formatDate } from '@/filters'
+import { formatDate, handleNoneValue } from '@/filters'
 import { getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
 
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'

src/packages/mobile/views/order/performance/components/breach/Index.vue

@@ -9,7 +9,7 @@
                 <CellGroup title="履约信息">
                     <Cell title="履约单号" :value="selectedRow.performanceplanid" />
                     <Cell title="当前步骤" :value="selectedRow.curstepname" />
-                    <Field name="ApplyRemark" label="备注" v-model="formData.ApplyRemark" placeholder="请输入备注"
+                    <Field name="ApplyRemark" label="备注" v-model="formData.ApplyRemark" maxlength="50" type="textarea" rows="2" autosize show-word-limit placeholder="请输入备注"
                         :rules="formRules.ApplyRemark" />
                     <Field name="Attachment" label="附件" :rules="formRules.Attachment" is-link>
                         <template #input>

src/packages/mobile/views/order/position/components/goods/delivery/Index.vue

@@ -9,7 +9,7 @@
                 <CellGroup title="持仓信息">
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="持仓方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="持仓金额" :value="formatDecimal(selectedRow.holderamount)" />
+                    <Cell title="持仓金额" :value="formatDecimal(selectedRow.marketamount)" />
                     <Cell title="持仓数量" :value="formatDecimal(selectedRow.curpositionqty)" />
                     <Cell title="冻结数量" :value="formatDecimal(selectedRow.frozenqty)" />
                     <Cell title="可用数量" :value="formatDecimal(selectedRow.enableqty)" />