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

src/views/profitable/oilcost.vue

@@ -64,9 +64,14 @@
             </template>
           </el-table-column>
           <el-table-column v-if="strokeType == 1"  prop="createDate" width="120" label="申请时间"></el-table-column>
-          <el-table-column v-if="strokeType == 3"  prop="amountRequested" label="请款金额（元）">
+           <el-table-column v-if="strokeType == 3"  prop="amountRequested" label="请款金额（元）">
+             <template slot-scope="scope">
+              {{scope.row.amountRequested}}
+            </template>
           </el-table-column>
-          <el-table-column v-if="strokeType == 3"  prop="createDate" width="120" label="请款时间"></el-table-column>
+           <el-table-column v-if="strokeType == 3"  prop="createDate" label="请款时间"> <template slot-scope="scope">
+              {{scope.row.createDate}}
+            </template></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
@@ -92,8 +97,8 @@
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
              
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
-              <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
-              <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(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>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -608,6 +608,8 @@
 					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.goodsName =this.goods!=''?this.goods:''+supplygoods[i].goodsName
+							this.dataList.goodsName=this.goods!=''?this.goods:''+supplygoods[i].goodsName
 							this.dataList1.weight=Number(this.dataList1.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
 							this.dataList.weight=Number(this.dataList.weight)+Number(Number(supplygoods[i].estimateOutWarehouseWeight).toFixed(3))
 						}