zhongtianhaoyuan 1 year ago
parent
commit
2d6ea351dd

+ 6 - 6
src/views/profitable/cashout.vue

@@ -43,11 +43,11 @@
             <ws-select v-model="deptBudgetList.autoAssign" class="typeselect">
               <ws-option label="不自动分配" value="不自动分配" style="color: #8890b1" />
               <ws-option label="仓储费自动分配" value="仓储费自动分配" style="color: #8890b1" />
-              <ws-option label="煤款自动分配" value="煤款自动分配" style="color: #8890b1" />
+              <ws-option label="燃料费自动分配" value="燃料费自动分配" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
-            v-show="deptBudgetList.autoAssign == '煤款自动分配'">
+          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
+            v-show="deptBudgetList.autoAssign == '燃料费自动分配'">
             <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "合同费用"' label="合同编号" span="1"
@@ -889,7 +889,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.autoAssign != '煤款自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
+      if (this.deptBudgetList.autoAssign != '燃料费自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
         if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '全部分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '全部分配' && this.deptBudgetList.storageFeeFlag != 1) {
           this.deptBudgetList.amountMoney = Number(this.deptBudgetList.amountMoney).toFixed(2)
           if (this.amount != this.deptBudgetList.amountMoney) {
@@ -916,10 +916,10 @@ export default {
         } else if (this.deptBudgetList.autoAssign == "仓储费自动分配") {
           this.deptBudgetList.autoAssign = 3
           this.deptBudgetList.expenseAllocationInfoList = []
-        } else if (this.deptBudgetList.autoAssign == "煤款自动分配") {
+        } else if (this.deptBudgetList.autoAssign == "燃料费自动分配") {
           if (!this.deptBudgetList.coalPrice) {
             this.$message({
-              message: '单价不能为空!',
+              message: '燃料费单价不能为空!',
               type: 'warning',
             })
             return

+ 2 - 2
src/views/profitable/cashoutaduit.vue

@@ -38,9 +38,9 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
-          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
+          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">
             <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
             <span>{{deptBudgetList.coalPrice}}</span>

+ 1 - 1
src/views/profitable/cashoutaduitNQ.vue

@@ -36,7 +36,7 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">

+ 1 - 1
src/views/profitable/coalCost.vue

@@ -3,7 +3,7 @@
     <div class="container">
         <el-row class="row_top">
             <el-col :span="12">
-                <h2 class="bg-left title">煤款</h2>
+                <h2 class="bg-left title">燃料费</h2>
             </el-col>
             <el-col :span="12" class="bg-right">
                 <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6"

+ 1 - 1
src/views/profitable/component/routers/route.js

@@ -429,7 +429,7 @@ const profitableRouter = {
         module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true,
-        _title:'煤款'
+        _title:'燃料费'
         // module: 'procurement.sparepart.applDetail'
       },
       hidden:true,

+ 1 - 1
src/views/profitable/expensemanagementdetails.vue

@@ -90,7 +90,7 @@
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
         <el-col style="text-align: right" :span="6">
-          <el-button @click="coalCost()">煤款</el-button>
+          <el-button @click="coalCost()">燃料费</el-button>
           <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left: 10px" @click="oilcost()">油费</el-button>
           </el-badge>

+ 1 - 1
src/views/profitable/expensemanagentlook.vue

@@ -35,7 +35,7 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">