Merge remote-tracking branch 'origin/beta' into beta

# Conflicts:
#	jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java
beta
kk 1 year ago
commit c1b6ae0005
  1. 105
      jianshui-admin/src/main/java/com/jianshui/web/controller/system/InvoiceAllYhdjController.java
  2. 2
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/BillInfoServiceImpl.java
  3. 11
      jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java
  4. 3
      jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java
  5. 2
      jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml
  6. 75
      jianshui-ui/src/api/digital/registered.js
  7. 610
      jianshui-ui/src/views/digital/registered/index.vue
  8. 26
      jianshui-ui/src/views/invoice/billinfo/index.vue
  9. 8
      jianshui-ui/src/views/platform/product_info/index.vue
  10. 43
      sql/invoiceallyhdjMenu.sql

@ -0,0 +1,105 @@
package com.jianshui.web.controller.system;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.jianshui.system.domain.InvoiceAllYhdj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.jianshui.common.annotation.Log;
import com.jianshui.common.core.controller.BaseController;
import com.jianshui.common.core.domain.AjaxResult;
import com.jianshui.common.enums.BusinessType;
import com.jianshui.common.utils.poi.ExcelUtil;
import com.jianshui.common.core.page.TableDataInfo;
import com.jianshui.system.service.IInvoiceAllYhdjService;
/**
* 金四-用户登记Controller
*
* @author jianshui
* @date 2024-02-28
*/
@RestController
@RequestMapping("/invoiceall/invoiceallyhdj")
public class InvoiceAllYhdjController extends BaseController
{
@Autowired
private IInvoiceAllYhdjService invoiceAllYhdjService;
/**
* 查询金四-用户登记列表
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:list')")
@GetMapping("/list")
public TableDataInfo list(InvoiceAllYhdj invoiceAllYhdj)
{
startPage();
List<InvoiceAllYhdj> list = invoiceAllYhdjService.selectInvoiceAllYhdjList(invoiceAllYhdj);
return getDataTable(list);
}
/**
* 导出金四-用户登记列表
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:export')")
@Log(title = "金四-用户登记", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, InvoiceAllYhdj invoiceAllYhdj)
{
List<InvoiceAllYhdj> list = invoiceAllYhdjService.selectInvoiceAllYhdjList(invoiceAllYhdj);
ExcelUtil<InvoiceAllYhdj> util = new ExcelUtil<InvoiceAllYhdj>(InvoiceAllYhdj.class);
util.exportExcel(response, list, "金四-用户登记数据");
}
/**
* 获取金四-用户登记详细信息
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(invoiceAllYhdjService.selectInvoiceAllYhdjById(id));
}
/**
* 新增金四-用户登记
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:add')")
@Log(title = "金四-用户登记", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody InvoiceAllYhdj invoiceAllYhdj)
{
return toAjax(invoiceAllYhdjService.insertInvoiceAllYhdj(invoiceAllYhdj));
}
/**
* 修改金四-用户登记
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:edit')")
@Log(title = "金四-用户登记", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody InvoiceAllYhdj invoiceAllYhdj)
{
return toAjax(invoiceAllYhdjService.updateInvoiceAllYhdj(invoiceAllYhdj));
}
/**
* 删除金四-用户登记
*/
@PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:remove')")
@Log(title = "金四-用户登记", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(invoiceAllYhdjService.deleteInvoiceAllYhdjByIds(ids));
}
}

@ -87,7 +87,7 @@ public class BillInfoServiceImpl implements IBillInfoService {
Map<String,String> invocieStatusDictMap = new HashMap<>(); ;
List<SysDictData> invocieStatusData = dictTypeService.selectDictDataByType("invoice_status");
List<SysDictData> invocieStatusData = dictTypeService.selectDictDataByType("bill_state");
if (CollectionUtil.isNotEmpty(invocieStatusData)){
invocieStatusData.forEach(e->invocieStatusDictMap.put(e.getDictValue(),e.getDictLabel()));

@ -25,11 +25,11 @@ public class InvoiceAllYhdj implements Serializable
private Long id;
/** 办税人员姓名(税局实名认证的人员) */
@Excel(name = "办税人员姓名(税局实名认证的人员)")
@Excel(name = "办税人员姓名")
private String bsryxm;
/** 登录身份(1:财务负责人,2:法定代表人,3:办税人,4:购票员,5:普通管理员,99:其他) 备注:如果选择99|其他,则办税人员名称、手机号码、身份证件号码.可以不传 */
@Excel(name = "登录身份(1:财务负责人,2:法定代表人,3:办税人,4:购票员,5:普通管理员,99:其他) 备注:如果选择99|其他,则办税人员名称、手机号码、身份证件号码.可以不传")
@Excel(name = "登录身份")
private String dlsf;
/** 办税人员登录密码 */
@ -37,7 +37,7 @@ public class InvoiceAllYhdj implements Serializable
private String dlsfmm;
/** 登录方式(参考码表) */
@Excel(name = "登录方式(参考码表)")
@Excel(name = "登录方式")
private String dlfs;
/** 登录密码 */
@ -57,11 +57,11 @@ public class InvoiceAllYhdj implements Serializable
private String nsrsbh;
/** 办税人员身份证件号码(税局实名认证的人员) */
@Excel(name = "办税人员身份证件号码(税局实名认证的人员)")
@Excel(name = "身份证件号")
private String bsrysfzjhm;
/** 办税人员手机号码(税局实名认证的人员) */
@Excel(name = "办税人员手机号码(税局实名认证的人员)")
@Excel(name = "手机号码")
private String bsrysjhm;
/** 中间号码 */
@ -83,6 +83,7 @@ public class InvoiceAllYhdj implements Serializable
private Date updateTime;
/** 备注 */
@Excel(name = "备注")
private String remark;

@ -1,6 +1,8 @@
package com.jianshui.system.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jianshui.common.annotation.Excel;
import com.jianshui.common.core.domain.BaseEntity;
@ -33,6 +35,7 @@ public class ServiceManage extends BaseEntity
private Integer state;
@Excel(name = "服务状态")
@TableField(exist = false)
private String serviceState;
/** 请求报文类型 */

@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectInvoiceAllYhdjVo">
select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,identity,dqbm from invoice_all_yhdj
select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,`identity`,dqbm from invoice_all_yhdj
</sql>
<select id="selectInvoiceAllYhdjList" parameterType="InvoiceAllYhdj" resultMap="InvoiceAllYhdjResult">

@ -0,0 +1,75 @@
import request from '@/utils/request'
// 查询金四-用户登记列表
export function listInvoiceallyhdj(query) {
return request({
url: '/invoiceall/invoiceallyhdj/list',
method: 'get',
params: query
})
}
// 查询金四-用户登记详细
export function getInvoiceallyhdj(id) {
return request({
url: '/invoiceall/invoiceallyhdj/' + id,
method: 'get'
})
}
//用户登记
export function registeredMethod(registeredParams,identity) {
return request({
url: '/api/invoice_all/v1/registration?identity=' + identity+"&order="+registeredParams,
method: 'post',
})
}
//人脸识别
export function qrcodeMethod(qrcodeParams,identity) {
return request({
url: '/api/invoice_all/v1/qrcode?identity=' + identity+"&order="+qrcodeParams,
method: 'post',
})
}
// 新增金四-用户登记
export function addInvoiceallyhdj(data) {
return request({
url: '/invoiceall/invoiceallyhdj',
method: 'post',
data: data
})
}
// 修改金四-用户登记
export function updateInvoiceallyhdj(data) {
return request({
url: '/invoiceall/invoiceallyhdj',
method: 'put',
data: data
})
}
// 删除金四-用户登记
export function delInvoiceallyhdj(id) {
return request({
url: '/invoiceall/invoiceallyhdj/' + id,
method: 'delete'
})
}
export function encrypt(data) {
return request({
url: '/sandbox/encrypt',
method: 'post',
data: data
})
}
export function getCompanyservice(companyid) {
return request({
url: '/system/companyservice/' + companyid,
method: 'get'
})
}

@ -0,0 +1,610 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px">
<el-row>
<el-form-item label="办税人姓名" prop="bsryxm">
<el-input
v-model="queryParams.bsryxm"
placeholder="请输入办税人姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="登录身份" prop="dlsf">
<el-select v-model="queryParams.dlsf" placeholder="请选择登录身份" clearable size="small">
<el-option v-for="dict in dict.type.login_dlsf" :key="dict.value" :label="dict.label"
:value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="登录方式" prop="dlfs">
<el-select v-model="queryParams.dlfs" placeholder="请选择登录方式" clearable size="small">
<el-option v-for="dict in dict.type.login_dlfs" :key="dict.value" :label="dict.label"
:value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="登录账号" prop="dlzh">
<el-input
v-model="queryParams.dlzh"
placeholder="请输入登录账号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="纳税人名称" prop="nsrmc">
<el-input
v-model="queryParams.nsrmc"
placeholder="请输入纳税人名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="纳税人识别号" prop="nsrsbh">
<el-input
v-model="queryParams.nsrsbh"
placeholder="请输入纳税人识别号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="身份证件号码" prop="bsrysfzjhm">
<el-input
v-model="queryParams.bsrysfzjhm"
placeholder="请输入办税人员身份证件号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="bsrysjhm">
<el-input
v-model="queryParams.bsrysjhm"
placeholder="请输入办税人员手机号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="企业ID" prop="identity">
<el-input
v-model="queryParams.identity"
placeholder="请输入企业ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['invoiceall:invoiceallyhdj:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['invoiceall:invoiceallyhdj:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['invoiceall:invoiceallyhdj:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['invoiceall:invoiceallyhdj:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="invoiceallyhdjList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" v-if="false" />
<el-table-column label="办税人员姓名" align="center" prop="bsryxm" />
<el-table-column label="登录密码" align="center" prop="dlsfmm" />
<el-table-column label="登录身份" align="center" prop="dlsf" >
<template slot-scope="scope">
<dict-tag :options="dict.type.login_dlsf" :value="scope.row.dlsf"/>
</template>
</el-table-column>
<el-table-column label="办税人员登录密码" align="center" prop="dlsfmm" />
<el-table-column label="登录方式" align="center" prop="dlfs">
<template slot-scope="scope">
<dict-tag :options="dict.type.login_dlfs" :value="scope.row.dlfs"/>
</template>
</el-table-column>
<el-table-column label="登录密码" align="center" prop="dlmm" />
<el-table-column label="登录账号" align="center" prop="dlzh" />
<el-table-column label="纳税人名称" align="center" prop="nsrmc" />
<el-table-column label="纳税人识别号" align="center" prop="nsrsbh" />
<el-table-column label="身份证件号" align="center" prop="bsrysfzjhm" />
<el-table-column label="手机号码" align="center" prop="bsrysjhm" />
<el-table-column label="中间号码" align="center" prop="zjh" />
<el-table-column label="企业ID" align="center" prop="identity" />
<el-table-column label="地区编码" align="center" prop="dqbm" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="registered(scope.row)"
v-hasPermi="['invoiceall:invoiceallyhdj:edit']"
v-if="scope.row.dqbm != null
&& scope.row.dqbm != ''
&& scope.row.dlfs != null
&& scope.row.dlfs != ''
&& scope.row.dlsfmm != null
&& scope.row.dlsfmm != ''
&& scope.row.dlmm != null
&& scope.row.dlmm != ''
&& scope.row.dlzh != null
&& scope.row.dlzh != ''
&& scope.row.nsrmc != null
&& scope.row.nsrmc != ''
&& scope.row.nsrsbh != null
&& scope.row.nsrsbh != ''
&& scope.row.bsrysfzjhm != null
&& scope.row.bsrysfzjhm != ''
&& scope.row.identity != null
&& scope.row.identity != ''"
>登记</el-button>
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="qrcode(scope.row)"
v-hasPermi="['invoiceall:invoiceallyhdj:remove']"
v-show="scope.row.dqbm != null
&& scope.row.dqbm != ''
&& scope.row.nsrsbh != null
&& scope.row.nsrsbh != ''
&& scope.row.bsrysfzjhm != null
&& scope.row.bsrysfzjhm != ''
&& scope.row.identity != null
&& scope.row.identity != ''"
>人脸识别</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改用户登记对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="办税人员姓名" prop="bsryxm">
<el-input v-model="form.bsryxm" placeholder="请输入办税人员姓名" />
</el-form-item>
<el-form-item label="登录身份" prop="dlsf">
<el-select v-model="form.dlsf" placeholder="请选择登录身份" clearable size="small">
<el-option v-for="dict in dict.type.login_dlsf" :key="dict.value" :label="dict.label"
:value="dict.value"/>
</el-select>
<!-- <el-input v-model="form.dlsf" placeholder="请输入登录身份" />-->
</el-form-item>
<el-form-item label="办税人员登录密码" prop="dlsfmm">
<el-input v-model="form.dlsfmm" placeholder="请输入办税人员登录密码" />
</el-form-item>
<el-form-item label="登录方式" prop="dlfs">
<el-select v-model="form.dlfs" placeholder="请选择登录方式" clearable size="small">
<el-option v-for="dict in dict.type.login_dlfs" :key="dict.value" :label="dict.label"
:value="dict.value"/>
</el-select>
<!-- <el-input v-model="form.dlfs" placeholder="请输入登录方式" />-->
</el-form-item>
<el-form-item label="登录密码" prop="dlmm">
<el-input v-model="form.dlmm" placeholder="请输入登录密码" />
</el-form-item>
<el-form-item label="登录账号" prop="dlzh">
<el-input v-model="form.dlzh" placeholder="请输入登录账号" />
</el-form-item>
<el-form-item label="纳税人名称" prop="nsrmc">
<el-input v-model="form.nsrmc" placeholder="请输入纳税人名称" />
</el-form-item>
<el-form-item label="纳税人识别号" prop="nsrsbh">
<el-input v-model="form.nsrsbh" placeholder="请输入纳税人识别号" />
</el-form-item>
<el-form-item label="身份证件号" prop="bsrysfzjhm">
<el-input v-model="form.bsrysfzjhm" placeholder="请输入办税人员身份证件号码" />
</el-form-item>
<el-form-item label="手机号码" prop="bsrysjhm">
<el-input v-model="form.bsrysjhm" placeholder="请输入办税人员手机号码" />
</el-form-item>
<el-form-item label="中间号码" prop="zjh">
<el-input v-model="form.zjh" placeholder="请输入中间号码" />
</el-form-item>
<el-form-item label="企业ID" prop="identity">
<el-input v-model="form.identity" placeholder="请输入企业ID" />
</el-form-item>
<el-form-item label="地区编码" prop="dqbm">
<el-input v-model="form.dqbm" placeholder="请输入地区编码" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listInvoiceallyhdj,
getInvoiceallyhdj,
delInvoiceallyhdj,
addInvoiceallyhdj,
updateInvoiceallyhdj,
registeredMethod,
getCompanyservice,
qrcodeMethod,
encrypt
} from "@/api/digital/registered";
export default {
name: "Invoiceallyhdj",
dicts: ['login_dlsf','login_dlfs'],
data() {
return {
//
loading: true,
//
ids: [],
should : false,
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// -
invoiceallyhdjList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
bsryxm: null,
dlsf: null,
dlsfmm: null,
dlfs: null,
dlmm: null,
dlzh: null,
nsrmc: null,
nsrsbh: null,
bsrysfzjhm: null,
bsrysjhm: null,
zjh: null,
},
//
form: {},
//
rules: {
identity: [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
bsryxm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
dqbm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
dlsf : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
dlsfmm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
dlmm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
dlzh : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
nsrmc : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
nsrsbh : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
bsrysfzjhm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
],
bsrysjhm : [
{ required: true, message: "属性不能为空", trigger: "blur" }
]
},
//
registeredParams: {
appkey: "935248bf224f6c8431cdc1969f029519",
async: false,
bsrysfzjhm: "",
serviceId: "yhdj",
dqbm: "",
nsrsbh: "",
jsonData: {
bsryxm: "",
dlsf: "",
dlsfmm: "",
dlfs: "",
dlmm: "",
dlzh: "",
nsrmc: "",
nsrsbh: "",
bsrysfzjhm: "",
bsrysjhm: "",
zjh: "",
deviceType: "",
userExt: {
}
}
},
//
qrcodeParams : {
appkey: "935248bf224f6c8431cdc1969f029519",
async: true,
bsrysfzjhm:"",
dqbm: "",
nsrsbh: "",
jsonData: {
rlsblx: ""
},
serviceId: "hqrlsbewm"
},
};
},
created() {
this.getList();
},
methods: {
/** 查询金四-用户登记列表 */
getList() {
this.loading = true;
listInvoiceallyhdj(this.queryParams).then(response => {
this.invoiceallyhdjList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
bsryxm: null,
dlsf: null,
dlsfmm: null,
dlfs: null,
dlmm: null,
dlzh: null,
nsrmc: null,
nsrsbh: null,
bsrysfzjhm: null,
bsrysjhm: null,
zjh: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
identity: null,
dqbm: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加用户登记";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getInvoiceallyhdj(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改金四-用户登记";
});
},
//
registered(row) {
this.reset();
getCompanyservice(row.identity).then(resp=>{
//
if(resp.code==200 && resp.data != null && resp.data != ""){
this.convertRegistedParam(row,true)
const requestBody = {
key: resp.data.secret,
order: JSON.stringify(this.registeredParams),
}
encrypt(requestBody).then(res => {
if (res.code == 200 && res.data != null && res.data != "") {
registeredMethod(res.data,row.identity).then(response => {
if (response.code == 200){
this.$message.success('请求登记成功')
}
});
}else if (res.data == null || res.data == ""){
this.$message.error('报文加密失败')
}
})
}else if(resp.data == null || resp.data == "") {
this.$message.error('请检查企业ID配置')
}
})
},
/** 人脸识别 */
qrcode(row){
this.reset();
getCompanyservice(row.identity).then(resp=>{
//
if(resp.code==200 && resp.data != null && resp.data != ""){
this.convertRegistedParam(row,false)
const requestBody = {
key: resp.data.secret,
order: JSON.stringify(this.qrcodeParams),
}
encrypt(requestBody).then(res => {
if (res.code == 200 && res.data != null && res.data != "") {
qrcodeMethod(res.data,row.identity).then(response => {
if (response.code == 200 && response.data != null && response.data != ""){
if (response.data.ewm != null && response.data.ewm != ""){
this.$message.success('登记成功')
}else {
this.$message.error('登记失败')
}
}else {
this.$message.error('登记失败')
}
});
}else if (res.data == null || res.data == ""){
this.$message.error('报文加密失败')
}
})
}else if (resp.data == null || resp.data == ""){
this.$message.error('请检查企业ID配置')
}
})
},
convertRegistedParam(row,flag){
if (flag){
this.registeredParams.bsrysfzjhm = row.bsrysfzjhm;
this.registeredParams.dqbm = row.dqbm;
this.registeredParams.nsrsbh = row.nsrsbh;
this.registeredParams.jsonData.bsryxm = row.bsryxm;
this.registeredParams.jsonData.dlsf = row.dlsf;
this.registeredParams.jsonData.dlsfmm = row.dlsfmm;
this.registeredParams.jsonData.dlfs = row.dlfs;
this.registeredParams.jsonData.dlmm = row.dlmm;
this.registeredParams.jsonData.dlzh = row.dlzh;
this.registeredParams.jsonData.nsrmc = row.nsrmc;
this.registeredParams.jsonData.nsrsbh = row.nsrsbh;
this.registeredParams.jsonData.bsrysjhm = row.bsrysjhm;
this.registeredParams.jsonData.zjh = row.zjh;
this.registeredParams.jsonData.bsrysfzjhm = row.bsrysfzjhm;
}else {
this.qrcodeParams.bsrysfzjhm = row.bsrysfzjhm;
this.qrcodeParams.dqbm = row.dqbm;
this.qrcodeParams.nsrsbh = row.nsrsbh;
}
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateInvoiceallyhdj(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addInvoiceallyhdj(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除金四-用户登记编号为"' + ids + '"的数据项?').then(function() {
return delInvoiceallyhdj(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('invoiceall/invoiceallyhdj/export', {
...this.queryParams
}, `invoiceallyhdj_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -375,9 +375,9 @@
<el-table-column label="客户系统订单号" align="center" prop="outTradeOrderno" width="120px"/>
<!-- <el-table-column label="流水号" align="center" prop="fpqqlsh" /> -->
<el-table-column label="发票种类" align="center" prop="invoiceType">
<template slot-scope="scope">
<dict-tag :options="dict.type.invoice_type" :value="scope.row.invoiceType"/>
</template>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.invoice_type" :value="scope.row.invoiceType"/>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="购方名称" align="center" prop="buyerName"/>
<el-table-column label="购方税号" align="center" prop="buyerTaxnum"/>
@ -404,9 +404,9 @@
</template>
</el-table-column>
<el-table-column label="推送方式" align="center" prop="tsfs">
<template slot-scope="scope">
<dict-tag :options="dict.type.tsfs" :value="scope.row.tsfs"/>
</template>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.tsfs" :value="scope.row.tsfs"/>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="清单标志" align="center" prop="qdbz">
<template slot-scope="scope">
@ -430,9 +430,9 @@
</template>
</el-table-column>
<el-table-column label="订单来源" align="center" prop="source">
<template slot-scope="scope">
<dict-tag :options="dict.type.source" :value="scope.row.source"/>
</template>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.source" :value="scope.row.source"/>-->
<!-- </template>-->
</el-table-column>
<!-- <el-table-column label="服务公司" align="center" prop="serviceSupplierKey">
<template slot-scope="scope">
@ -440,9 +440,9 @@
</template>
</el-table-column> -->
<el-table-column label="单据类型" align="center" prop="billType">
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_type" :value="scope.row.billType"/>
</template>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.bill_type" :value="scope.row.billType"/>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="业务留存字段" align="center" prop="businessRemark" width="120px"/>
<el-table-column label="开票时间" align="center" prop="invoicedTime" width="100">
@ -733,7 +733,7 @@ import {
export default {
name: "Billinfo",
dicts: ['invoice_type', 'invoice_kind', 'bill_type'],
dicts: ['invoice_type', 'invoice_kind', 'bill_type','bill_state'],
data() {
return {
showMore: false,

@ -198,7 +198,7 @@
/>
<!-- 添加或修改商品信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="商品编码" prop="productCode">
<el-input v-model="form.productCode" placeholder="请输入商品编码" />
@ -256,6 +256,8 @@ export default {
loading: true,
//
ids: [],
//
productCodes: [],
//
single: true,
//
@ -351,6 +353,7 @@ export default {
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.productCodes = selection.map(item => item.productCode)
this.single = selection.length!==1
this.multiple = !selection.length
},
@ -393,7 +396,8 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商品信息编号为"' + ids + '"的数据项?').then(function() {
const codes = row.productCode || this.productCodes;
this.$modal.confirm('是否确认删除商品编码为"' + codes + '"的数据项?').then(function() {
return delProduct_info(ids);
}).then(() => {
this.getList();

@ -0,0 +1,43 @@
-- 顶级目录sql
INSERT INTO `jianshui_dev`.`sys_menu`( `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('数电配置', 0, 10, 'digital', NULL, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', '2021-12-09 16:18:41', 'admin', '2021-12-21 15:06:58', '数电配置目录');
-- 菜单 SQL
SELECT @parentId := LAST_INSERT_ID();
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记', @parentId, '1', 'registered', 'digital/registered/index', 1, 0, 'C', '0', '0', 'digital:registered:list', '#', 'admin', sysdate(), '', null, '用户登记菜单');
-- 按钮父菜单ID
SELECT @parentId := LAST_INSERT_ID();
-- 按钮 SQL
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'digital:registered:query', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'digital:registered:add', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'digital:registered:edit', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'digital:registered:remove', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('用户登记导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'digital:registered:export', '#', 'admin', sysdate(), '', null, '');
-- 登陆身份字典
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '财务负责人', '1', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '法定代表人', '2', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '办税人', '3', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 4, '购票员', '4', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 5, '普通管理员', '5', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 6, '销售人员', '6', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 7, '开票员', '7', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 8, '其他', '99', 'login_dlsf', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
--
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '证书登录', '1', 'login_dlfs', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '账密或中间号方式登录', '2', 'login_dlfs', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '自主授权', '3', 'login_dlfs', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
INSERT INTO `jianshui_dev`.`sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 4, '数电客户端', '4', 'login_dlfs', NULL, 'default', 'N', '0', 'admin', NOW(), '', NOW(), NULL);
Loading…
Cancel
Save