From 13d3b9d38e5a8411fa0a73abecd1df04b06f1b50 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 7 May 2022 15:07:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=97=A7=E7=9A=84?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commoncontract/CommonContractFeign.java   | 13 +++---
 .../CommonContractFeignFallback.java          | 13 +++---
 .../commoncontract/CommonContractRest.java    | 27 ++++--------
 .../commoncontract/CommonContractService.java | 43 +++++++------------
 4 files changed, 35 insertions(+), 61 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
index 5b9b806129..afc3c2da1a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
@@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,9 +43,9 @@ public interface CommonContractFeign {
     @PostMapping("/generateContractNo")
     public Map<String, String> generateContractNo(@RequestParam("userSid") String userSid);
 
-    @ApiOperation("新增保存")
+  /*  @ApiOperation("新增保存")
     @PostMapping("/save")
-    public ResultBean save(@RequestBody CommonContractDto dto);
+    public ResultBean save(@RequestBody CommonContractDto dto);*/
 
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
@@ -92,10 +91,10 @@ public interface CommonContractFeign {
     public ResultBean delAppCommonContractByBusSid(@RequestParam("busSid") String busSid);
 
     /*销售订单*/
-    @ApiOperation("手机端根据销售订单sid查询合同信息")
+ /*   @ApiOperation("手机端根据销售订单sid查询合同信息")
     @GetMapping("/getAppBusOrderContractByOrderSid")
     public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(@RequestParam("userSid") String userSid, @RequestParam("orderSid") String orderSid);
-
+*/
     @ApiOperation("手机端保存、修改销售订单合同信息")
     @PostMapping("/saveOrUpdateAppBusOrderContract")
     public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(@RequestBody AppBusOrderContractDto dto);
@@ -133,9 +132,9 @@ public interface CommonContractFeign {
     @GetMapping("/printItemSet")
     public ResultBean<PrintItemVo> printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName);
 
-    @ApiOperation(value = "打印项确认(生成word后转为pdf)")
+  /*  @ApiOperation(value = "打印项确认(生成word后转为pdf)")
     @PostMapping("/printConfirm")
-    public ResultBean<List<PrintConfirmVo>> printConfirm(@RequestBody PrintConfirmDto dto);
+    public ResultBean<List<PrintConfirmVo>> printConfirm(@RequestBody PrintConfirmDto dto);*/
 
 
     /******************************************************新车买卖合同审核（流程）******************************************************/
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
index 189fd364b8..ce5051555e 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
@@ -8,7 +8,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,11 +37,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         return null;
     }
 
-    @Override
+   /* @Override
     public ResultBean save(CommonContractDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问");
     }
-
+*/
     @Override
     public ResultBean update(CommonContractDto dto, String sid) {
         return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问");
@@ -100,11 +99,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         return rb.setMsg("接口anrui-base/commoncontract/delAppCommonContractByBusSid无法访问");
     }
 
-    @Override
+  /*  @Override
     public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-base/commoncontract/getAppBusOrderContractByOrderSid无法访问");
-    }
+    }*/
 
     @Override
     public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(AppBusOrderContractDto dto) {
@@ -140,11 +139,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问");
     }
 
-    @Override
+   /* @Override
     public ResultBean printConfirm(PrintConfirmDto dto) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问");
-    }
+    }*/
 
     @Override
     public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
index 4f3e90b8e2..ca06b93e4b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
@@ -1,21 +1,10 @@
 package com.yxt.anrui.base.biz.commoncontract;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
-import com.yxt.anrui.buscenter.api.busorder.BusOrder;
-import com.yxt.anrui.buscenter.api.busorder.BusOrderAllVo;
-import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
-import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
-import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo;
-import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo;
-import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel;
-import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo;
-import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -74,8 +63,8 @@ public class CommonContractRest implements CommonContractFeign {
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
-    @Autowired
-    private BusOrderFeign busOrderFeign;
+ /*   @Autowired
+    private BusOrderFeign busOrderFeign;*/
 
     @Override
     public ResultBean<PagerVo<CommonContractVo>> listPage(@RequestBody PagerQuery<CommonContractQuery> pq) {
@@ -90,7 +79,7 @@ public class CommonContractRest implements CommonContractFeign {
         return map;
     }
 
-    @Override
+   /* @Override
     public ResultBean save(CommonContractDto dto) {
         ResultBean rb = ResultBean.fireFail();
         dto.setSid(UUID.randomUUID().toString());
@@ -169,7 +158,7 @@ public class CommonContractRest implements CommonContractFeign {
             finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto);
         }
         return rb.success().setData(commonContract.getSid());
-    }
+    }*/
 
     @Override
     public ResultBean update(CommonContractDto dto, String sid) {
@@ -298,7 +287,7 @@ public class CommonContractRest implements CommonContractFeign {
      * @param orderSid
      * @return
      */
-    @Override
+   /* @Override
     public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
         if (StringUtils.isBlank(userSid)) {
             return new ResultBean().fail().setMsg("用户sid不能为空");
@@ -307,7 +296,7 @@ public class CommonContractRest implements CommonContractFeign {
             return new ResultBean().fail().setMsg("销售sid不能为空");
         }
         return commonContractService.getAppBusOrderContractByOrderSid(userSid, orderSid);
-    }
+    }*/
 
     /**
      * 手机端保存、修改销售订单合同信息
@@ -411,10 +400,10 @@ public class CommonContractRest implements CommonContractFeign {
         return commonContractService.printItemSet(busSid, customerName);
     }
 
-    @Override
+   /* @Override
     public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
         return commonContractService.printConfirm(dto);
-    }
+    }*/
 
     public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException {
         SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 7d243efa74..317c35a14f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -3,8 +3,6 @@ package com.yxt.anrui.base.biz.commoncontract;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo;
-import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commoncontract.*;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
@@ -15,20 +13,13 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.biz.flow.FlowableService;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
-import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
 import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
-import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo;
-import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountFeign;
-import com.yxt.anrui.buscenter.api.busordermodel.AppBusOrderModelVo;
-import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
-import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
@@ -51,12 +42,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /**
@@ -94,14 +81,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private DictCommonFeign dictCommonFeign;
     @Autowired
     private BusDepositFeign busDepositFeign;
-    @Autowired
+  /*  @Autowired
     private BusOrderFeign busOrderFeign;
     @Autowired
-    private BusOrderDiscountFeign busOrderDiscountFeign;
-    @Autowired
+    private BusOrderDiscountFeign busOrderDiscountFeign;*/
+  /*  @Autowired
     private BusOrderModelFeign busOrderModelFeign;
     @Autowired
-    private BusOrderVehicleFeign busOrderVehicleFeign;
+    private BusOrderVehicleFeign busOrderVehicleFeign;*/
     @Autowired
     private BusDepositVehicleFeign busDepositVehicleFeign;
     @Autowired
@@ -410,7 +397,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      * @param orderSid 销售订单sid
      * @return
      */
-    public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
+   /* public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
         Map<String, String> map = generateContractNo(userSid);
         String staffSid = map.get("staffSid");
         CommonContractVo commonContractVo = baseMapper.selectCountByCusAndStaAndBusSid(staffSid, orderSid);
@@ -439,7 +426,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
         return new ResultBean<AppBusOrderContractVo>().success().setData(contractVo);
-    }
+    }*/
 
     /**
      * 手机端保存/修改销售订单
@@ -580,7 +567,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      * @param dto
      * @return
      */
-    public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
+   /* public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
         Map<String, Object> map = new HashMap<String, Object>();
         // 合同信息
         CommonContract contract = fetchBySid(dto.getSid());
@@ -699,7 +686,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return new ResultBean().fail().setMsg("生成文件失败");
         }
         return new ResultBean().success().setData(list);
-    }
+    }*/
 
     /**
      * 生成 新车买卖合同(现车或订车) pdf
@@ -865,7 +852,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      * @param createDate 交订金时间(未确定，暂时取“制单日期”)
      * @return
      */
-    public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) {
+   /* public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) {
         // 品牌简称
         String brandShortName = baseVehicleBrandService.getBrandShortName(brandSid);
         // 车型代号
@@ -888,7 +875,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String loanType = "";
 
         return brandShortName + vehicleTypeCodeNum + orgShortName + regionDivision + yearAndMonth + num + loanType;
-    }
+    }*/
 
     /**
      * 根据传入的交订金时间获取所属年份和月份
@@ -953,8 +940,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      * @param map 封装数据
      * @return
      */
-    public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) {
-        Map<String, Object> commonContractMap = map;
+  /*  public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) {
+        Map<String, Object> commonContractMap = map;*/
         /**
          * 车辆登记合同参数：
          * 甲方：${partyA}
@@ -971,7 +958,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
          */
         //甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称
         //乙方为受卖方，即销售订单的客户名称
-        ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid());
+       /* ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid());
         if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) {
             BusOrderVo orderVo = busOrderVoResultBean.getData();
             //乙方
@@ -979,9 +966,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             //客户名称
             commonContractMap.put("customerName", orderVo.getCustomerName());
         }
-        return commonContractMap;
+        return commonContractMap;*/
 
-    }
+   /* }*/
 
     /**
      * 涉及高低开票的，需要打印两套合同：

From cb97c1351749ec5120fc6625c8a33a5791a09ade Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 7 May 2022 18:13:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=E5=92=8C=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/zhengchangkaipiao/openTicket.js   |   9 +
 .../components/uploadFile/multifileUpload.vue |  87 +++
 .../anrui-buscenter-ui/src/router/index.js    |  16 +
 .../zhangchangkaipiaoguanli.vue               |  18 +-
 .../zhengchangkaipiaoAdd.vue                  | 441 +++++++++++--
 .../zhengchangkaipiaoInfo.vue                 | 393 ++++++++++++
 .../zhengchangkaipiaoEdit.vue                 | 583 +++++++++++++++++
 .../zhengchangkaipiaoInfo.vue                 | 594 ++++++++++++++++++
 8 files changed, 2063 insertions(+), 78 deletions(-)
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/multifileUpload.vue
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/zhengchangkaipiao/openTicket.js b/anrui-buscenter/anrui-buscenter-ui/src/api/zhengchangkaipiao/openTicket.js
index 1db7590c50..7b6335677f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/zhengchangkaipiao/openTicket.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/zhengchangkaipiao/openTicket.js
@@ -74,6 +74,15 @@ export function submitFinBillApplication(data) {
   })
 }
 
+// 查看图片
+export function fetchFileBySid(data) {
+  return request({
+    url: '/fin/v1/finbillfile/fetchFileBySid',
+    method: 'post',
+    params: data
+  })
+}
+
 // 待办任务同意办理
 export function businessAgree(data) {
   return request({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/multifileUpload.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/multifileUpload.vue
new file mode 100644
index 0000000000..2e872ec2c9
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/multifileUpload.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <!-- 此上传模板支持多文件上传-->
+    <el-upload action="" :data="datas" :accept="accept" :on-change="handleChange" :on-remove="handleRemove" :file-list="fileList_FuJian" :http-request="uploadSectionFile" :show-file-list="showfile" multiple>
+      <el-button size="small" type="primary">选择文件</el-button>
+      <div slot="tip" v-show="reminder == true" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型: {{ accept }}</div>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { upload } from '@/api/business/beiAn'
+
+export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    // 由父组件根据不同需求传参数，设置接受上传的文件类型
+    accept: {
+      type: String,
+      default: ''
+    },
+    // 设置提示内容能否展示
+    reminder: {
+      type: Boolean,
+      default: true
+    },
+    // 设置是否显示已上传文件列表
+    showfile: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      datas: null,
+      name: null,
+      accessToken: {},
+      fileList_FuJian: [],
+      enclosure: '',
+      file_add: '',
+      idsz: '',
+      file_catch: '',
+      files_list: []
+    }
+  },
+  methods: {
+    show(val) {
+      this.fileList_FuJian = []
+      this.fileList_FuJian = val
+    },
+    handleChange(file, fileList) {
+    },
+    handleRemove(file, fileList) {
+      this.$emit('handleRemove', file)
+    },
+    // 上传文件 FrontPhoto
+    uploadSectionFile(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append('file', file)
+      // 项目封装的请求方法，下面做简单介绍
+      upload(form).then((res) => {
+        // 自行处理各种情况
+        if (res.success) {
+          this.$emit('handleSuccess', res)
+        }
+        if (res.msg === '操作成功') {
+          this.$message({
+            message: '上传成功！',
+            type: 'success'
+          })
+        }
+      }).catch((err) => {
+        console.log(err)
+        // 如果等于备案,就调备案图片上传接口
+      })
+    }
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
index dd7fbf4f3d..483c88c952 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
@@ -636,6 +636,22 @@ export const constantRoutes = [{
     component: () =>
       import('@/views/workflow/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingEdit.vue'),
     name: 'gaizhangshenqingEdit'
+  },
+
+  // 开票管理
+  // 正常开票申请详情
+  {
+    path: '/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue',
+    component: () =>
+      import('@/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue'),
+    name: 'zhengchangkaipiaoguanliInfo'
+  },
+  // 正常开票申请编辑
+  {
+    path: '/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue',
+    component: () =>
+      import('@/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue'),
+    name: 'zhengchangkaipiaoEdit'
   }
   // 销售订单
   // 销售管理详情
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
index 9973e51caf..fe480ec706 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
@@ -38,7 +38,7 @@
                   <el-input v-model="listQuery.params.billState" placeholder="" clearable/>
                 </el-form-item>
                 <el-form-item label="申请日期:" class="searchlist">
-                  <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applyEndDate" clearable style="width: 200px" type="date" placeholder="开始日期"/>
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applyStartDate" clearable style="width: 200px" type="date" placeholder="开始日期"/>
                   <div class="line">至</div>
                   <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applyEndDate" clearable style="width: 200px" type="date" placeholder="结束日期"/>
                 </el-form-item>
@@ -60,7 +60,7 @@
               <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button>
+                  <el-button type="primary" size="small" :disabled="scope.row.nodeState !== '待提交'" @click="handUpdate(scope.row)">办理</el-button>
                   <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>
@@ -113,8 +113,8 @@
         </div>
       </div>
     </div>
-    <zhengchangkaipiaoAdd v-show="viewState == 2" ref="divAdd" @doback="resetState"/>
-<!--    <zhengchangkaipiaoInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>-->
+    <zhengchangkaipiaoAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <zhengchangkaipiaoInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
@@ -170,12 +170,12 @@ export default {
     // 数据字典加载
     DataDictionary() {
       dataDictionary({ type: 'invoiceType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.billType_list = res.data
         }
       })
       namesDown().then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.billName_list = res.data
         }
       })
@@ -200,7 +200,7 @@ export default {
       this.listLoading = true
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
-        if (response.code === '200') {
+        if (response.success) {
           this.listQuery.total = response.data.total
           this.list = response.data.records
         }
@@ -208,6 +208,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     handReset() {
@@ -234,13 +235,12 @@ export default {
       this.viewState = 2
       this.$refs['divAdd'].showEdit(row)
     },
-    handlook(row) {
+    handLook(row) {
       this.viewState = 3
       this.$refs['divInfo'].showInfo(row)
     },
     resetState() {
       this.viewState = 1
-      this.handReset()
     }
   }
 }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoAdd.vue
index 572be02091..67bf8d912e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoAdd.vue
@@ -6,12 +6,12 @@
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
           </el-button>
-          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
           </el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="listconadd">
+      <div class="listadd">
         <div class="wlInfo"><span>公司申请入账单</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
           <el-row class="linetwo">
@@ -20,7 +20,7 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <el-input v-model="formobj.modelName" readonly/>
+                <el-input v-model="formobj.contractNo" readonly/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -30,7 +30,7 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <el-input v-model="formobj.configName" readonly/>
+                <el-input v-model="formobj.applyDate" readonly/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -40,33 +40,35 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <el-input v-model="formobj.configName" readonly/>
+                <el-input v-model="formobj.customerName" readonly/>
               </el-form-item>
             </el-col>
           </el-row>
           <div class="tableStyle">
             <div style="margin-left: 5px;font-weight: bold">开票信息</div>
             <div style="display: flex;justify-content: flex-start;align-items: center">
-              <span style="width: 150px">单台开票金额: </span><el-input v-model="formobj.configName" @keyup.native="UpNumber" @keydown.native="UpNumber" style="padding: 5px;" placeholder="" clearable></el-input>
+              <span style="width: 150px">单台开票金额: </span>
+              <el-input v-show="formobj.oneBillState !=='0'" v-model="formobj.oneBillMoney" readonly @keyup.native="UpNumber" @keydown.native="UpNumber" style="padding: 5px;" placeholder="" clearable></el-input>
+              <el-input v-show="formobj.oneBillState =='0'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" style="padding: 5px;" placeholder="" clearable></el-input>
             </div>
           </div>
           <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="车架号" align="left" header-align="center">
+            <el-table-column label="车架号" align="center" header-align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable/>
+                <span>{{ scope.row.VIN }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票类型" align="left" header-align="center">
+            <el-table-column label="开票类型" align="center" header-align="center">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.billTypeKey" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="开票名称" align="left" header-align="center">
+            <el-table-column label="开票名称" align="center" header-align="center">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.params.billName" placeholder="请选择" filterable clearable>
+                <el-select v-model="scope.row.billName" placeholder="请选择" @change="changeBillName($event, scope.row)" filterable clearable>
                   <el-option v-for="item in billName_list" :key="item.sid" :label="item.orgName" :value="item.sid"/>
                 </el-select>
               </template>
@@ -83,7 +85,20 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                {{ formobj.configName }}
+                {{ NumberMul() }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="是否延迟开票"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-radio-group v-model="formobj.isDelayBill">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
@@ -93,7 +108,7 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                <el-input v-model="formobj.configName" readonly/>
+                <el-input v-model="formobj.remarks" placeholder="" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -103,77 +118,120 @@
             </el-col>
             <el-col :span="21">
               <el-form-item>
-                {{ formobj.configName }}
+                {{ formobj.billState }}
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="tableStyle">
+          <div class="headline">
             <div style="margin-left: 5px;font-weight: bold">所附资料附件</div>
           </div>
-          <el-table :key="fileKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+          <el-table :key="fileKey" :data="finfile_list" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="small">上传</el-button>
+                <div class="balanceStyle">
+                  <upload :accept="accept" ref="divUpload" :reminder="false" :showfile="false" @handleSuccess="filesAdd($event, scope.row)" @handleRemove="filesRemove" />
+                  <el-button type="danger" size="small" @click="handDelete(scope.row)">删除</el-button>
+                </div>
               </template>
             </el-table-column>
-            <el-table-column label="附件名称" header-align="center">
+            <el-table-column label="附件名称" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
-              </template>
-            </el-table-column>
-            <el-table-column label="文件格式" header-align="center">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+                <span class="bluezi" @click="handlook(scope.row)">{{ scope.row.fileName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="上传人" header-align="center">
+            <el-table-column label="上传人" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+                <span>{{ scope.row.uploadName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="上传时间" header-align="center">
+            <el-table-column label="上传时间" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+                <span>{{ scope.row.uploadTime }}</span>
               </template>
             </el-table-column>
           </el-table>
         </el-form>
       </div>
     </div>
-    <!--End 添加修改部分-->
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-carousel :interval="4000" type="card">
+        <el-carousel-item v-for="(item, index) in file_list" :key="index">
+          <img style="width: 100%; height: 100%" :src="item.filePath" @click="handImg(item.filePath)"/>
+        </el-carousel-item>
+      </el-carousel>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisibleFile">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { save, dataDictionary, fetchDetailsBySid, submitFinBillApplication, namesDown } from '@/api/zhengchangkaipiao/openTicket.js'
+import { save, dataDictionary, fetchDetailsBySid, submitFinBillApplication, namesDown, fetchFileBySid } from '@/api/zhengchangkaipiao/openTicket.js'
+import upload from '@/components/uploadFile/multifileUpload.vue'
 export default {
   name: 'zhengchangkaipiaoAdd',
+  components: {
+    upload
+  },
   data() {
     return {
       viewTitle: '',
+      dialogVisible: false,
+      dialogVisibleFile: false,
+      dialogImageUrl: '',
       index: 0,
       tableKey: 0,
       fileKey: 1,
+      file_list: [],
       billType_list: [],
       billName_list: [],
+      accept: '.jpg,.jpeg,.png,.JPG,.JPEG,.PNG',
       // 表单数据
       formobj: {
         sid: '',
-        billAppPublicSid: '',
-        billState: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
         contractNo: '',
         contractSid: '',
-        createByName: window.sessionStorage.getItem('name'),
         customerName: '',
         customerSid: '',
         oneBillMoney: '',
+        oneBillState: '',
         totalBillMoney: '',
-        useOrgSid: '',
-        finBillApplicationAppendxs: [],
-        finBillFiles: [],
-        finBillVehicles: []
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
       },
+      finfile_list: [
+        {
+          fileName: '《客户开票申请书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《开票信息确认书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《车辆登记合同》',
+          uploadName: '',
+          uploadTime: ''
+        }
+      ],
+      currentDate: '',
       rules: {},
       submitdisabled: false
     }
@@ -182,58 +240,264 @@ export default {
     // 数据字典加载
     DataDictionary() {
       dataDictionary({ type: 'invoiceType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.billType_list = res.data
         }
       })
       namesDown().then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.billName_list = res.data
         }
       })
     },
+    // 开票金额合计（车辆数乘以单台开票金额(单台开票金额目前先按照整数算)）
+    NumberMul() {
+      var arg1 = parseFloat(this.formobj.finBillVehicles.length)
+      var arg2 = 0
+      if (this.formobj.oneBillMoney !== '') {
+        arg2 = parseFloat(this.formobj.oneBillMoney)
+      }
+      var m = 0
+      var s1 = arg1.toString()
+      var s2 = arg2.toString()
+      try {
+        m += s1.split('.')[1].length
+      } catch (e) {
+        console.log(e)
+      }
+      try {
+        m += s2.split('.')[1].length
+      } catch (e) {
+        console.log(e)
+      }
+      this.formobj.totalBillMoney = Number(s1.replace(',', '')) * Number(s2.replace(',', '')) / Math.pow(10, m)
+      return Number(s1.replace(',', '')) * Number(s2.replace(',', '')) / Math.pow(10, m)
+    },
+    // 获取制单日期
+    newDate() {
+      let date = new Date()
+      let year = date.getFullYear() // 年
+      let month = date.getMonth() + 1 // 月
+      let day = date.getDate() // 日
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      this.currentDate = year + '-' + month + '-' + day
+    },
     UpNumber(e) {
       e.target.value = e.target.value.replace(/[^0-9.]/g, '')
     },
     showEdit(row) {
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
       this.viewTitle = '【编辑】公司开票申请'
-      console.log('编辑回显', row)
+      this.DataDictionary()
+      this.newDate()
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《客户开票申请书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《开票信息确认书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《车辆登记合同》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs = resp.data
+          }
+        }
+      })
       fetchDetailsBySid(row.sid).then((resp) => {
-        this.DataDictionary()
-        if (resp.code === '200') {
-          this.formobj = resp.data
+        if (resp.success) {
+          console.log(resp.data)
+          this.formobj.sid = row.sid
+          this.formobj.contractNo = resp.data.contractNo
+          this.formobj.contractSid = resp.data.contractSid
+          this.formobj.customerName = resp.data.customerName
+          this.formobj.customerSid = resp.data.customerSid
+          this.formobj.oneBillMoney = resp.data.oneBillMoney
+          this.formobj.totalBillMoney = resp.data.totalBillMoney
+          this.formobj.billAppPublicSid = resp.data.billAppPublicSid
+          this.formobj.billState = resp.data.billState
+          this.formobj.isDelayBill = resp.data.isDelayBill
+          this.formobj.remarks = resp.data.remarks
+          this.formobj.oneBillState = resp.data.oneBillState
+          if (resp.data.applyDate === '') {
+            this.formobj.applyDate = this.currentDate
+          } else {
+            this.formobj.applyDate = resp.data.applyDate
+          }
+          this.formobj.finBillVehicles = resp.data.finBillVehicles
+          if (resp.data.finBillFileVos.length > 0) {
+            for (var i = 0; i < resp.data.finBillFileVos.length; i++) {
+              if (resp.data.finBillFileVos[i].fileType === '《客户开票申请书》') {
+                this.finfile_list[0].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[0].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《开票信息确认书》') {
+                this.finfile_list[1].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[1].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《车辆登记合同》') {
+                this.finfile_list[2].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[2].uploadName = resp.data.finBillFileVos[i].createByName
+              }
+            }
+          }
         }
       }).catch((e) => {
         this.formobj = row
       })
     },
-    saveEdit() {
-      this.$refs['form_obj'].validate((valid) => {
-        if (valid) {
-          this.submitdisabled = true
-          save(this.formobj).then((resp) => {
-            this.submitdisabled = false
-            this.$message({
-              showClose: true,
-              type: 'success',
-              message: resp.msg
-            })
-            this.handleReturn('true')
-          }).catch(() => {
-            this.submitdisabled = false
-          })
+    changeBillName(value, row) {
+      var aa = null
+      this.billName_list.forEach((e) => {
+        if (e.sid === value) {
+          aa = {
+            sid: e.sid,
+            value: e.orgName
+          }
+        }
+      })
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].VIN === row.VIN) {
+          this.formobj.finBillVehicles[i].billName = aa.value
+          this.formobj.finBillVehicles[i].billNameSid = aa.sid
+        }
+      }
+    },
+    filesAdd(item, row) {
+      var arrayList = []
+      arrayList = item.data
+      if (row.fileName === '《客户开票申请书》') {
+        this.formobj.khkpsqsApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      } else if (row.fileName === '《开票信息确认书》') {
+        this.formobj.kpxxqrsApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      } else {
+        this.formobj.cldjhtApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      }
+    },
+    filesRemove(item) {
+      // console.log(item)
+    },
+    handDelete(row) {
+      const tip = '请确认是否删除' + row.fileName + ' 中上传的文件?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (row.fileName === '《客户开票申请书》') {
+          this.formobj.khkpsqsApplicationAppendxs = []
+        } else if (row.fileName === '《开票信息确认书》') {
+          this.formobj.kpxxqrsApplicationAppendxs = []
         } else {
-          return false
+          this.formobj.cldjhtApplicationAppendxs = []
         }
       })
     },
+    handlook(row) {
+      this.dialogVisible = true
+      this.file_list = []
+      console.log(this.formobj.kpxxqrsApplicationAppendxs, this.formobj.khkpsqsApplicationAppendxs, this.formobj.cldjhtApplicationAppendxs)
+      if (row.fileName === '《客户开票申请书》') {
+        if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+          for (var i = 0; i < this.formobj.khkpsqsApplicationAppendxs.length; i++) {
+            if (this.formobj.khkpsqsApplicationAppendxs[i].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.khkpsqsApplicationAppendxs[i].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else if (row.fileName === '《开票信息确认书》') {
+        if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+          for (var a = 0; a < this.formobj.kpxxqrsApplicationAppendxs.length; a++) {
+            if (this.formobj.kpxxqrsApplicationAppendxs[a].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.kpxxqrsApplicationAppendxs[a].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else {
+        if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+          for (var b = 0; b < this.formobj.cldjhtApplicationAppendxs.length; b++) {
+            if (this.formobj.cldjhtApplicationAppendxs[b].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.cldjhtApplicationAppendxs[b].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      }
+    },
+    handImg(val) {
+      this.dialogVisibleFile = true
+      this.dialogImageUrl = val
+    },
+    saveEdit() {
+      this.submitdisabled = true
+      console.log(this.formobj)
+      save(this.formobj).then((resp) => {
+        this.submitdisabled = false
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: resp.msg
+        })
+        this.handleReturn('true')
+      }).catch(() => {
+        this.submitdisabled = false
+      })
+    },
     submitVehicleApply() {
+      this.submitdisabled = true
       submitFinBillApplication(this.formobj).then((res) => {
-        console.log(res.code, res.success)
-        if (res.code === '200' && res.success) {
+        if (res.success) {
+          this.submitdisabled = false
           this.$message({
             showClose: true,
             type: 'success',
@@ -251,11 +515,33 @@ export default {
     },
     // 返回（===既判断又赋值）
     handleReturn(isreload) {
+      this.formobj = {
+        sid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        contractNo: '',
+        contractSid: '',
+        customerName: '',
+        customerSid: '',
+        oneBillMoney: '',
+        oneBillState: '',
+        totalBillMoney: '',
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
+      }
+      this.file_list = []
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.departureDate = ''
-      this.formobj.remarks = '' // 备注
-      this.formobj.vehicleList = []
-      this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
   }
@@ -292,4 +578,21 @@ export default {
 .el-form-item-right {
   text-align: right;
 }
+.balanceStyle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.listadd{
+  margin-left: 14px;
+  margin-right: 14px;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue
index e69de29bb2..b08327f920 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue
@@ -0,0 +1,393 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listadd">
+        <div class="wlInfo"><span>公司申请入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="合同编号:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.contractNo" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.applyDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="客户名称:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.customerName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">开票信息</div>
+            <div>
+              <span style="margin-right: 10px">单台开票金额：{{ formobj.oneBillMoney }} </span>
+            </div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.VIN }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票金额合计"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.totalBillMoney }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="是否延迟开票"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.isDelayBill == '1' ? '是' : '否' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.remarks }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票状态"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                {{ formobj.billState }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="headline">
+            <div style="margin-left: 5px;font-weight: bold">所附资料附件</div>
+          </div>
+          <el-table :key="fileKey" :data="finfile_list" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="附件名称" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handlook(scope.row)">{{ scope.row.fileName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传时间" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadTime }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-carousel :interval="4000" type="card">
+        <el-carousel-item v-for="(item, index) in file_list" :key="index">
+          <img style="width: 100%; height: 100%" :src="item.filePath" @click="handImg(item.filePath)"/>
+        </el-carousel-item>
+      </el-carousel>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisibleFile">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid, fetchFileBySid } from '@/api/zhengchangkaipiao/openTicket.js'
+export default {
+  name: 'zhengchangkaipiaoInfo',
+  data() {
+    return {
+      viewTitle: '',
+      dialogVisible: false,
+      dialogVisibleFile: false,
+      dialogImageUrl: '',
+      index: 0,
+      tableKey: 0,
+      fileKey: 1,
+      file_list: [],
+      // 表单数据
+      formobj: {
+        sid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        contractNo: '',
+        contractSid: '',
+        customerName: '',
+        customerSid: '',
+        oneBillMoney: '',
+        totalBillMoney: '',
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
+      },
+      finfile_list: [
+        {
+          fileName: '《客户开票申请书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《开票信息确认书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《车辆登记合同》',
+          uploadName: '',
+          uploadTime: ''
+        }
+      ],
+      currentDate: '',
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '公司开票申请'
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《客户开票申请书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《开票信息确认书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: row.sid, fileType: '《车辆登记合同》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchDetailsBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          console.log(resp.data)
+          this.formobj.sid = row.sid
+          this.formobj.contractNo = resp.data.contractNo
+          this.formobj.contractSid = resp.data.contractSid
+          this.formobj.customerName = resp.data.customerName
+          this.formobj.customerSid = resp.data.customerSid
+          this.formobj.oneBillMoney = resp.data.oneBillMoney
+          this.formobj.totalBillMoney = resp.data.totalBillMoney
+          this.formobj.billAppPublicSid = resp.data.billAppPublicSid
+          this.formobj.billState = resp.data.billState
+          this.formobj.isDelayBill = resp.data.isDelayBill
+          this.formobj.remarks = resp.data.remarks
+          if (resp.data.applyDate === '') {
+            this.formobj.applyDate = this.currentDate
+          } else {
+            this.formobj.applyDate = resp.data.applyDate
+          }
+          this.formobj.finBillVehicles = resp.data.finBillVehicles
+          if (resp.data.finBillFileVos.length > 0) {
+            for (var i = 0; i < resp.data.finBillFileVos.length; i++) {
+              if (resp.data.finBillFileVos[i].fileType === '《客户开票申请书》') {
+                this.finfile_list[0].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[0].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《开票信息确认书》') {
+                this.finfile_list[1].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[1].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《车辆登记合同》') {
+                this.finfile_list[2].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[2].uploadName = resp.data.finBillFileVos[i].createByName
+              }
+            }
+          }
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    handlook(row) {
+      this.dialogVisible = true
+      this.file_list = []
+      if (row.fileName === '《客户开票申请书》') {
+        if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+          for (var i = 0; i < this.formobj.khkpsqsApplicationAppendxs.length; i++) {
+            if (this.formobj.khkpsqsApplicationAppendxs[i].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.khkpsqsApplicationAppendxs[i].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else if (row.fileName === '《开票信息确认书》') {
+        if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+          for (var a = 0; a < this.formobj.kpxxqrsApplicationAppendxs.length; a++) {
+            if (this.formobj.kpxxqrsApplicationAppendxs[a].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.kpxxqrsApplicationAppendxs[a].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else {
+        if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+          for (var b = 0; b < this.formobj.cldjhtApplicationAppendxs.length; b++) {
+            if (this.formobj.cldjhtApplicationAppendxs[b].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.cldjhtApplicationAppendxs[b].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      }
+    },
+    handImg(val) {
+      this.dialogVisibleFile = true
+      this.dialogImageUrl = val
+    },
+    // 返回（===既判断又赋值）
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        contractNo: '',
+        contractSid: '',
+        customerName: '',
+        customerSid: '',
+        oneBillMoney: '',
+        totalBillMoney: '',
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
+      }
+      this.file_list = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.linetwo {
+  border-left: 0px;
+  border-right: 0px;
+}
+.linetwo .el-col{
+  border: 0;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 45px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+.listadd{
+  margin-left: 14px;
+  margin-right: 14px;
+}
+</style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue
new file mode 100644
index 0000000000..b7d3343ad3
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoEdit.vue
@@ -0,0 +1,583 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
+          </el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
+          </el-button>
+          <el-button type="info" size="small">关闭</el-button>
+        </div>
+      </div>
+      <div class="listadd">
+        <div class="wlInfo"><span>公司申请入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="合同编号:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.contractNo" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.applyDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="客户名称:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.customerName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">开票信息</div>
+            <div style="display: flex;justify-content: flex-start;align-items: center">
+              <span style="width: 150px">单台开票金额: </span>
+              <el-input v-show="formobj.oneBillState !=='0'" v-model="formobj.oneBillMoney" readonly  @keyup.native="UpNumber" @keydown.native="UpNumber" style="padding: 5px;" placeholder="" clearable></el-input>
+              <el-input v-show="formobj.oneBillState =='0'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" style="padding: 5px;" placeholder="" clearable></el-input>
+            </div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.VIN }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" header-align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.billTypeKey" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" header-align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.billName" placeholder="请选择" @change="changeBillName($event, scope.row)" filterable clearable>
+                  <el-option v-for="item in billName_list" :key="item.sid" :label="item.orgName" :value="item.sid"/>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票金额合计"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                {{ NumberMul() }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="是否延迟开票"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-radio-group v-model="formobj.isDelayBill">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票状态"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                {{ formobj.billState }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="headline">
+            <div style="margin-left: 5px;font-weight: bold">所附资料附件</div>
+          </div>
+          <el-table :key="fileKey" :data="finfile_list" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="balanceStyle">
+                  <upload :accept="accept" ref="divUpload" :reminder="false" :showfile="false" @handleSuccess="filesAdd($event, scope.row)" @handleRemove="filesRemove" />
+                  <el-button type="danger" size="small" @click="handDelete(scope.row)">删除</el-button>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="附件名称" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handlook(scope.row)">{{ scope.row.fileName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传时间" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadTime }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-carousel :interval="4000" type="card">
+        <el-carousel-item v-for="(item, index) in file_list" :key="index">
+          <img style="width: 100%; height: 100%" :src="item.filePath" @click="handImg(item.filePath)"/>
+        </el-carousel-item>
+      </el-carousel>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisibleFile">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { save, dataDictionary, fetchDetailsBySid, submitFinBillApplication, namesDown, fetchFileBySid } from '@/api/zhengchangkaipiao/openTicket.js'
+import upload from '@/components/uploadFile/multifileUpload.vue'
+export default {
+  name: 'zhengchangkaipiaoEdit',
+  components: {
+    upload
+  },
+  data() {
+    return {
+      viewTitle: '',
+      dialogVisible: false,
+      dialogVisibleFile: false,
+      dialogImageUrl: '',
+      index: 0,
+      tableKey: 0,
+      fileKey: 1,
+      file_list: [],
+      billType_list: [],
+      billName_list: [],
+      accept: '.jpg,.jpeg,.png,.JPG,.JPEG,.PNG',
+      // 表单数据
+      formobj: {
+        sid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        contractNo: '',
+        contractSid: '',
+        customerName: '',
+        customerSid: '',
+        oneBillMoney: '',
+        oneBillState: '',
+        totalBillMoney: '',
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        businessSid: '', // 业务sid
+        instanceId: '', // 流程id
+        taskId: '', // 环节id
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
+      },
+      finfile_list: [
+        {
+          fileName: '《客户开票申请书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《开票信息确认书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《车辆登记合同》',
+          uploadName: '',
+          uploadTime: ''
+        }
+      ],
+      currentDate: '',
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    this.DataDictionary()
+    console.log('url:' + window.location.href)
+    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
+    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
+    const info = window.location.href.slice(a, b)
+    var sid = info.substr(info.indexOf('=') + 1)
+    this.showInfo(sid)
+    // ===获取参数
+    var one = window.location.href.lastIndexOf('#') + 1
+    var two = window.location.href.lastIndexOf('}') + 1
+    const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
+    var tar = data.substr(data.indexOf('=') + 1)
+    const obj = JSON.parse(tar)
+    console.log('iframe页面获取的obj:', obj)
+    // 同意列表
+    this.formobj.businessSid = sid
+    this.formobj.instanceId = obj.instanceId
+    this.formobj.taskId = obj.taskId
+  },
+  methods: {
+    // 数据字典加载
+    DataDictionary() {
+      dataDictionary({ type: 'invoiceType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+      namesDown().then((res) => {
+        if (res.success) {
+          this.billName_list = res.data
+        }
+      })
+    },
+    // 开票金额合计（车辆数乘以单台开票金额）
+    NumberMul() {
+      var arg1 = parseFloat(this.formobj.finBillVehicles.length)
+      var arg2 = parseFloat(this.formobj.oneBillMoney)
+      var m = 0
+      var s1 = arg1.toString()
+      var s2 = arg2.toString()
+      try {
+        m += s1.split('.')[1].length
+      } catch (e) {
+        console.log(e)
+      }
+      try {
+        m += s2.split('.')[1].length
+      } catch (e) {
+        console.log(e)
+      }
+      this.formobj.totalBillMoney = Number(s1.replace(',', '')) * Number(s2.replace(',', '')) / Math.pow(10, m)
+      return Number(s1.replace(',', '')) * Number(s2.replace(',', '')) / Math.pow(10, m)
+    },
+    // 获取制单日期
+    newDate() {
+      let date = new Date()
+      let year = date.getFullYear() // 年
+      let month = date.getMonth() + 1 // 月
+      let day = date.getDate() // 日
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      this.currentDate = year + '-' + month + '-' + day
+    },
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^0-9.]/g, '')
+    },
+    showInfo(sid) {
+      this.viewTitle = '【编辑】公司开票申请'
+      this.DataDictionary()
+      this.newDate()
+      fetchFileBySid({ billAppSid: sid, fileType: '《客户开票申请书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: sid, fileType: '《开票信息确认书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: sid, fileType: '《车辆登记合同》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchDetailsBySid(sid).then((resp) => {
+        if (resp.success) {
+          console.log(resp.data)
+          this.formobj.sid = sid
+          this.formobj.contractNo = resp.data.contractNo
+          this.formobj.contractSid = resp.data.contractSid
+          this.formobj.customerName = resp.data.customerName
+          this.formobj.customerSid = resp.data.customerSid
+          this.formobj.oneBillMoney = resp.data.oneBillMoney
+          this.formobj.totalBillMoney = resp.data.totalBillMoney
+          this.formobj.billAppPublicSid = resp.data.billAppPublicSid
+          this.formobj.billState = resp.data.billState
+          this.formobj.isDelayBill = resp.data.isDelayBill
+          this.formobj.remarks = resp.data.remarks
+          this.formobj.oneBillState = resp.data.oneBillState
+          if (resp.data.applyDate === '') {
+            this.formobj.applyDate = this.currentDate
+          } else {
+            this.formobj.applyDate = resp.data.applyDate
+          }
+          this.formobj.finBillVehicles = resp.data.finBillVehicles
+          if (resp.data.finBillFileVos.length > 0) {
+            for (var i = 0; i < resp.data.finBillFileVos.length; i++) {
+              if (resp.data.finBillFileVos[i].fileType === '《客户开票申请书》') {
+                this.finfile_list[0].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[0].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《开票信息确认书》') {
+                this.finfile_list[1].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[1].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《车辆登记合同》') {
+                this.finfile_list[2].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[2].uploadName = resp.data.finBillFileVos[i].createByName
+              }
+            }
+          }
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    changeBillName(value, row) {
+      var aa = null
+      this.billName_list.forEach((e) => {
+        if (e.sid === value) {
+          aa = {
+            sid: e.sid,
+            value: e.orgName
+          }
+        }
+      })
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].VIN === row.VIN) {
+          this.formobj.finBillVehicles[i].billName = aa.value
+          this.formobj.finBillVehicles[i].billNameSid = aa.sid
+        }
+      }
+    },
+    filesAdd(item, row) {
+      var arrayList = []
+      arrayList = item.data
+      if (row.fileName === '《客户开票申请书》') {
+        this.formobj.khkpsqsApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      } else if (row.fileName === '《开票信息确认书》') {
+        this.formobj.kpxxqrsApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      } else {
+        this.formobj.cldjhtApplicationAppendxs.push({
+          createBySid: window.sessionStorage.getItem('staffSid'),
+          name: window.sessionStorage.getItem('name'),
+          fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
+          fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
+          linkSid: '',
+          attachType: '',
+          fileSize: arrayList.size,
+          filePath: arrayList.fullUrl,
+          appendixName: row.fileName
+        })
+      }
+    },
+    filesRemove(item) {
+      // console.log(item)
+    },
+    handDelete(row) {
+      const tip = '请确认是否删除' + row.fileName + ' 中上传的文件?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (row.fileName === '《客户开票申请书》') {
+          this.formobj.khkpsqsApplicationAppendxs = []
+        } else if (row.fileName === '《开票信息确认书》') {
+          this.formobj.kpxxqrsApplicationAppendxs = []
+        } else {
+          this.formobj.cldjhtApplicationAppendxs = []
+        }
+      })
+    },
+    handlook(row) {
+      this.dialogVisible = true
+      this.file_list = []
+      console.log(this.formobj.kpxxqrsApplicationAppendxs, this.formobj.khkpsqsApplicationAppendxs, this.formobj.cldjhtApplicationAppendxs)
+      if (row.fileName === '《客户开票申请书》') {
+        if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+          for (var i = 0; i < this.formobj.khkpsqsApplicationAppendxs.length; i++) {
+            if (this.formobj.khkpsqsApplicationAppendxs[i].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.khkpsqsApplicationAppendxs[i].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else if (row.fileName === '《开票信息确认书》') {
+        if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+          for (var a = 0; a < this.formobj.kpxxqrsApplicationAppendxs.length; a++) {
+            if (this.formobj.kpxxqrsApplicationAppendxs[a].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.kpxxqrsApplicationAppendxs[a].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else {
+        if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+          for (var b = 0; b < this.formobj.cldjhtApplicationAppendxs.length; b++) {
+            if (this.formobj.cldjhtApplicationAppendxs[b].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.cldjhtApplicationAppendxs[b].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      }
+    },
+    handImg(val) {
+      this.dialogVisibleFile = true
+      this.dialogImageUrl = val
+    },
+    saveEdit() {
+      this.submitdisabled = true
+      console.log(this.formobj)
+      save(this.formobj).then((resp) => {
+        this.submitdisabled = false
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: resp.msg
+        })
+        this.handleReturn('true')
+      }).catch(() => {
+        this.submitdisabled = false
+      })
+    },
+    submitVehicleApply() {
+      this.submitdisabled = true
+      submitFinBillApplication(this.formobj).then((res) => {
+        if (res.success) {
+          this.submitdisabled = false
+          this.$message({
+            showClose: true,
+            type: 'success',
+            message: '提交成功'
+          })
+          this.handleReturn('true')
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '提交失败'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.linetwo {
+  border-left: 0px;
+  border-right: 0px;
+}
+.linetwo .el-col{
+  border: 0;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 45px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+.balanceStyle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+</style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue
new file mode 100644
index 0000000000..1f92d42f22
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/kaipiaoguanliFlow/zhengchangkaipiaoguanli/zhengchangkaipiaoInfo.vue
@@ -0,0 +1,594 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button v-show="transactState=='00'" type="primary" @click="openAgree">同 意</el-button>
+          <el-button v-show="transactState=='00'" type="danger" @click="openReject">驳 回</el-button>
+<!--          <el-button v-show="transactState=='00'" type="danger" @click="openStop">终 止</el-button>-->
+          <el-button v-show="transactState=='01'" type="danger" @click="openRevoke">撤 回 </el-button>
+          <el-button type="info" size="small">关 闭</el-button>
+        </div>
+      </div>
+      <div class="listadd">
+        <div class="wlInfo"><span>公司申请入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="合同编号:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.contractNo" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.applyDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="客户名称:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.customerName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="transactState=='00'">
+            <el-form :model="dialogList" :inline="true">
+              <el-row class="linetwo">
+                <el-col :span="3" class="el-form-item-right">
+                  <el-form-item label="审批意见:">
+                  </el-form-item>
+                </el-col>
+                <el-col :span="21">
+                  <el-form-item>
+                    <el-input v-model="dialogList.comment" type="textarea" maxlength="20" placeholder="请输入审批意见" style="width: 400px" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">开票信息</div>
+            <div>
+              <span style="margin-right: 10px">单台开票金额：{{ formobj.oneBillMoney }} </span>
+            </div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.VIN }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票金额合计"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.totalBillMoney }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="是否延迟开票"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.isDelayBill == '1' ? '是' : '否' }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <span>{{ formobj.remarks }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="开票状态"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                {{ formobj.billState }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="headline">
+            <div style="margin-left: 5px;font-weight: bold">所附资料附件</div>
+          </div>
+          <el-table :key="fileKey" :data="finfile_list" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="附件名称" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handlook(scope.row)">{{ scope.row.fileName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上传时间" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uploadTime }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-carousel :interval="4000" type="card">
+        <el-carousel-item v-for="(item, index) in file_list" :key="index">
+          <img style="width: 100%; height: 100%" :src="item.filePath" @click="handImg(item.filePath)"/>
+        </el-carousel-item>
+      </el-carousel>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisibleFile">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid, fetchFileBySid, businessAgree, rejectTask, breakTask, revokeTask } from '@/api/zhengchangkaipiao/openTicket.js'
+export default {
+  name: 'zhengchangkaipiaoguanliInfo',
+  data() {
+    return {
+      viewTitle: '',
+      dialogVisible: false,
+      dialogVisibleFile: false,
+      dialogImageUrl: '',
+      index: 0,
+      tableKey: 0,
+      fileKey: 1,
+      file_list: [],
+      // 表单数据
+      formobj: {
+        sid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        contractNo: '',
+        contractSid: '',
+        customerName: '',
+        customerSid: '',
+        oneBillMoney: '',
+        totalBillMoney: '',
+        billAppPublicSid: '',
+        billState: '',
+        procDefId: '',
+        nodeSid: '',
+        procInstSid: '',
+        isDelayBill: '',
+        applyDate: '',
+        remarks: '',
+        finBillVehicles: [],
+        khkpsqsApplicationAppendxs: [], // 客户开票申请书附件信息
+        kpxxqrsApplicationAppendxs: [], // 开票信息确认书附件信息
+        cldjhtApplicationAppendxs: [] // 车辆登记合同附件信息
+      },
+      finfile_list: [
+        {
+          fileName: '《客户开票申请书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《开票信息确认书》',
+          uploadName: '',
+          uploadTime: ''
+        },
+        {
+          fileName: '《车辆登记合同》',
+          uploadName: '',
+          uploadTime: ''
+        }
+      ],
+      currentDate: '',
+      dialogList: {
+        comment: ''
+      },
+      transactState: '', // 办理状态
+      // 同意办理列表
+      agreeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 驳回列表
+      regectList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 终止列表
+      stopList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 撤回
+      revokeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
+    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
+    const info = window.location.href.slice(a, b)
+    var sid = info.substr(info.indexOf('=') + 1)
+    this.showInfo(sid)
+    // ===获取参数
+    var one = window.location.href.lastIndexOf('#') + 1
+    var two = window.location.href.lastIndexOf('}') + 1
+    const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
+    var tar = data.substr(data.indexOf('=') + 1)
+    const obj = JSON.parse(tar)
+    console.log('iframe页面获取的obj:', obj)
+    // 同意列表
+    this.agreeList.businessSid = sid
+    this.agreeList.instanceId = obj.instanceId
+    this.agreeList.taskId = obj.taskId
+    // 驳回列表
+    this.regectList.businessSid = sid
+    this.regectList.instanceId = obj.instanceId
+    this.regectList.taskId = obj.taskId
+    // 终止列表
+    this.stopList.businessSid = sid
+    this.stopList.instanceId = obj.instanceId
+    this.stopList.taskId = obj.taskId
+    // 撤回列表
+    this.revokeList.businessSid = sid
+    this.revokeList.instanceId = obj.instanceId
+    this.revokeList.taskId = obj.taskId
+    // 办理状态
+    this.transactState = obj.transactState
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '公司开票申请'
+      fetchFileBySid({ billAppSid: sid, fileType: '《客户开票申请书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: sid, fileType: '《开票信息确认书》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchFileBySid({ billAppSid: sid, fileType: '《车辆登记合同》' }).then((resp) => {
+        if (resp.success) {
+          if (resp.data.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs = resp.data
+          }
+        }
+      })
+      fetchDetailsBySid(sid).then((resp) => {
+        if (resp.success) {
+          console.log(resp.data)
+          this.formobj.sid = sid
+          this.formobj.contractNo = resp.data.contractNo
+          this.formobj.contractSid = resp.data.contractSid
+          this.formobj.customerName = resp.data.customerName
+          this.formobj.customerSid = resp.data.customerSid
+          this.formobj.oneBillMoney = resp.data.oneBillMoney
+          this.formobj.totalBillMoney = resp.data.totalBillMoney
+          this.formobj.billAppPublicSid = resp.data.billAppPublicSid
+          this.formobj.billState = resp.data.billState
+          this.formobj.isDelayBill = resp.data.isDelayBill
+          this.formobj.remarks = resp.data.remarks
+          if (resp.data.applyDate === '') {
+            this.formobj.applyDate = this.currentDate
+          } else {
+            this.formobj.applyDate = resp.data.applyDate
+          }
+          this.formobj.finBillVehicles = resp.data.finBillVehicles
+          if (resp.data.finBillFileVos.length > 0) {
+            for (var i = 0; i < resp.data.finBillFileVos.length; i++) {
+              if (resp.data.finBillFileVos[i].fileType === '《客户开票申请书》') {
+                this.finfile_list[0].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[0].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《开票信息确认书》') {
+                this.finfile_list[1].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[1].uploadName = resp.data.finBillFileVos[i].createByName
+              } else if (resp.data.finBillFileVos[i].fileType === '《车辆登记合同》') {
+                this.finfile_list[2].uploadTime = resp.data.finBillFileVos[i].createTime
+                this.finfile_list[2].uploadName = resp.data.finBillFileVos[i].createByName
+              }
+            }
+          }
+        }
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    handlook(row) {
+      this.dialogVisible = true
+      this.file_list = []
+      if (row.fileName === '《客户开票申请书》') {
+        if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+          for (var i = 0; i < this.formobj.khkpsqsApplicationAppendxs.length; i++) {
+            if (this.formobj.khkpsqsApplicationAppendxs[i].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.khkpsqsApplicationAppendxs[i].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else if (row.fileName === '《开票信息确认书》') {
+        if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+          for (var a = 0; a < this.formobj.kpxxqrsApplicationAppendxs.length; a++) {
+            if (this.formobj.kpxxqrsApplicationAppendxs[a].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.kpxxqrsApplicationAppendxs[a].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      } else {
+        if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+          for (var b = 0; b < this.formobj.cldjhtApplicationAppendxs.length; b++) {
+            if (this.formobj.cldjhtApplicationAppendxs[b].appendixName === row.fileName) {
+              this.file_list.push({
+                filePath: this.formobj.cldjhtApplicationAppendxs[b].filePath
+              })
+            }
+          }
+        } else {
+          this.dialogVisible = false
+        }
+      }
+    },
+    // 同意
+    openAgree() {
+      this.$confirm('是否确认执行同意操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleAgree()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消同意'
+        })
+      })
+    },
+    // 驳回
+    openReject() {
+      this.$confirm('是否确认执行驳回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleReject()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消驳回'
+        })
+      })
+    },
+    // 终止
+    openStop() {
+      this.$confirm('是否确认执行终止操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleStop()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消终止'
+        })
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.agreeList.comment = this.dialogList.comment
+      businessAgree(this.agreeList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.refreshIt()
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.stopList.comment = this.dialogList.comment
+      breakTask(this.stopList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.regectList.comment = this.dialogList.comment
+      rejectTask(this.regectList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      this.revokeList.comment = this.dialogList.comment
+      revokeTask(this.revokeList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    handImg(val) {
+      this.dialogVisibleFile = true
+      this.dialogImageUrl = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.linetwo {
+  border-left: 0px;
+  border-right: 0px;
+}
+.linetwo .el-col{
+  border: 0;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+  margin-right: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 45px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
+</style>

From 5bbd13f0c8d6ebb21bce67c094e369f1b1fa4b8c Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 9 May 2022 08:52:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=97=A7=E7=9A=84?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
index b5b176346d..f3121011ed 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
@@ -956,7 +956,7 @@ public class BusOrderService extends MybatisBaseService<BusOrderMapper, BusOrder
             commonAppendixFeign.saveOrUpdatePcAppendix(pcCommonAppendixDto1,commonContractDto.getSid(),busOrderCommonContractDto.getStaffSid());
         }
         commonContractDto.setAppdixUrl(s);
-        commonContractFeign.save(commonContractDto);
+//        commonContractFeign.save(commonContractDto);
         String contractNo = busOrderCommonContractDto.getContractNo();
         baseMapper.updateContractNo(contractNo,orderSid);
     }