Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c1bc517820
|
|
@ -114,7 +114,7 @@
|
|||
|
||||
<select id="selectPutInListList" resultType="com.bonus.sgzb.app.domain.PurchaseCheckInfo">
|
||||
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
|
||||
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName,
|
||||
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.nick_name purchaserName,
|
||||
tk.create_by
|
||||
from purchase_check_info pci
|
||||
left join tm_task tk on pci.task_id = tk.task_id
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="deptName" column="dept_name" />
|
||||
<result property="typeName" column="name" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="userName" column="user_name" />
|
||||
<result property="userName" column="nick_name" />
|
||||
</resultMap>
|
||||
<resultMap type="com.bonus.sgzb.system.api.domain.SysUser" id="UsersResult">
|
||||
<id property="userId" column="user_id" />
|
||||
<result property="userName" column="user_name" />
|
||||
<result property="userName" column="nick_name" />
|
||||
</resultMap>
|
||||
<sql id="bmUnitInfo">
|
||||
select unit_id, unit_name, status, type_id, link_man, telphone, dept_id, del_flag, create_by, create_time,
|
||||
|
|
@ -93,19 +93,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</if>
|
||||
</select>
|
||||
<select id="getUserAll" resultMap="UsersResult">
|
||||
select user_id id,user_name name
|
||||
select user_id id,nick_name name
|
||||
from sys_user
|
||||
where
|
||||
<if test="userId != null and userId != ''">
|
||||
user_id = #{userId}
|
||||
</if>
|
||||
<if test="userName != null and userName != ''">
|
||||
AND user_name like concat('%', #{userName}, '%')
|
||||
AND nick_name like concat('%', #{userName}, '%')
|
||||
</if>
|
||||
</select>
|
||||
<select id="selectTypeList" parameterType="com.bonus.sgzb.base.domain.BmUnitInfo" resultMap="BmUnitInfoResult">
|
||||
SELECT a.unit_id, a.unit_name, a.status, a.type_id, a.link_man, a.telphone, a.dept_id, a.del_flag, a.create_by,
|
||||
a.create_time, a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name, be.user_id, cf.user_name
|
||||
a.create_time, a.update_by, a.update_time, a.remark, a.company_id, b.dept_name, c.name, be.user_id, cf.nick_name
|
||||
FROM bm_unit_info a
|
||||
LEFT JOIN sys_dept b ON a.dept_id = b.dept_id
|
||||
LEFT JOIN sys_dic c ON a.type_id = c.id
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<result property="isBind" column="is_bind" />
|
||||
<result property="name" column="name" />
|
||||
<result property="bindTime" column="bind_time" />
|
||||
<result property="userName" column="user_name" />
|
||||
<result property="userName" column="nick_name" />
|
||||
<result property="id" column="id" />
|
||||
</resultMap>
|
||||
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<select id="selectMaLabelBindList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
|
||||
SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
|
||||
mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name
|
||||
FROM ma_machine_label b
|
||||
left join ma_label_bind a on a.ma_id = b.ma_id
|
||||
LEFT JOIN ma_type mt ON a.type_id = mt.type_id
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
|
||||
SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
|
||||
mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
|
||||
mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.nick_name
|
||||
FROM ma_machine_label b
|
||||
left join ma_label_bind a on a.ma_id = b.ma_id
|
||||
LEFT JOIN ma_type mt ON a.type_id = mt.type_id
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
||||
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
||||
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
||||
su.user_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||
m.remark, m.company_id ,m.type_id id , m.type_name label
|
||||
from ma_type m
|
||||
left join ma_prop_set mps on m.type_id = mps.type_id
|
||||
|
|
@ -277,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
||||
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
||||
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
||||
su.user_name keeperUserName, mtr.user_id repairUserId, su1.user_name repairUserName, mpi.prop_name,
|
||||
su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName, mpi.prop_name,
|
||||
m.del_flag, m.create_by, m.create_time,
|
||||
m.remark, m.company_id
|
||||
from ma_type m
|
||||
|
|
@ -333,7 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
m.lease_price,m.rent_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
|
||||
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
|
||||
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
|
||||
su.user_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
|
||||
m.remark, m.company_id
|
||||
from ma_type m
|
||||
left join ma_prop_set mps on m.type_id = mps.type_id
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
m.pay_price,
|
||||
m.remark,
|
||||
e.prop_name,
|
||||
us.user_name as keeperUserName,
|
||||
us.nick_name as keeperUserName,
|
||||
mtf.file_name photoName,
|
||||
mtf.file_url photoUrl,
|
||||
mtf2.file_name documentName,
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<select id="getMaintenanceGangInfoAll" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
|
||||
SELECT mt.type_id as modelId ,mt.type_name as modelName,
|
||||
mt2.type_id, mt2.type_name ,
|
||||
mt2.type_id, mt2.type_name,
|
||||
mt3.type_id as typeId,mt3.type_name as typeName,
|
||||
mt3.type_id as kindId,mt4.type_name as kindName,
|
||||
su.user_id as userId, su.user_name as userName
|
||||
su.user_id as userId, su.nick_name as userName
|
||||
FROM ma_type mt
|
||||
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
|
||||
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
|
||||
|
|
@ -34,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
|
||||
LEFT JOIN sys_user su ON su.user_id = mtk.user_id
|
||||
WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
|
||||
|
||||
<if test="typeName != null and typeName != ''">
|
||||
AND mt3.type_name like concat('%', #{typeName}, '%')
|
||||
</if>
|
||||
|
|
@ -42,12 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
|
||||
SELECT su.user_id as userId, su.user_name as userName FROM `sys_user` su
|
||||
SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
|
||||
LEFT JOIN sys_user_role sur ON su.user_id = sur.user_id
|
||||
LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
|
||||
WHERE sr.role_id = '102' AND su.del_flag = '0'
|
||||
<if test="userName != null and userName != ''">
|
||||
AND su.user_name like concat('%', #{userName}, '%')
|
||||
AND su.nick_name like concat('%', #{userName}, '%')
|
||||
</if>
|
||||
ORDER BY su.user_id DESC
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
tt.CODE AS repairCode,
|
||||
bui.unit_name AS backUnit,
|
||||
bpi.lot_name AS backPro,
|
||||
su.user_name AS createName,
|
||||
su.nick_name AS createName,
|
||||
tt.create_time AS createTime,
|
||||
bai.CODE AS backCode,
|
||||
sd.name AS repairStatus,
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
left join sys_dic sd on sd.id = tt.task_status
|
||||
where 1=1
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, su.user_name) > 0
|
||||
AND (locate(#{keyword}, su.nick_name) > 0
|
||||
or locate(#{keyword}, tt.CODE) > 0)
|
||||
</if>
|
||||
<if test="backUnit != null and backUnit != ''">
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
||||
AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
|
||||
</if>
|
||||
GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.user_name
|
||||
GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.nick_name
|
||||
order by tt.create_time desc
|
||||
</select>
|
||||
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
tt.CODE AS repairCode,
|
||||
bui.unit_name AS backUnit,
|
||||
bpi.lot_name AS backPro,
|
||||
su.user_name AS createName,
|
||||
su.nick_name AS createName,
|
||||
tt.create_time AS createTime,
|
||||
bai.CODE AS backCode,
|
||||
sd.NAME AS repairStatus,
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
rd.repaired_num AS repairedNum,
|
||||
rd.scrap_num AS scrapNum,
|
||||
case rd.status when '0' then '未完成' when '1' then '已完成' else '' end as status,
|
||||
su2.user_name as repairer,
|
||||
su2.nick_name as repairer,
|
||||
rd.update_time as updateTime
|
||||
FROM
|
||||
repair_apply_details rd
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id
|
||||
where 1=1
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, su.user_name) > 0
|
||||
AND (locate(#{keyword}, su.nick_name) > 0
|
||||
or locate(#{keyword}, tt.CODE) > 0)
|
||||
</if>
|
||||
<if test="backUnit != null and backUnit != ''">
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
rad.repaired_num as repairedNum,
|
||||
rad.scrap_num as scrapNum,
|
||||
rad.status as status,
|
||||
su.user_name as repairer,
|
||||
su.nick_name as repairer,
|
||||
rad.update_time as updateTime,
|
||||
rad.type_id as typeId
|
||||
from repair_apply_details rad
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
where rad.task_id = #{taskId} and rad.company_id = #{companyId}
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, mm.ma_code) > 0
|
||||
or locate(#{keyword}, su.user_name) > 0
|
||||
or locate(#{keyword}, su.nick_name) > 0
|
||||
or locate(#{keyword}, mt2.type_name) > 0
|
||||
or locate(#{keyword}, mt.type_name) > 0)
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mt2.type_id, mt2.type_name ,
|
||||
mt3.type_id as typeId,mt3.type_name as typeName,
|
||||
mt3.type_id as kindId,mt4.type_name as kindName,
|
||||
su.user_id as userId, su.user_name as userName
|
||||
su.user_id as userId, su.nick_name as userName
|
||||
FROM ma_type mt
|
||||
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
|
||||
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
|
||||
|
|
@ -42,12 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">
|
||||
SELECT su.user_id as userId, su.user_name as userName FROM `sys_user` su
|
||||
SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
|
||||
LEFT JOIN sys_user_role sur ON su.user_id = sur.user_id
|
||||
LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
|
||||
WHERE sr.role_id = '101' AND su.del_flag = '0'
|
||||
<if test="userName != null and userName != ''">
|
||||
AND su.user_name like concat('%', #{userName}, '%')
|
||||
AND su.nick_name like concat('%', #{userName}, '%')
|
||||
</if>
|
||||
ORDER BY su.user_id DESC
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ public class SltAgreementInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "根据条件获取协议结算列表")
|
||||
@GetMapping("/getSltAgreementInfo")
|
||||
public TableDataInfo getSltAgreementInfo(AgreementInfo bean)
|
||||
{
|
||||
public TableDataInfo getSltAgreementInfo(AgreementInfo bean) {
|
||||
startPage();
|
||||
List<AgreementInfo> list = new ArrayList<>();
|
||||
if (bean.getUnitId() == null && bean.getProjectId() == null && bean.getSltStatus()== null){
|
||||
|
|
@ -56,8 +55,7 @@ public class SltAgreementInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "根据协议获取结算清单")
|
||||
@PostMapping("/getSltInfo")
|
||||
public AjaxResult getSltInfo(@RequestBody List<AgreementInfo> list)
|
||||
{
|
||||
public AjaxResult getSltInfo(@RequestBody List<AgreementInfo> list) {
|
||||
SltInfoVo bean = service.getSltInfo(list);
|
||||
return AjaxResult.success(bean);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,5 +49,5 @@ public interface SltAgreementInfoMapper {
|
|||
|
||||
int updateApply(SltAgreementApply apply);
|
||||
|
||||
|
||||
int updateMaStatus(SltAgreementInfo agreementInfo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,6 +87,19 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
|
|||
int i = mapper.updateRelation(apply);
|
||||
int j = 0;
|
||||
if (i > 0){
|
||||
List<SltAgreementRelation> relations = mapper.getRelations(apply);
|
||||
List<AgreementInfo> infos = new ArrayList<>();
|
||||
for (SltAgreementRelation bean : relations){
|
||||
AgreementInfo info = new AgreementInfo();
|
||||
info.setAgreementId(Long.valueOf(bean.getAgreementId()));
|
||||
infos.add(info);
|
||||
}
|
||||
List<SltAgreementInfo> loseList = getLoseList(infos);
|
||||
for (SltAgreementInfo agreementInfo : loseList){
|
||||
if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()){
|
||||
mapper.updateMaStatus(agreementInfo);
|
||||
}
|
||||
}
|
||||
j = mapper.updateApply(apply);
|
||||
}else {
|
||||
throw new ServiceException("结算审核失败");
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
baif.`code`,
|
||||
mm.ma_code AS maCode,
|
||||
bcd.back_num AS backNum,
|
||||
su.user_name AS backPerson,
|
||||
su.nick_name AS backPerson,
|
||||
bcd.create_time AS createTime,
|
||||
bpl.lot_name AS proName,
|
||||
bui.unit_name AS unitName
|
||||
|
|
@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="keyWord != null and keyWord != ''">
|
||||
and (baif.`code` like concat('%',#{keyWord},'%') or
|
||||
mm.ma_code like concat('%',#{keyWord},'%') or
|
||||
su.user_name like concat('%',#{keyWord},'%'))
|
||||
su.nick_name like concat('%',#{keyWord},'%'))
|
||||
</if>
|
||||
<if test="typeName != null and typeName != ''">
|
||||
and mt2.type_name like concat('%',#{typeName},'%')
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mm.ma_code as maCode,
|
||||
mt.unit_name as unit,
|
||||
lod.out_num as preNum,
|
||||
su.user_name as leasePerson,
|
||||
su.nick_name as leasePerson,
|
||||
lod.create_time as createTime,
|
||||
bpl.lot_name as proName,
|
||||
bui.unit_name as unitName
|
||||
|
|
@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
and (bai.agreement_code like concat('%',#{keyWord},'%') or
|
||||
mm.ma_code like concat('%',#{keyWord},'%') or
|
||||
mt.unit_name like concat('%',#{keyWord},'%') or
|
||||
su.user_name like concat('%',#{keyWord},'%'))
|
||||
su.nick_name like concat('%',#{keyWord},'%'))
|
||||
</if>
|
||||
<if test="typeName != null and typeName != ''">
|
||||
and mt2.type_name like concat('%',#{typeName},'%')
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
|
||||
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
|
||||
pci.update_by,
|
||||
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,su.user_name
|
||||
pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,su.nick_name
|
||||
purchaserName,tk.task_status taskStatus
|
||||
from purchase_check_info pci
|
||||
left join tm_task tk on pci.task_id = tk.task_id
|
||||
|
|
@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where task_type = 23
|
||||
<if test="keyWord != null and keyWord != ''">
|
||||
and (tk.code like concat('%',#{keyWord},'%') or
|
||||
su.user_name like concat('%',#{keyWord},'%')
|
||||
su.nick_name like concat('%',#{keyWord},'%')
|
||||
)
|
||||
</if>
|
||||
<if test="purchaseTime != null and purchaseTime != ''">and pci.purchase_time = #{purchaseTime}</if>
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dic.NAME taskStatusName,
|
||||
bui.unit_name unitName,
|
||||
bpl.lot_name projectName,
|
||||
su.user_name createBy,
|
||||
su.nick_name createBy,
|
||||
tk.create_time createTime,
|
||||
tk.remark,
|
||||
tk.CODE repairNum
|
||||
|
|
@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE
|
||||
tk.task_type = 45
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, su.user_name) > 0
|
||||
AND (locate(#{keyword}, su.nick_name) > 0
|
||||
or locate(#{keyword}, tk.CODE) > 0
|
||||
or locate(#{keyword}, bui.unit_name) > 0
|
||||
or locate(#{keyword}, bpl.lot_name) > 0)
|
||||
|
|
@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dic.NAME taskStatusName,
|
||||
bui.unit_name unitName,
|
||||
bpl.lot_name projectName,
|
||||
su.user_name createBy,
|
||||
su.nick_name createBy,
|
||||
tk.create_time createTime,
|
||||
tk.remark,
|
||||
tk.CODE repairNum,
|
||||
|
|
@ -336,7 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE
|
||||
tk.task_type = 45
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (locate(#{keyword}, su.user_name) > 0
|
||||
AND (locate(#{keyword}, su.nick_name) > 0
|
||||
or locate(#{keyword}, tk.CODE) > 0
|
||||
or locate(#{keyword}, bui.unit_name) > 0
|
||||
or locate(#{keyword}, bpl.lot_name) > 0)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dic.NAME taskStatusName,
|
||||
bui.unit_name unitName,
|
||||
bpl.lot_name projectName,
|
||||
su.user_name createBy,
|
||||
su.nick_name createBy,
|
||||
tk.create_time createTime,
|
||||
tk.remark,
|
||||
tk1.CODE repairNum,
|
||||
|
|
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dic.NAME taskStatusName,
|
||||
bui.unit_name unitName,
|
||||
bpl.lot_name projectName,
|
||||
su.user_name createBy,
|
||||
su.nick_name createBy,
|
||||
tk.create_time createTime,
|
||||
tk.remark,
|
||||
tk1.CODE repairNum,
|
||||
|
|
|
|||
|
|
@ -80,6 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
remark = #{remark}
|
||||
where id = #{id}
|
||||
</update>
|
||||
<update id="updateMaStatus">
|
||||
update ma_machine
|
||||
set ma_status = '103'
|
||||
where ma_id = #{maId}
|
||||
</update>
|
||||
<select id="getSltAgreementInfo" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
|
||||
SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,
|
||||
bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<!--用户/维修员/库管员/采购员-下拉选-->
|
||||
<select id="getUserByRoleIdCbxSelect" resultType="com.bonus.sgzb.system.domain.SelectVo">
|
||||
SELECT su.user_id AS id,
|
||||
su.user_name AS `name`
|
||||
su.nick_name AS `name`
|
||||
FROM sys_role sr
|
||||
LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
|
||||
LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0'
|
||||
|
|
@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
UNION ALL
|
||||
SELECT su.user_id AS id,
|
||||
su.dept_id AS parentId,
|
||||
su.user_name AS label
|
||||
su.nick_name AS label
|
||||
FROM sys_role sr
|
||||
LEFT JOIN sys_user_role sur ON sr.role_id = sur.role_id
|
||||
LEFT JOIN sys_user su ON sur.user_id = su.user_id AND su.del_flag = '0'
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<el-input
|
||||
v-model="bindingName"
|
||||
placeholder="请输入部门名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
size="small"
|
||||
@input="getTree"
|
||||
prefix-icon="el-icon-search"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.propName"
|
||||
placeholder="请输入资产类型名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.unitName"
|
||||
placeholder="请输入单位名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<el-input
|
||||
v-model="form.linkMan"
|
||||
placeholder="请输入联系人"
|
||||
maxlength="60"
|
||||
maxlength="20"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="telphone">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
v-model="userName"
|
||||
placeholder="请输入人员名称"
|
||||
clearable
|
||||
size="small"
|
||||
size="small" maxlength="50"
|
||||
prefix-icon="el-icon-search"
|
||||
@input="getUserList"
|
||||
style="margin-bottom: 20px"
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.unitName"
|
||||
placeholder="请输入单位名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.proName"
|
||||
placeholder="请输入工程项目名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="工程项目名称" prop="proName">
|
||||
<el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="60"/>
|
||||
<el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工程类型" prop="typeId">
|
||||
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人" prop="linkMan">
|
||||
<el-input v-model="form.linkMan" placeholder="请输入联系人" />
|
||||
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="telphone">
|
||||
<el-input v-model="form.telphone" placeholder="请输入联系电话" maxlength="11"/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.lotName"
|
||||
placeholder="请输入标段工程名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="标段工程名称" prop="lotName">
|
||||
<el-input v-model="form.lotName" placeholder="请输入标段工程名称" />
|
||||
<el-input v-model="form.lotName" placeholder="请输入标段工程名称" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属工程项目" prop="ownPro">
|
||||
<el-select
|
||||
|
|
@ -191,10 +191,10 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人" prop="linkMan">
|
||||
<el-input v-model="form.linkMan" placeholder="请输入联系人" />
|
||||
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="telphone">
|
||||
<el-input v-model="form.telphone" placeholder="请输入联系电话" />
|
||||
<el-input v-model="form.telphone" placeholder="请输入联系电话" maxlength="11"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入单位类型名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="单位类型名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="60"/>
|
||||
<el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="50"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人姓名" prop="cName">
|
||||
<el-input
|
||||
<el-input maxlength="50"
|
||||
v-model="queryParams.cName"
|
||||
placeholder="请输入联系人姓名"
|
||||
clearable
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系人电话" prop="cPhone">
|
||||
<el-input
|
||||
<el-input
|
||||
v-model="queryParams.cPhone"
|
||||
placeholder="请输入联系人电话"
|
||||
clearable
|
||||
clearable maxlength="11"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -87,8 +87,8 @@
|
|||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table v-loading="loading" :data="tableList" >
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="序号" align="center" prop="dictId" />
|
||||
<el-table-column label="转让方单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="转让方工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
<el-input
|
||||
v-model="dialogParams.backUserName"
|
||||
placeholder="请输入退料人"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
<el-input
|
||||
v-model="dialogParams.backPhone"
|
||||
placeholder="请输入退料人电话"
|
||||
clearable
|
||||
clearable maxlength="11"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
<el-input
|
||||
v-model="dialogParams.leaseUserName"
|
||||
placeholder="请输入领料人"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -230,7 +230,7 @@
|
|||
<el-input
|
||||
v-model="dialogParams.leasePhone"
|
||||
placeholder="请输入领料人电话"
|
||||
clearable
|
||||
clearable maxlength="11"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
<el-input
|
||||
v-model="dialogParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -255,7 +255,7 @@
|
|||
|
||||
<el-table v-loading="dialogLoading" :data="deviceList" height="350px" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" align="center" prop="dictId" />
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="机具名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="机具规格" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
|
||||
|
|
@ -506,15 +506,16 @@ export default {
|
|||
this.resetForm("dialogForm");
|
||||
this.getDialogList();
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
/** 工地直转--打开弹窗 */
|
||||
handleAdd() {
|
||||
this.resetForm("dialogForm");
|
||||
this.open = true;
|
||||
this.title = "工地直转";
|
||||
this.deviceList = []
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.dictId)
|
||||
this.ids = selection.map(item => item)
|
||||
this.single = selection.length!=1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.agreementCode"
|
||||
placeholder="请输入协议编号"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -135,7 +135,8 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="合同编号" prop="contractCode">
|
||||
<el-input v-model="form.contractCode" placeholder="合同编号" />
|
||||
<el-input
|
||||
maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="往来单位:" prop="unitId">
|
||||
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" style="width: 100%;" >
|
||||
|
|
@ -190,7 +191,8 @@
|
|||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="授权人" prop="authPerson">
|
||||
<el-input v-model="form.authPerson" placeholder="请输入授权人" />
|
||||
<el-input
|
||||
maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="联系方式" prop="phone">
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
:maxlength="20"
|
||||
:maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="协议号" prop="agreementCode">
|
||||
<el-input v-model="queryParams.agreementCode" disabled></el-input>
|
||||
<el-input maxlength="50" v-model="queryParams.agreementCode" disabled></el-input maxlength="50" >
|
||||
</el-form-item>
|
||||
<el-form-item label="物品类型" prop="status">
|
||||
<el-cascader
|
||||
|
|
@ -36,14 +36,14 @@
|
|||
filterable></el-cascader>
|
||||
</el-form-item>
|
||||
<el-form-item label="领料人" prop="leasePerson">
|
||||
<el-input
|
||||
<el-input maxlength="50"
|
||||
v-model="queryParams.leaseApplyInfo.leasePerson"
|
||||
placeholder="请输入领料人"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="领料人电话" prop="phone">
|
||||
<el-input
|
||||
<el-input maxlength="11"
|
||||
v-model="queryParams.leaseApplyInfo.phone"
|
||||
placeholder="请输入领料人电话"
|
||||
clearable
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="roleName">
|
||||
<el-input
|
||||
<el-input maxlength="100"
|
||||
v-model="queryParams.leaseApplyInfo.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="createTime">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
<el-input maxlength="100"
|
||||
v-model="scope.row.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@
|
|||
|
||||
<!-- 同意 -->
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="50" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="examineVisible=false">取 消</el-button>
|
||||
<el-button type="primary" @click="subAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="50" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="refuseVisible=false">取 消</el-button>
|
||||
<el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="app-container" id="returnApply">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />
|
||||
<el-input maxlength="50" v-model="queryParams.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单位名称" prop="unitId">
|
||||
<el-select v-model="queryParams.unitId"
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="协议号" prop="agreementCode">
|
||||
<el-input v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
|
||||
<el-input maxlength="50" v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -135,13 +135,13 @@
|
|||
<el-input v-model="form.num" placeholder="请输入出库数量" />
|
||||
</el-form-item>
|
||||
<el-form-item label="班组名称" prop="teamName">
|
||||
<el-input v-model="form.teamName" placeholder="请输入班组名称" />
|
||||
<el-input v-model="form.teamName" placeholder="请输入班组名称" maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="领用人员" prop="leaseMan">
|
||||
<el-input v-model="form.leaseMan" placeholder="请输入领用人员" />
|
||||
<el-input v-model="form.leaseMan" placeholder="请输入领用人员" maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model="form.phone" placeholder="请输入联系电话" />
|
||||
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
|
|
@ -164,13 +164,13 @@
|
|||
<el-input v-model="nform.num" placeholder="请输入退库数量"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组名称" prop="teamName">
|
||||
<el-input v-model="nform.teamName" placeholder="请输入班组名称" />
|
||||
<el-input v-model="nform.teamName" placeholder="请输入班组名称" maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="退库人员" prop="leaseMan">
|
||||
<el-input v-model="nform.leaseMan" placeholder="请输入退库人员" />
|
||||
<el-input v-model="nform.leaseMan" placeholder="请输入退库人员" maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model="nform.phone" placeholder="请输入联系电话" />
|
||||
<el-input v-model="nform.phone" placeholder="请输入联系电话" maxlength="11" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="增减原因" align="center" prop="remark" :show-overflow-tooltip="true" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.remark" style="width: 100%;"></el-input>
|
||||
<el-input v-model="scope.row.remark" style="width: 100%;" maxlength="50"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="费用小计" align="center" prop="cost" :show-overflow-tooltip="true" width="120"/>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.backCode"
|
||||
placeholder="请选择报废单号"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -274,7 +274,7 @@
|
|||
<el-input
|
||||
v-model="dialogQueryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
:clearable="false"
|
||||
:clearable="false" maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
<el-input
|
||||
v-model="domain.partNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
<el-input
|
||||
v-model="domain.partCost"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -163,7 +163,7 @@
|
|||
<el-input
|
||||
v-model="domain.repairNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -220,7 +220,7 @@
|
|||
<el-input
|
||||
v-model="domain.partNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
<el-input
|
||||
v-model="domain.partCost"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<el-input
|
||||
v-model="dynamicValidateForm.scrapReason"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="50"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<el-input
|
||||
v-model="dynamicValidateFormTwo.scrapNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<el-input
|
||||
v-model="dynamicValidateFormTwo.scrapReason"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="50"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<el-input
|
||||
v-model="domain.partName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="50"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<el-input
|
||||
v-model="domain.partPrice"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 330px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<el-input
|
||||
v-model="domain.partNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -170,7 +170,7 @@
|
|||
<el-input
|
||||
v-model="domain.repairNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
<el-input
|
||||
v-model="domain.partName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="50"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
<el-input
|
||||
v-model="domain.partPrice"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 330px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
<el-input
|
||||
v-model="domain.partNum"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
size="small" maxlength="10"
|
||||
style="width: 350px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -73,8 +73,8 @@
|
|||
<el-form-item label="退料单号" prop="backCode">
|
||||
<el-input
|
||||
v-model="queryParams.backCode"
|
||||
placeholder="请选择退料单号"
|
||||
clearable
|
||||
placeholder="退料单号"
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -273,7 +273,7 @@
|
|||
<el-input
|
||||
v-model="dialogQueryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.backCode"
|
||||
placeholder="请选择修试审核单号"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -274,7 +274,7 @@
|
|||
<el-input
|
||||
v-model="dialogQueryParams.keyword"
|
||||
placeholder="请输入关键字"
|
||||
:clearable="false"
|
||||
:clearable="false" maxlength="50"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -297,7 +297,7 @@
|
|||
<el-input
|
||||
v-model="form.maCode"
|
||||
placeholder="请输入设备编码,如NSJJ+类型编码+规格编码"
|
||||
:clearable="true"
|
||||
:clearable="true" maxlength="50"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.labelType"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
v-model="maForm.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable :disabled="isCheck||isView"
|
||||
type="textarea"
|
||||
type="textarea" maxlength="150"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -179,13 +179,13 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="配件名称:" prop="machineTypeName">
|
||||
<el-input v-model="form.machineTypeName" disabled/>
|
||||
<el-input v-model="form.machineTypeName" disabled maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="配件型号" prop="specificationType">
|
||||
<el-input v-model="form.specificationType" disabled />
|
||||
<el-input v-model="form.specificationType" disabled maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收数量" prop="purchaseNum">
|
||||
<el-input v-model="form.purchaseNum" disabled />
|
||||
<el-input v-model="form.purchaseNum" disabled maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item label="验收结论" prop="checkResult">
|
||||
<el-radio v-model="form.checkResult" label="通过">通过</el-radio>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<el-input
|
||||
v-model="maForm.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
clearable maxlength="150"
|
||||
type="textarea"
|
||||
style="width: 240px"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="固定资产编码" align="center" prop="assetsCode" >
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.assetsCode" v-show="form.fixCode=='0'"></el-input>
|
||||
<el-input v-model="scope.row.assetsCode" v-show="form.fixCode=='0'" maxlength="50" ></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<el-input
|
||||
v-model="query.dictName"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -111,19 +111,19 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="基层单位" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="计划数" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="计划单价" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入基层单位" maxlength="50"/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入借出方单位"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入借入方单位"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<el-input
|
||||
v-model="houseName"
|
||||
placeholder="请输入货架名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
size="small"
|
||||
prefix-icon="el-icon-search"
|
||||
style="margin-bottom: 20px"
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.userName"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.houseName"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="名称" prop="houseName">
|
||||
<el-input v-model="form.houseName" placeholder="请输入名称" />
|
||||
<el-input v-model="form.houseName" placeholder="请输入名称" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="app-container" id="accessory">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
||||
<el-form-item label="关键字" prop="paName">
|
||||
<el-input v-model="queryParams.paName" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery" />
|
||||
<el-input v-model="queryParams.paName" placeholder="请输入关键字" maxlength="50" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
||||
|
|
@ -70,12 +70,12 @@
|
|||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="名称" prop="paName">
|
||||
<el-input v-model="form.paName" placeholder="请输入名称" />
|
||||
<el-input v-model="form.paName" placeholder="请输入名称" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="计量单位" prop="unitId">
|
||||
<el-input v-model="form.unitId" placeholder="请输入计量单位" />
|
||||
<el-input v-model="form.unitId" placeholder="请输入计量单位" maxlength="50" />
|
||||
<!-- <el-input-number v-model="form.unitId" controls-position="right" :min="0" /> -->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -202,12 +202,12 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="设备原编号" prop="preCode">
|
||||
<el-input v-model="form.preCode" placeholder="请输入设备原编号" />
|
||||
<el-input v-model="form.preCode" placeholder="请输入设备原编号" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="固定资产编号" prop="assetsCode">
|
||||
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
|
||||
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="资产属性" prop="propId">
|
||||
<el-select v-model="form.propId" placeholder="请选择资产属性">
|
||||
<el-select v-model="form.propId" filterable placeholder="请选择资产属性" >
|
||||
<el-option label="请选择" :value="0" ></el-option>
|
||||
<el-option
|
||||
v-for="keeper in propList"
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="本次检验人员" prop="checkMan">
|
||||
<el-input v-model="form.checkMan" placeholder="请输入本次检验人员" />
|
||||
<el-input v-model="form.checkMan" placeholder="请输入本次检验人员" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -280,20 +280,20 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="出厂编号" prop="outFacCode">
|
||||
<el-input v-model="form.outFacCode" placeholder="请输入出厂编号" />
|
||||
<el-input v-model="form.outFacCode" placeholder="请输入出厂编号" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="厂家" prop="maVender">
|
||||
<el-select v-model="form.maVender" placeholder="机具厂家" clearable style="width: 180px">
|
||||
<el-select v-model="form.maVender" placeholder="机具厂家" clearable filterable style="width: 180px">
|
||||
<el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier" :value="item.supplierId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="" />
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="" maxlength="150"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<el-input
|
||||
v-model="userName"
|
||||
placeholder="请输入人员名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
size="small"
|
||||
@input="getTree"
|
||||
prefix-icon="el-icon-search"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -147,141 +147,7 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 添加或修改用户配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="用户昵称" prop="nickName">
|
||||
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="归属部门" prop="deptId">
|
||||
<treeselect v-model="form.deptId" :options="treeOptions" :show-count="true" placeholder="请选择归属部门" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机号码" prop="phonenumber">
|
||||
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
||||
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
||||
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="用户性别">
|
||||
<el-select v-model="form.sex" placeholder="请选择性别">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_user_sex"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<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-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="岗位">
|
||||
<el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
|
||||
<el-option
|
||||
v-for="item in postOptions"
|
||||
:key="item.postId"
|
||||
:label="item.postName"
|
||||
:value="item.postId"
|
||||
:disabled="item.status == 1"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="角色">
|
||||
<el-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
|
||||
<el-option
|
||||
v-for="item in roleOptions"
|
||||
:key="item.roleId"
|
||||
:label="item.roleName"
|
||||
:value="item.roleId"
|
||||
:disabled="item.status == 1"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</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>
|
||||
|
||||
<!-- 用户导入对话框 -->
|
||||
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:limit="1"
|
||||
accept=".xlsx, .xls"
|
||||
:headers="upload.headers"
|
||||
:action="upload.url + '?updateSupport=' + upload.updateSupport"
|
||||
:disabled="upload.isUploading"
|
||||
:on-progress="handleFileUploadProgress"
|
||||
:on-success="handleFileSuccess"
|
||||
:auto-upload="false"
|
||||
drag
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
<div class="el-upload__tip text-center" slot="tip">
|
||||
<div class="el-upload__tip" slot="tip">
|
||||
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
|
||||
</div>
|
||||
<span>仅允许导入xls、xlsx格式文件。</span>
|
||||
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
|
||||
</div>
|
||||
</el-upload>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitFileForm">确 定</el-button>
|
||||
<el-button @click="upload.open = false">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<el-input
|
||||
v-model="userName"
|
||||
placeholder="请输入人员名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
size="small"
|
||||
@input="getTree"
|
||||
prefix-icon="el-icon-search"
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -156,142 +156,7 @@
|
|||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 添加或修改用户配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="用户昵称" prop="nickName">
|
||||
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="归属部门" prop="deptId">
|
||||
<treeselect v-model="form.deptId" :options="treeOptions" :show-count="true" placeholder="请选择归属部门" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机号码" prop="phonenumber">
|
||||
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
||||
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
||||
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="用户性别">
|
||||
<el-select v-model="form.sex" placeholder="请选择性别">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_user_sex"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<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-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="岗位">
|
||||
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
|
||||
<el-option
|
||||
v-for="item in postOptions"
|
||||
:key="item.postId"
|
||||
:label="item.postName"
|
||||
:value="item.postId"
|
||||
:disabled="item.status == 1"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="角色">
|
||||
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
|
||||
<el-option
|
||||
v-for="item in roleOptions"
|
||||
:key="item.roleId"
|
||||
:label="item.roleName"
|
||||
:value="item.roleId"
|
||||
:disabled="item.status == 1"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</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>
|
||||
|
||||
<!-- 用户导入对话框 -->
|
||||
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:limit="1"
|
||||
accept=".xlsx, .xls"
|
||||
:headers="upload.headers"
|
||||
:action="upload.url + '?updateSupport=' + upload.updateSupport"
|
||||
:disabled="upload.isUploading"
|
||||
:on-progress="handleFileUploadProgress"
|
||||
:on-success="handleFileSuccess"
|
||||
:auto-upload="false"
|
||||
drag
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
<div class="el-upload__tip text-center" slot="tip">
|
||||
<div class="el-upload__tip" slot="tip">
|
||||
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
|
||||
</div>
|
||||
<span>仅允许导入xls、xlsx格式文件。</span>
|
||||
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
|
||||
</div>
|
||||
</el-upload>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitFileForm">确 定</el-button>
|
||||
<el-button @click="upload.open = false">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
placeholder="请输入供应商名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="单位类型名称" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="请输入单位类型名称" />
|
||||
<el-input v-model="form.dictName" placeholder="请输入单位类型名称" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="字典类型" prop="dictType">-->
|
||||
<!-- <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.supplier"
|
||||
placeholder="请输入供应商名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -124,22 +124,22 @@
|
|||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item label="供应商名称" prop="supplier">
|
||||
<el-input v-model="form.supplier" placeholder="请输入供应商名称" />
|
||||
<el-input v-model="form.supplier" placeholder="请输入供应商名称" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商地址" prop="address">
|
||||
<el-input v-model="form.address" placeholder="请输入供应商地址" />
|
||||
<el-input v-model="form.address" placeholder="请输入供应商地址" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="法人代表" prop="legalPerson">
|
||||
<el-input v-model="form.legalPerson" placeholder="请输入法人代表" />
|
||||
<el-input v-model="form.legalPerson" placeholder="请输入法人代表" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要联系人" prop="primaryContact">
|
||||
<el-input v-model="form.primaryContact" placeholder="请输入主要联系人" />
|
||||
<el-input v-model="form.primaryContact" placeholder="请输入主要联系人" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input v-model="form.phone" placeholder="请输入联系电话" />
|
||||
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="经营范围" prop="businessScope">
|
||||
<el-input v-model="form.businessScope" placeholder="请输入经营范围" />
|
||||
<el-input v-model="form.businessScope" placeholder="请输入经营范围" maxlength="50"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="营业执照" prop="businessLicense">
|
||||
<el-upload
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<el-input
|
||||
v-model="typeName"
|
||||
placeholder="请输入类型名称"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
size="small"
|
||||
prefix-icon="el-icon-search"
|
||||
style="margin-bottom: 20px"
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="计量单位" prop="unitName">
|
||||
<el-input v-model="form.unitName" placeholder="请输入计量单位" maxlength="11"/>
|
||||
<el-input v-model="form.unitName" placeholder="请输入计量单位" maxlength="20"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="库管员" prop="keeperUserId">
|
||||
<el-select v-model="form.keeperUserId" filterable placeholder="请选择库管员" filterable>
|
||||
<el-select v-model="form.keeperUserId" filterable placeholder="请选择库管员" >
|
||||
<el-option
|
||||
v-for="keeper in keeperList"
|
||||
:key="keeper.userId"
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注内容"></el-input>
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注内容" maxlength="150"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="调整后价格" prop="leasePrice">
|
||||
<el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="0"></el-input-number>
|
||||
<el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="0" maxlength="10"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
<el-input
|
||||
v-model="query.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
<el-input
|
||||
v-model="query.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
clearable maxlength="50"
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue