Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/profitable/expensemanagementdetails.vue

@@ -196,17 +196,9 @@
                   scope.row.unallocatedAmount > 0)
               " @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
-              <el-button v-if="scope.row.status == '已驳回'" @click="del(0, scope.row)" type="danger">删除</el-button>
-              <el-button v-if="
-                scope.row.approveStatus == '待财务审核' ||
-                scope.row.approveStatus == '待决策人审核' ||
-                scope.row.approveStatus == '待内勤审核'
-              " @click="aduit(scope.row)" type="primary">审核</el-button>
-              <el-button v-if="
-                !scope.row.approveStatus &&
-                scope.row.expensesType == 2 &&
-                scope.row.status == '待付款'
-              " @click="payment(scope.row)" type="primary">付款</el-button>
+              <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
+              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
+              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="分配状态">

src/views/taskManagement/supplyofgoods.vue

@@ -94,6 +94,7 @@
     fmoney,
     EventBus
   } from 'base-core-lib'
+import { toFixed } from 'xe-utils/methods'
   export default {
     name: 'viewSpareMoney',
     components: {
@@ -280,9 +281,10 @@
           }
           
          }
+         this.num=this.num.toFixed(3)
          console.log(this.multipleSelection1)
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight:0)+'吨'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight.toFixed(3):0)+'吨'
           }
         for (let i = 0; i < val.length; i++) {
           val[i].select=true
@@ -328,8 +330,9 @@
           }
           
          }
+         this.num=this.num.toFixed(3)
           for (let q = 0; q < this.multipleSelection1.length; q++) {
-            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight:0)+'吨，'
+            this.content=this.content+this.multipleSelection1[q].goodsName+(this.multipleSelection1[q].estimateOutWarehouseWeight?this.multipleSelection1[q].estimateOutWarehouseWeight.toFixed(3):0)+'吨，'
           }
       },
       getList() {
@@ -403,7 +406,7 @@
                 });
                 return
             }
-            if(String(this.multipleSelection[i].estimateOutWarehouseWeight).indexOf('.')!=-1&&this.multipleSelection[i].estimateOutWarehouseWeight.substring(this.multipleSelection[i].estimateOutWarehouseWeight.indexOf('.')+1, this.multipleSelection[i].estimateOutWarehouseWeight.length).length>3){
+            if(String(this.multipleSelection[i].estimateOutWarehouseWeight).indexOf('.')!=-1&&String(this.multipleSelection[i].estimateOutWarehouseWeight).substring(String(this.multipleSelection[i].estimateOutWarehouseWeight).indexOf('.')+1, this.multipleSelection[i].estimateOutWarehouseWeight.length).length>3){
               this.$message({
                 message: '预计出库重量输入错误',
                 type: 'error'

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -598,13 +598,15 @@
 						}
 						console.log(this.goods)
 					}
+					this.dataList1.weight=this.dataList1.weight.toFixed(3)
+					this.dataList.weight=this.dataList.weight.toFixed(3)
 				}else if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
 					var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
 					if(localStorage.getItem('supplygoodsstatus')&&localStorage.getItem('supplygoodsstatus')==0){
 						for (let i = 0; i < supplygoods.length; i++) {
 							this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
-							this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
-							this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
+							this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+							this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
 						}
 					}
 					

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -1082,8 +1082,8 @@
               for (let i = 0; i < supplygoods.length; i++) {
                 console.log(this.goods)
                 this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
-                this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
-                this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
+                this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
+                this.dataList.weight=Number(this.dataList.weight)+Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
               }
             }
           }

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -1832,12 +1832,12 @@ export default {
                       this.dataList1.weight =
                       Number(this.dataList1.weight) +
                       Number(
-                        supplygoods[i].estimateOutWarehouseWeight
+                        supplygoods[i].estimateOutWarehouseWeight.toFixed(3)
                       )
                     this.dataList.weight =
                       Number(this.dataList.weight) +
                       Number(
-                        supplygoods[i].estimateOutWarehouseWeight
+                        supplygoods[i].estimateOutWarehouseWeight.toFixed(3)
                       )
                     }
                     
@@ -1857,10 +1857,10 @@ export default {
                       : '' + supplygoods[i].goodsName
                   this.dataList1.weight =
                     Number(this.dataList1.weight) +
-                    Number(supplygoods[i].estimateOutWarehouseWeight)
+                    Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
                   this.dataList.weight =
                     Number(this.dataList.weight) +
-                    Number(supplygoods[i].estimateOutWarehouseWeight)
+                    Number(supplygoods[i].estimateOutWarehouseWeight.toFixed(3))
                 }
               }
             }

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -101,7 +101,7 @@
             </el-form-item>
             <div class="input-item-margin">
               <el-button v-if="deptBudgetList.priceStatus=='审核中'" type="primary"
-                v-hasPermission="`tranManager.transportationInfo.ship`" size="small" @click="examine()">审核中</el-button>
+                 size="small">{{deptBudgetList.approveStatus}}</el-button>
               <el-button v-else type="primary" @click="priceSubmit()">提交</el-button>
             </div>
           </el-row>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -113,11 +113,9 @@
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
-              v-hasPermission="`tranManager.transportationInfo.trian`" 
               size="small"
-              @click="examine()"
               class="submit"
-              >审核中</el-button
+              >{{deptBudgetList.approveStatus}}</el-button
             >
              <el-button
              v-else

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -115,12 +115,14 @@
                 </el-button>
               </div>
               <el-button v-if="deptBudgetList.priceStatus!='审核中'&&pricetype==1" type="primary" @click="priceSubmit(1)">提交</el-button>
+              <el-button v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1" type="primary">{{deptBudgetList.approveStatus}}</el-button>
               <div v-if="deptBudgetList.priceStatusCar=='审核中'&&pricetype==2">
                 <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
                   @click="examine(2)">审核中
                 </el-button>
               </div>
               <el-button v-if="deptBudgetList.priceStatusCar!='审核中'&&pricetype==2" type="primary" @click="priceSubmit(2)">提交</el-button>
+              <el-button v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button>
             </div>
           </div>
           <div class="content3" v-for="(item, index) in driverlist" :key="index">