lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客户信息 供应商信息 修改 提交 编码无重复校验修改 导出内容修改 页面显示内容修改

Browse Source
This commit is contained in:
liuhanqing
2025-10-17 14:23:04 +08:00
parent 37e5363253
commit 41d73152d6
8 changed files with 142 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java
View File

@@ -23,7 +23,7 @@ public class BasCustomer extends BaseEntity
private String customerNo; private String customerNo;
/** 客户基本分类 */ /** 客户基本分类 */
@Excel(name = "客户基本分类") // @Excel(name = "客户基本分类")
private String customerGroupNo; private String customerGroupNo;
/** 客户名称 */ /** 客户名称 */
@@ -38,62 +38,86 @@ public class BasCustomer extends BaseEntity
@Excel(name = "是否可用",dictType = "is_available") @Excel(name = "是否可用",dictType = "is_available")
private String useable; private String useable;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 业务部门 */ /** 业务部门 */
@Excel(name = "业务部门") //@Excel(name = "业务部门")
private String businessDepartment; private String businessDepartment;
/** 业务员 */ /** 业务员 */
@Excel(name = "业务员") //@Excel(name = "业务员")
private String salesman; private String salesman;
/** 助忆码 */ /** 助忆码 */
@Excel(name = "助忆码") //@Excel(name = "助忆码")
private String mnemonicCode; private String mnemonicCode;
/** 客户类型 */ /** 客户类型 */
@Excel(name = "客户类型") //@Excel(name = "客户类型")
private String type; private String type;
/** 纳税人登记号 */ /** 纳税人登记号 */
@Excel(name = "纳税人登记号") //@Excel(name = "纳税人登记号")
private String taxpayerRegistrationNumber; private String taxpayerRegistrationNumber;
/** 对应财务组织 */ /** 对应财务组织 */
@Excel(name = "对应财务组织") //@Excel(name = "对应财务组织")
private String organization; private String organization;
/** 上级客户 */ /** 上级客户 */
@Excel(name = "上级客户") //@Excel(name = "上级客户")
private String supCustomer; private String supCustomer;
/** 散户 */ /** 散户 */
@Excel(name = "散户") //@Excel(name = "散户")
private String retailInvestor; private String retailInvestor;
/** 国家/地区 */ /** 国家/地区 */
@Excel(name = "国家/地区") //@Excel(name = "国家/地区")
private String country; private String country;
/** 时区 */ /** 时区 */
@Excel(name = "时区") //@Excel(name = "时区")
private String timeZone; private String timeZone;
/** 数据格式 */ /** 数据格式 */
@Excel(name = "数据格式") //@Excel(name = "数据格式")
private String dataFormat; private String dataFormat;
/** 联系人姓名 */ /** 联系人姓名 */
@Excel(name = "联系人姓名") //@Excel(name = "联系人姓名")
private String contactName; private String contactName;
/** 发货国家 */ /** 发货国家 */
@Excel(name = "发货国家") //@Excel(name = "发货国家")
private String shipment; private String shipment;
/** 税类 */ /** 税类 */
@Excel(name = "税类") //@Excel(name = "税类")
private String taxCategory; private String taxCategory;
private String updateId;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getUpdateId() {
return updateId;
}
public void setUpdateId(String updateId) {
this.updateId = updateId;
}
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;

14
ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/service/impl/BasCustomerServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.bas.BasCustomer.service.impl; package com.ruoyi.bas.BasCustomer.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.bas.BasCustomer.domain.BasCustomer; import com.ruoyi.bas.BasCustomer.domain.BasCustomer;
import com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper; import com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper;
import com.ruoyi.bas.BasCustomer.service.IBasCustomerService; import com.ruoyi.bas.BasCustomer.service.IBasCustomerService;
@@ -53,6 +54,12 @@ public class BasCustomerServiceImpl implements IBasCustomerService
@Override @Override
public int insertBasCustomer(BasCustomer basCustomer) public int insertBasCustomer(BasCustomer basCustomer)
{ {
BasCustomer basCustomerParam = new BasCustomer();
basCustomerParam.setCustomerNo(basCustomer.getCustomerNo());
List<BasCustomer> basCustomers = basCustomerMapper.selectBasCustomerList(basCustomerParam);
if (CollUtil.isNotEmpty(basCustomers)){
throw new RuntimeException("客户编号已存在");
}
return basCustomerMapper.insertBasCustomer(basCustomer); return basCustomerMapper.insertBasCustomer(basCustomer);
} }
@@ -65,6 +72,13 @@ public class BasCustomerServiceImpl implements IBasCustomerService
@Override @Override
public int updateBasCustomer(BasCustomer basCustomer) public int updateBasCustomer(BasCustomer basCustomer)
{ {
BasCustomer basCustomerParam = new BasCustomer();
basCustomerParam.setCustomerNo(basCustomer.getCustomerNo());
basCustomerParam.setUpdateId(basCustomer.getId());
List<BasCustomer> basCustomers = basCustomerMapper.selectBasCustomerList(basCustomerParam);
if (CollUtil.isNotEmpty(basCustomers)){
throw new RuntimeException("客户编号已存在");
}
return basCustomerMapper.updateBasCustomer(basCustomer); return basCustomerMapper.updateBasCustomer(basCustomer);
} }

50
ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java
View File

@@ -23,7 +23,6 @@ public class BasSupplier extends BaseEntity
private String supplierNo; private String supplierNo;
/** 供应商名称 */ /** 供应商名称 */
@Excel(name = "供应商名称")
private String supplierGroupNo; private String supplierGroupNo;
/** 供应商名称 */ /** 供应商名称 */
@@ -38,54 +37,79 @@ public class BasSupplier extends BaseEntity
@Excel(name = "是否可用",dictType = "is_available") @Excel(name = "是否可用",dictType = "is_available")
private String useable; private String useable;
@Excel(name = "备注")
private String remark;
/** 地区分类 */ /** 地区分类 */
@Excel(name = "地区分类") //@Excel(name = "地区分类")
private String supplierArae; private String supplierArae;
/** 纳税人登记号 */ /** 纳税人登记号 */
@Excel(name = "纳税人登记号") //@Excel(name = "纳税人登记号")
private String taxpayerRegistrationNumber; private String taxpayerRegistrationNumber;
/** 国家 */ /** 国家 */
@Excel(name = "国家") //@Excel(name = "国家")
private String country; private String country;
/** 时区 */ /** 时区 */
@Excel(name = "时区") //@Excel(name = "时区")
private String timeZone; private String timeZone;
/** 数据格式 */ /** 数据格式 */
@Excel(name = "数据格式") //@Excel(name = "数据格式")
private String dataFormat; private String dataFormat;
/** 收货国家 */ /** 收货国家 */
@Excel(name = "收货国家") //@Excel(name = "收货国家")
private String receivingCountry; private String receivingCountry;
/** 税类 */ /** 税类 */
@Excel(name = "税类") //@Excel(name = "税类")
private String taxCategory; private String taxCategory;
/** 法人 */ /** 法人 */
@Excel(name = "法人") //@Excel(name = "法人")
private String legalPerson; private String legalPerson;
/** 注册资金 */ /** 注册资金 */
@Excel(name = "注册资金") //@Excel(name = "注册资金")
private String registeredCapital; private String registeredCapital;
/** 企业地址 */ /** 企业地址 */
@Excel(name = "企业地址") //@Excel(name = "企业地址")
private String address; private String address;
/** 联系人姓名 */ /** 联系人姓名 */
@Excel(name = "联系人姓名") //@Excel(name = "联系人姓名")
private String contactName; private String contactName;
/** 联系电话 */ /** 联系电话 */
@Excel(name = "联系电话") //@Excel(name = "联系电话")
private String contactNumber; private String contactNumber;
private String updateId;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getUpdateId() {
return updateId;
}
public void setUpdateId(String updateId) {
this.updateId = updateId;
}
public void setId(String id) public void setId(String id)
{ {
this.id = id; this.id = id;

14
ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/service/impl/BasSupplierServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.bas.BasSupplier.service.impl; package com.ruoyi.bas.BasSupplier.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.bas.BasSupplier.domain.BasSupplier; import com.ruoyi.bas.BasSupplier.domain.BasSupplier;
import com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper; import com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper;
import com.ruoyi.bas.BasSupplier.service.IBasSupplierService; import com.ruoyi.bas.BasSupplier.service.IBasSupplierService;
@@ -53,6 +54,12 @@ public class BasSupplierServiceImpl implements IBasSupplierService
@Override @Override
public int insertBasSupplier(BasSupplier basSupplier) public int insertBasSupplier(BasSupplier basSupplier)
{ {
BasSupplier basSupplierParam = new BasSupplier();
basSupplierParam.setSupplierNo(basSupplier.getSupplierNo());
List<BasSupplier> basSuppliers = basSupplierMapper.selectBasSupplierList(basSupplierParam);
if (CollUtil.isNotEmpty(basSuppliers)) {
throw new RuntimeException("供应商编码已存在");
}
return basSupplierMapper.insertBasSupplier(basSupplier); return basSupplierMapper.insertBasSupplier(basSupplier);
} }
@@ -65,6 +72,13 @@ public class BasSupplierServiceImpl implements IBasSupplierService
@Override @Override
public int updateBasSupplier(BasSupplier basSupplier) public int updateBasSupplier(BasSupplier basSupplier)
{ {
BasSupplier basSupplierParam = new BasSupplier();
basSupplierParam.setSupplierNo(basSupplier.getSupplierNo());
basSupplierParam.setUpdateId(basSupplier.getId());
List<BasSupplier> basSuppliers = basSupplierMapper.selectBasSupplierList(basSupplierParam);
if (CollUtil.isNotEmpty(basSuppliers)) {
throw new RuntimeException("供应商编码已存在");
}
return basSupplierMapper.updateBasSupplier(basSupplier); return basSupplierMapper.updateBasSupplier(basSupplier);
} }

13
ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper"> <mapper namespace="com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper">
<resultMap type="BasCustomer" id="BasCustomerResult"> <resultMap type="BasCustomer" id="BasCustomerResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="customerNo" column="customer_no" /> <result property="customerNo" column="customer_no" />
@@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasCustomerList" parameterType="BasCustomer" resultMap="BasCustomerResult"> <select id="selectBasCustomerList" parameterType="BasCustomer" resultMap="BasCustomerResult">
<include refid="selectBasCustomerVo"/> <include refid="selectBasCustomerVo"/>
<where> <where>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if> <if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="customerGroupNo != null and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if> <if test="customerGroupNo != null and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if> <if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if> <if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
@@ -54,9 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if> <if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
<if test="shipment != null and shipment != ''"> and shipment like concat('%', #{shipment}, '%')</if> <if test="shipment != null and shipment != ''"> and shipment like concat('%', #{shipment}, '%')</if>
<if test="taxCategory != null and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if> <if test="taxCategory != null and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
<if test="updateId != null and updateId != ''"> and id != #{updateId}</if>
</where> </where>
</select> </select>
<select id="selectBasCustomerById" parameterType="String" resultMap="BasCustomerResult"> <select id="selectBasCustomerById" parameterType="String" resultMap="BasCustomerResult">
<include refid="selectBasCustomerVo"/> <include refid="selectBasCustomerVo"/>
where id = #{id} where id = #{id}
@@ -144,9 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteBasCustomerByIds" parameterType="String"> <delete id="deleteBasCustomerByIds" parameterType="String">
delete from bas_customer where id in delete from bas_customer where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

14
ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper"> <mapper namespace="com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper">
<resultMap type="BasSupplier" id="BasSupplierResult"> <resultMap type="BasSupplier" id="BasSupplierResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="supplierNo" column="supplier_no" /> <result property="supplierNo" column="supplier_no" />
@@ -32,8 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasSupplierList" parameterType="BasSupplier" resultMap="BasSupplierResult"> <select id="selectBasSupplierList" parameterType="BasSupplier" resultMap="BasSupplierResult">
<include refid="selectBasSupplierVo"/> <include refid="selectBasSupplierVo"/>
<where> <where>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if> <if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="supplierGroupNo != null and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if> <if test="supplierGroupNo != null and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if> <if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if> <if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
@@ -50,9 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if> <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if> <if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
<if test="contactNumber != null and contactNumber != ''"> and contact_number = like concat('%',#{contactNumber}, '%')</if> <if test="contactNumber != null and contactNumber != ''"> and contact_number = like concat('%',#{contactNumber}, '%')</if>
<if test="updateId != null and updateId != ''"> and id != #{updateId} </if>
</where> </where>
order by id desc
</select> </select>
<select id="selectBasSupplierById" parameterType="String" resultMap="BasSupplierResult"> <select id="selectBasSupplierById" parameterType="String" resultMap="BasSupplierResult">
<include refid="selectBasSupplierVo"/> <include refid="selectBasSupplierVo"/>
where id = #{id} where id = #{id}
@@ -134,9 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteBasSupplierByIds" parameterType="String"> <delete id="deleteBasSupplierByIds" parameterType="String">
delete from bas_supplier where id in delete from bas_supplier where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

22
ruoyi-ui/src/views/bas/basCustomer/index.vue
View File

@@ -44,18 +44,18 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange" max-height="700"> <el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" align="center" />
<el-table-column width="120" label="客户编号" align="left" prop="customerNo" /> <el-table-column label="客户编号" align="left" prop="customerNo" />
<el-table-column width="120" label="客户类别" align="left" prop="customerGroupNo" /> <!-- <el-table-column label="客户类别" align="left" prop="customerGroupNo" /> -->
<el-table-column width="220" label="客户名称" align="left" prop="customerName" /> <el-table-column label="客户名称" align="left" prop="customerName" />
<el-table-column width="120" label="简称" align="left" prop="simpleName" /> <el-table-column label="简称" align="left" prop="simpleName" />
<el-table-column width="120" label="是否可用" align="left" prop="useable" > <el-table-column label="是否可用" align="left" prop="useable" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/> <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" label="备注" align="left" prop="remark" /> <el-table-column label="备注" align="left" prop="remark" />
<el-table-column width="120" label="业务部门" align="left" prop="businessDepartment" /> <!-- <el-table-column width="120" label="业务部门" align="left" prop="businessDepartment" />
<el-table-column width="120" label="业务员" align="left" prop="salesman" /> <el-table-column width="120" label="业务员" align="left" prop="salesman" />
<el-table-column width="120" label="助记码" align="left" prop="mnemonicCode" /> <el-table-column width="120" label="助记码" align="left" prop="mnemonicCode" />
<el-table-column width="120" label="客户类型" align="left" prop="type" /> <el-table-column width="120" label="客户类型" align="left" prop="type" />
@@ -68,7 +68,7 @@
<el-table-column width="120" label="数据格式" align="left" prop="dataFormat" /> <el-table-column width="120" label="数据格式" align="left" prop="dataFormat" />
<el-table-column width="120" label="联系人" align="left" prop="contactName" /> <el-table-column width="120" label="联系人" align="left" prop="contactName" />
<el-table-column width="120" label="装运国家" align="left" prop="shipment" /> <el-table-column width="120" label="装运国家" align="left" prop="shipment" />
<el-table-column width="120" label="税种" align="left" prop="taxCategory" /> <el-table-column width="120" label="税种" align="left" prop="taxCategory" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bas:BasCustomer:edit']">修改</el-button>
@@ -110,7 +110,7 @@
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="业务部门" prop="businessDepartment"> <!-- <el-form-item label="业务部门" prop="businessDepartment">
<el-input v-model="form.businessDepartment" placeholder="请输入业务部门" /> <el-input v-model="form.businessDepartment" placeholder="请输入业务部门" />
</el-form-item> </el-form-item>
<el-form-item label="业务员" prop="salesman"> <el-form-item label="业务员" prop="salesman">
@@ -151,7 +151,7 @@
</el-form-item> </el-form-item>
<el-form-item label="税种" prop="taxCategory"> <el-form-item label="税种" prop="taxCategory">
<el-input v-model="form.taxCategory" placeholder="请输入税种" /> <el-input v-model="form.taxCategory" placeholder="请输入税种" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button> <el-button type="primary" @click="submitForm">确定</el-button>

24
ruoyi-ui/src/views/bas/basSupplier/index.vue
View File

@@ -194,17 +194,17 @@
<el-table v-loading="loading" :data="BasSupplierList" @selection-change="handleSelectionChange" max-height="700"> <el-table v-loading="loading" :data="BasSupplierList" @selection-change="handleSelectionChange" max-height="700">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="供应商编号" align="left" prop="supplierNo" width="120" /> <el-table-column label="供应商编号" align="left" prop="supplierNo" />
<el-table-column label="供应商组" align="left" prop="supplierGroupNo" width="120" /> <!-- <el-table-column label="供应商组" align="left" prop="supplierGroupNo" /> -->
<el-table-column label="供应商名称" align="left" prop="supplierName" width="120" /> <el-table-column label="供应商名称" align="left" prop="supplierName" />
<el-table-column label="简称" align="left" prop="simpleName" width="120" /> <el-table-column label="简称" align="left" prop="simpleName" />
<el-table-column label="是否可用" align="left" prop="useable" width="120" > <el-table-column label="是否可用" align="left" prop="useable" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/> <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="left" prop="remark" width="120" /> <el-table-column label="备注" align="left" prop="remark" />
<el-table-column label="地区" align="left" prop="supplierArae" width="120" /> <!-- <el-table-column label="地区" align="left" prop="supplierArae" width="120" />
<el-table-column label="纳税人登记号" align="left" prop="taxpayerRegistrationNumber" width="120" /> <el-table-column label="纳税人登记号" align="left" prop="taxpayerRegistrationNumber" width="120" />
<el-table-column label="国家" align="left" prop="country" width="120" /> <el-table-column label="国家" align="left" prop="country" width="120" />
<el-table-column label="时区" align="left" prop="timeZone" width="120" /> <el-table-column label="时区" align="left" prop="timeZone" width="120" />
@@ -215,7 +215,7 @@
<el-table-column label="注册资本" align="right" prop="registeredCapital" width="120" /> <el-table-column label="注册资本" align="right" prop="registeredCapital" width="120" />
<el-table-column label="地址" align="left" prop="address" width="120" /> <el-table-column label="地址" align="left" prop="address" width="120" />
<el-table-column label="联系人" align="left" prop="contactName" width="120" /> <el-table-column label="联系人" align="left" prop="contactName" width="120" />
<el-table-column label="联系电话" align="left" prop="contactNumber" width="120" /> <el-table-column label="联系电话" align="left" prop="contactNumber" width="120" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -250,9 +250,9 @@
<el-form-item label="供应商编号" prop="supplierNo"> <el-form-item label="供应商编号" prop="supplierNo">
<el-input v-model="form.supplierNo" placeholder="请输入供应商编号" /> <el-input v-model="form.supplierNo" placeholder="请输入供应商编号" />
</el-form-item> </el-form-item>
<el-form-item label="供应商组编号" prop="supplierGroupNo"> <!-- <el-form-item label="供应商组编号" prop="supplierGroupNo">
<el-input v-model="form.supplierGroupNo" placeholder="请输入供应商组编号" /> <el-input v-model="form.supplierGroupNo" placeholder="请输入供应商组编号" />
</el-form-item> </el-form-item> -->
<el-form-item label="供应商名称" prop="supplierName"> <el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" /> <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item> </el-form-item>
@@ -272,7 +272,7 @@
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<el-form-item label="地区" prop="supplierArae"> <!-- <el-form-item label="地区" prop="supplierArae">
<el-input v-model="form.supplierArae" placeholder="请输入地区" /> <el-input v-model="form.supplierArae" placeholder="请输入地区" />
</el-form-item> </el-form-item>
<el-form-item label="纳税人登记号" prop="taxpayerRegistrationNumber"> <el-form-item label="纳税人登记号" prop="taxpayerRegistrationNumber">
@@ -307,7 +307,7 @@
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="contactNumber"> <el-form-item label="联系电话" prop="contactNumber">
<el-input v-model="form.contactNumber" placeholder="请输入联系电话" /> <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button> <el-button type="primary" @click="submitForm">确定</el-button>