no message

src/components/FinancialModule/addFinancialDocuments.vue

@@ -388,7 +388,7 @@
         <p class="rb_tit">{{BillName}}
           (<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId'
             @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)" class="w120 _border_b_1"
-            :disabled="orderObj&&(orderObj.Rate||orderObj.isRB_Branch_Id)?true:false">
+            :disabled="(orderObj&&orderObj.Rate)||(orderObj&&orderObj.isRB_Branch_Id)?true:false">
             <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
               :disabled="item.disabled">
             </el-option>
@@ -693,7 +693,7 @@
             <td>{{$t('fnc.sfjine')}}<br /><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
             <td colspan="3">{{chinaAllPrice}}</td>
             <td>{{$t('fnc.sfjine')}}<br /><span class="_font_size12">{{$t('fnc.xiaoxie')}}</span></td>
-            <td colspan="3">{{allPriceTo}}</td>
+            <td colspan="3">{{allPriceTo!='NaN'?allPriceTo:''}}</td>
           </tr>
           <tr>
             <td>{{$t('fnc.yjfkuanriqi')}}</td>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1396,6 +1396,8 @@
       },
       //其他支出跳转制单
       AddOutDetail() {
+        let id = [245, 246]
+        id = id.length > 0 ? JSON.stringify(id) : null;
         var TCArr = [this.msg.TCIDs];
         let orderObj = {
           OrderID: 0,
@@ -1411,7 +1413,8 @@
             companyID: this.msgList && this.msgList.length > 0 && this.msgList[0].OutBranchId ? this.msgList[0]
               .OutBranchId : this.$route.query.OutBranchId,
             'blank': 'y',
-            'orderObj': JSON.stringify(orderObj)
+            'orderObj': JSON.stringify(orderObj),
+            'templateID': id,
           }
         });
       },
@@ -1488,15 +1491,15 @@
 
           // _orderSource 1 酒店   2餐厅   5 车资
           if (_orderSource === 1 && _type === 2) {
-            id = [51, 52]
+            id = [51, 52, 245, 246]
           } else if (_orderSource === 2 && _type === 2) {
-            id = [54, 55]
+            id = [54, 55, 245, 246]
           } else if (_orderSource === 5 && _type === 2) {
-            id = [49, 50, 57, 58]
+            id = [49, 50, 57, 58, 245, 246]
           }
           // 门票
           else if (_orderSource === 3 && _type === 2) {
-            id = [88, 89]
+            id = [88, 89, 245, 246]
           }
         }
 

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -459,15 +459,17 @@
 
     // _orderSource 1 酒店   2餐厅   5 车资
             if (_orderSource === 1 && _type === 2) {
-              id = [51, 52]
+              id = [51, 52, 245, 246]
             } else if (_orderSource === 2 && _type === 2) {
-              id = [54, 55]
+              id = [54, 55, 245, 246]
             } else if (_orderSource === 5 && _type === 2) {
-              id = [49, 50, 57, 58]
+              id = [49, 50, 57, 58, 245, 246]
             }
             // 门票
             else if (_orderSource === 3 && _type === 2) {
-              id = [88, 89]
+              id = [88, 89, 245, 246]
+            }else if (_orderSource === 14 && _type === 2) {
+              id = [245, 246]
             }
         }