Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -30,6 +30,7 @@
         "enddate": "EndDate",
         "choice": "Please choice",
         "choice1": "Please enter kewords",
+        "choice2": "Choice",
         "yes": "Yes",
         "no": "No",
         "submitfailure": "Submit Failure:",
@@ -428,7 +429,13 @@
             "freezemargin": "FreezeMargin",
             "tips1": "Is the confirmation to be revoked?",
             "tips2": "Revocation is successful",
-            "tips3": "Is the confirmation to be revoked?"
+            "tips3": "Is the confirmation to be revoked?",
+            "clear": {
+                "title": "Quick Clear",
+                "goodsId": "Goods",
+                "buyOrSell": "BuyOrSell",
+                "price": "Price"
+            }
         },
         "goodstrade": {
             "title": "Goods Trades",

public/locales/zh-CN.json

@@ -31,6 +31,7 @@
         "enddate": "结束日期",
         "choice": "请选择",
         "choice1": "请输入关键字",
+        "choice2": "选择",
         "yes": "是",
         "no": "否",
         "submitfailure": "提交失败:",
@@ -430,7 +431,13 @@
             "freezemargin": "冻结金额",
             "tips1": "是否撤销该委托单？",
             "tips2": "撤销成功",
-            "tips3": "是否撤销该交收单？"
+            "tips3": "是否撤销该交收单？",
+            "clear": {
+                "title": "快撤",
+                "goodsId": "委托商品",
+                "buyOrSell": "委托方向",
+                "price": "撤销价格"
+            }
         },
         "goodstrade": {
             "title": "订单成交单",

src/filters/index.ts

@@ -251,6 +251,21 @@ export function diffDays(value?: string) {
 }
 
 /**
+ * 显示公告日期
+ * @param value 
+ * @returns 
+ */
+export function formatMsgDate(value?: string) {
+    if ( moment(value).isSame(moment(), "day") ) {
+        return formatDate(value, 'HH:mm:ss')
+    } else if (moment(value).isSame(moment().subtract(1, 'day'), "day")) {
+        return formatDate(value, '昨日 '+'HH:mm:ss')
+    } else {
+        return formatDate(value, 'YYYY-MM-DDs')
+    }
+}
+
+/**
  * 更换数字单位
  * @param value
  * @returns

src/packages/mobile/views/notice/list/components/detail/index.vue

@@ -7,7 +7,7 @@
             <section class="notice-detail__container">
                 <h1>{{ selectedRow.title }}</h1>
                 <h4>
-                    <span>{{ formatDate(selectedRow.createtime, 'YYYY-MM-DD') }}</span>
+                    <span>{{ formatDate(selectedRow.createtime, 'YYYY-MM-DD HH:mm:ss') }}</span>
                 </h4>
                 <HtmlContainer :context="formatHtmlString(selectedRow.content)" />
             </section>

src/packages/mobile/views/notice/list/index.vue

@@ -14,13 +14,13 @@
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
             <CellGroup class="article" style="background-color: transparent;padding-top: 10px;" v-if="dataList.length">
                 <template v-for="(item, index) in dataList" :key="index">
-                    <Cell :value="formatDate(item.createtime, 'YYYY-MM-DD')" @click="openDetail(item)">
+                    <Cell :value="formatDate(item.createtime, 'YYYY/MM/DD HH:mm:ss')" @click="openDetail(item)">
                         <template #title>
                             <TextEllipsis :content="item.title" />
                         </template>
                         <template #value>
                             <Badge :offset="[-5, 8]" :dot="!item.readed">
-                                <span style="padding-right: 15px;">{{ formatDate(item.createtime, 'YYYY-MM-DD') }}</span>
+                                <span style="font-size: 13px">{{ formatDate(item.createtime, 'YYYY/MM/DD HH:mm:ss') }}</span>
                             </Badge>
                         </template>
                     </Cell>

src/packages/pc/components/layouts/header/components/report/index.vue

@@ -214,31 +214,31 @@ const taDetailProps = [
 
 /// 出入金明细
 const logsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'updatetime', label: t('report.bank.updatetime') },
-    { field: 'executetypedisplay', label: t('report.bank.executetypedisplay') },
-    { field: 'amount', label: t('report.bank.amount') },
-    { field: 'applystatusdisplay', label: t('report.bank.applystatusdisplay') },
+    { field: 'updatetime', label: 'report.bank.updatetime' },
+    { field: 'executetypedisplay', label: 'report.bank.executetypedisplay' },
+    { field: 'amount', label: 'report.bank.amount' },
+    { field: 'applystatusdisplay', label: 'report.bank.applystatusdisplay' },
 ])
 
 /// 持仓汇总
 const dpostionsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: t('report.position.goodsdisplay') },
-    { field: 'buyorselldisplay', label: t('report.position.buyorselldisplay') },
-    { field: 'curpositionqty', label: t('report.position.curpositionqty') },
-    { field: 'frozenqty', label: t('report.position.frozenqty') },
-    { field: 'curholderamount', label: t('report.position.curholderamount') },
-    { field: 'avagepricedisplay', label: t('report.position.avagepricedisplay') },
+    { field: 'goodsdisplay', label: 'report.position.goodsdisplay' },
+    { field: 'buyorselldisplay', label: 'report.position.buyorselldisplay' },
+    { field: 'curpositionqty', label: 'report.position.curpositionqty' },
+    { field: 'frozenqty', label: 'report.position.frozenqty' },
+    { field: 'curholderamount', label: 'report.position.curholderamount' },
+    { field: 'avagepricedisplay', label: 'report.position.avagepricedisplay' },
 ])
 
 /// 成交明细
 const tradeDetailsTableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: t('report.trade.goodsdisplay') },
-    { field: 'buyorselldisplay', label: t('report.trade.buyorselldisplay'), width: 100 },
-    { field: 'tradeqty', label: t('report.trade.tradeqty'), width: 80 },
-    { field: 'tradeprice', label: t('report.trade.tradeprice'), width: 80 },
-    { field: 'tradeamount', label: t('report.trade.tradeamount'), width: 100 },
-    { field: 'charge', label: t('report.trade.charge'), width: 80 },
-    { field: 'tradetime', label: t('report.trade.tradetime') },
+    { field: 'goodsdisplay', label: 'report.trade.goodsdisplay' },
+    { field: 'buyorselldisplay', label: 'report.trade.buyorselldisplay', width: 100 },
+    { field: 'tradeqty', label: 'report.trade.tradeqty', width: 80 },
+    { field: 'tradeprice', label: 'report.trade.tradeprice', width: 80 },
+    { field: 'tradeamount', label: 'report.trade.tradeamount', width: 100 },
+    { field: 'charge', label: 'report.trade.charge', width: 80 },
+    { field: 'tradetime', label: 'report.trade.tradetime' },
 ])
 
 const selectList = [

src/packages/pc/components/modules/address/index.vue

@@ -40,10 +40,10 @@ const showModal = computed({
 const { loading, dataList } = useRequest(queryUserReceiveInfo)
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'radio', label: '选择', width: 80 },
-    { field: 'receivername', label: '收货人' },
-    { field: 'phonenum', label: '联系电话' },
-    { field: 'address', label: '收货地址' },
+    { field: 'radio', label: 'common.choice2', width: 80 },
+    { field: 'receivername', label: 'mine.address.receiverName' },
+    { field: 'phonenum', label: 'mine.address.phoneNum' },
+    { field: 'address', label: 'mine.address.address' },
 ])
 
 const onChange = (index: number) => {

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

@@ -1,23 +1,23 @@
 <!-- 商品订单-委托-快撤 -->
 <template>
-    <app-drawer title="快撤" v-model:show="show" :width="420" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('order.goodsorder.clear.title')" v-model:show="show" :width="420" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formModel" :rules="formRules"
             @submit.prevent>
-            <el-form-item prop="goodsId" label="委托商品">
+            <el-form-item prop="goodsId" :label="t('order.goodsorder.clear.goodsId')">
                 <el-select effect="dark" :placeholder="t('common.choice')" v-model="formModel.goodsId">
                     <template v-for="(item, index) in goodsList" :key="index">
                         <el-option :label="item.goodsname" :value="item.goodsid" />
                     </template>
                 </el-select>
             </el-form-item>
-            <el-form-item label="委托方向">
+            <el-form-item :label="t('order.goodsorder.clear.buyOrSell')">
                 <el-radio-group v-model="formModel.buyOrSell">
                     <el-radio v-for="(item, index) in getBuyOrSellList()" :key="index" :label="item.value">
                         {{ item.label }}
                     </el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item prop="price" :label="formModel.buyOrSell === BuyOrSell.Buy ? '≤撤销价格' : '≥撤销价格'">
+            <el-form-item prop="price" :label="(formModel.buyOrSell === BuyOrSell.Buy ? '≤' : '≥')+t('order.goodsorder.clear.price')">
                 <el-input-number :placeholder="t('common.pleaseenter')" v-model="formModel.price" />
             </el-form-item>
         </el-form>

src/packages/sbyj/views/market/detail/index.vue

@@ -100,12 +100,12 @@
                                     {{ enableqty(selectedRow) + getGoodsUnitName(selectedRow.goodsUnitID) }}
                                 </span>
                             </li>
-                            <!-- <li>
+                            <li>
                                 <span>订单价格</span>
                                 <span>
                                     {{ formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace) }}
                                 </span>
-                            </li> -->
+                            </li>
                             <li>
                                 <span>已付定金</span>
                                 <span>{{ selectedRow.tHDetailEx.payedDeposit }}</span>

src/packages/sbyj/views/order/close/index.vue

@@ -41,6 +41,18 @@
                                 <span>终止结余</span>
                                 <span :class="handlePriceColor(item.closepl)">{{ formatDecimal(item.closepl) }}</span>
                             </li>
+                            <li>
+                                <span>已付定金</span>
+                                <span>{{ formatDecimal(item.repayeddeposit) }}</span>
+                            </li>
+                            <li>
+                                <span>已补定金</span>
+                                <span>{{ formatDecimal(item.rerestockdeposit) }}</span>
+                            </li>
+                            <li>
+                                <span>滞纳金</span>
+                                <span>{{ formatDecimal(item.recallatefee) }}</span>
+                            </li>
                         </ul>
                     </div>
                 </div>

src/packages/sbyj/views/order/history/index.vue

@@ -40,10 +40,10 @@
                                 <span>订单金额</span>
                                 <span>{{ item.tradeamount }}</span>
                             </li> -->
-                            <!-- <li>
+                            <li>
                                 <span>订单价格</span>
                                 <span>{{ formatDecimal(item.openprice, item.decimalplace) }}</span>
-                            </li> -->
+                            </li>
                             <li>
                                 <span>已付定金</span>
                                 <span>{{ item.payeddeposit }}</span>

src/packages/sbyj/views/order/list/index.vue

@@ -43,10 +43,10 @@
                                     {{ enableqty(item) + getGoodsUnitName(item.goodsUnitID) }}
                                 </span>
                             </li>
-                            <!-- <li>
+                            <li>
                                 <span>订单价格</span>
                                 <span>{{ formatDecimal(item.tHDetailEx.holderPrice, item.decimalPlace) }}</span>
-                            </li> -->
+                            </li>
                             <li>
                                 <span>已付定金</span>
                                 <span>{{ item.tHDetailEx.payedDeposit }}</span>

src/types/model/order.d.ts

@@ -1829,5 +1829,8 @@ declare namespace Model {
         tradedate: string; // 交易日(yyyyMMdd)
         tradeid: number; // 成交单号
         tradeproperty: number; // 交易属性
+        repayeddeposit: number // 已付定金
+        rerestockdeposit: number // 已补定金
+        recallatefee: number // 滞纳金
     }
 }