bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
dingjie 2023-12-23 18:50:28 +08:00
parent 83ac831e0a fd12bca625
commit a47c83e0aa
20 changed files with 767 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
View File

@ -123,4 +123,16 @@ public class LeaseApplyDetails implements Serializable {
@ApiModelProperty(value = "装备管理方式")
private int manageType;
/**
* 装备管理方式(0编号 1计数)
*/
@ApiModelProperty(value = "装备管理方式名称")
private String manageTypeName;
/**
* 实时库存
*/
@ApiModelProperty(value = "实时库存")
private Double num;
}

28
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
View File

@ -137,11 +137,11 @@ public class TmTask implements Serializable {
private String phone;
@ApiModelProperty(value="退料申请时间")
private String backTime;
@ApiModelProperty(value="退料审核人")
@ApiModelProperty(value="退料审核人 机具分公司审批人")
private String directAuditBy;
@ApiModelProperty(value="退料审核时间")
@ApiModelProperty(value="退料审核时间 机具分公司审批时间")
private String directAuditTime;
@ApiModelProperty(value="退料审核备注")
@ApiModelProperty(value="退料审核备注 机具分公司审批备注")
private String directAuditRemark;
@ApiModelProperty(value="往来单位id")
@ -179,7 +179,7 @@ public class TmTask implements Serializable {
@ApiModelProperty(value="审批状态id")
private String examineStatusId;
@ApiModelProperty(value="审批状态")
@ApiModelProperty(value="审批状态的备注")
private String examineStatus;
@ApiModelProperty(value="创建时间")
@ -187,4 +187,24 @@ public class TmTask implements Serializable {
@ApiModelProperty(value="更新时间")
private String updateTimes;
@ApiModelProperty(value="公司审批人")
private String companyAuditBy;
@ApiModelProperty(value="公司审批时间")
private String companyAuditTime;
@ApiModelProperty(value="公司审批备注")
private String companyAuditRemark;
@ApiModelProperty(value="分管审批人")
private String deptAuditBy;
@ApiModelProperty(value="分管审批时间")
private String deptAuditTime;
@ApiModelProperty(value="分管审批备注")
private String deptAuditRemark;
}

52
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -7,6 +7,7 @@ import com.bonus.sgzb.app.service.TmTaskService;
import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.core.utils.StringHelper;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Set;
/**
* 任务表(tm_task)表控制层
@ -278,17 +280,55 @@ public class TmTaskController extends BaseController {
if (CollUtil.isEmpty(task.getLeaseApplyInfoList())){
return AjaxResult.error("任务表修改完成,但领料任务明细为空，执行失败！");
}
// 修改任务关联的协议
tmTaskService.updateAgreementByTask(task);
// 根据参数判断是否需要修改工程与往来单位
if (StringUtils.isNotNull(task.getProjectId()) && StringUtils.isNotNull(task.getUnitId())) {
Integer agreementId = tmTaskService.getAgreementIdByUnit(task);
if (StringUtils.isNotNull(agreementId)) {
task.setAgreementId(agreementId);
tmTaskService.updateAgreementByTask(task); // 修改任务关联的协议
//修改领料任务表信息
//先判断 目前数据库有几个公司
List<LeaseApplyInfo> list = tmTaskService.getListSome(task.getTaskId());
LeaseApplyInfo infoAdd = new LeaseApplyInfo();
if(list.size()<2){
List<List<LeaseApplyDetails>> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId");
String companyId="";
for (List<LeaseApplyDetails> leaseApplyDetailsList : deviceByCompanyList) {
companyId = leaseApplyDetailsList.get(0).getCompanyId() + "@" ;
}
LeaseApplyInfo info = new LeaseApplyInfo();
infoAdd.setTaskId(task.getTaskId().intValue());
infoAdd.setCode(task.getLeaseApplyInfoList().get(0).getCode());
infoAdd.setLeasePerson(task.getLeaseApplyInfoList().get(0).getLeasePerson());
infoAdd.setPhone(task.getLeaseApplyInfoList().get(0).getPhone());
infoAdd.setRemark(task.getLeaseApplyInfoList().get(0).getRemark());
infoAdd.setType(task.getLeaseApplyInfoList().get(0).getType());
if(companyId.contains("101")){
info.setId(101);
info.setTaskId(task.getTaskId().intValue());
LeaseApplyInfo bean = tmTaskService.getListSomeol(info);
if(bean==null){
infoAdd.setCompanyId(101);
leaseApplyInfoService.genderLeaseCode(infoAdd);
}
}else if(companyId.contains("102")){
info.setId(102);
info.setTaskId(task.getTaskId().intValue());
LeaseApplyInfo bean = tmTaskService.getListSomeol(info);
if(bean==null){
infoAdd.setCompanyId(102);
leaseApplyInfoService.genderLeaseCode(infoAdd);
}
}
}
LeaseApplyInfo bean = new LeaseApplyInfo();
bean.setTaskId(task.getTaskId().intValue());
bean.setLeasePerson(task.getLeaseApplyInfo().getLeasePerson());
bean.setPhone(task.getLeaseApplyInfo().getPhone());
bean.setRemark(task.getLeaseApplyInfo().getRemark());
tmTaskService.updateLeaseInfo(bean);
for (LeaseApplyInfo leaseApplyInfo : task.getLeaseApplyInfoList()) {
if (leaseApplyInfo == null || leaseApplyInfo.getId() == null) {
continue;
}

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -82,7 +82,12 @@ public interface TmTaskMapper {
TmTask getLeaseListTmTask(TmTask task);
LeaseApplyInfo getLeaseListByLeaseInfo(TmTask task);
Integer getAgreementIdByUnit(TmTask task);
List<LeaseApplyInfo> getLeaseListByLeaseInfo(TmTask task);
void updateLeaseInfo(LeaseApplyInfo task);
List<LeaseApplyInfo> getListSome(Long taskId);
LeaseApplyInfo getListSomeol(LeaseApplyInfo info);
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.app.service;
import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.apache.ibatis.annotations.Param;
@ -58,4 +59,11 @@ public interface TmTaskService{
int insertAgreement(TmTask record);
List<TmTask> getLeaseListAll(TmTask task);
void updateLeaseInfo(LeaseApplyInfo task);
List<LeaseApplyInfo> getListSome(Long taskId);
LeaseApplyInfo getListSomeol(LeaseApplyInfo info);
}

14
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -61,19 +61,19 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
// 更新 (ma_machine 设备表)的状态
int updateMaMachineStatus = leaseOutDetailsMapper.updateMaMachineStatus(record);
// 插入(tm_task_agreement 任务协议表)协议信息
int insertAgreementInfo = leaseOutDetailsMapper.insertAgreementInfo(record);
// int insertAgreementInfo = leaseOutDetailsMapper.insertAgreementInfo(record);
// 进行状态判断
if (updateLeaseApplyDetailsOutNum > 0) {
if (insertSelectiveNum > 0) {
if (updateMaTypeStockNum > 0) {
if (updateMaMachineStatus > 0) {
if (insertAgreementInfo > 0) {
// if (updateMaMachineStatus > 0) {
// if (insertAgreementInfo > 0) {
return AjaxResult.success("领料出库成功!");
}
return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
}
return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
// }
// return AjaxResult.error("领料出库失败,插入任务协议信息错误!");
// }
// return AjaxResult.error("领料出库失败,最后更新设备状态错误!");
}
return AjaxResult.error("出库失败,更新设备规格库存数量时出错!");
}

36
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -243,14 +243,38 @@ public class TmTaskServiceImpl implements TmTaskService{
List<TmTask> tmTaskList = new ArrayList<>();
TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task);
if(tmTask != null){
LeaseApplyInfo leaseApplyInfo = tmTaskMapper.getLeaseListByLeaseInfo(task);
tmTask.setLeaseApplyInfo(leaseApplyInfo);
if(leaseApplyInfo !=null){
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo);
tmTask.setLeaseApplyDetails(leaseApplyDetails);
List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task);
tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
if (leaseApplyInfo != null) {
// 去查询领料任务详情表
List<LeaseApplyDetails> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {
listLeaseDetails.addAll(leaseApplyDetails);
}
}
}
// 塞入领料任务详情的集合中
tmTask.setLeaseApplyDetails(listLeaseDetails);
}
tmTaskList.add(tmTask);
return tmTaskList;
}
}
@Override
public void updateLeaseInfo(LeaseApplyInfo task) {
tmTaskMapper.updateLeaseInfo(task);
}
@Override
public List<LeaseApplyInfo> getListSome(Long taskId) {
return tmTaskMapper.getListSome(taskId);
}
@Override
public LeaseApplyInfo getListSomeol(LeaseApplyInfo info) {
return tmTaskMapper.getListSomeol(info);
}
}

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java
View File

@ -93,7 +93,8 @@ public class MaLabelBindController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody MaLabelBindVO maLabelBindVO)
{
return toAjax(maLabelBindService.insertMaLabelBind(maLabelBindVO));
return maLabelBindService.insertMaLabelBind(maLabelBindVO);
}
/**

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaLabelBindService.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import java.util.List;
@ -41,7 +42,7 @@ public interface IMaLabelBindService
* @param maLabelBindVO 机具设备标签ma_label_bind
* @return 结果
*/
public int insertMaLabelBind(MaLabelBindVO maLabelBindVO);
public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBindVO);
/**
* 修改机具设备标签ma_label_bind

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
View File

@ -4,12 +4,10 @@ import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
import com.bonus.sgzb.base.service.IMaLabelBindService;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.utils.StringHelper;
import lombok.extern.flogger.Flogger;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@ -66,13 +64,13 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
* @return 结果
*/
@Override
public int insertMaLabelBind(MaLabelBindVO maLabelBind)
public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBind)
{
int i = 0;
int b =0;
MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode());
if(null != bean){
return b;
return AjaxResult.error("设备编码已绑定！！！");
}else {
MaMachine maMachine =new MaMachine();
maMachine.setMaCode(maLabelBind.getMaCode());
@ -84,7 +82,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind);
i = maLabelBindMapper.insertMaLabelBindS(maLabelBind);
}
return i;
return AjaxResult.success("绑定成功");
}
/**

79
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -32,12 +32,12 @@
select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType}
</select>
<update id="deleteTaskByPrimaryKey" parameterType="java.lang.Long">
<update id="deleteTaskByPrimaryKey" >
update tm_task set `status` = '0'
where task_id = #{taskId,jdbcType=BIGINT}
where task_id = #{taskId}
</update>
<update id="deleteTaskInfoByTaskId" parameterType="java.lang.Long">
<update id="deleteTaskInfoByTaskId" >
update lease_apply_info set `status` = '0'
where task_id = #{taskId}
</update>
@ -496,6 +496,7 @@
<if test="record.keyWord != null and record.keyWord != ''">
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
</if>
ORDER BY tt.update_time DESC
</select>
<select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
@ -509,7 +510,9 @@
<select id="getLeaseApplyDetails" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails">
SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
mt.num
FROM
lease_apply_details lad
LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
@ -524,35 +527,54 @@
<select id="getLeaseListTmTask" resultType="com.bonus.sgzb.base.api.domain.TmTask">
SELECT
SELECT DISTINCT
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpi.pro_id as proId, bpi.pro_id as projectId,bpi.pro_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
tt.create_by as applyFor,d.`name` as taskName,
su2.user_name as companyAuditBy,
lai.company_audit_time as companyAuditTime,
lai.company_audit_remark as companyAuditRemark,
su3.user_name as deptAuditBy,
lai.dept_audit_time as deptAuditTime,
lai.dept_audit_remark as deptAuditRemark,
su4.user_name as directAuditBy,
lai.direct_audit_time as directAuditTime,
lai.direct_audit_remark as directAuditRemark,
d.id as examineStatusId,
bai.agreement_code as agreementCode,
tt.create_time as createTimes, tt.update_time as updateTimes,
bai.agreement_id as agreementId
FROM
FROM
tm_task tt
LEFT JOIN sys_user su ON tt.create_by = su.user_name
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_info bpi ON bpi.pro_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN sys_dic d ON d.id = tt.task_status
LEFT JOIN sys_user su ON tt.create_by = su.user_name
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id
LEFT JOIN bm_project_info bpi ON bpi.pro_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
LEFT JOIN sys_dic d ON d.id = tt.task_status
LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
LEFT JOIN sys_user su2 ON lai.company_audit_by = su2.user_id
LEFT JOIN sys_user su3 ON lai.dept_audit_by = su3.user_id
LEFT JOIN sys_user su4 ON lai.direct_audit_by = su4.user_id
WHERE tt.task_id = #{taskId}
</select>
<select id="getLeaseListByLeaseInfo" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
SELECT
lai.*
FROM
lease_apply_info lai
WHERE
lai.task_id = #{taskId}
</select>
<select id="getLeaseListByLeaseInfo" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
SELECT
lai.*
FROM
lease_apply_info lai
WHERE
lai.task_id = #{taskId}
</select>
<update id="updateTmTaskAuditStatus">
UPDATE tm_task SET task_status = #{record.taskStatus} WHERE task_id = #{record.taskId}
@ -605,9 +627,24 @@
parennt_id = #{record.parenntId}
</update>
<update id="updateLeaseInfo">
UPDATE lease_apply_info SET lease_person = #{leasePerson}, phone = #{phone}, remark = #{remark}
WHERE task_id = #{taskId}
</update>
<select id="getAgreementIdByUnit" resultType="java.lang.Integer">
select agreement_id from bm_agreement_info
where unit_id = #{unitId} and project_id = #{projectId}
</select>
<select id="getListSome" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
SELECT * FROM `lease_apply_info`
WHERE task_id = #{taskId} AND `status` ='1'
</select>
<select id="getListSomeol" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
SELECT * FROM `lease_apply_info`
WHERE task_id = #{taskId} AND `status` ='1' and company_id = #{id}
</select>
</mapper>

71
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -165,14 +165,15 @@ import {
getDeviceTypeTree,
getAgreementInfoById,
submitLeaseApply,
getTaskDetail
getTaskDetail,
editLeaseApply
} from '@/api/claimAndRefund/receive'
import { mapState } from 'vuex'
import { getInfo } from '@/api/login'
export default {
name: "Role",
data() {
return {
user:null, // 用户信息
// 遮罩层
loading: false,
// 选中数组
@ -250,10 +251,11 @@ export default {
},
leaseApplyDetails:[],
leaseApplyInfoList:[],
//领料详情单条模板
leaseApplyDetailsItem:{
parenntId:null,
createBy: null,
companyId: null,
status: 0,
@ -280,6 +282,9 @@ export default {
unitList:[], //单位 集合
proList:[], // 工程 集合
deviceTypeTree: [], // 设备 树结构数据
taskId:null, // 是否编辑
// 设备 树显示 配置
deviceTypeTreeProps: {
multiple:false,
@ -309,21 +314,27 @@ export default {
};
},
created() {
this.GetUserInfo()
this.GetUnitData()
this.GetProData()
this.GetDeviceTypeTree()
// this.getList();
console.log('this.$route.query.taskId',this.$route.query.taskId)
if(this.$route.query.taskId){
this.GetTaskDetail(this.$route.query.taskId)
this.taskId = this.$route.query.taskId
}
},
computed:{
...mapState(['user'])
},
methods: {
// 获取用户信息
async GetUserInfo(){
const res = await getInfo()
this.user = res.user
},
// 获取 来往单位 列表数据
async GetUnitData(){
const params = {
@ -381,7 +392,6 @@ export default {
const res = await getTaskDetail({taskId})
const data = res.rows[0]
console.log('GetTaskDetail =================',data)
// unitId:null,
// proId:null,
@ -390,11 +400,12 @@ export default {
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.projectId
this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfo.phone
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfo.leasePerson
this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfo.remark
this.queryParams.agreementId = data.agreementId
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
this.leaseApplyInfoList = data.leaseApplyInfoList
this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
return this.handelEchoData(item)
})
@ -412,7 +423,7 @@ export default {
template.remark = item.remark
template.preNum = item.preNum
template.status = item.status
template.parenntId = item.parenntId
return template
},
@ -534,11 +545,27 @@ export default {
this.$message.error('请添加数据');
return
}
this.queryParams.createBy = this.user.name
this.queryParams.companyId = this.user.id
this.queryParams.createBy = this.user.userName
this.queryParams.companyId = this.user.companyId
const res = await submitLeaseApply(this.queryParams)
let res;
if(this.taskId){
this.leaseApplyInfoList.forEach(v => {
v = Object.assign(v,this.queryParams.leaseApplyInfo)
this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
})
const params = {
...this.queryParams,taskId:this.taskId,
leaseApplyInfoList:this.leaseApplyInfoList
}
res = await editLeaseApply(params)
}else {
res = await submitLeaseApply(this.queryParams)
}
if(res.code == 200){
this.$message({
type:'success',
@ -623,7 +650,7 @@ export default {
if(nodes[0].level != 4){
return
}
console.log('nodes[0]',nodes[0],this.user)
this.leaseApplyDetails.push(
this.handelTableItemData(nodes[0])
)
@ -641,11 +668,17 @@ export default {
handelTableItemData(node){
const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
template.createBy = this.user.name
template.companyId = this.user.id
template.companyId = node.data.companyId
template.typeId = node.data.id
template.unitCn = node.data.unitName
template.typeCn = node.pathLabels[2]
template.guigeCn = node.pathLabels[3]
if(this.taskId){
const index = this.leaseApplyInfoList.find(key => key.companyId == node.data.companyId)
template.parenntId = index ? index.id : ''
}
return template
}
}

223
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -1,54 +1,50 @@
<template>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<h3>肖洁提交的领料申请</h3>
<div>领料单号：L20231122-001</div>
<h3>{{ queryParams.applyFor }}提交的领料申请</h3>
<div>领料单号：{{ queryParams.code }}</div>
</el-row>
<el-row :gutter="24" class="mb8">
<el-col :span="18">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="领料工程" prop="dictName">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.proName"
placeholder="请输入领料工程"
clearable
style="width: 240px"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="领料人" prop="dictName">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.leaseApplyInfo.leasePerson"
placeholder="请输入领料人"
clearable
style="width: 240px"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系电话" prop="dictName">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.leaseApplyInfo.phone"
placeholder="请输入联系电话"
clearable
style="width: 240px"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="typeList" @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" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :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" />
<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" />
<el-table-column label="任务状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="当前库存" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
<el-table-column label="申请时间" align="center" prop="updateTimes" :show-overflow-tooltip="true" />
<el-table-column label="任务状态" align="center" prop="taskName" :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" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@ -69,13 +65,13 @@
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</el-col>
<el-col :span="6">
@ -88,48 +84,76 @@
<!-- </el-timeline-item>-->
<!-- </el-timeline>-->
<el-timeline>
<el-timeline-item timestamp="2018/4/12" placement="top">
<el-timeline-item color="#0bbd87" icon="el-icon-check" placement="top">
<el-card>
<h4>提交审批</h4>
<p>肖洁 提交于 2018/4/12 20:46</p>
<p class="title">提交审批</p>
<p class="author">申请人：{{queryParams.applyFor}}</p>
<p class="time">申请时间：{{queryParams.updateTimes}}</p>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="2018/4/3" placement="top">
<el-timeline-item v-for="(v,i) in flowPath" :type="v.type" :color="v.color" :icon="v.icon" :key="i" placement="top">
<el-card>
<h4>公司审批</h4>
<p>肖洁 提交于 2018/4/3 20:46</p>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="2018/4/2" placement="top">
<el-card>
<h4>部门审批</h4>
<p>肖洁 提交于 2018/4/2 20:46</p>
<p class="title">{{v.name}}</p>
<p class="author" v-if="queryParams[v.authorKey]">审核人：{{queryParams[v.authorKey]}}</p>
<p class="time" v-if="queryParams[v.timeKey]">审核时间：{{queryParams[v.timeKey]}}</p>
<p class="remark" v-if="queryParams[v.remarkKey]">审核意见：{{ queryParams[v.remarkKey] }}</p>
</el-card>
</el-timeline-item>
</el-timeline>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;">
<el-button type="primary" >同意</el-button>
<el-button >拒绝</el-button>
<el-button type="primary" @click="agree">同意</el-button>
<!-- <el-button >拒绝</el-button>-->
</div>
<el-dialog title="审核意见" :visible.sync="examineVisible">
<el-input placeholder="请输入审核意见" v-model="queryParams.companyAuditRemarks "></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="handelExamine(false)">取 消</el-button>
<el-button type="primary" @click="handelExamine(true)">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { auditLeaseByCompany, getTaskDetail } from '@/api/claimAndRefund/receive'
import {mapState} from 'vuex'
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
data() {
return {
flowPath:[
{
id:30,
name:'待分公司审核',
remarkKey:'companyAuditRemark',
authorKey:'companyAuditBy',
timeKey:'companyAuditTime'
},{
id:31,
name:'待分管部门审核',
remarkKey:'deptAuditRemark',
authorKey:'deptAuditBy',
timeKey:'deptAuditTime'
},{
id:32,
name:'待内部审核',
remarkKey:'directAuditRemark',
authorKey:'directAuditBy',
timeKey:'directAuditTime'
}
],
examineVisible:false,
// 遮罩层
loading: true,
loading: false,
// 选中数组
ids: [],
// 非单个禁用
@ -150,11 +174,11 @@ export default {
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined
leaseApplyInfo:{
},
leaseApplyDetails:[],
companyAuditRemarks:''
},
// 表单参数
form: {},
@ -187,22 +211,72 @@ export default {
}, {
content: '部门审批',
timestamp: '2018-04-11'
}]
}],
};
},
computed:{
...mapState(['user'])
},
created() {
this.getList();
let taskId = this.$route.query.taskId
if(taskId){
this.getData(taskId)
}
},
methods: {
agree(){
this.examineVisible = true
},
handelExamine(type){
if(type){
this.subAuditLeaseByCompany()
}else {
this.queryParams.companyAuditRemarks = ''
}
this.examineVisible = type
},
//审核 同意
async subAuditLeaseByCompany(){
const params = JSON.parse(JSON.stringify(this.queryParams))
params.taskStatus ++
params.leaseApplyInfoList.forEach(v => {
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id)
})
const res = await auditLeaseByCompany(params)
if(res.code == 200){
this.examineVisible = false
this.$router.back()
}
console.log('subAuditLeaseByCompany ==================',res)
},
/** 查询字典类型列表 */
getList() {
this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.total = response.total;
this.loading = false;
async getData(taskId) {
const res = await getTaskDetail({
taskId
})
this.queryParams = {...this.queryParams,...res.rows[0]}
this.$set(this.queryParams,'leaseApplyInfo',this.queryParams.leaseApplyInfoList[0])
this.queryParams.leaseApplyDetails.forEach(v => {
this.$set(v,'applyFor',this.queryParams.applyFor)
this.$set(v,'updateTimes',this.queryParams.updateTimes)
this.$set(v,'taskName',this.queryParams.taskName)
})
for (let i=0; i < this.flowPath.length; i++ ){
if(this.flowPath[i].id == this.queryParams.examineStatusId){
this.flowPath[i].type = 'primary'
this.flowPath[i].icon = 'el-icon-more'
break
}else {
this.flowPath[i].color = '#0bbd87'
this.flowPath[i].icon = 'el-icon-check'
}
);
}
},
// 取消按钮
cancel() {
@ -302,3 +376,28 @@ export default {
}
};
</script>
<style lang="scss" scoped>
::v-deep .el-card__body{
padding: 10px !important;
p{
margin: 0 !important;
}
.title{
color: #848484;
font-weight: 700;
}
.author{
font-size: 13px;
margin-top: 5px;
}
.time{
font-size: 12px;
}
.remark{
margin-top: 10px;
word-break: break-all;
font-size: 13px;
}
}
</style>

163
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -97,18 +97,7 @@
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
v-if=" scope.row "
size="mini"
@ -121,7 +110,7 @@
size="mini"
type="text"
icon="el-icon-document"
@click="handleExamine(scope.row)"
@click="openLld(scope.row)"
>领料单</el-button>
</template>
</el-table-column>
@ -135,53 +124,72 @@
@pagination="getList"
/>
<!-- 新增编辑弹窗 -->
<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-form-item>
<el-form-item label="工程名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入工程名称" />
</el-form-item>
<el-form-item label="开始日期" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入开始日期" />
</el-form-item>
<el-form-item label="租赁期限" prop="dictName">
<el-input-number v-model="form.dictName" style="width:100%;" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="授权人" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入授权人" />
</el-form-item>
<el-form-item label="授权人" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入授权人" />
</el-form-item>
<el-form-item label=" 联系方式" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入联系方式" />
</el-form-item>
<!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body>
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
领料单
</div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>领料单位：</span>{{ leaseApplyData.unitName }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>工程名称：</span>{{ leaseApplyData.proName }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>时间：</span>{{ leaseApplyData.updateTimes }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>编号：</span>{{ leaseApplyData.agreementCode }}
</div>
</div>
<el-table :data="leaseApplyDetails" class="table" style="margin-top: 20px">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" />
<el-table-column label="规格型号" align="center" prop="typeModelName" />
<el-table-column label="计量单位" align="center" prop="unitName" />
<el-table-column label="预领数量" align="center" prop="preNum" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="出库方式" align="center" prop="manageTypeName" />
</el-table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
<div class="item" style="width: 25%;">
<span>审核：</span>
</div>
<div class="item" style="width: 25%;">
<span>领料：</span>
</div>
<div class="item" style="width: 25%;">
<span>仓库：</span>
</div>
<div class="item" style="width: 25%;">
<span>操作人：</span>
</div>
</div>
</vue-easy-print>
<el-form-item label="合同照片" prop="dictName">
<el-input v-model="form.dictName" placeholder="图片上传" />
</el-form-item>
<el-form-item label="备注" prop="dictName">
<el-input v-model="form.dictName" type="textarea" placeholder="图片上传" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="print">打 印</el-button>
<el-button @click="open = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { getLeaseAuditListAll,getUnitData,getProData } from "@/api/claimAndRefund/receive";
import { getLeaseAuditListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
import vueEasyPrint from 'vue-easy-print';
export default {
name: "Dict",
data() {
@ -247,6 +255,11 @@ export default {
]
},
deptName: undefined,
//领料单
leaseApplyDetails:[],
// 领料任务详情数据
leaseApplyData:{}
};
},
created() {
@ -255,6 +268,7 @@ export default {
this.GetUnitData()
this.GetProData()
},
components:{vueEasyPrint},
methods: {
/** 查询字典类型列表 */
async getList() {
@ -335,8 +349,30 @@ export default {
// this.title = "添加字典类型";
},
handleExamine(row) {
this.$router.push("/claimAndRefund/receive/receiveExamine");
this.$router.push({
path:"/claimAndRefund/receive/receiveExamine",
query: {
taskId:row.taskId
}
});
},
//打开领料单
async openLld(row){
this.open = true
const res = await getTaskDetail({taskId:row.taskId})
this.leaseApplyDetails = res.rows[0].leaseApplyDetails
this.leaseApplyData = res.rows[0]
console.log('this.leaseApplyData ============',this.leaseApplyData)
},
// 领料单 打印
print(){
this.$refs.remarksPrintRef.print();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictId)
@ -399,3 +435,32 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.print{
.title{
text-align: center;
font-weight: 600;
font-size: 16px;
}
.info{
margin-top: 10px;
display: flex;
flex-wrap: wrap;
.item{
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
}
}
.fillIn{
margin-top: 15px;
display: flex;
justify-content: space-between;
}
}
</style>

110
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="后缀范围" prop="count">
<el-form-item label="后缀范围">
<div style="display: flex;"><el-input v-model="form.str" placeholder="0001"></el-input> - <el-input v-model="form.str1" placeholder="0005"></el-input></div>
</el-form-item>
@ -146,10 +146,14 @@
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.maCode" v-bind:class="[scope.row.statusFlag==1 ? redColor : '']"></el-input>
<el-input v-model="scope.row.maCode" :disabled="scope.row.statusFlag==0" οninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column label="固定资产编码" align="center" prop="assetsCode" width="120" />
<el-table-column label="固定资产编码" align="center" prop="assetsCode" >
<template slot-scope="scope">
<el-input v-model="scope.row.assetsCode" v-show="form.isFixed=='0'"></el-input>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
@ -227,9 +231,10 @@ export default {
},
// 表单参数
form: {
exCode:'NSJJ',
count:1,
// isFixed:'',
exCode:'',
str:'',
str1:'',
isFixed:'1',
typeId:''
},
codeList: [],//弹窗列表list
@ -283,16 +288,16 @@ export default {
},
// 取消按钮
cancel() {
this.reset()
this.open = false;
},
// 表单重置
reset() {
this.form = {
maId: undefined,
dictName: undefined,
dictType: undefined,
status: "0",
remark: undefined
str: undefined,
str1: undefined,
isFixed:'1',
};
this.resetForm("form");
},
@ -322,7 +327,11 @@ export default {
/** 编码按钮操作 */ //getCodeList newCodeList
handleCode(row) {
console.log(row)
this.reset()
this.form = row;
this.$set(this.form,'str','')
this.$set(this.form,'str1','')
this.$set(this.form,'isFixed','1')
let arr = this.form.arrivalTime.split('-')
this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
this.form.count = row.checkNum;
@ -341,38 +350,38 @@ export default {
},
//生成列表codeList
createCodeList(){
if(this.codeList.length>=this.form.checkNum){
this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
}else{
for(let i = 0; i < this.form.count; i++) {
let obj = {
typeName:this.form.typeName,
specificationType:this.form.specificationType,
typeId: this.form.typeId,
taskId: this.form.taskId,
assetsCode:'',
isFixed:this.form.isFixed,
}
this.newCodeList.push(obj)
}
console.log(this.newCodeList,'this.newCodeList')
this.codeList = this.getCodeList.concat(this.newCodeList)
}
// if(this.codeList.length>=this.form.checkNum){
// this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
// }else{
// for(let i = 0; i < this.form.count; i++) {
// let obj = {
// typeName:this.form.typeName,
// specificationType:this.form.specificationType,
// typeId: this.form.typeId,
// taskId: this.form.taskId,
// assetsCode:'',
// isFixed:this.form.isFixed,
// }
// this.newCodeList.push(obj)
// }
// console.log(this.newCodeList,'this.newCodeList')
// this.codeList = this.getCodeList.concat(this.newCodeList)
// }
},
//填充按钮
fillingCodeList(){
console.log(Number(this.form.str))
this.codeList = []
let num = Number(this.form.str)
console.log(Number(this.form.str1))
// console.log(Number(this.form.str1))
let num1 = Number(this.form.str1)
let count= num1-num+1;//生成数量
console.log()
let sum = count + this.form.bindNum;
console.log(sum)
if(sum>this.form.checkNum){
this.$modal.msgError("编码数量已超过验收数量");
}else{
// if(sum>this.form.checkNum){
// this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。");
// }else{
if(num1>num){
for(let i = 0; i < count; i++) {
let obj = {
@ -380,14 +389,16 @@ export default {
specificationType:this.form.specificationType,
typeId: this.form.typeId,
taskId: this.form.taskId,
maCode:this.form.exCode+(i+num),
maCode:this.form.exCode+("00000" + (num+i)).slice(-4),
assetsCode:'',
isFixed:this.form.isFixed,
}
this.codeList.push(obj)
}
}else{
this.$modal.msgError("编码后缀范围输入格式不正确");
}
}
// }
},
/** 提交按钮 */
@ -407,15 +418,14 @@ export default {
}else{
editPurchaseMacode(this.codeList).then(response => {
console.log(response.data)
if(response.data && response.length>0){
if(response.data && response.data.length>0){
this.codeList = response.data;
this.$modal.msgError("编码绑定失败,存在重复编码，请重新输入");
}else{
this.$modal.msgSuccess("绑定成功");
this.$modal.msgSuccess("编码绑定成功");
this.open = false;
this.getList();
}
}
});
}
@ -434,13 +444,19 @@ export default {
});
},
delCode(row) {
const maCode = row.maCode ;
this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delMacodeList(maCode);
}).then(() => {
this.getdetailmaCodeList(row);
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
console.log(row)
this.codeList.forEach((item,index) => {
if(item.maCode==row.maCode){
this.codeList.splice(index,1)
}
});
// const maCode = row.maCode ;
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
// return delMacodeList(maCode);
// }).then(() => {
// this.getdetailmaCodeList(row);
// this.$modal.msgSuccess("删除成功");
// }).catch(() => {});
},
// 返回列表页
jumpList(){

14
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -76,7 +76,19 @@
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100">
<!-- <template slot-scope="scope">
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
</template> -->
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">

68
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -118,9 +118,10 @@
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus">
<!-- <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template> -->
<template slot-scope="scope">
<span v-if="scope.row.taskStatus=='26'">已验收合格</span>
<span v-if="scope.row.taskStatus=='28'">已入库</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -135,6 +136,7 @@
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.taskStatus=='26'"
@click="handleUpdate(scope.row)"
>审核</el-button>
<!-- <el-button-->
@ -253,12 +255,15 @@
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status=='0'">未入库</span>
<span v-if="scope.row.status=='1'">已入库</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
@ -266,11 +271,13 @@
<el-button
size="mini"
type="text"
v-if="scope.row.status=='0'"
@click="pass(scope.row)"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status=='0'"
@click="refused(scope.row)"
>不通过</el-button>
<!-- <el-button-->
@ -453,16 +460,17 @@ export default {
row.taskId = this.query.taskId;
let obj = {
taskId:this.query.taskId,
checkResult:'1',//1 审核通过 2 驳回 -必填
maId:row.maId,
inputNum:row.checkNum,
maCode:row.maCode,
typeId:row.typeId,
// remark:row.remark,
// repairNum:row.repairNum,
}
let param =[obj]
let param ={
taskId:this.query.taskId,
checkResult:'1',
inputRecordList:[obj]
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
@ -477,11 +485,17 @@ export default {
console.log(this.ids)
this.ids.forEach(item => {
item.taskId = this.query.taskId;
item.checkType = '1'
item.type= item.manageType//0.编号 1.计数
item.typeId= item.typeId
item.maId= item.maId
item.inputNum= item.checkNum
item.maCode= item.maCode
});
changePutinStatus(this.ids).then(response => {
let param ={
taskId:this.query.taskId,
checkResult:'1',
inputRecordList:this.ids
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
this.getDialogTable();
@ -497,16 +511,17 @@ export default {
row.taskId = this.query.taskId;
let obj = {
taskId:this.query.taskId,
id:row.id,
checkType:'2',//1 审核通过 2 驳回 -必填
type:row.manageType,//0.编号 1.计数
maId:row.maId,
maCode:row.maCode,
inputNum:row.checkNum,
typeId:row.typeId,
remark:row.remark,
repairNum:row.repairNum,
}
let param =[obj]
let param ={
taskId:this.query.taskId,
checkResult:'2',
inputRecordList:[obj]
}
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
@ -521,11 +536,18 @@ export default {
console.log(this.ids)
this.ids.forEach(item => {
item.taskId = this.query.taskId;
item.checkType = '2'
item.type=item.manageType
item.typeId= item.typeId
item.maId= item.maId
item.inputNum= item.checkNum
item.maCode= item.maCode
});
let param ={
taskId:this.query.taskId,
checkResult:'2',
inputRecordList:this.ids
}
changePutinStatus(this.ids).then(response => {
changePutinStatus(param).then(response => {
if(response.code==200){
this.$modal.msgSuccess("审批成功");
this.getDialogTable();

31
sgzb-ui/src/views/store/shelves/shelvesConfig.vue
View File

@ -99,17 +99,17 @@
<!-- v-hasPermi="['system:user:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物品种类" align="center" key="typeId" prop="typeId" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" key="typeId" prop="typeId" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" key="houseName" prop="dept.houseName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="货架编号" align="center" key="houseId" prop="dept.houseId" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="物品种类" align="center" key="itemType" prop="itemType" class-name="" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" key="machineTypeName" prop="machineTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" key="specificationType" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="设备编码" align="center" key="maCode" prop="maCode" />
<el-table-column label="货架编号" align="center" key="houseName" prop="houseName" :show-overflow-tooltip="true" />
<el-table-column
label="操作"
align="center"
@ -124,12 +124,12 @@
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:user:edit']"-->
<!-- >修改</el-button>-->
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
@ -355,16 +355,7 @@ export default {
status: undefined,
deptId: undefined
},
// 列信息
columns: [
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true }
],
// 表单校验
rules: {
userName: [
@ -432,8 +423,8 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.handleQuery();
// this.queryParams.deptId = data.id;
// this.handleQuery();
},
// 取消按钮

165
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -1,57 +1,72 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="dictName">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物品种类" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请选择物品种类"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="是否是固定资产"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请选择设备类型"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="status">
<el-form-item label="物品种类" prop="itemId">
<el-select
v-model="queryParams.status"
placeholder="规格型号"
clearable
style="width: 240px"
v-model="queryParams.itemId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="typeItem in itemList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceId">
<el-select
v-model="queryParams.deviceId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="规格型号" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择规格型号"
clearable
style="width: 240px"
>
<el-option
v-for="model in modelList"
:key="model.typeId"
:label="model.typeName"
:value="model.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select v-model="queryParams.propId" placeholder="请选择资产属性">
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
@ -73,7 +88,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="devicesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物品种类" align="center" prop="itemType" />
@ -90,10 +105,11 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
</template>
</el-table-column>
<el-table-column label="采购单号" align="center" prop="buyTask" />
<el-table-column label="固定资产编号" align="center" prop="assetsCode" />
<el-table-column label="设备原编号" align="center" prop="preCode" />
<el-table-column label="购置批次" align="center" prop="buyTask" />
<el-table-column label="绑定标签" align="center" prop="typeId" />
<el-table-column label="二维码" align="center" prop="" />
<el-table-column label="所在仓库" align="center" prop="ownHouse" />
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
<!-- <template slot-scope="scope">-->
@ -104,12 +120,13 @@
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="danger"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
@ -157,27 +174,30 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="固定资产编号" prop="assetsCode">
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
<el-form-item label="二维码编号" >
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="采购单号" prop="buyTask">
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备原编号" prop="preCode">
<el-input v-model="form.preCode" placeholder="请输入设备原编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="购置批次" prop="buyTask">
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绑定标签" >
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
<el-form-item label="固定资产编号" prop="assetsCode">
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -227,15 +247,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出入库编号" prop="outFacCode">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
<el-form-item label="出入库次数" prop="outFacCode">
<el-input v-model="form.dictName" placeholder="请输入字典名称" disabled/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="管理员" prop="dictName">
<el-col :span="8">
<el-form-item label="厂家" prop="dictName">
<el-input v-model="form.dictName" placeholder="" />
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="" />
@ -275,7 +295,7 @@
import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
import { getProLists } from "@/api/base/base";
import { imgUpLoad } from "@/api/system/upload";
import { getTypeList } from "@/api/store/warehousing";
export default {
name: "Dict",
@ -297,13 +317,17 @@ export default {
// 总条数
total: 0,
// 字典表格数据
typeList: [],
devicesList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 日期范围
dateRange: [],
itemList:[],
typeList:[],
modelList:[],
// 查询参数
queryParams: {
pageNum: 1,
@ -328,9 +352,24 @@ export default {
created() {
this.getList();
this.getPropData();
this.getTypeList();
},
methods: {
//设备类型
getTypeList() {
getTypeList({level:'2'}).then(response => {
this.itemList = response.data;
}
);
getTypeList({level:'3'}).then(response => {
this.typeList = response.data;
}
);
getTypeList({level:'4'}).then(response => {
this.modelList = response.data;
}
);
},
/** 查询资产属性下拉 */
getPropData() {
getProLists().then(response => {
@ -340,8 +379,10 @@ export default {
/** 查询列表 */
getList() {
this.loading = true;
listMachine(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.queryParams.beginTime=this.dateRange[0]
this.queryParams.endTime=this.dateRange[1]
listMachine(this.queryParams).then(response => {
this.devicesList = response.rows;
this.total = response.total;
this.loading = false;
}

9
sgzb-ui/vue.config.js
View File

@ -35,12 +35,13 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//192.168.0.14:28080
// target: `http://192.168.0.14:21624`,//线上环境
// target: `http://10.40.92.140:8080`,//丁/
//192.168.0.14
// target: `http://112.29.103.165:21624`,//线上环境
target: `http://192.168.0.14:21624`,//线上环境
// target: `http://192.168.4.2:8080`,//丁
// target: `http://10.40.92.138:8080`,//丁/
// target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.111:8080`,//亮
target: `http://10.40.92.59:8080`,//亮
// target: `http://10.40.92.209:8080`,//刘川
changeOrigin: true,