Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

# Conflicts:
#	src/components/Buying/CommondityOrderList.vue

src/assets/common/lang/jp.js

@@ -2591,6 +2591,7 @@ export const op={
   bmzg:'部門の主管',
   fgszjl:'支社長',
   opszje:'OP設定金額',
+  fgszjdb:'日本印象を新たにする',
 
 }
 

src/assets/common/lang/zh-tw.js

@@ -2586,6 +2586,7 @@ export const op={
   bmzg:'部門首長',
   fgszjl:'分公司總經理',
   opszje:'OP設定金額',
+  fgszjdb:'新增日本印象',
 
 }
 

src/assets/common/lang/zh.js

@@ -2602,6 +2602,7 @@ export const op={
   bmzg:'部门主管',
   fgszjl:'分公司总经理',
   opszje:'OP设置金额',
+  fgszjdb:'新增日本印象',
 }
 
 import invoicesManager from './zhCN/invoicesManager'

src/components/FinancialModule/CapitalAllocation.vue

@@ -51,6 +51,7 @@
     <div class="query-box">
       <ul>
         <li>
+          <input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
           <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
           <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
@@ -261,7 +262,8 @@ export default {
       LogLoading: true,
       EmId:0,
       total: 0,
-      currentPage: 0
+      currentPage: 0,
+      btnShow:false,
     }
   },
   created(){
@@ -269,6 +271,10 @@ export default {
     let userInfo = this.getLocalStorage();    // 读取缓存数据
     this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    // 集团ID
     this.EmId=userInfo.EmployeeId;
+    let ActionMenuCode=userInfo.ActionMenuCode;
+    if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
+      this.btnShow=true;
+    }
   },
   methods:{
     getList: function () {  // 获取列表数据
@@ -353,6 +359,9 @@ export default {
         }
       }, err => {})
     },
+    goAddurl(url){
+       this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
+    },
     goURL: function (url, edit, id) {
        this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
     },

src/components/FinancialModule/addCapitalAllocation.vue

@@ -415,6 +415,9 @@ export default {
       let userInfo = this.getLocalStorage();
       this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
       this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+      if(this.$route.query.fengs){
+        this.msg.RB_Branch_Id = 1218;
+      }
       this.BillName = userInfo.GroupName;
       if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
         this.msg.TemplateId=34;

src/components/leaderPay2.vue

@@ -1343,11 +1343,8 @@
           return
         }
         let list = this.listCost
-        let allPrice = 0;
-        let yizhiPrice = list[0].TotalPrice;
-        for (let i = 0; i < list.length; i++) {
-          allPrice = list[i].UnitPrice * list[i].PeopleNum
-        }
+        let allPrice = obj.UnitPrice * obj.PeopleNum;
+        let yizhiPrice = obj.TotalPrice;
         if (allPrice < inputPrice + yizhiPrice) {
           this.$message.error('金额有误')
           return
@@ -1393,11 +1390,11 @@
             this.listCost[this.dialogFormVisibleIndex] = obj
             this.$forceUpdate()
             this.$message.success("制单成功")
+            this.getNavT()
           } else {
             this.$message.error(res.data.message)
           }
-          this.dialogFormVisibleLoding = false
-          this.dialogFormVisible = false
+         
         }, null)
       },
       goZhiDan: function (obj) {
@@ -1452,6 +1449,8 @@
             } else {
               this.$message.error(res.data.message);
             }
+            this.dialogFormVisibleLoding = false
+            this.dialogFormVisible = false
           },
           err => {}
         );