Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -88,7 +88,7 @@ public interface BaseVehicleModelFeign {
     @ApiOperation("删除、批量删除")
     @DeleteMapping("/deleteBySids")
     @ApiImplicitParam(name = "sids", value = "车型sid，若为多个sid，以逗号分隔")
-    public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid);
+    public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
 
     /**
      * 详情
@@ -107,8 +107,8 @@ public interface BaseVehicleModelFeign {
      * @return
      */
     @ApiOperation("修改回显")
-    @GetMapping("/getAll/{sid}/{userSid}")
-    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+    @GetMapping("/getAll")
+    public ResultBean<BaseVehicleModelSelectVo> getAll(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
 
     /**
      * 快速新增回显

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -52,7 +52,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean deleteBySids(String sids, String userSid) {
+    public ResultBean deleteBySids(String sids, String userSid,String orgPath) {
         return null;
     }
 
@@ -62,7 +62,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid,String orgPath) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -303,8 +303,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
             return rb.setMsg("该配置已有关联车型，无法修改");
         }
         String userSid = dto.getUserSid();
+        /*
         ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
         String sid1 = useOrgByUserSid.getData().getSid();
+        */
+        String sid1 = dto.getCreateOrgSId();
         int i3 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid);
         if (i3 == 0) {
             return rb.setMsg("该配置不属于当前分公司，无法修改");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -11,7 +11,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -74,6 +74,8 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
 
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     @Override
     public ResultBean<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
@@ -148,15 +150,23 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean deleteBySids(String sids, String userSid) {
+    public ResultBean deleteBySids(String sids, String userSid,String orgPath) {
         List<String> sidList = Arrays.asList(sids.split(","));
         for (String sid : sidList) {
             int i = baseVehmodelConfigService.checkByModelSid(sid);
             if (i > 0) {
                 return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除");
             }
+            /*
             ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
             String sid1 = useOrgByUserSid.getData().getSid();
+            */
+            String sid1 = "";
+            if(StringUtils.isNotBlank(orgPath)){
+                sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            }else{
+                sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+            }
             int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
             if (i1 == 0) {
                 return ResultBean.fireFail().setMsg("该车型不属于当前分公司，无法删除");
@@ -185,7 +195,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid, String userSid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid, String userSid,String orgPath) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
         if (vo == null) {
@@ -195,8 +205,16 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         if (i3 > 0) {
             return rb.setMsg("该车型已有关联配置，无法修改");
         }
+        /*
         ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
         String sid1 = useOrgByUserSid.getData().getSid();
+        */
+        String sid1 = "";
+        if(StringUtils.isNotBlank(orgPath)){
+            sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }else{
+            sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
         int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
         if (i4 == 0) {
             return rb.setMsg("该车型不属于当前分公司，无法修改");
@@ -211,7 +229,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }
-        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
+//        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
         return rb.success().setData(vo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -467,12 +467,18 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (Map<String, String> map : maps) {
             String modelSid = map.get("modelSid");
             String configurationItemsSid = map.get("configurationItemsSid");
-            String userSid = map.get("userSid");
-            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-            if ("0".equals(resultBean.getData())) {
-                return rb.setMsg("该用户无分公司，不允许操作");
+            String userSid = map.get("userSid"); 
+            String orgPath = map.get("orgPath");
+            String useOrgSid = "";
+            if(StringUtils.isNotBlank(orgPath)){
+                useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            }else{
+                useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
             }
-            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, resultBean.getData());
+            if ("0".equals(useOrgSid)) {
+                return rb.setMsg("该用户无分公司，不允许操作");
+            } 
+            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, useOrgSid);
             if (vo == null) {
                 return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
             }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue

@@ -8,7 +8,7 @@
     </div>
     <div class="">
       <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-show="formobj.typeKey !== '02'">
+        <div v-if="formobj.typeKey !== '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
@@ -254,8 +254,8 @@
             </el-col>
           </el-row>
         </div>
-        <div v-show="formobj.typeKey == '02'">
-          <el-row>
+        <div v-if="formobj.typeKey == '02'">
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8">
               <div class="span-sty">厂家贴息</div>
               <el-form-item>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="">
       <el-form ref="form_obj" :model="formobj" label-position="top" :rules="rules" class="formaddcopy02">
-        <div v-show="formobj.typeKey !== '02'">
+        <div v-if="formobj.typeKey !== '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
@@ -349,17 +349,17 @@
             </el-col>
           </el-row>
         </div>
-        <div v-show="formobj.typeKey == '02'">
-          <el-row>
+        <div v-if="formobj.typeKey == '02'">
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8">
-              <div class="span-sty">厂家贴息</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>厂家贴息</div>
+              <el-form-item prop="factoryDiscount">
                 <el-input class="addinputw" v-model="formobj.factoryDiscount" placeholder="" clearable @keyup.native="formobj.factoryDiscount = oninput(formobj.factoryDiscount, 2)"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>厂家贴息用途</div>
+              <el-form-item prop="factoryDiscountUse">
                 <el-input class="addinputw" v-model="formobj.factoryDiscountUse" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -468,7 +468,8 @@ export default {
         otherPolicyPeriod: [{ required: true, message: '期数不能为空', trigger: 'blur' }],
         otherPolicyMonthlyRepay: [{ required: true, message: '月还金额不能为空', trigger: 'blur' }],
         returnTime: [{ required: true, message: '预计首期还款日不能为空', trigger: 'blur' }],
-        serviceAmount: [{ required: true, message: '服务费不能为空', trigger: 'blur' }]
+        serviceAmount: [{ required: true, message: '服务费不能为空', trigger: 'blur' }],
+        factoryDiscountUse: [{ required: true, message: '厂家贴息用途不能为空', trigger: 'blur' }]
       }
     }
   },

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue

@@ -8,7 +8,7 @@
     </div>
     <div class="listconadd">
       <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-show="formobj.typeKey !== '02'">
+        <div v-if="formobj.typeKey !== '02'">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
@@ -254,8 +254,8 @@
             </el-col>
           </el-row>
         </div>
-        <div v-show="formobj.typeKey == '02'">
-          <el-row>
+        <div v-if="formobj.typeKey == '02'">
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8">
               <div class="span-sty">厂家贴息</div>
               <el-form-item>

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@@ -1,12 +1,10 @@
 import request from '@/utils/request'
-// import qs from 'qs'
-// 资方信息表
 
 // 待开票车辆条件查询 （已改）
 export function listPage(data) {
   return request({
-    url: '/buscenter/v1/busordervehicle/getExpectInvoiceList',
-    data,
+    url: '/fin/v1/finbillapplication/listPage',
+    data: data,
     method: 'post',
     headers: {
       'Content-Type': 'application/json'
@@ -14,38 +12,31 @@ export function listPage(data) {
   })
 }
 
-// 开票申请前验证选择的车辆（合同编号和客户必须相同）已改
-export function checkNum(data) {
+// 详情回显 获取一条记录
+export function fetchDetailsBySid(data) {
   return request({
-    url: '/buscenter/v1/busordervehicle/checkFinGinvoiceapply',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
+    url: '/fin/v1/finbillapplication/fetchDetailsBySid/' + data,
+    method: 'get'
   })
 }
 
-// 批量删除
-export function deleteBySids(data) {
+// 开票申请--保存
+export function saveOrUpdate(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/delBySids', // + data
-    method: 'post',
+    url: '/fin/v1/finbillapplication/save',
     data: data,
-    // data:{
-    //   sids:data
-    // },
+    method: 'post',
     headers: {
       'Content-Type': 'application/json'
     }
   })
 }
 
-// 添加保存全部
-export function saveList(data) {
+// 开票申请--提交
+export function submit(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/saveFinGinvoiceapply',
-    data,
+    url: '/fin/v1/finbillapplication/submitFinBillApplication',
+    data: data,
     method: 'post',
     headers: {
       'Content-Type': 'application/json'
@@ -53,75 +44,56 @@ export function saveList(data) {
   })
 }
 
-// 打开编辑 拼接字符串
-export function getAll(data) {
+// 流程审批（同意）
+export function complete(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/getAll?finGindSid=' + data,
+    url: '/fin/v1/finbillapplication/complete',
+    data: data,
     method: 'post'
   })
 }
 
-// 修改(编辑)保存全部 , sid
-export function update(data) {
-  console.log('这里是请求接口', data)
+// 流程审批（驳回）
+export function reject(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/updateAll/' + data.sid,
-    method: 'post',
+    url: '/fin/v1/finbillapplication/reject',
     data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
+    method: 'post'
   })
 }
 
-// 详情回显 获取一条记录/base/v1/basefinbank/details/{sid}
-export function details(data) {
+// 流程审批（撤回）
+export function revokeProcess(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/fetchBillNo/' + data,
-    method: 'get'
+    url: '/fin/v1/finbillapplication/revokeProcess',
+    data: data,
+    method: 'post'
   })
 }
 
-// 列表导出
-export function exportExcel(data) {
+// 流程审批（终止）
+export function breakProcess(data) {
   return request({
-    url: '/v1/anruifinmanagement/exportExcel',
-    data,
-    method: 'get',
-    params: data
+    url: '/fin/v1/finbillapplication/breakProcess',
+    data: data,
+    method: 'post'
   })
 }
 
-// 模糊搜索客户
-export function customerName() {
+// 审批流程（同意）获取下一环节
+export function getNextNodesForSubmit(data) {
   return request({
-    url: "/buscenter/v1/busorder/likeGetCustomerName",
-    method: "post"
-    // params: { staffSid: id }
-  });
+    url: '/fin/v1/finbillapplication/getNextNodesForSubmit',
+    method: 'get',
+    params: data
+  })
 }
-
-// 上传文件
-// export function fileUpload() {
-//   return request({
-//     url:'/base/file/upload',
-//     method: 'post',
-//     // data: data,
-//     headers: {
-//       'Content-Type':'multipart/form-data',
-//     }
-//   })
-// }
-
-// 获取下拉框option
-export function typeValues(data) {
+// 审批流程（驳回）获取上一环节
+export function getPreviousNodesForReject(data) {
   return request({
-    url: '/portal/v1/dictcommons/typeValues',
+    url: '/fin/v1/finbillapplication/getPreviousNodesForReject',
     method: 'get',
     params: data
-    // headers: {
-    //   'Content-Type':'multipart/form-data',
-    // }
   })
 }
 

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -8,6 +8,15 @@ export function typeValues(data) {
     })
 }
 
+// 获取数据字典（根据分组）
+export function getTypeValueList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/getTypeValueList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 品牌下拉
 export function brandDown(data) {
   return request({
@@ -154,6 +163,15 @@ export function selectOrgList(data) {
   })
 }
 
+// 获取所有经销商
+export function selectAllDisList(data) {
+  return request({
+    url: '/base/v1/basedistributor/selectAllDisList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
 export function getButtonPermissions(data) {
   return request({

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -227,6 +227,27 @@ const codemenu = [
     component: () =>
       import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue'),
     name: 'fukuanYiBanInfo'
+  },
+  // 开票申请管理编辑
+  {
+    path: '/kaipiaoguanliFlow/finginvoiceapplyEdit',
+    component: () =>
+      import('@/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue'),
+    name: 'finginvoiceapplyEdit'
+  },
+  // 开票申请管理待办详情
+  {
+    path: '/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo',
+    component: () =>
+      import('@/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue'),
+    name: 'finginvoiceapplyDaiBanInfo'
+  },
+  // 开票申请管理已办详情
+  {
+    path: '/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo',
+    component: () =>
+      import('@/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue'),
+    name: 'finginvoiceapplyYiBanInfo'
   }
 ]
 export default codemenu

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapply.vue

@@ -2,144 +2,133 @@
   <div class="app-container">
     <!--列表页面-->
     <div v-show="viewState == 1">
-      <!--标题按钮部分开始-->
-      <div class="tab-header webtop">
-        <!--标题-->
-        <div>公司开票申请</div>
-        <!--start 查询列表按钮部分开始-->
-        <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
-          <el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
-          <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
-        </div>
-        <!--end 查询列表按钮部分结束-->
-      </div>
-      <!--按钮部分结束-->
+      <button-bar view-title="开票申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <!--Start查询列表部分-->
       <div class="main-content">
-        <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-        <div v-show="isSearchShow" class="search">
-          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-            <el-form-item label="单据编号">
-              <el-input v-model="listQuery.billNo" placeholder="请输入单据编号" clearable class="filter-item"/>
-            </el-form-item>
-            <el-form-item label="开票性质">
-              <el-form-item prop="invoiceType">
-                <el-select @change="getinvoicingNature" placeholder="请选择" v-model="listQuery.invoiceType">
-                  <el-option :key="index.dictKey" :label="item.dictValue" :value="item.dictKey" v-for="(item,index) in typeList">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="销售类型">
+                <el-select placeholder="请选择" v-model="listQuery.params.saleTypeKey">
+                  <el-option v-for="item in payType" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-form-item>
-            <el-form-item label="开票名称">
-              <el-input v-model="listQuery.invoiceName" placeholder="请输入开票名称" clearable class="filter-item"/>
-            </el-form-item>
-            <el-form-item label="申请日期">
-              <el-date-picker v-model="listQuery.createDateStart" type="date" placeholder="选择日期"></el-date-picker>
-              <span style="padding: 0 8px">至</span>
-              <el-date-picker v-model="listQuery.createDateEnd" type="date" placeholder="选择日期"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="申请人">
-              <el-input v-model="listQuery.createByName" placeholder="请输入申请人姓名" clearable class="filter-item"/>
-            </el-form-item>
-            <el-form-item label="是否欠款开票" class="applyseaech">
-              <el-select v-model="listQuery.isOwedMoney" clearable placeholder="请选择">
-                <el-option v-for="item in optionsOne" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div class="btn">
-            <el-button type="primary" @click="handleFilter">查询</el-button>
-            <el-button type="primary" @click="handleReset">重置</el-button>
+              <el-form-item label="合同编号">
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="开票单位">
+                <el-input v-model="listQuery.params.openTickUnitName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="业务状态">
+                <el-select placeholder="请选择" v-model="listQuery.params.billStateKey">
+                  <el-option v-for="item in bill" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="发起日期">
+                <el-date-picker v-model="listQuery.params.applyStartDate" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.applyEndDate" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
           </div>
         </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">公司开票申请列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.saleTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合同编号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.contractNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票单位" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.customerName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.modelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="台数" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.num }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="业务状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createByName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发起日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.applyDate }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
       </div>
-      <!--End查询列表部分-->
-
-      <div class="listtop">
-        <div class="tit">公司开票申请列表</div>
-        <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-      </div>
-      <!--Start 主页面主要部分 -->
-      <div class="listcon">
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" fit highlight-current-row style="width: 100%;" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" align="center" width="50"/>
-          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-          <el-table-column prop="jc" label="单据编号" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.billNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票性质" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleQuantity }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票单价" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceUnitPrice }}</span>
-            </template>
-          </el-table-column>
-          s
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="欠款票" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.isOwedMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请人" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createByName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="申请日期" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="当前办理人" align="center"> <!--当前办理人是指更新者？-->
-            <template slot-scope="scope">
-              <span>{{ scope.row.auditName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="当前环节" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.link }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="资料附件" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.contactMobile }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <!--End 主页面主要部分-->
-      <div class="pages">
-        <div class="tit"/>
-        <!-- 翻页 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-      </div>
-      <!--End查询列表部分-->
     </div>
     <!--开票申请新增及修改列表部分 -->
-    <finginvoiceapply-add v-show="viewState == 2 || viewState == 3" ref="divAdd" @goBack="resetViewState"></finginvoiceapply-add>
+    <finginvoiceapply-add v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <!--开票申请详情列表部分-->
-    <finginvoiceapply-info v-show="viewState == 4" ref="divInfo" @goBack="resetViewState"></finginvoiceapply-info>
+    <finginvoiceapply-info v-show="viewState == 3" ref="divInfo" @doback="resetState" />
 
   </div>
 </template>
@@ -147,6 +136,9 @@
 <script>
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import { listPage } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { typeValues, getOrgSidByPath, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
 import finginvoiceapplyAdd from './finginvoiceapplyAdd'
 import finginvoiceapplyInfo from './finginvoiceapplyInfo'
 
@@ -155,37 +147,30 @@ export default {
   components: {
     Pagination,
     pageye,
+    ButtonBar,
     finginvoiceapplyAdd,
     finginvoiceapplyInfo
   },
   data() {
     return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
       viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      sides: '',
-      total: 1,
       FormLoading: false,
       listLoading: false,
-      // 是否欠款开票
-      optionsOne: [{
-        value: '1',
-        label: '是'
-      }, {
-        value: '0',
-        label: '否'
-      }],
-      // 是否提前开票
-      optionsTwo: [{
-        value: '1',
-        label: '是'
-      }, {
-        value: '0',
-        label: '否'
-      }],
       // start 日期选择
       pickerOptions: {
         disabledDate(time) {
@@ -212,28 +197,35 @@ export default {
           }
         }]
       },
-      typeList: [], // 选择器
+      payType: [],
+      bill: [],
       // 翻页
       listQuery: {
         current: 1,
-        size: 20,
-        billNo: '', // 单据编号
-        invoiceType: '', // 开票性质
-        invoiceName: '', // 开票名称
-        createByName: '', // 创建人\申请人姓名
-        createDateStart: '', // 申请日期开始
-        createDateEnd: '', // 申请日期截至
-        isOwedMoney: '', // 是否欠款开票
-        departmentSid: '' // 部门sid
-      },
-      temp: {}, // 添加和修改
+        size: 10,
+        total: 0,
+        params: {
+          applyEndDate: '',
+          applyStartDate: '',
+          billStateKey: '',
+          contractNo: '',
+          createByName: '',
+          createBySid: '',
+          customerName: '',
+          modelName: '',
+          openTickUnitName: '',
+          saleTypeKey: '',
+          useOrgSid: ''
+        }
+      }
     }
   },
   created() {
     // 初始化变量
     this.init()
-    // 加载列表
-    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
     // 搜索条件效果
@@ -245,11 +237,36 @@ export default {
         this.searchxianshitit = '显示查询条件'
       }
     },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     init() {
+      typeValues({ type: 'purchaseType' }).then((res) => {
+        if (res.success) {
+          this.payType = res.data
+        }
+      })
+      typeValues({ type: 'billServState' }).then((res) => {
+        if (res.success) {
+          this.bill = res.data
+        }
+      })
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.listQuery.params.useOrgSid = resp.data
+          this.getList()
+        }
+      })
     },
     // 信息条数 获取点击时当前的sid
     handleSelectionChange(row) {
-      console.log('开票', row)
       const aa = []
       row.forEach(element => {
         aa.push(element.sid)
@@ -265,69 +282,15 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      listPage({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          invoiceType: this.listQuery.invoiceType, // 传递参数，
-          billNo: this.listQuery.billNo,
-          invoiceName: this.listQuery.invoiceName,
-          createByName: this.listQuery.createByName,
-          createDateStart: this.listQuery.createDateStart,
-          createDateEnd: this.listQuery.createDateEnd,
-          isOwedMoney: this.listQuery.isOwedMoney,
-          orgSid: this.listQuery.departmentSid
-        }
-      }).then(response => { // 拦截器
-        console.log('列表查询结果1：', response);
-        console.log('列表查询结果：' + JSON.stringify(response))
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      listPage(this.listQuery).then(response => {
         this.listLoading = false
-        console.log(response)
-        if (response.code === '200' && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
-          this.total = response.data.total
-          for (var i = 0; i < this.list.length; i++) {
-            if (response.data.records[i].isOwedMoney === '1') {
-              this.list[i].isOwedMoney = '是'
-            }
-            if (response.data.records[i].isOwedMoney === '0') {
-              this.list[i].isOwedMoney = '否'
-            }
-          }
-          for (var i = 0; i < response.data.records.length; i++) {
-            var timeArr = response.data.records[i].createTime.split(' ')
-            this.list[i].createTime = timeArr[0]
-          }
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
-        }
-      })
-    },
-
-    // 根据本行sid删除数据 deleteBySids()
-    handleDelete() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
-        return
-      }
-      console.log('这里是获取删除按钮里的sids数组', this.sids)
-      deleteBySids(this.sids).then(response => {
-        console.log('删除数返回的结果', response)
-        if (response.code === '200') {
-          this.$notify({
-            title: '提示',
-            message: '删除成功',
-            type: 'success',
-            duration: 2000
-          })
-          this.getList()
-        } else {
-          this.$notify({
-            title: '删除失败',
-            message: response.msg,
-            type: 'error'
-          })
+          this.listQuery.total = 0
         }
       })
     },
@@ -338,18 +301,36 @@ export default {
     },
     // 点击重置
     handleReset() {
-      // this.listQuery. = {}
-      this.listQuery.billNo = '' // 单据编号
-      this.listQuery.invoiceType = ''// 开票性质
-      this.listQuery.invoiceName = '' // 开票名称
-      this.listQuery.createByName = '' // 创建人\申请人姓名
-      this.listQuery.createDateStart = ''// 申请日期开始
-      this.listQuery.createDateEnd = '' // 申请日期截至
-      this.listQuery.isOwedMoney = ''// 是否欠款开票
-      this.listQuery.departmentSid = ''
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          applyEndDate: '',
+          applyStartDate: '',
+          billStateKey: '',
+          contractNo: '',
+          createByName: '',
+          createBySid: '',
+          customerName: '',
+          modelName: '',
+          openTickUnitName: '',
+          saleTypeKey: '',
+          useOrgSid: ''
+        }
+      }
+      this.init()
+    },
+    toEdit(row) {
+      this.viewState = 2
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 3
+      this.$refs['divInfo'].showInfo(row)
     },
     // 修改、编辑、详情返回列表页面
-    resetViewState() {
+    resetState() {
       this.viewState = 1
     }
   }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyInfo.vue

@@ -3,350 +3,278 @@
     <!--标题按钮部分开始-->
     <div class="tab-header webtop">
       <!--标题-->
-      <div>公司开票申请详情</div>
+      <div>{{ viewTitle }}</div>
       <!--start 新增修改按钮-->
       <div>
-        <el-button type="primary" size="small">下载</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!--end 添加修改按钮-->
     </div>
     <!--按钮部分结束-->
     <div class="listconadd">
-      <div class="title">公司开票申请单</div>
-      <el-form :model="ruleForm.finGinvoiceapplyDto" ref="ruleForm" label-width="100px" class="invoiceform">
-        <div class=" topcon">
-          <!--第一行-->
-          <el-row class="topline lineone">
-            <el-col :span="7">
-              <el-form-item label="单据编号">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.billNo" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="制单人">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.makeListName" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item label="制单日期">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.createTime" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="invoiceadd">
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="开票性质" prop="invoiceType"></el-form-item>
-            </el-col>
-            <el-col :span="20" class="addinput">
-              <el-form-item prop="invoiceType">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceType" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="开票名称" prop="invoiceName"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="invoiceName">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceName" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="税号" prop="dutyParagraph"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="dutyParagraph">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.dutyParagraph" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="开票地址" prop="invoiceAddress"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="invoiceAddress">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceAddress" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="电话" prop="invoiceTelephone"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="invoiceTelephone">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceTelephone" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="开户行" prop="bankDeposit"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="bankDeposit">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.bankDeposit" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="银行账号" prop="bankAccount"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="bankAccount">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.bankAccount" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="数量(辆)" prop="vehicleQuantity"></el-form-item>
-            </el-col>
-            <el-col :span="5" class="addinput">
-              <el-form-item prop="vehicleQuantity">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.vehicleQuantity" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="3" class="addlabel">
-              <el-form-item label="开票单价" prop="invoiceUnitPrice"></el-form-item>
-            </el-col>
-            <el-col :span="4" class="addinput">
-              <el-form-item prop="invoiceUnitPrice">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceUnitPrice" readonly></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="3" class="addlabel">
-              <el-form-item label="开票金额" prop="invoiceMoney"></el-form-item>
-            </el-col>
-            <el-col :span="5" class="addinput">
-              <el-form-item prop="invoiceMoney">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.invoiceMoney" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="VIN号" prop="vin"></el-form-item>
-            </el-col>
-            <el-col :span="20" class="addinput">
-              <el-form-item prop="vin">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.vin" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="备注"></el-form-item>
-            </el-col>
-            <el-col :span="20" class="addinput">
-              <el-form-item prop="remarks">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.remarks" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <!--Start 中间特殊部分-->
-          <el-row class="inforow">
-            <el-col :span="4" class="infocol">
-              <el-form-item label="回款方式"></el-form-item>
-            </el-col>
-            <el-col :span="20" class="infocol ">
-              <div class="collineone">
-                <div class="block blockone"><span>单位公户</span>{{ruleForm.finGinvoiceapplyDto.modeName1}}</div>
-                <div class="block blocktwo"><span>户</span>{{ruleForm.finGinvoiceapplyDto.money1}}</div>
-                <div class="block blockthree"><span>元;建设银行</span>{{ruleForm.finGinvoiceapplyDto.modeName2}}</div>
-                <div class="block blockfour"><span>卡</span>{{ruleForm.finGinvoiceapplyDto.money2}}</div>
-                <div class="block blockfive"><span>元;现金</span>{{ruleForm.finGinvoiceapplyDto.modeName1}}</div>
-                <div class="block blocksix"><span>元;其他</span>{{ruleForm.finGinvoiceapplyDto.money3}}</div>
-              </div>
-              <div class="collinetwo">
-                <div class="block blockone"><span>订金</span>{{ruleForm.finGinvoiceapplyDto.money4}}</div>
-                <div class="block blocktwo"><span>元</span></div>
-              </div>
-            </el-col>
-          </el-row>
-          <!--End 中间特殊部分-->
-
-          <el-row>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="是否欠款票"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinputRadio">
-              <el-radio :label="1" v-model="ruleForm.finGinvoiceapplyDto.isOwedMoney" disabled>是</el-radio>
-              <el-radio :label="0" v-model="ruleForm.finGinvoiceapplyDto.isOwedMoney" disabled>否</el-radio>
-            </el-col>
-            <el-col :span="4" class="addlabel">
-              <el-form-item label="承若回款日期" prop="returnedMoneyDate"></el-form-item>
-            </el-col>
-            <el-col :span="8" class="addinput">
-              <el-form-item prop="returnedMoneyDate">
-                <el-input v-model="ruleForm.finGinvoiceapplyDto.returnedMoneyDate" readonly></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="24" class="addlabelFour">
-              <el-form-item label="提供前开票发票留财务,财务只提供发牌哦复印件：" prop="returnedMoneyDate">
-                <el-radio :label="1" v-model="ruleForm.finGinvoiceapplyDto.isProvideInvoice" disabled>是</el-radio>
-                <el-radio :label="0" v-model="ruleForm.finGinvoiceapplyDto.isProvideInvoice" disabled>否</el-radio>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <div class="addtable">
-            <div class="tabletitle">
-              <div class="titlename">
-                所附资料附件
-              </div>
-            </div>
-            <template class="tablelist">
-              <el-table
-                :data="ruleForm.commonAppendixDtoList" :index="index" border tyle="width: 100%">
-                <el-table-column :index="index+1" align="center" label="序号" type="index" width="100"/>
-                <el-table-column align="center" label="附件名称" prop="fileName">
-                  <template slot-scope="props">
-                    <span class="bluezi" @click="handleDown(props.row)">{{props.row.fileName}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="文件格式" prop="fileType">
-                  <template slot-scope="props">
-                    <span>{{props.row.fileType}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="上传人" prop="createByName">
-                  <template slot-scope="props">
-                    <span>{{props.row.createByName}}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
+      <div class="titwu">公司开票申请单</div>
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8">
+            <div class="span-sty">发起人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">主车开票信息</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">单台开票金额</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票类型默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票名称默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <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">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合格证状态" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.certificateStateValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票类型" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.billTypeValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票名称" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
             </template>
-          </div>
-        </div>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票金额合计</div>
+            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">挂车开票信息</div>
+        <el-table :key="billingKey" :data="formobj.finBillTrailers" :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>{{ scope.row.gcVinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="主车车架号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="title">客户开票申请书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">开票信息确认书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">车辆登记合同</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </div>
 </template>
 
 <script>
-  export default {
-    name: "finginvoiceapplyInfo",
-    data() {
-      return {
-        index: 0,
-        temp: {},
-        ruleForm: {
-          //用户sid
-          userSid: '',
-          staffSid: '',
-          //finGinvoiceapplyDto 开始
-          finGinvoiceapplyDto: {
-            orgSid: '',
-            billNo: '',//单据编号1
-            makeListName: '',//制单人1
-            createTime: '',//制单日期1
-            invoiceType: '',	//开票性质
-            invoiceTypeKey: '', //	开票性质key
-            invoiceName: '', //开票名称1
-            dutyParagraph: '',//税号1
-            invoiceAddress: '', //开票地址1
-            invoiceTelephone: '', //电话1
-            bankDeposit: '', //开户行1
-            bankAccount: '', //银行账号1
-            vehicleQuantity: '',//数量（辆）1
-            invoiceUnitPrice: '', //开票单价1
-            invoiceMoney: '',//开票金额1
-            vin: '',//VIN号1
-            remarks: '',//备注
-            channelName: '', //渠道名称
-            channelMoney: '', //渠道金额
-            bankName: '', //建行银行1
-            bankMoney: '', //建行金额
-            cash: '', //现金
-            deposit: '', //订金
-            isOwedMoney: 1, //是否欠款票1
-            returnedMoneyDate: '', //承若回款日期1
-            isProvideInvoice: 1, //是否只提供发票复印件1
-            //回款方式
-            modeName1: '', //单位公户渠道名称
-            money1: '',//单位公户回款方式金额
-            modeName2: '', //建设银行渠道名称
-            money2: '',//建设银行回款方式金额
-            modeName3: '现金', //现金渠道名称
-            money3: '', //现金回款方式金额
-            modeName4: '其它', //其它渠道名称
-            money4: '',//其它回款方式金额
-          },
-          //  回款方式数组 空数组
-          finGinvoiceapplyDetailDtoList: [],
-          //  附件信息 空数组
-          commonAppendixDtoList: [],
-        },
-      }
-    },
-    created() {
-      // this.showCheck()
-    },
-    methods: {
-      showCheck() {
-        console.log('这里是详情页面', this.temp);
-        console.log('这里是详情页面接收到的billNo', this.temp.finGinvoiceapply.billNo)
-        //finGinvoiceapplyDetailDtoList 回款方式数组
-        this.ruleForm.finGinvoiceapplyDetailDtoList = this.temp.finGinvoiceapplyDetail; //回款方式
-        var array = this.ruleForm.finGinvoiceapplyDetailDtoList;
-        //commonAppendixDtoList 附件上传的数组
-        this.ruleForm.commonAppendixDtoList = this.temp.finCommonAppendixVoList; //附件
-        // finGinvoiceapplyDto 开票信息数组
-        this.ruleForm.finGinvoiceapplyDto = this.temp.finGinvoiceapply; //开票
-        this.ruleForm.finGinvoiceapplyDto.modeName1 = array[0].modeName;
-        this.ruleForm.finGinvoiceapplyDto.money1 = array[0].money;
-        this.ruleForm.finGinvoiceapplyDto.modeName2 = array[1].modeName;
-        this.ruleForm.finGinvoiceapplyDto.money2 = array[1].money;
-        this.ruleForm.finGinvoiceapplyDto.modeName3 = array[2].modeName;
-        this.ruleForm.finGinvoiceapplyDto.money3 = array[2].money;
-        this.ruleForm.finGinvoiceapplyDto.modeName4 = array[3].modeName;
-        this.ruleForm.finGinvoiceapplyDto.money4 = array[3].money;
-        this.ruleForm.finGinvoiceapplyDto.makeListName = this.temp.finGinvoiceapply.createByName; //制单人
-        this.ruleForm.finGinvoiceapplyDto.isOwedMoney = parseInt(this.temp.finGinvoiceapply.isOwedMoney); //是否欠款票
-        this.ruleForm.finGinvoiceapplyDto.isProvideInvoice = parseInt(this.temp.finGinvoiceapply.isProvideInvoice); //是否发票
-        var timeArr = this.temp.finGinvoiceapply.createTime.split(' ');
-        this.ruleForm.finGinvoiceapplyDto.createTime = timeArr[0];
-        console.log('这是详情的ruleForm', this.ruleForm);
-        // this.$nextTick(() => {
-        //   this.$refs['ruleForm'].clearValidate()
-        // });
-        this.billNo = '';
+import { fetchDetailsBySid } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+export default {
+  name: 'finginvoiceapplyInfo',
+  data() {
+    return {
+      viewTitle: '',
+      tableKey: 0,
+      billingKey: 1,
+      index: 0,
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      formobj: {
+        applyDate: '',
+        arrearsMoney: '',
+        arrearsOpenYYKey: '',
+        arrearsOpenYYValue: '',
+        billNo: '',
+        billStateKey: '',
+        billStateValue: '',
+        cldjhtApplicationAppendxs: [],
+        contractNo: '',
+        contractSid: '',
+        createByName: '',
+        customerName: '',
+        customerSid: '',
+        deptName: '',
+        deptSid: '',
+        finBillTrailers: [],
+        finBillVehicles: [],
+        isDelayBill: '',
+        isHighAndLowOpen: '',
+        isLQOrigInvoice: '',
+        khkpsqsApplicationAppendxs: [],
+        kpxxqrsApplicationAppendxs: [],
+        modelName: '',
+        modelSid: '',
+        nodeSid: '',
+        nodeState: '',
+        oneBillMoney: '',
+        openTickName: '',
+        openTickSid: '',
+        openTickTypeKey: '',
+        openTickTypeValue: '',
+        openTickUnitName: '',
+        openTickUnitSid: '',
+        orgSidPath: '',
+        procDefId: '',
+        procInstSid: '',
+        remarks: '',
+        returnedMoneyDate: '',
+        saleDeptName: '',
+        saleDeptSid: '',
+        saleTypeKey: '',
+        saleTypeValue: '',
+        sid: '',
+        staffName: '',
+        staffSid: '',
+        totalBillMoney: '',
+        useOrgSid: '',
+        createBySid: ''
       },
+      rules: {}
+    }
+  },
 
-      //下载附件
-      handleDown(row){
-        // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
-        var name = row.fileName
-        const a = document.createElement('a')
-        a.setAttribute('download', name)
-        a.setAttribute('target', '_blank')
-        a.setAttribute('href', process.env.VUE_APP_BASE_API + "/base/file/download")
-        a.click()
-      },
-
-      // 关闭、返回到列表页面
-      handleReturn() {
-        this.$emit('goBack'); //在子组件中，通过$emit()来触发事件
-      },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '公司开票详情'
+      fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
+              this.image_list1.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
+              this.image_list2.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
+              this.image_list3.push(e.fileUrl)
+            })
+          }
+        }
+      })
     },
-
+    // 开票金额合计
+    totalBillMoney() {
+      if (this.formobj.oneBillMoney !== '' && this.formobj.finBillVehicles.length > 0) {
+        this.formobj.totalBillMoney = parseFloat(this.formobj.oneBillMoney) * parseFloat(this.formobj.finBillVehicles.length)
+      }
+      return this.formobj.totalBillMoney
+    },
+    // 关闭、返回到列表页面
+    handleReturn() {
+      this.image_list1 = []
+      this.image_list2 = []
+      this.image_list3 = []
+      this.$emit('doback')
+    }
   }
+}
 </script>
 
 <style scoped>
-
+.span-sty {
+  width: 100px !important;
+}
+.addinputInfo {
+  margin-left: 90px !important;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@@ -0,0 +1,468 @@
+<template>
+  <div class="app-container">
+    <!--标题按钮部分开始-->
+    <div class="tab-header webtop">
+      <!--标题-->
+      <div>{{ viewTitle }}</div>
+      <!--start 新增修改按钮-->
+      <div>
+        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+      </div>
+      <!--end 添加修改按钮-->
+    </div>
+    <!--按钮部分结束-->
+    <div class="">
+      <div class="titwu">公司开票申请单</div>
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8">
+            <div class="span-sty">发起人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">主车开票信息</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">单台开票金额</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票类型默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票名称默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <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">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合格证状态" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.certificateStateValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票类型" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.billTypeValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票名称" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票金额合计</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.totalBillMoney }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">挂车开票信息</div>
+        <el-table :key="billingKey" :data="formobj.finBillTrailers" :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>{{ scope.row.gcVinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="主车车架号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="title">客户开票申请书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">开票信息确认书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">车辆登记合同</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid, complete, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+
+export default {
+  name: 'finginvoiceapplyDaiBanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      tableKey: 0,
+      billingKey: 1,
+      index: 0,
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      formobj: {
+        applyDate: '',
+        arrearsMoney: '',
+        arrearsOpenYYKey: '',
+        arrearsOpenYYValue: '',
+        billNo: '',
+        billStateKey: '',
+        billStateValue: '',
+        cldjhtApplicationAppendxs: [],
+        contractNo: '',
+        contractSid: '',
+        createByName: '',
+        customerName: '',
+        customerSid: '',
+        deptName: '',
+        deptSid: '',
+        finBillTrailers: [],
+        finBillVehicles: [],
+        isDelayBill: '',
+        isHighAndLowOpen: '',
+        isLQOrigInvoice: '',
+        khkpsqsApplicationAppendxs: [],
+        kpxxqrsApplicationAppendxs: [],
+        modelName: '',
+        modelSid: '',
+        nodeSid: '',
+        nodeState: '',
+        oneBillMoney: '',
+        openTickName: '',
+        openTickSid: '',
+        openTickTypeKey: '',
+        openTickTypeValue: '',
+        openTickUnitName: '',
+        openTickUnitSid: '',
+        orgSidPath: '',
+        procDefId: '',
+        procInstSid: '',
+        remarks: '',
+        returnedMoneyDate: '',
+        saleDeptName: '',
+        saleDeptSid: '',
+        saleTypeKey: '',
+        saleTypeValue: '',
+        sid: '',
+        staffName: '',
+        staffSid: '',
+        totalBillMoney: '',
+        useOrgSid: '',
+        createBySid: ''
+      },
+      rules: {},
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 450 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '公司开票详情'
+      fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
+              this.image_list1.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
+              this.image_list2.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
+              this.image_list3.push(e.fileUrl)
+            })
+          }
+        }
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = '同意'
+      getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = ''
+      getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.span-sty {
+  width: 100px !important;
+}
+.addinputInfo {
+  margin-left: 90px !important;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -0,0 +1,495 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <!--标题-->
+      <div>{{ viewTitle }}</div>
+      <!--start 添加修改按钮-->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
+        </el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交
+        </el-button>
+      </div>
+    </div>
+    <div class="">
+      <div class="titwu">公司开票申请单</div>
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8">
+            <div class="span-sty">发起人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">主车开票信息</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty"><span class="icon">*</span>单台开票金额</div>
+            <el-form-item><el-input v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票类型默认</div>
+            <el-form-item>
+              <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票名称默认</div>
+            <el-form-item>
+              <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
+                <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合格证状态" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.certificateStateValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票类型" align="center">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)" clearable>
+                <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票名称" align="center">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
+                <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票金额合计</div>
+            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">挂车开票信息</div>
+        <el-table :key="billingKey" :data="formobj.finBillTrailers" :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>{{ scope.row.gcVinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="主车车架号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="title">客户开票申请书</div>
+        <el-row>
+          <el-col :span="24">
+            <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+          </el-col>
+        </el-row>
+        <div class="title">开票信息确认书</div>
+        <el-row>
+          <el-col :span="24">
+            <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+          </el-col>
+        </el-row>
+        <div class="title">车辆登记合同</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid, saveOrUpdate, submit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
+import upload from '@/components/uploadFile/upload'
+
+export default {
+  name: '',
+  components: {
+    upload
+  },
+  data() {
+    return {
+      viewTitle: '',
+      submitdisabled: false,
+      diploma_list: [],
+      accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
+      tableKey: 0,
+      billingKey: 1,
+      index: 0,
+      openTick_list: [],
+      openTickType_list: [],
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      formobj: {
+        applyDate: '',
+        arrearsMoney: '',
+        arrearsOpenYYKey: '',
+        arrearsOpenYYValue: '',
+        billNo: '',
+        billStateKey: '',
+        billStateValue: '',
+        cldjhtApplicationAppendxs: [],
+        contractNo: '',
+        contractSid: '',
+        createByName: '',
+        customerName: '',
+        customerSid: '',
+        deptName: '',
+        deptSid: '',
+        finBillTrailers: [],
+        finBillVehicles: [],
+        isDelayBill: '',
+        isHighAndLowOpen: '',
+        isLQOrigInvoice: '',
+        khkpsqsApplicationAppendxs: [],
+        kpxxqrsApplicationAppendxs: [],
+        modelName: '',
+        modelSid: '',
+        nodeSid: '',
+        nodeState: '',
+        oneBillMoney: '',
+        openTickName: '',
+        openTickSid: '',
+        openTickTypeKey: '',
+        openTickTypeValue: '',
+        openTickUnitName: '',
+        openTickUnitSid: '',
+        orgSidPath: '',
+        procDefId: '',
+        procInstSid: '',
+        remarks: '',
+        returnedMoneyDate: '',
+        saleDeptName: '',
+        saleDeptSid: '',
+        saleTypeKey: '',
+        saleTypeValue: '',
+        sid: '',
+        staffName: '',
+        staffSid: '',
+        totalBillMoney: '',
+        useOrgSid: '',
+        createBySid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 450 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'invoiceType' }).then((res) => {
+        if (res.success) {
+          this.openTickType_list = res.data
+        }
+      })
+    },
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
+      e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
+      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        console.log(e.target.value)
+        e.target.value = parseFloat(e.target.value)
+      }
+    },
+    showInfo(sid) {
+      this.init()
+      this.viewTitle = '【编辑】公司开票申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
+          this.formobj.instanceId = res.data.procInstSid
+          this.formobj.userSid = window.sessionStorage.getItem('userSid')
+          selectAllDisList({orgSid: this.formobj.useOrgSid}).then((resp) => {
+            if (resp.success) {
+              this.openTick_list = resp.data
+            }
+          })
+          if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
+              this.image_list3.push({
+                name: e.fileName,
+                url: e.fileUrl
+              })
+            })
+          }
+          if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
+              this.image_list2.push({
+                name: e.fileName,
+                url: e.fileUrl
+              })
+            })
+          }
+          if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
+              this.image_list1.push({
+                name: e.fileName,
+                url: e.fileUrl
+              })
+            })
+          }
+        }
+      })
+    },
+    // 开票金额合计
+    totalBillMoney() {
+      if (this.formobj.oneBillMoney !== '' && this.formobj.finBillVehicles.length > 0) {
+        this.formobj.totalBillMoney = parseFloat(this.formobj.oneBillMoney) * parseFloat(this.formobj.finBillVehicles.length)
+      }
+      return this.formobj.totalBillMoney
+    },
+    changeOpenTickType(val) {
+      const choose = this.openTickType_list.filter((item) => item.dictValue === val)
+      this.formobj.openTickTypeKey = choose[0].dictKey
+      if (this.formobj.finBillVehicles.length > 0) {
+        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+          this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+        }
+      }
+    },
+    changeOpenTick(val) {
+      const choose = this.openTick_list.filter((item) => item.name === val)
+      this.formobj.openTickSid = choose[0].sid
+      if (this.formobj.finBillVehicles.length > 0) {
+        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.formobj.finBillVehicles[i].openTickName = choose[0].name
+          this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+          this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+        }
+      }
+    },
+    changeBillType(val, row) {
+      const choose = this.openTickType_list.filter((item) => item.dictValue === val)
+      row.billTypeKey = choose[0].dictKey
+    },
+    changeOpenTickName(val, row) {
+      const choose = this.openTick_list.filter((item) => item.name === val)
+      row.openTickSid = choose[0].sid
+      row.openTickRemarks = choose[0].openTickRemarks
+    },
+    handleSave() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
+        return
+      }
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleSubmit() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
+        return
+      }
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    getUrl() {
+      if (this.image_list1.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.image_list1.length; i++) {
+          aa.push({
+            attachType: '',
+            billAppSid: '',
+            createByName: window.sessionStorage.getItem('name'),
+            fileSid: '',
+            fileName: this.image_list1[i].name,
+            fileType: this.image_list1[i].name.substr(this.image_list1[i].name.lastIndexOf('.')),
+            fileUrl: this.image_list1[i].url,
+            sid: ''
+          })
+        }
+        this.formobj.khkpsqsApplicationAppendxs = aa
+      }
+      if (this.image_list2.length > 0) {
+        const bb = []
+        for (var k = 0; k < this.image_list2.length; k++) {
+          bb.push({
+            attachType: '',
+            billAppSid: '',
+            createByName: window.sessionStorage.getItem('name'),
+            fileSid: '',
+            fileName: this.image_list2[k].name,
+            fileType: this.image_list2[k].name.substr(this.image_list2[k].name.lastIndexOf('.')),
+            fileUrl: this.image_list2[k].url,
+            sid: ''
+          })
+        }
+        this.formobj.kpxxqrsApplicationAppendxs = bb
+      }
+      if (this.image_list3.length > 0) {
+        const cc = []
+        for (var m = 0; m < this.image_list3.length; m++) {
+          cc.push({
+            attachType: '',
+            billAppSid: '',
+            createByName: window.sessionStorage.getItem('name'),
+            fileSid: '',
+            fileName: this.image_list3[m].name,
+            fileType: this.image_list3[m].name.substr(this.image_list3[m].name.lastIndexOf('.')),
+            fileUrl: this.image_list3[m].url,
+            sid: ''
+          })
+        }
+        this.formobj.cldjhtApplicationAppendxs = cc
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.span-sty {
+  width: 100px !important;
+}
+.addinputInfo {
+  margin-left: 90px !important;
+}
+.addinputw {
+  margin-left: 90px !important;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@@ -0,0 +1,342 @@
+<template>
+  <div class="app-container">
+    <!--标题按钮部分开始-->
+    <div class="tab-header webtop">
+      <!--标题-->
+      <div>{{ viewTitle }}</div>
+      <!--start 新增修改按钮-->
+      <div>
+        <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+      </div>
+      <!--end 添加修改按钮-->
+    </div>
+    <!--按钮部分结束-->
+    <div class="">
+      <div class="titwu">公司开票申请单</div>
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8">
+            <div class="span-sty">发起人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">发起日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">销售专员</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">销售类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">合同编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票单位</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">客户名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">主车开票信息</div>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">单台开票金额</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票类型默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">开票名称默认</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <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">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="合格证状态" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.certificateStateValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票类型" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.billTypeValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票名称" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票金额合计</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.totalBillMoney }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">开票状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div class="title">挂车开票信息</div>
+        <el-table :key="billingKey" :data="formobj.finBillTrailers" :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>{{ scope.row.gcVinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="主车车架号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.vinNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="title">客户开票申请书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">开票信息确认书</div>
+        <el-row>
+          <el-col :span="24">
+            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+          </el-col>
+        </el-row>
+        <div class="title">车辆登记合同</div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item>
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid, revokeProcess } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+export default {
+  name: 'finginvoiceapplyYiBanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      tableKey: 0,
+      billingKey: 1,
+      index: 0,
+      image_list1: [],
+      image_list2: [],
+      image_list3: [],
+      formobj: {
+        applyDate: '',
+        arrearsMoney: '',
+        arrearsOpenYYKey: '',
+        arrearsOpenYYValue: '',
+        billNo: '',
+        billStateKey: '',
+        billStateValue: '',
+        cldjhtApplicationAppendxs: [],
+        contractNo: '',
+        contractSid: '',
+        createByName: '',
+        customerName: '',
+        customerSid: '',
+        deptName: '',
+        deptSid: '',
+        finBillTrailers: [],
+        finBillVehicles: [],
+        isDelayBill: '',
+        isHighAndLowOpen: '',
+        isLQOrigInvoice: '',
+        khkpsqsApplicationAppendxs: [],
+        kpxxqrsApplicationAppendxs: [],
+        modelName: '',
+        modelSid: '',
+        nodeSid: '',
+        nodeState: '',
+        oneBillMoney: '',
+        openTickName: '',
+        openTickSid: '',
+        openTickTypeKey: '',
+        openTickTypeValue: '',
+        openTickUnitName: '',
+        openTickUnitSid: '',
+        orgSidPath: '',
+        procDefId: '',
+        procInstSid: '',
+        remarks: '',
+        returnedMoneyDate: '',
+        saleDeptName: '',
+        saleDeptSid: '',
+        saleTypeKey: '',
+        saleTypeValue: '',
+        sid: '',
+        staffName: '',
+        staffSid: '',
+        totalBillMoney: '',
+        useOrgSid: '',
+        createBySid: ''
+      },
+      rules: {},
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 450 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '公司开票详情'
+      fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.khkpsqsApplicationAppendxs.length > 0) {
+            this.formobj.khkpsqsApplicationAppendxs.forEach((e) => {
+              this.image_list1.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) {
+            this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => {
+              this.image_list2.push(e.fileUrl)
+            })
+          }
+          if (this.formobj.cldjhtApplicationAppendxs.length > 0) {
+            this.formobj.cldjhtApplicationAppendxs.forEach((e) => {
+              this.image_list3.push(e.fileUrl)
+            })
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.span-sty {
+  width: 100px !important;
+}
+.addinputInfo {
+  margin-left: 90px !important;
+}
+</style>

anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js

@@ -51,9 +51,10 @@ export function saveGetAll(data) {
 // 编辑回显 已改
 export function getAll(data) {
   return request({
-    url: '/base/v1/basevehiclemodel/getAll/' + data.sid + '/' + data.userSid,
+    url: '/base/v1/basevehiclemodel/getAll',
     method: 'get',
-    params: data
+    params: data,
+    headers: { 'Content-Type': 'application/json' }
   })
 }
 

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@@ -632,7 +632,8 @@ export default {
           console.log('删除的数据', sids)
           const params = {
             sids: sids,
-            userSid: window.sessionStorage.getItem('userSid')
+            userSid: window.sessionStorage.getItem('userSid'),
+            orgPath: window.sessionStorage.getItem('defaultOrgPath')
           }
           deleteBySids(params).then(resp => {
             if (resp.success) {

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@@ -309,7 +309,7 @@ export default {
       this.dialogStatus = 'update'
       console.log('编辑回显', sid)
       const userSid = window.sessionStorage.getItem('userSid')
-      getAll({ sid: sid, userSid: userSid }).then(resp => {
+      getAll({ sid: sid, userSid: userSid, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then(resp => {
         const data = resp.data
         this.temp = data
         this.temp = JSON.parse(JSON.stringify(this.temp).replace(

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@@ -479,7 +479,8 @@ export default {
         bb.push({
           modelSid: element.modelSid,
           configurationItemsSid: element.configurationItemsSid,
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
         })
       })
       this.sids = aa

anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue

@@ -324,7 +324,8 @@ export default {
         bb.push({
           modelSid: element.sid,
           configurationItemsSid: element.configSid,
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
         })
       })
       this.sids = aa