no message

src/assets/common/lang/zhCN/fill.js

@@ -4320,6 +4320,18 @@ export const obj = {
       zhuyuewzs: '注：余额为正数表示原公司欠目标公司金额',
       guanldhhbsh: '关联单号(多单据表示合并审核)',
       shoufkdx: '收/付款对象',
+      fangxiang: '方向',
+      zheng: '正',
+      fan: '反',
+      riben: '日本',
+      taiwan: '台湾',
+      chehang: '车行',
+      daisdfmx: '代收代付明细',
+      chunaishtg: '出纳审核通过',
+      xianjizhmx: '现金账户明细',
+      feiyongkm: '费用科目',
+      yuanbizh: '原币种',
+      yonglecl: '永乐车辆',
     }
   }
   //#endregion

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1947,7 +1947,7 @@
             EmpIds: this.GetDetail.RelevanceFrId,
             EmpBranchId: this.GetDetail.RB_Branch_Id,
             blank: 'y',
-            tab: this.$t('objFill.qsxq')
+            tab: '期数详情'
           }
         });
       },

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -324,10 +324,10 @@ export default {
     },watch:{
         'GetDetail': {
             handler(newValue) {
-            this.getDataDes();
+              this.getDataDes();
             },
             deep: true,
-            immediate: true
+            immediate: false
         }
     },created(){
 
@@ -385,18 +385,21 @@ export default {
             this.IsAdvanceFinance=this.GetDetail.IsAdvanceFinance;
             this.ECommerceGoodsModel=this.GetDetail.ECommerceGoodsModel;
             this.details=this.GetDetail;
-
             if(this.OtherType==7||this.details.MatchFrId>0){
                 this.getDetails()
                 if(this.OtherType==81){
                     this.getMatchTransferList()
                 }
+                if(this.OtherType==82){
+                    this.getJapanCarDetails()
+                }
             }else if(this.OtherType==65){
                 this.getyfTableList()
             }else if(this.IsAdvanceFinance ==1){
                 this.getczTableList();
             }else if(this.OtherType ==82){
                 this.getJapanCarDetails();
+
             }
       },
       goTravelControlList(id){

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -217,7 +217,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="永乐车辆">
+              <el-form-item :label="$t('objFill.v101.FinancialModule.yonglecl')">
                 <el-select filterable v-model='msg.JapanCarId'>
                   <el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
                   <el-option v-for="item in JapanCarList" :key="item.Id" :value="item.Id"

src/components/FinancialModule/RecPayQuery.vue

@@ -293,6 +293,15 @@
                           </el-select>
                         </el-form-item>
                       </el-col> -->
+            <el-col :span="4" v-if="Finance_ExpenseType==true">
+              <el-form-item :label="$t('objFill.v101.FinancialModule.yonglecl')">
+                <el-select filterable v-model='msg.JapanCarId'>
+                  <el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
+                  <el-option v-for="item in JapanCarList" :key="item.Id" :value="item.Id"
+                    :label="item.CarNo"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </template>
         </el-row>
       </el-form>
@@ -934,6 +943,7 @@
   export default {
     data() {
       return {
+        JapanCarList: [],
         loadingDC: false,
         loadingDC1: false,
         loadingDC2: false,
@@ -977,6 +987,7 @@
           sTradeDate: '',
           eTradeDate: '',
           ClientType: '',
+          JapanCarId: 0,
           RemitterName: '',
           ClientID: '',
           sMoney: '',
@@ -999,7 +1010,9 @@
           Sort: '2',
           EmployeeId: '',
           KingdeeMark: '0',
-          AuditId : ''
+          AuditId : '',
+          OtherType: 0,
+          ReFinanceId: 0,
         },
         getCompanyMsg: { // 公司
           RB_Group_Id: '0',
@@ -1189,6 +1202,19 @@
       this.DepartIDs = userInfo.RB_Department_Id;
       this.userId = userInfo.EmployeeId;
       this.msg.EmployeeId = userInfo.EmployeeId;
+
+      if(this.$route.query.JapanCarObj){
+        let JapanCar = this.$route.query.JapanCarObj
+        this.msg.OtherType = 82
+        this.msg.ReFinanceId = JapanCar.JapanCarId
+        this.msg.JapanCarId = Number(JapanCar.JapanCarId)
+      }else {
+        this.msg.OtherType = 0
+        this.msg.ReFinanceId = 0
+        this.msg.JapanCarId = 0
+      }
+      this.GetJapanCarCustomerList()
+
       this.financeinfo_post_GetList();
       this.financeinfo_post_GetCostTypeList();
       this.FinancialFlowTemplate_post_GetList();
@@ -1225,6 +1251,13 @@
       })
     },
     methods: {
+      GetJapanCarCustomerList() { // 获取对象类型
+        this.apipost('JapanCar_get_GetCarList', {keyWord:''}, res => {
+          if (res.data.resultCode == 1) {
+            this.JapanCarList = res.data.data;
+          }
+        }, err => {})
+      },
       goPrinting(){
         if(this.multipleSelection.length==0) return this.$message({
             type: 'info',
@@ -1545,6 +1578,13 @@
         if (!this.msg.AccountType) this.msg.AccountType = 0;
         if (!this.msg.KJCostTypeId) this.msg.KJCostTypeId = 0;
         if (!this.msg.IsSelectKJSetCostType) this.msg.IsSelectKJSetCostType = 0;
+        if(this.msg.JapanCarId>0){
+          this.msg.OtherType = 82
+          this.msg.ReFinanceId = this.msg.JapanCarId
+        }else{
+          this.msg.OtherType = 0
+          this.msg.ReFinanceId = 0
+        }
         this.loading = true;
         this.apipost('Financial_post_GetALLPageList', this.msg, res => {
           if (res.data.resultCode == 1) {