收支查询的费用类型修改

src/pages/financial/financalDocument/RecPayQuery.vue

@@ -475,7 +475,9 @@
   ._TCIDAndTCNUMList {
     display: flex;
   }
-
+  .caoz i{
+    margin-bottom: 5px;
+  }
 </style>
 
 <template>
@@ -713,6 +715,14 @@
                 border-radius: 4px;">
                 收入
               </span>
+              <span v-if="scope.row.Type==4" style="display: inline-block;
+                padding: 2px 8px;
+                color: white;
+                background-color: #2BB87C;
+                line-height: 16px;
+                border-radius: 4px;">
+                调拨
+              </span>
               <span v-if="scope.row.Type==5" style="display: inline-block;
                 padding: 2px 8px;
                 color: white;
@@ -838,7 +848,7 @@
         <el-table-column prop="StatusStr" label="当前状态"></el-table-column>
         <el-table-column prop="Remark" label="操作">
           <template slot-scope="scope">
-            <div>
+            <div class="caoz">
               <span>
                 <el-tooltip class="item" effect="dark" content="查看" placement="top">
                   <i v-if="scope.row.Type !== 4" style="width: 30px;
@@ -898,6 +908,21 @@
                         outline: none;" class="iconfont icon-fapiao" v-if="Finance_InvoiceUpdate==true && scope.row.Type==2" @click="setdaju(scope.row)">
                   </i>
                 </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="费用类型" placement="top">
+                  <!--                    <i v-if="scope.row.isExchange" style="width: 30px;-->
+                  <i style="width: 30px;
+                        height: 30px;
+                        display: inline-block;
+                        color: white !important;
+                        border-radius: 50%;
+                        text-align: center;
+                        line-height: 30px;
+                        margin-right: 10px;
+                        cursor: pointer;
+                        background-color: #47BF8C;
+                        outline: none;" class="iconfont icon-caiwu" v-if="Finance_ExpenseType==true && (scope.row.Type==2 || scope.row.Type==1)" @click="showfeiyong(scope.row)">
+                  </i>
+                </el-tooltip>
               </span>
             </div>
           </template>
@@ -962,6 +987,26 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 修改费用类型 -->
+    <el-dialog title="修改费用类型" width="400px"
+      :visible.sync="costmode" center >
+      <el-form label-width="110px">
+        <div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
+          <p>费用类型：
+            <el-select filterable v-model='x.CostTypeId' placeholder=""   @change="getAccountList2(x.CostTypeId,y)"
+              class="w250 _border_b_1">
+              <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID' >
+              </el-option>
+            </el-select>
+          </p>
+        </div>
+        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="costmode=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
     
   </div>
 </template>
@@ -996,6 +1041,7 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
         widthSon: '700px',
         colorSon: "#f5f5f5",
         Finance_InvoiceUpdate:false,
+        Finance_ExpenseType:false,
         msg: {
           pageIndex: 1,
           pageSize: 5,
@@ -1111,7 +1157,8 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
         },
         xgfpBox:false,
         getInvoiceList:[],
-
+        costmode:false,//费用类型的修改弹窗
+        trabeList:[],//修改费用类型的下啦数据
       }
     },
     created() {
@@ -1159,9 +1206,12 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
       let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
       if (ActionMenuList && ActionMenuList.length > 0) {
         ActionMenuList.forEach(x => {
-          if (x.FunctionCode == 'Finance_InvoiceUpdate') {
+          if (x.FunctionCode == 'Finance_InvoiceUpdate') {//发票修改权限
             this.Finance_InvoiceUpdate = true
           }
+          if(x.FunctionCode == 'Finance_ExpenseType'){//费用类型修改权限
+            this.Finance_ExpenseType = true
+          }
         })
       }
     },
@@ -1785,6 +1835,43 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
             "pageIndex": pageIndex
           }
         })
+      },
+      showfeiyong(row){
+        this.apipost('Financial_get_GetFinanceCostTypeList', {FrId:row.FrID}, res => {
+            if (res.data.resultCode == 1) {
+              this.trabeList = res.data.data
+              this.costmode = true
+            }
+          }, err => {})
+      },
+      getAccountList2(val,index){
+        this.GetCostTypeList.map((x)=>{
+          if(x.ID == val){
+            this.trabeList[index].CostTypeName = x.Name;
+            return
+          }
+        })
+      },
+      preservetransaction(){//保存费用类型的修改
+        let msg = []
+        this.trabeList.forEach(x=>{
+          let  obj ={
+            ID:x.ID,
+            FinanceId:x.FinanceId,
+            CostTypeId:x.CostTypeId,
+            CostTypeName:x.CostTypeName,
+          }
+          msg.push(obj)
+        })
+        this.apipost('Financial_get_SetFinanceCostTypeInfo', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message);
+            this.costmode = false
+            this.getPageList()
+          }else{
+            this.Error(res.data.message);
+          }
+        }, err => {})
       }
 
     }

src/pages/financial/orderCompleteStatistics.vue

@@ -169,7 +169,7 @@
     <div style="width:100%; overflow-x:auto">
       <table :boeder="1" class="singeRowTable orderCompleteStatistics" style="width:3000px;border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
         <tr>
-          <th colspan="14" style="border-right:1px solid #999;border-bottom:1px solid #999">合同信息</th>
+          <th colspan="15" style="border-right:1px solid #999;border-bottom:1px solid #999">合同信息</th>
           <th colspan="6" style="border-right:1px solid #999;border-bottom:1px solid #999">收款信息</th>
           <th colspan="2" style="border-right:1px solid #999;border-bottom:1px solid #999">合同有效金额</th>
           <th colspan="7" style="border-right:1px solid #999;border-bottom:1px solid #999">消费情况</th>