前端

src/views/profitable/oilcost.vue

@@ -47,7 +47,7 @@
           </el-table-column>
           <el-table-column v-if="strokeType == 3" prop="warehouseName" label="仓库名" width="100px">
           </el-table-column>
-          <el-table-column v-if="strokeType == 3" prop="warehouseName" label="备注" width="100px">
+          <el-table-column v-if="strokeType == 3" prop="remark" label="备注" width="100px">
           </el-table-column>
           <el-table-column v-if="strokeType == 1" prop="driverName" label="司机名" width="100px">
           </el-table-column>
@@ -93,7 +93,7 @@
              
               <!-- <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="edit(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.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>
@@ -112,10 +112,10 @@
   <el-form-item v-if="strokeType==1" label="车牌号">
     {{form.carNo}}
   </el-form-item>
-  <el-form-item  label="起点">
+  <el-form-item v-if="strokeType==1" label="起点">
     {{form.originProvince}}{{form.originCity}}{{form.originArea}}{{form.originAddress}}
   </el-form-item>
-  <el-form-item  label="终点">
+  <el-form-item v-if="strokeType==1" label="终点">
     {{form.destinationProvince}}{{form.destinationCity}}{{form.destinationArea}}{{form.destinationAddress}}
   </el-form-item>
   <el-form-item  v-if="strokeType==1" label="总油耗（升）">
@@ -124,6 +124,21 @@
   <el-form-item  v-if="strokeType==1" label="总金额（元）">
     {{form.totalCost}}
   </el-form-item>
+  <el-form-item v-if="strokeType==1" label="申请时间">
+    {{form.createDate}}
+  </el-form-item>
+  <el-form-item v-if="strokeType==3" label="仓库名">
+    {{form.warehouseName}}
+  </el-form-item>
+  <el-form-item v-if="strokeType==3" label="备注">
+    {{form.remark}}
+  </el-form-item>
+  <el-form-item v-if="strokeType==3" label="请款金额">
+    {{form.amountRequested}}
+  </el-form-item>
+  <el-form-item v-if="strokeType==3" label="请款时间">
+    {{form.createDate}}
+  </el-form-item>
   <div style="border-bottom:1px solid #ccc;margin-bottom:18px;"></div>
   <div v-if="form.fillingDetailInfoList">
     <div v-for="(item,index) in form.fillingDetailInfoList">
@@ -142,10 +157,23 @@
       </el-form-item>
     </div>
   </div>
+    <div v-if="form.shortFillingInfoList">
+    <div v-for="(item,index) in form.shortFillingInfoList">
+      <div>加油-{{index+1}}</div>
+      <el-form-item label="车牌号">
+        {{item.carNo}}
+      </el-form-item>
+      <el-form-item label="起始地">
+        {{item.originProvince}}{{item.originCity}}{{item.originArea}}{{item.originAddress}}
+      </el-form-item>
+      <el-form-item label="终到地">
+        {{item.destinationProvince}}{{item.destinationCity}}{{item.destinationArea}}{{item.destinationAddress}}
+      </el-form-item>
+    </div>
+  </div>
   
   <el-form-item>
-    <el-button type="primary" @click="onSubmit">立即创建</el-button>
-    <el-button>取消</el-button>
+    <el-button @click="dialogVisible1=false">关闭</el-button>
   </el-form-item>
 </el-form>
       <!-- </div> -->
@@ -270,7 +298,7 @@
                 message: '通过成功!',
                 type: 'success',
               })
-              this.$router.go(-1)
+              this.getList()
             }).catch((response) => {
               this.$message({
                 message: '通过失败!',
@@ -285,9 +313,9 @@
           })
         }
       },
-      pass(row){
+      reject(row){
         if(row.taskId){
-          this.$confirm('确认通过请款信息？', '提示', {
+          this.$confirm('确认驳回请款信息？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -301,13 +329,13 @@
             }).toPromise()
             .then((response) => {
               this.$message({
-                message: '通过成功!',
+                message: '驳回成功!',
                 type: 'success',
               })
-              this.$router.go(-1)
+              this.getList()
             }).catch((response) => {
               this.$message({
-                message: '通过失败!',
+                message: '驳回失败!',
                 type: 'error',
               })
             })

src/views/warehousenew/warehouseManagementEdit.vue

@@ -345,11 +345,16 @@
         this.fileList = files
         console.log('uploadSuccess ', data, files, url)
       },
-      onChange(files) {
-        this.fileNum = files
-        this.$refs.upload.handleSaveBill().then((res) => {
-          console.log(files)
-        })
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
       },
       handleClose() {
         this.accessoryTFs = false