财务管理国际化

src/i18n/languages/zh_CN.json

@@ -196,7 +196,7 @@
     	"请输入项目": "请输入项目",
     	"请选择": "请选择",
     	"请选择业务员": "请选择业务员",
-    	"请选择业务员": "请选择供应商",
+    	"请选择供应商": "请选择供应商",
     	"请选择出货渠道": "请选择出货渠道",
     	"请选择单位": "请选择单位",
     	"请选择始发仓": "请选择始发仓",
@@ -256,8 +256,6 @@
     	"审核备注":"审核备注",
     	"审核请款单":"审核请款单",
     	"费用类型":"费用类型",
-    	"未开票":"未开票",
-    	"已开票":"已开票",
     	"反审核成功":"反审核成功",
     	"待审核":"待审核",
     	"已审核待核销":"已审核待核销",

src/views/ecw/financial/creatCollection.vue

@@ -342,7 +342,7 @@
                 <el-option
                   v-for="item in currencyList"
                   :key="item.id"
-                  :label="item.titleZh"
+                  :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
                   :value="item.id"
                 />
               </el-select>
@@ -367,7 +367,7 @@
             <template slot-scope="scope">
               <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
               <div v-else>
-                <div v-for="itemAmount in scope.row.collectionAmount">{{itemAmount.currencyName}}: {{ itemAmount.amount}}</div>
+                <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
 <!--                <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
@@ -852,7 +852,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     checkDiscount(e){
@@ -893,7 +893,7 @@ export default {
           var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
           if(dollarList.length>0){
             var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
-            amountList.push({currencyName:item.titleZh,amount:dollar})
+            amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
           }
         })
         // const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)

src/views/ecw/financial/creatPayment.vue

@@ -540,7 +540,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     getList() {

src/views/ecw/financial/openInvoice.vue

@@ -154,7 +154,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     async getData() {

src/views/ecw/financial/payable.vue

@@ -204,7 +204,7 @@
           </el-form-item>
           <el-form-item label="" label-width="0px">
             <el-select v-model="costObj.currencyId" :placeholder="$t('请选择单位')">
-              <el-option v-for="item in currencyList" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
+              <el-option v-for="item in currencyList" :key="item.id" :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-row>
@@ -305,7 +305,7 @@ export default {
     },
     getCurrencyLabel(id){
       var label = this.currencyList.filter(item=>item.id == id)
-      if(label.length>0) return label[0].titleZh
+      if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
       return ''
     },
     /** 搜索按钮操作 */

src/views/ecw/financial/paymentDetail.vue

@@ -330,7 +330,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     getList() {

src/views/ecw/financial/paymentExamine.vue

@@ -153,7 +153,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     getSummaries(param) {

src/views/ecw/financial/printPaymentVoucher.vue

@@ -149,7 +149,7 @@
     methods: {
 		getCurrencyLabel(id){
 		  var label = this.currencyList.filter(item=>item.id == id)
-		  if(label.length>0) return label[0].titleZh
+		  if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 		  return ''
 		},
       getCollectionData(){

src/views/ecw/financial/printVoucher.vue

@@ -37,7 +37,7 @@
             <td>{{ index + 1 }}</td>
             <td>{{ orderData.tidanNo||''}}</td>
             <td>{{ item.orderNo }}</td>
-            <td>{{ item.titleZh }}</td>
+            <td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td>
             <td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
             <td> {{item.totalAmount}}</td>
             <td>{{getCurrencyLabel(item.currencyId)}}</td>
@@ -209,7 +209,7 @@
     methods: {
 		getCurrencyLabel(id){
 		  var label = this.currencyList.filter(item=>item.id == id)
-		  if(label.length>0) return label[0].titleZh
+		  if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 		  return ''
 		},
       getList() {

src/views/ecw/financial/receiptDetail.vue

@@ -74,7 +74,14 @@
             <el-option :value="0" label="不需要"></el-option>
           </el-select> -->
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('核销基准币种')">
+        <el-descriptions-item>
+              <template slot="label">
+                {{$t('核销基准币种')}}
+                  <el-tooltip class="item" effect="light" :content="$t('应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种')" placement="top">
+                    <el-button icon="el-icon-question"></el-button>
+                  </el-tooltip>
+                </template>
+
           {{getCurrencyLabel(showCurrencyId)}}
         </el-descriptions-item>
       </el-descriptions>
@@ -176,7 +183,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
             <div v-else>
-              <div v-for="itemAmount in scope.row.collectionAmount">{{itemAmount.currencyName}}: {{ itemAmount.amount}}</div>
+              <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
 <!--              <div v-if="scope.row.collectionAmount[0]">{{ $t('美元') }}: {{ scope.row.collectionAmount[0] }}</div>
               <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1] }}</div>
               <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2] }}</div> -->
@@ -286,9 +293,9 @@
       <el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button>
       <el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button>
     </div>
-    <el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="40%" append-to-body>
+    <el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="50%" append-to-body>
       <div style="padding: 0 24px">
-        <el-form ref="addForm" :model="addForm" label-width="150px">
+        <el-form ref="addForm" :model="addForm" label-width="250px">
           <el-form-item :label="$t('收款单号')">{{ form.receiptNo }}</el-form-item>
           <el-form-item :label="$t('剩余应收金额')">
             <template v-if="surplusData.length==0">
@@ -346,7 +353,7 @@
               <el-option
                 v-for="item in currencyList"
                 :key="item.id"
-                :label="item.titleZh"
+                :label="$i18n.locale=='zh_CN'?item.titleZh:item.titleEn"
                 :value="item.id"
               />
             </el-select>
@@ -361,7 +368,10 @@
             :rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }"
           >
             <template slot="label">
-              {{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
+              <el-tooltip class="item" effect="light" :content="$t('实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率')" placement="top-start">
+               <el-button> {{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）</el-button>
+              </el-tooltip>
+
             </template>
             <el-input  v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
             <span v-else>{{ addForm.rate}}</span>
@@ -415,6 +425,7 @@
 </template>
 
 <script>
+import helpIcon from  "@/assets/images/help.png"
 import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { getToken } from "@/utils/auth";
 import { listSimpleDepts } from "@/api/system/dept";
@@ -435,6 +446,7 @@ import {
 import { getCurrencyPage } from "@/api/ecw/currency";
 import NP from 'number-precision'
 
+
 export default {
   data() {
     return {
@@ -631,7 +643,7 @@ export default {
            // if(n && n.discountTotal&&n.discountTotal>0){
            //   amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)})
            // }else{
-             amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:dollar})
+             amountList.push({currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
            // }
 
           }
@@ -661,7 +673,7 @@ export default {
     },
     getCurrencyLabel(id){
       var label = this.currencyList.filter(item=>item.id == id)
-      if(label.length>0) return label[0].titleZh
+      if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
       return ''
     },
     calculation() {

src/views/ecw/financial/receivable.vue

@@ -321,7 +321,7 @@ export default {
   methods: {
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
-	    if(label.length>0) return label[0].titleZh
+	    if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 	    return ''
 	  },
     /** 查询列表 */

src/views/system/internalHelpDoc/index.vue

@@ -65,11 +65,7 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-<<<<<<< HEAD
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-=======
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
->>>>>>> d95d3878d23dd1546aa50a51bded6a000200cd21
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题中文" prop="titleZh">
           <el-input v-model="form.titleZh" placeholder="请输入标题中文" />