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

# Conflicts:
#	src/views/warehousenew/warehousingOrder.vue

src/views/profitable/expensemanagementdetails.vue

@@ -5,10 +5,10 @@
       <el-col :span="12">
         <h2 class="bg-left title">费用详情</h2>
       </el-col>
-      <el-col :span="12" class="bg-right"></el-col>
-      <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
-          style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
-      </el-button>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
       </el-col>
     </el-row>
     <div class="center">
@@ -23,28 +23,28 @@
         <el-col :span="18">
           <div class="datascreen">
             <!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
-            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList">
+            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList" class="options_css">
               <el-option v-for="item in choiceObj" :key="item.id" :label="item.costNo" :value="item.costNo">
               </el-option>
             </el-select>
-            <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选" clearable  @change="getList">
+            <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选" clearable  @change="getList" class="options_css">
               <el-option v-for="item in costChoice" :key="item.id" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
-            <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选" clearable  @change="getList">
+            <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选" clearable  @change="getList" class="options_css">
               <el-option v-for="item in flowToList" :key="item.id" :label="item.flowTo" :value="item.flowTo">
               </el-option>
             </el-select>
             
-            <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选" clearable  @change="getList">
+            <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选" clearable  @change="getList" class="options_css">
               <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName" :value="item.expenseName">
               </el-option>
             </el-select>
-            <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option placeholder="按未分配金额筛选" clearable  @change="getList">
+            <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option placeholder="按未分配金额筛选" clearable  @change="getList" class="options_css">
               <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount" :value="item.unallocatedAmount">
               </el-option>
-            </el-select>
-            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选" clearable  @change="getList">
+            </el-select> 
+            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选" clearable  @change="getList" class="options_css">
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
               </el-option>
             </el-select>
@@ -851,4 +851,7 @@ export default {
 .bg-right {
   padding-top: 15px;
 }
+.options_css{
+  margin:0 5px;
+}
 </style>

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">