Handy_Cao 1 rok temu
rodzic
commit
b748c6ab18

+ 49 - 35
public/locales/en-US.json

@@ -353,48 +353,50 @@
             "title": "Online Order",
             "title2": "History Online Order",
             "subtitle": "Online Order Information",
-            "wrtypename": "wrtypename",
-            "deliveryqty": "deliveryqty",
-            "xdeliveryprice": "xdeliveryprice",
-            "deliverypricemove": "deliverypricemove",
-            "deliveryamount": "deliveryamount",
-            "xgoodsremainamount": "xgoodsremainamount",
-            "deliverytotalamount": "deliverytotalamount",
-            "remaintotalamount": "remaintotalamount",
-            "warehousename": "warehousename",
-            "matchusername": "matchusername",
-            "deliverytime": "deliverytime",
-            "xgoodscode": "xgoodscode",
-            "deliveryid": "orderid"
+            "wrtypename": "WrTypeName",
+            "deliveryqty": "DeliveryQty",
+            "xdeliveryprice": "XDeliveryPrice",
+            "deliverypricemove": "DeliveryPriceMove",
+            "deliveryamount": "DeliveryAmount",
+            "xgoodsremainamount": "XGoodsRemainAmount",
+            "deliverytotalamount": "DeliveryTotalAmount",
+            "remaintotalamount": "RemainTotalAmount",
+            "warehousename": "WarehouseName",
+            "matchusername": "MatchUserName",
+            "deliverytime": "DeliveryTime",
+            "xgoodscode": "Code/Name",
+            "deliveryid": "DeliveryId"
         },
         "offline": {
             "title": "Offline Order",
             "subtitle": "Offline Order Information",
-            "goodsname": "name/code",
-            "buyorselldisplay": "direction",
-            "deliveryqty": "deliveryqty",
-            "deliveryprice": "deliveryprice",
-            "deliveryamount": "deliveryamount",
-            "matchusername": "matchusername",
-            "deliveryinfo": "deliveryinfo",
-            "reqtime": "reqtime",
-            "orderstatusdisplay": "orderstatus",
-            "deliveryorderid": "orderid"
+            "goodsname": "Name/Code",
+            "buyorselldisplay": "Direction",
+            "deliveryqty": "DeliveryQty",
+            "deliveryprice": "DeliveryPrice",
+            "deliveryamount": "DeliveryAmount",
+            "matchusername": "MatchuserName",
+            "deliveryinfo": "DeliveryInfo",
+            "reqtime": "ApplyTime",
+            "applydate": "ApplyDate",
+            "orderstatusdisplay": "OrderStatus",
+            "deliveryorderid": "OrderId"
         },
         "spot": {
             "title": "Spot Order",
             "subtitle": "Pick Up Information",
-            "goodsname": "name/code",
-            "warehousename": "warehouse",
-            "qty": "qty",
-            "appointmentmodeldisplay": "deliveryway",
-            "contactname": "username",
-            "contactnum": "mobile",
-            "address": "address",
-            "appointmentremark": "appointment",
-            "applytime": "applytime",
-            "applystatus": "applystatus",
-            "applyid": "orderid"
+            "goodsname": "Name/Code",
+            "warehousename": "WarehouseName",
+            "qty": "Qty",
+            "appointmentmodeldisplay": "DeliveryWay",
+            "contactname": "UserName",
+            "contactnum": "Mobile",
+            "address": "Address",
+            "appointmentremark": "AppointmentRemark",
+            "applytime": "ApplyTime",
+            "date": "Date",
+            "applystatus": "ApplyStatus",
+            "applyid": "ApplyId"
         }
     },
     "transfer": {
@@ -536,7 +538,12 @@
         "signagain": "SignAgain",
         "cancel": "Cancel",
         "modify": "Modify",
-        "add": "Add",
+        "addbanksign": "Add Bank Sign",
+        "modifybanksign": "Modify Bank Sign",
+        "Pleaseselectyourbank": "Please select your bank",
+        "Pleaseenteryourmobilephonenumber": "Please enter mobile number",
+        "Pleaseenterbankaccountname": "Please enter bank account name",
+        "Pleaseenterbankaccountno": "Please enter bank account no",
         "youhavenotaddedasignedaccount": "You have not added a signed account",
         "fundstype": "fundstype",
         "pleasechoicefundstype": "Please choice funds type",
@@ -544,6 +551,13 @@
         "operatetype": "operatetype",
         "amount": "amount",
         "bankaccountno": "BankAccountNo",
+        "search": {
+            "title": "Search BranchBank",
+            "Pleaseenterbranchbankname": "Please enter branch bank name",
+            "choicebranchbank": "choice branch bank",
+            "nodatas": "No Datas",
+            "searching": "Searching..."
+        },
         "capital": {
             "title": "Funds",
             "hisamountlogs": "Historys"

+ 15 - 1
public/locales/zh-CN.json

@@ -378,6 +378,7 @@
             "matchusername": "交收对手方",
             "deliveryinfo": "交收信息",
             "reqtime": "申请时间",
+            "applydate": "申请日期",
             "orderstatusdisplay": "单据状态",
             "deliveryorderid": "交收单号"
         },
@@ -393,6 +394,7 @@
             "address": "收货地址",
             "appointmentremark": "发票信息",
             "applytime": "申请时间",
+            "date": "日期",
             "applystatus": "提货状态",
             "applyid": "提货单号"
         }
@@ -536,7 +538,12 @@
         "signagain": "重新签约",
         "cancel": "解约",
         "modify": "修改",
-        "add": "添加签约账户",
+        "addbanksign": "添加签约账户",
+        "modifybanksign": "修改签约账户",
+        "Pleaseselectyourbank": "请选择开户银行",
+        "Pleaseenteryourmobilephonenumber": "请输入手机号码",
+        "Pleaseenterbankaccountno": "请输入银行卡账号",
+        "Pleaseenterbankaccountname": "请输入银行卡账户名",
         "youhavenotaddedasignedaccount": "您还未添加签约账户",
         "fundstype": "资金类型",
         "pleasechoicefundstype": "请选择资金类型",
@@ -544,6 +551,13 @@
         "operatetype": "操作类型",
         "amount": "金额",
         "bankaccountno": "银行卡号",
+        "search": {
+            "title": "查询支行",
+            "Pleaseenterbranchbankname": "请输入支行名称",
+            "choicebranchbank": "选择支行",
+            "nodatas": "暂无数据",
+            "searching": "搜索中..."
+        },
         "capital": {
             "title": "资金",
             "hisamountlogs": "历史资金流水"

+ 2 - 2
src/packages/mobile/views/bank/sign/Index.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="bank-sign__empty" v-else-if="isloaded">
             <Empty :description="$t('banksign.youhavenotaddedasignedaccount')" />
-            <Button type="danger" @click="showComponent(false)" round>{{ $t('banksign.add') }}</Button>
+            <Button type="danger" @click="showComponent(false)" round>{{ $t('banksign.addbanksign') }}</Button>
         </div>
         <template #footer>
             <div class="g-form__footer inset" v-if="bankInfo">
@@ -29,7 +29,7 @@
                 <Button type="danger" round block @click="beforeShowComponent"
                     v-if="bankInfo.signstatus === SignStatus.Signed && cusBank?.canmodifysigninfo === 1">{{ $t('banksign.modify') }}</Button>
                 <Button type="danger" round block @click="showComponent(false)"
-                    v-if="bankInfo.signstatus === SignStatus.Unsigned && cusBank?.cansign === 1">{{ $t('banksign.add') }}</Button>
+                    v-if="bankInfo.signstatus === SignStatus.Unsigned && cusBank?.cansign === 1">{{ $t('banksign.addbanksign') }}</Button>
             </div>
         </template>
         <component ref="componentRef" v-bind="{ isedit }" :is="componentMap.get(componentId)" @closed="closeComponent"

+ 10 - 10
src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -2,26 +2,26 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar :title="isedit ? '修改签约账户' : '添加签约账户'" @back="closed" />
+                <app-navbar :title="isedit ? $t('banksign.modifybanksign') : $t('banksign.addbanksign')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>
-                    <Field name="OpenBankAccId" label="开户银行" :rules="formRules.OpenBankAccId" is-link>
+                    <Field name="OpenBankAccId" :label="$t('banksign.bankname')" :rules="formRules.OpenBankAccId" is-link>
                         <template #input>
-                            <app-select :readonly="bankaccount != ''" v-model="formData.OpenBankAccId" placeholder="请选择开户银行" :options="banklist"
+                            <app-select :readonly="bankaccount != ''" v-model="formData.OpenBankAccId" :placeholder="$t('banksign.Pleaseselectyourbank')" :options="banklist"
                                 :optionProps="{ label: 'bankname', value: 'bankid' }" />
                         </template>
                     </Field>
-                    <Field type="number" name="BankNo" label="银行卡号" :readonly="bankaccount != ''" maxlength="30" v-model.trim="formData.BankAccountNo"
-                        placeholder="请输入银行卡账号" :rules="formRules.BankAccountNo" />
-                    <Field name="AccountName" label="姓名" readonly v-model="formData.AccountName" placeholder="请输入银行卡账户名"
+                    <Field type="number" name="BankNo" :label="$t('banksign.bankaccountno')" :readonly="bankaccount != ''" maxlength="30" v-model.trim="formData.BankAccountNo"
+                    :placeholder="$t('banksign.Pleaseenterbankaccountno')" :rules="formRules.BankAccountNo" />
+                    <Field name="AccountName" :label="$t('banksign.bankaccountname')" readonly v-model="formData.AccountName" :placeholder="$t('banksign.Pleaseenterbankaccountname')"
                         :rules="formRules.AccountName" />
-                    <Field name="MobilePhone" label="手机号码" :readonly="mobile2 != ''" maxlength="50"
-                        v-model="formData.MobilePhone" placeholder="请输入手机号码" :rules="formRules.MobilePhone" />
+                    <Field name="MobilePhone" :label="$t('banksign.mobilephone')" :readonly="mobile2 != ''" maxlength="50"
+                        v-model="formData.MobilePhone" :placeholder="$t('banksign.Pleaseenteryourmobilephonenumber')" :rules="formRules.MobilePhone" />
                     <template v-for="(item, index) in configs" :key="index">
                         <template v-if="(item.fieldcode === 'verify_code')">
                             <Field v-if="(bankInfo === undefined) && showExtendInfo(item)" v-model="item.value" type="digit"
-                                name="vcode" :label="item.fieldname" placeholder="必填" autocomplete="off">
+                                name="vcode" :label="item.fieldname" :placeholder="$t('common.required')" autocomplete="off">
                                 <template #button>
                                     <Button size="small" type="danger" :disabled="isCountdown" @click="sendVerifyCode">
                                         <span v-if="isCountdown">重新发送({{ currentTime.seconds }})</span>
@@ -51,7 +51,7 @@
             </Form>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button type="danger" round block @click="formRef?.submit()">{{ bankInfo ? '修改' : '提交' }}</Button>
+                    <Button type="danger" round block @click="formRef?.submit()">{{ bankInfo ? $t('operation.modify') : $t('operation.submit') }}</Button>
                 </div>
             </template>
             <Search v-model:show="showSearch" @change="onBankChange" />

+ 4 - 4
src/packages/mobile/views/bank/sign/components/edit/search/index.vue

@@ -2,16 +2,16 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="查询支行">
+                <app-navbar :title="$t('banksign.search.title')">
                     <template #footer>
                         <Form action="/">
-                            <Search placeholder="请输入支行名称" v-model="keyword" @search="onSearch" />
+                            <Search :placeholder="$t('banksign.search.Pleaseenterbranchbankname')" v-model="keyword" @search="onSearch" />
                         </Form>
                     </template>
                 </app-navbar>
             </template>
             <RadioGroup v-model="checked" style="padding-bottom: 50px;" v-if="dataList.length">
-                <CellGroup title="选择支行">
+                <CellGroup :title="$t('banksign.search.choicebranchbank')">
                     <template v-for="(item, index) in dataList" :key="index">
                         <Cell :title="item.branchname" :label="item.branchnum" clickable @click="onChange(item)">
                             <template #icon>
@@ -21,7 +21,7 @@
                     </template>
                 </CellGroup>
             </RadioGroup>
-            <Empty description="暂无数据" v-else />
+            <Empty :description="$t('banksign.search.nodatas')" v-else />
         </app-view>
     </app-modal>
 </template>

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

@@ -1,10 +1,10 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="交收提货" >
+            <app-navbar :title="$t('delivery.title')" >
                 <template #right v-if="selectedComponent.history">
                     <div class="button-more" @click="openComponent(selectedComponent.name)">
-                        <span>更多</span>
+                        <span>{{ $t('common.more') }}</span>
                     </div>
                 </template>
             </app-navbar>

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

@@ -3,20 +3,20 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="线下交收单" @back="closed" />
+                <app-navbar :title="$t('delivery.offline.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="线下交收单信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodsnamedisplay" />
-                    <Cell title="交收方向" :value="selectedRow.buyorselldisplay" />
-                    <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <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" />
-                    <Cell title="单据状态" :value="selectedRow.orderstatusdisplay" />
-                    <Cell title="交收单号" :value="selectedRow.deliveryorderid" />
+                <CellGroup :title="$t('delivery.offline.subtitle')">
+                    <Cell :title="$t('delivery.offline.goodsname')" :value="selectedRow.goodsnamedisplay" />
+                    <Cell :title="$t('delivery.offline.buyorselldisplay')" :value="selectedRow.buyorselldisplay" />
+                    <Cell :title="$t('delivery.offline.deliveryqty')" :value="selectedRow.deliveryqty" />
+                    <Cell :title="$t('delivery.offline.deliveryprice')" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryprice" />
+                    <Cell :title="$t('delivery.offline.deliveryamount')" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryamount" />
+                    <Cell :title="$t('delivery.offline.matchusername')" :value="selectedRow.matchusername" />
+                    <Cell :title="$t('delivery.offline.deliveryinfo')" :value="selectedRow.deliveryinfo" />
+                    <Cell :title="$t('delivery.offline.reqtime')" :value="selectedRow.reqtime" />
+                    <Cell :title="$t('delivery.offline.orderstatusdisplay')" :value="selectedRow.orderstatusdisplay" />
+                    <Cell :title="$t('delivery.offline.deliveryorderid')" :value="selectedRow.deliveryorderid" />
                 </CellGroup>
             </div>
         </app-view>

+ 8 - 8
src/packages/mobile/views/order/delivery/components/offline/list/Index.vue

@@ -15,34 +15,34 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交收方向</span>
+                            <span>{{ $t('delivery.offline.buyorselldisplay') }}</span>
                             <span>{{ item.buyorselldisplay }}</span>
                         </li>
                         <li>
-                            <span>交收数量</span>
+                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
                             <span>{{ item.deliveryqty }}</span>
                         </li>
                         <li>
-                            <span>交收价格</span>
+                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
                             <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
                         </li>
                         <li>
-                            <span>交收货款</span>
+                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
                             <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
                         </li>
                         <li>
-                            <span>交收信息</span>
+                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
                             <span>{{ item.deliveryinfo }}</span>
                         </li>
                         <li>
-                            <span>申请日期</span>
+                            <span>{{ $t('delivery.offline.applydate') }}</span>
                             <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>撤销</Button>
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

+ 15 - 15
src/packages/mobile/views/order/delivery/components/online/detail/Index.vue

@@ -3,23 +3,23 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="点选交收单" @back="closed" />
+                <app-navbar :title="$t('delivery.online.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="点选交收单信息">
-                    <Cell title="商品名称" :value="selectedRow.wrtypename" />
-                    <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <Cell title="订货价" :value="selectedRow.xdeliveryprice" />
-                    <Cell title="升贴水" :value="selectedRow.deliverypricemove" />
-                    <Cell title="总货款" :value="selectedRow.deliveryamount" />
-                    <Cell title="剩余货款" :value="selectedRow.xgoodsremainamount" />
-                    <Cell title="总金额" :value="selectedRow.deliverytotalamount" />
-                    <Cell title="剩余金额" :value="selectedRow.remaintotalamount" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="发货方" :value="selectedRow.matchusername" />
-                    <Cell title="申请时间" :value="selectedRow.deliverytime" />
-                    <Cell title="交收合约" :value="selectedRow.xgoodscode + '/' + selectedRow.xgoodsname" />
-                    <Cell title="交收单号" :value="selectedRow.deliveryid" />
+                <CellGroup :title="$t('delivery.online.subtitle')">
+                    <Cell :title="$t('delivery.online.wrtypename')" :value="selectedRow.wrtypename" />
+                    <Cell :title="$t('delivery.online.deliveryqty')" :value="selectedRow.deliveryqty" />
+                    <Cell :title="$t('delivery.online.xdeliveryprice')" :value="selectedRow.xdeliveryprice" />
+                    <Cell :title="$t('delivery.online.deliverypricemove')" :value="selectedRow.deliverypricemove" />
+                    <Cell :title="$t('delivery.online.deliveryamount')" :value="selectedRow.deliveryamount" />
+                    <Cell :title="$t('delivery.online.xgoodsremainamount')" :value="selectedRow.xgoodsremainamount" />
+                    <Cell :title="$t('delivery.online.deliverytotalamount')" :value="selectedRow.deliverytotalamount" />
+                    <Cell :title="$t('delivery.online.remaintotalamount')" :value="selectedRow.remaintotalamount" />
+                    <Cell :title="$t('delivery.online.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('delivery.online.matchusername')" :value="selectedRow.matchusername" />
+                    <Cell :title="$t('delivery.online.deliverytime')" :value="selectedRow.deliverytime" />
+                    <Cell :title="$t('delivery.online.xgoodscode')" :value="selectedRow.xgoodscode + '/' + selectedRow.xgoodsname" />
+                    <Cell :title="$t('delivery.online.deliveryid')" :value="selectedRow.deliveryid" />
                 </CellGroup>
             </div>
         </app-view>

+ 7 - 7
src/packages/mobile/views/order/delivery/components/online/history/Index.vue

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史点选交收单" @back="closed">
+                <app-navbar :title="$t('delivery.online.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,29 +24,29 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>交收数量</span>
+                                    <span>{{ $t('delivery.online.deliveryqty') }}</span>
                                     <span>{{ item.deliveryqty }}</span>
                                 </li>
                                 <li>
-                                    <span>订货价</span>
+                                    <span>{{ $t('delivery.online.xdeliveryprice') }}</span>
                                     <span>{{ item.xdeliveryprice }}</span>
                                 </li>
                                 <li>
-                                    <span>升贴水</span>
+                                    <span>{{ $t('delivery.online.deliverypricemove') }}</span>
                                     <span>{{ item.deliverypricemove }}</span>
                                 </li>
                                 <li>
-                                    <span>剩余金额</span>
+                                    <span>{{ $t('delivery.online.remaintotalamount') }}</span>
                                     <span>{{ item.remaintotalamount }}</span>
                                 </li>
                                 <li>
-                                    <span>申请日期</span>
+                                    <span>{{ $t('delivery.online.deliverytime') }}</span>
                                     <span>{{ formatDate(item.deliverytime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                            <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

+ 6 - 6
src/packages/mobile/views/order/delivery/components/online/list/Index.vue

@@ -15,29 +15,29 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交收数量</span>
+                            <span>{{ $t('delivery.online.deliveryqty') }}</span>
                             <span>{{ item.deliveryqty }}</span>
                         </li>
                         <li>
-                            <span>订货价</span>
+                            <span>{{ $t('delivery.online.xdeliveryprice') }}</span>
                             <span>{{ item.xdeliveryprice }}</span>
                         </li>
                         <li>
-                            <span>升贴水</span>
+                            <span>{{ $t('delivery.online.deliverypricemove') }}</span>
                             <span>{{ item.deliverypricemove }}</span>
                         </li>
                         <li>
-                            <span>剩余金额</span>
+                            <span>{{ $t('delivery.online.remaintotalamount') }}</span>
                             <span>{{ item.remaintotalamount }}</span>
                         </li>
                         <li>
-                            <span>申请日期</span>
+                            <span>{{ $t('delivery.online.deliverytime') }}</span>
                             <span>{{ formatDate(item.deliverytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

+ 13 - 13
src/packages/mobile/views/order/delivery/components/spot/detail/Index.vue

@@ -3,25 +3,25 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="现货提货单" @back="closed" />
+                <app-navbar :title="$t('delivery.spot.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="提货信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.wrstandardcode+'/'+selectedRow.wrstandardname" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="提货数量" :value="selectedRow.qty" />
-                    <Cell title="提货方式" :value="selectedRow.appointmentmodeldisplay" />
-                    <Cell title="联系人" :value="selectedRow.contactname" />
-                    <Cell title="联系方式" :value="selectedRow.contactnum" />
-                    <Cell title="收货地址" :value="address" v-if="selectedRow.appointmentmodel === 1" />
-                    <Cell title="发票信息" title-style="flex:none" v-if="selectedRow.appointmentremark">
+                <CellGroup :title="$t('delivery.spot.subtitle')">
+                    <Cell :title="$t('delivery.spot.goodsname')" :value="selectedRow.wrstandardcode+'/'+selectedRow.wrstandardname" />
+                    <Cell :title="$t('delivery.spot.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('delivery.spot.qty')" :value="selectedRow.qty" />
+                    <Cell :title="$t('delivery.spot.appointmentmodeldisplay')" :value="selectedRow.appointmentmodeldisplay" />
+                    <Cell :title="$t('delivery.spot.contactname')" :value="selectedRow.contactname" />
+                    <Cell :title="$t('delivery.spot.contactnum')" :value="selectedRow.contactnum" />
+                    <Cell :title="$t('delivery.spot.address')" :value="address" v-if="selectedRow.appointmentmodel === 1" />
+                    <Cell :title="$t('delivery.spot.appointmentremark')" title-style="flex:none" v-if="selectedRow.appointmentremark">
                         <template #value>
                             <div style="white-space: pre-line">{{ selectedRow.appointmentremark }}</div>
                         </template>
                     </Cell>
-                    <Cell title="申请时间" :value="selectedRow.applytime" />
-                    <Cell title="提货状态" :value="getApplyStatusName(selectedRow.applystatus)" />
-                    <Cell title="提货单号" :value="selectedRow.applyid" />
+                    <Cell :title="$t('delivery.spot.applytime')" :value="selectedRow.applytime" />
+                    <Cell :title="$t('delivery.spot.applystatus')" :value="getApplyStatusName(selectedRow.applystatus)" />
+                    <Cell :title="$t('delivery.spot.applyid')" :value="selectedRow.applyid" />
                 </CellGroup>
             </div>
         </app-view>

+ 4 - 4
src/packages/mobile/views/order/delivery/components/spot/list/Index.vue

@@ -16,21 +16,21 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>数量</span>
+                            <span>{{ $t('delivery.spot.qty') }}</span>
                             <span>{{ item.qty }}</span>
                         </li>
                         <li>
-                            <span>类型</span>
+                            <span>{{ $t('delivery.spot.appointmentmodeldisplay') }}</span>
                             <span>{{ item.appointmentmodeldisplay }}</span>
                         </li>
                         <li>
-                            <span>日期</span>
+                            <span>{{ $t('delivery.spot.date') }}</span>
                             <span>{{ formatDate(item.applytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>