Commit dc71804c authored by huangjie's avatar huangjie

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents ca68b9b7 f2d9ea5a
package com.dsk.cscec.controller;
import com.dsk.common.core.controller.BaseController;
import com.dsk.cscec.service.IDCustomerService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 组织维表(DCustomer)表控制层
*
* @author lcl
* @since 2023-12-08 14:57:22
*/
@RestController
@RequestMapping("/customer")
public class DCustomerController extends BaseController {
/**
* 服务对象
*/
@Resource
private IDCustomerService baseService;
}
package com.dsk.cscec.domain;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
/**
* 组织维表(DCustomer)表实体类
*
* @author lcl
* @since 2023-12-08 14:57:25
*/
@Data
public class DCustomer implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客商主键
*/
private Long customerKey;
/**
* ipm供应商id
*/
private String customerId;
/**
* ipm供应商名称
*/
private String cusomerName;
/**
* 财务客商编码
*/
private String finCustomerCode;
/**
* 财务客商名称
*/
private String finCustomerName;
/**
* 税号
*/
private String taxNumber;
/**
* 是否有效 Y 有效 N 无效
*/
private String isvalid;
/**
* 供应商编号
*/
private String customerCode;
/**
* 供应商名称
*/
private String customerName;
/**
* 供应商状态
*/
private String customerState;
/**
* 推荐公司ID
*/
private String recommendOrgId;
/**
* 推荐公司
*/
private String recommendOrg;
/**
* 准入时间
*/
private Date approveDate2;
/**
* 版本
*/
private Long version;
/**
* 供应商id
*/
private String supplierId;
/**
* 供应商类别编码
*/
private String customerCategoryCode;
/**
* 法人代表
*/
private String representative;
/**
* 工商注册号
*/
private String registerNo;
/**
* 统一社会信用代码
*/
private String unifySocialCode;
/**
* 税务登记号
*/
private String businessLicense;
/**
* 组织机构代码号
*/
private String orgnizationCode;
/**
* 注册资金
*/
private Double registerCapital;
/**
* 主营业务
*/
private String primaryBusiness;
/**
* 资质等级
*/
private String credential;
/**
* 品牌
*/
private String brand;
/**
* 地址
*/
private String address;
/**
* 城市id
*/
private String registerCityId;
/**
* 注册地区域
*/
private String registerRegion;
/**
* 省份
*/
private String registerProvince;
/**
* 城市
*/
private String registerCity;
/**
* 开户行
*/
private String openBank;
/**
* 银行账号
*/
private String bankAccount;
/**
* 联系人
*/
private String contactPerson;
/**
* 电话
*/
private String contactPhone;
/**
* 手机
*/
private String mobile;
/**
* 邮编
*/
private String zipcode;
/**
* email
*/
private String email;
/**
* 网址
*/
private String website;
/**
* 备注说明
*/
private String remark;
/**
* 地区编号
*/
private String areaCode;
/**
* 货币种类
*/
private String currency;
/**
* 所属组织机构id
*/
private String orgnizationId;
/**
* 类型
*/
private String customerType;
/**
* 企业信用情况
*/
private String creditSituation;
/**
* 创建者id
*/
private String employeeId;
/**
* 成立日期
*/
private String establishDate;
/**
* 区号
*/
private String phoneCode;
/**
* 企业性质
*/
private String customerProperty;
/**
* 职务
*/
private String sectorPosition;
/**
* 鉴别字段
*/
private String scope;
/**
* 传真
*/
private String fax;
/**
* 供应商类别
*/
private String customerClass;
/**
* 身份证号
*/
private String idCard;
/**
* 附属子公司名称
*/
private String subCompany;
/**
* 联营公司名称
*/
private String alliedCompany;
/**
* 营业额
*/
private Double turnOver;
/**
* 主要客户
*/
private String mainCustomer;
/**
* 主要货源
*/
private String mainResource;
/**
* 主要经营区域
*/
private String mainRegion;
/**
* 原材料供应情况
*/
private String rawMaterial;
/**
* 生产线及产能情况
*/
private String productline;
/**
* 客商类型
*/
private String customerCategoryType;
/**
* 所属母公司名称
*/
private String customerFirm;
/**
* 客商类型id
*/
private String customertypeId;
/**
* 供应商类别id
*/
private String customerCategoryTypeId;
/**
* 企业注册地
*/
private String registerAddress;
/**
* 工厂仓库所在地
*/
private String warehouseAddress;
/**
* 合作产品
*/
private String teamworkProduct;
/**
* 供方类型
*/
private String isfactoryorfranchise;
/**
* 营业执照到期时间1
*/
private Date expireDate1;
/**
* 组织机构代码证到期时间2
*/
private Date expireDate2;
/**
* 税务登记证到期时间3
*/
private Date expireDate3;
/**
* 资质证书到期时间4
*/
private Date expireDate4;
/**
* 安全生产许可证到期时间5
*/
private Date expireDate5;
/**
* 队长名称
*/
private String leaderName;
/**
* 专业类别id
*/
private String groupSpecialtyId;
/**
* 集团专业类别
*/
private String groupSpecialty;
/**
* 经营管理能力
*/
private String manageAbility;
/**
* 产品质量保证能力
*/
private String productQualityAbility;
/**
* 施工承包范围
*/
private String constructJobScope;
/**
* 经办人
*/
private String responsiblePerson;
/**
* 签字时间
*/
private Date approveDate1;
/**
* 是否同意准入
*/
private String isagree;
/**
* 商务经理
*/
private String businessManager;
/**
* 项目经理
*/
private String projectManager;
/**
* 采购部门负责人
*/
private String purchasePrincipal;
/**
* 上级公司代码
*/
private String upperCompanyCode;
/**
* 劳务队伍标志
*/
private String serviceTeamLogo;
/**
* 劳务队长身份证号
*/
private String laborCaptainIdcard;
/**
* 劳务队长联系电话
*/
private String laborCaptainPhone;
/**
* 队伍规模人数
*/
private Double serviceTeamPersonnum;
/**
* 专业特长
*/
private String serviceTeamSpeciality;
/**
* 二级市场企业编码
*/
private String secondaryCode;
/**
* 商务经理签字时间
*/
private Date approveDate3;
/**
* 项目经理签字时间
*/
private Date approveDate4;
/**
* 业务流程状态
*/
private String flowState;
/**
* 是否为进京劳务企业
*/
private String isenterbjlaborcomany;
/**
* 施工队长资格证到期时间6
*/
private String expireDate6;
/**
* 授权委托书到期时间7
*/
private String expireDate7;
/**
* 考评等级
*/
private String creditLevel;
/**
* 数据标志
*/
private String baseLogo;
/**
* 推荐项目
*/
private String recommendProject;
/**
* 推荐项目ID
*/
private String recommendProjectId;
/**
* 客商推荐时间
*/
private Date recommendDate;
/**
* 资质证书号
*/
private String aptitudeCard;
/**
* 安全生产许可证号
*/
private String workSafetyLicense;
/**
* 主表
*/
private String masterId;
/**
* 纳税人身份
*/
private String paytaxType;
/**
* 纳税人税率
*/
private String taxRate;
/**
* 身份信息选择
*/
private String cardType;
/**
* 客商分数
*/
private Double customerScore;
/**
* 客商名称2
*/
private String customerName2;
/**
* 客商名称3
*/
private String customerName3;
/**
* 客商名称4
*/
private String customerName4;
/**
* 国家
*/
private String country;
/**
* 一体化客商类型
*/
private String finCustomerType;
/**
* 公司编码
*/
private String companyCode;
/**
* 业主性质
*/
private String ownerKind;
/**
* 客商性质
*/
private String customerKind;
/**
* 数据来源
*/
private String dataSource;
/**
* 是否业主
*/
private String isowner;
/**
* 是否供应商
*/
private String iscustomer;
/**
* 地址1
*/
private String abbrName1;
/**
* 地址2
*/
private String abbrName2;
/**
* 税率类型
*/
private String taxType;
/**
* 是否冻结
*/
private String isfreeze;
/**
* 数据变化时间
*/
private String updateDate;
/**
* 数据更新时间
*/
private Date loadTime;
}
package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.DCustomer;
/**
* 组织维表(DCustomer)表数据库访问层
*
* @author lcl
* @since 2023-12-08 14:57:27
*/
public interface DCustomerMapper extends BaseMapper<DCustomer> {
}
package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.DCustomer;
/**
* 组织维表(DCustomer)表服务接口
*
* @author lcl
* @since 2023-12-08 14:57:26
*/
public interface IDCustomerService extends IService<DCustomer> {
}
package com.dsk.cscec.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.mapper.DCustomerMapper;
import com.dsk.cscec.domain.DCustomer;
import com.dsk.cscec.service.IDCustomerService;
import org.springframework.stereotype.Service;
/**
* 组织维表(DCustomer)表服务实现类
*
* @author lcl
* @since 2023-12-08 14:57:26
*/
@Service
public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService {
}
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsk.cscec.mapper.DCustomerMapper">
</mapper>
\ No newline at end of file
......@@ -221,6 +221,7 @@ li {
}
.app-container {
position: absolute;
width: 100%;
height: 100%;
background-color: #f5f5f5;
......
......@@ -28,10 +28,10 @@ export default {
<style lang="scss" scoped>
.app-main {
position: relative;
height: calc(100% - 56px);
min-height: calc(100% - 56px);
width: 100%;
background: #f5f5f5;
overflow: hidden;
overflow: auto;
}
.fixed-header + .app-main {
......@@ -40,7 +40,7 @@ export default {
.hasTagsView {
.app-main {
height: calc(100% - 56px);
min-height: calc(100% - 56px);
min-width: 1240px;
}
......
......@@ -96,7 +96,6 @@ export default {
position: relative;
height: 100%;
width: 100%;
overflow: hidden;
&.mobile.openSidebar {
position: fixed;
......
......@@ -2,21 +2,11 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="组织名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入组织名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.deptName" placeholder="请输入组织名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="组织状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
......@@ -27,40 +17,21 @@
<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="['system:dept:add']"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dept:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠</el-button>
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="deptList"
row-key="deptId"
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="deptName" label="组织名称" width="260"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
......@@ -70,28 +41,10 @@
</el-table-column>
<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="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']"
>新增</el-button>
<el-button
v-if="scope.row.parentId != 0"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dept:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
<el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:dept:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -139,11 +92,7 @@
<el-col :span="12">
<el-form-item label="组织状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
......@@ -154,10 +103,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog
title="验证信息"
:visible.sync="yanzheng"
width="30%">
<el-dialog title="验证信息" :visible.sync="yanzheng" width="30%">
<div class="phonecont">
<div class="p1"><i class="el-icon-warning"></i>手机号码验证</div>
<div>已经向<font color="orange">{{phone}}</font>发送验证码,请注意查收</div>
......@@ -181,7 +127,7 @@
<script>
import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import {captchaSms,checkSmsCode} from '@/api/login'
import { captchaSms, checkSmsCode } from '@/api/login';
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
......@@ -190,10 +136,10 @@ export default {
components: { Treeselect },
data() {
return {
yanzheng:false,
phone:'',
yzm:'',
deptId:'',
yanzheng: false,
phone: '',
yzm: '',
deptId: '',
// 遮罩层
loading: true,
// 显示搜索条件
......@@ -247,7 +193,7 @@ export default {
},
created() {
this.getList();
this.phone = this.$store.state.user.phonenumber
this.phone = this.$store.state.user.phonenumber;
},
methods: {
/** 查询组织列表 */
......@@ -334,27 +280,27 @@ export default {
});
},
/** 提交按钮 */
submitForm: function() {
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deptId != undefined) {
updateDept(this.form).then(response => {
if(response.code == 200){
if (response.code == 200) {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}else{
this.$modal.msgError(response.msg)
} else {
this.$modal.msgError(response.msg);
}
});
} else {
addDept(this.form).then(response => {
if(response.code == 200){
if (response.code == 200) {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}else{
this.$modal.msgError(response.msg)
} else {
this.$modal.msgError(response.msg);
}
});
}
......@@ -363,40 +309,40 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
this.deptId = row.deptId
let islast = true
let txt = '是否确认删除名称为"' + row.deptName + '"的组织?'
if((row.children && row.children.length>0) || row.existUsers == true){//该组织下还有数据
islast = false
txt='是否删除该组织及该组织包含的所有人员?'
this.deptId = row.deptId;
let islast = true;
let txt = '是否确认删除名称为"' + row.deptName + '"的组织?';
if ((row.children && row.children.length > 0) || row.existUsers == true) {//该组织下还有数据
islast = false;
txt = '是否删除该组织及该组织包含的所有人员?';
}
let _this = this
let _this = this;
this.$confirm(txt, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if(islast){
delDept(row.deptId).then(res=>{
if(res.code == 200){
if (islast) {
delDept(row.deptId).then(res => {
if (res.code == 200) {
_this.getList();
_this.$modal.msgSuccess("删除成功");
}else{
this.$message.warning('删除失败!')
} else {
this.$message.warning('删除失败!');
}
}).catch(res=>{
this.$message.warning(res.msg)
})
}else{
}).catch(res => {
this.$message.warning(res.msg);
});
} else {
//发送验证码
captchaSms().then(res=>{
if(res.code == 200){
this.yanzheng = true
this.$message.success('短信验证码已发送')
}else{
this.$message.warning('验证码发送失败')
captchaSms().then(res => {
if (res.code == 200) {
this.yanzheng = true;
this.$message.success('短信验证码已发送');
} else {
this.$message.warning('验证码发送失败');
}
})
});
}
}).catch(() => {
this.$message({
......@@ -405,55 +351,59 @@ export default {
});
});
},
cancel1(){
this.yzm = ''
this.yanzheng = false
cancel1() {
this.yzm = '';
this.yanzheng = false;
},
subyzm(){
subyzm() {
//验证验证码
let param = {
smsCode:this.yzm
}
checkSmsCode(param).then(res=>{
if(res.code == 200){
delDept(this.deptId).then(res=>{
if(res.code == 200){
this.yzm = ''
this.yanzheng = false
smsCode: this.yzm
};
checkSmsCode(param).then(res => {
if (res.code == 200) {
delDept(this.deptId).then(res => {
if (res.code == 200) {
this.yzm = '';
this.yanzheng = false;
this.$message({
type: 'success',
message: '删除成功!'
});
this.getList()
}else{
this.$message.warning('删除失败!')
this.getList();
} else {
this.$message.warning('删除失败!');
}
}).catch(res=>{
this.$message.warning(res.msg)
})
}else{
this.$message.warning(res.msg)
}).catch(res => {
this.$message.warning(res.msg);
});
} else {
this.$message.warning(res.msg);
}
}).catch(res=>{
this.$message.warning(res.msg)
})
}).catch(res => {
this.$message.warning(res.msg);
});
},
}
};
</script>
<style lang="scss" scoped>
.phonecont{
.dept-container {
width: 100%;
height: 100%;
}
.phonecont {
padding-bottom: 20px;
.p1{
.el-icon-warning{
.p1 {
.el-icon-warning {
color: #f8ac59;
margin-right: 5px;
}
font-size: 18px;
}
>div{
> div {
line-height: 36px;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment