发布

src/components/Finance/ConferenceCost.vue

@@ -82,7 +82,7 @@
                             :controls="false" v-model="scope.row.count"></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="单位" width="100">
+                <el-table-column prop="name" label="单位" width="85">
                     <template slot-scope="scope">
                         <el-select size="small" v-model="scope.row.unit" placeholder="" clearable>
                             <el-option v-for="item in units" :key="item.id" :label="item.text" :value="item.id">
@@ -107,7 +107,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="name" label="系数" width="100">
+                <el-table-column prop="name" label="系数" width="80">
                     <template slot-scope="scope">
                         <el-input-number @change="calculateQuotation(scope.row)" :precision="2" size="mini"
                             :controls="false" v-model="scope.row.coefficient"></el-input-number>
@@ -155,7 +155,7 @@
                         {{ scope.row.reviewStatus === 0 ? '未审核' : scope.row.reviewStatus === 1 ? '已通过' : '已撤销' }}
                     </template>
                 </el-table-column>
-                <el-table-column  label="文件查看" width="75"> 
+                <el-table-column  label="文件查看" width="74"> 
                     <template slot-scope="scope">
                         <el-popover v-if="scope.row.imgsList.length>0" placement="right" width="400" trigger="hover">
                             <div style="white-space: pre-line;">
@@ -174,7 +174,7 @@
                         <div v-else style="cursor: pointer;">查看</div>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="100px">
+                <el-table-column label="操作" width="90px">
                     <template slot-scope="scope">
                         <div class="conferencecost-content-btn">
                             <el-button size="mini" @click="removeRow(scope.$index, scope.row)" type="danger">移

src/components/Finance/Overspend.vue

@@ -10,6 +10,7 @@
                             <el-option v-for="item in options" :key="item.id" :label="item.teamName" :value="item.id">
                             </el-option>
                         </el-select>
+                        <span style="color: red;">&nbsp;&nbsp;&nbsp;*&nbsp;额外超支额度：{{reservetwo(extOver.limit)}} {{extOver.currencyName}} 、 当前已用额度：{{reservetwo(groupExtraPrice.usedAmount)}} {{groupExtraPrice.remainingCurrencyName}} 、剩余可用额度：{{reservetwo(groupExtraPrice.remainingAmount)}} {{groupExtraPrice.remainingCurrencyName}}</span>
                     </div>
                     <div class="preserve-btn">
                         <el-button class="preserve" @click="ExportOverspendExcel" type="primary">超支明细表</el-button>
@@ -154,6 +155,7 @@
     </div>
 </template>
 <script>
+import { Decimal } from 'decimal.js'
 export default {
     data() {
         return {
@@ -179,10 +181,17 @@ export default {
                 jinliExpand: [],
                 zhuguanExpand: [],
                 syzhuguanExpand: []
-            }
+            },
+            extOver:{},
+            groupExtraPrice:{},
         }
     },
     methods: {
+        reservetwo(value) {
+            // 截取当前数据到小数点后两位
+            let realVal = new Decimal(value).toFixed(2)
+            return realVal
+        },
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
             this.pageIndex = 1;
@@ -295,6 +304,8 @@ export default {
                     that.dataCount = res.data.data.dataCount
                     that.tableData = res.data.data.dataList;
                     that.overspendAuditUser = res.data.data.overspendAuditUser;
+                    that.extOver = res.data.data.extOver;
+                    that.groupExtraPrice = res.data.data.groupExtraPrice;
                 } else {
                     that.$message({
                         message: res.data.msg,

src/components/OP/EntryDetails.vue

@@ -1869,7 +1869,7 @@ export default {
                     that.storageid = res.data.data.id;
                     // that.GetNationalTravelFeeData();
                     that.fullscreenLoading = false;
-                    that.GetEnterExitCostCorrelationTips(2);
+                    that.GetEnterExitCostCorrelationTips(2)
                     that.EnterExitCostFileOwner();
                     that.GetNationalTravelFeeData();
                 } else {