1

src/components/FinancialModule/FinancialDocuments.vue

@@ -1060,7 +1060,7 @@
           </td>
           <td class="_icon_btn">
             <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
-              <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
+              <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0) && item.Status!=2)"
                 class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex, item)"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
@@ -1086,7 +1086,7 @@
                             <i v-if="msg.Conditon==7" class="iconfont icon-zhuanhuan1" @click="getExchange(item.FrID)"></i>
                         </el-tooltip> -->
             <el-tooltip class="item" effect="dark" :content="$t('active.cl_zuofei')" placement="top">
-              <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
+              <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0) && item.Status!=2)"
                 class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
             </el-tooltip>
             <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item"

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -2667,7 +2667,12 @@
               SupplierName:data.SupplierName,
               DutyNo:data.DutyNo,
               AccountTypeStr:data.AccountTypeStr,
-              AccountCreateTime:data.AccountCreateTime
+              AccountCreateTime:data.AccountCreateTime,
+              JapanFeeMoney: data.JapanFeeMoney,
+              JapanFeeRemarks: data.JapanFeeRemarks,
+              JapanFeeCurrencyName: data.JapanFeeCurrencyName,
+              JapanFeeRate: data.JapanFeeRate,
+              JapanFinanceId: data.JapanFinanceId
             }
           this.helpBranchData={
             Type:data.Type,

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1864,37 +1864,48 @@
         let detailObj = this.msg.detailList.find(x=>{
           return x.CostTypeId==114
         })
+        let confirmMsg =[];
         if(ClientAccountObj&&ClientAccountObj.ClientAccountType&&ClientAccountObj.ClientAccountType==1&&!detailObj){
-          let title = z?'暂存':'提交'
-          this.$confirm('转账付款给日本账户，请确认此单无转账手续费吗？', this.$t('tips.tips'), {
-            confirmButtonText: `继续${title}`,
-            cancelButtonText: `取消${title}`,
-            type: 'warning'
-          }).then(() => {
-            that.loading = true;
-            that.FinancialPostSet()
-          }).catch(() => {})
+          confirmMsg.push("转账付款给日本账户，请确认此单无转账手续费吗？");
+        }
+        // 是否存在转账手续费  提示独立制单
+        let feeObj = this.msg.detailList.find(x=>{
+          return x.CostTypeId==114 && x.CurrencyId==3 && (x.UnitPrice==550 || x.UnitPrice==275 ||x.UnitPrice==183 ||x.UnitPrice==184 ||x.UnitPrice==137.5)
+        })
+        console.log(this.msg.detailList);
+        if(feeObj){
+          confirmMsg.push("从2023.1.1起制单，对于转账手续费将从原单剥离，系统自动生成独立手续费关联单据！");
         }
-        else if(this.msg.HelpBranchId>-1){
+
+        if(this.msg.HelpBranchId>-1){
           let that = this
-          let brandName='确认是由';
+          let brandName='确认由';
           this.companyList.forEach(item => {
             if(item.Id==this.msg.HelpBranchId){
               brandName+=item.BName;
             }
           });
-          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请确认准确避免驳回';
-          this.$confirm(brandName, this.$t('tips.tips'), {
-              confirmButtonText: '确认提交',
-              cancelButtonText: '取消提交',
-              type: 'warning'
-            }).then(() => {
-              that.FinancialPostSet()
-            }).catch(() => {
-
-            })
+          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请确认准确避免驳回！';
+          confirmMsg.push(brandName);
         }
-        else{
+        if(confirmMsg && confirmMsg.length>0){
+          let title = z?'暂存':'提交'
+          const h = this.$createElement
+          const newDatas = []   
+          for (const i in confirmMsg) {        
+            newDatas.push(h('p', null, confirmMsg[i]))     
+          }
+          this.$confirm(this.$t('tips.tips'), {
+            title: this.$t('tips.tips'),
+            message: h('div', null, newDatas),
+            confirmButtonText: `继续${title}`,
+            cancelButtonText: `取消${title}`,
+            type: 'warning'
+          }).then(() => {
+            that.loading = true;
+            that.FinancialPostSet()
+          }).catch(() => {})
+        }else{
           that.loading = true;
           that.FinancialPostSet()
         }

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -106,6 +106,15 @@
       <div >
         <span>创建日期：</span> {{clientBankAccountData.AccountCreateTime}}
       </div>
+      <div v-if="clientBankAccountData.JapanFeeMoney && clientBankAccountData.JapanFeeMoney>0">
+        -----------------------------------------------
+      </div>
+      <div v-if="clientBankAccountData.JapanFeeMoney && clientBankAccountData.JapanFeeMoney>0">
+        <span>手&nbsp;&nbsp;续&nbsp;&nbsp;费：</span> 
+        {{clientBankAccountData.JapanFeeMoney}}&nbsp;({{clientBankAccountData.JapanFeeCurrencyName}})&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单号：
+        <!-- <span>关联单号：</span> -->
+        <span style="display: inline; cursor: pointer; color: #106BAF;" @click="goUrlDetail('FinancialDocumentsDetail',clientBankAccountData.JapanFinanceId)">{{clientBankAccountData.JapanFinanceId}}</span>
+      </div>
     </div>
   </div>
 </template>
@@ -133,7 +142,17 @@
    
       clickClosePopup(){
         this.$emit('ClosePopup')
-      }
+      },
+      goUrlDetail(path, FrId) {
+        this.$router.push({
+          path: path,
+          query: {
+            id: FrId,
+            blank: 'y',
+            tab: FrId + '单据详情'
+          }
+        })
+      },
     },
     mounted() {