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:
sliang 2023-12-23 13:43:19 +08:00
parent 7e8e5b269b eab80f6156
commit 133baa8f3f
14 changed files with 528 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
View File

@ -40,6 +40,10 @@ public class LeaseOutDetails implements Serializable {
@ApiModelProperty(value = "maId")
private Integer maId;
/** 机具编号 */
@ApiModelProperty(value = "机具编号")
private String maCode;
/** 协议ID */
@ApiModelProperty(value = "协议ID")
private String agreementId;

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -31,6 +31,18 @@ public class LeaseOutDetailsController extends BaseController {
return getDataTable(leaseOutDetailsService.selectListByParentId(taskId));
}
/**
* 根据code编码查询设备信息
* @param mCode 机具编码
* @return 设备信息
*/
@Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY)
@GetMapping("/getMaMachineByCode")
public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) {
return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode));
}
/**
* 领料出库，对库存处理
* @param record 出库内容

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

@ -1,6 +1,7 @@
package com.bonus.sgzb.app.service;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import java.util.List;
@ -17,4 +18,6 @@ public interface LeaseOutDetailsService {
List<LeaseOutDetails> selectListByParentId(String parentId);
AjaxResult submitOut(LeaseOutDetails record);
List<MaMachine> getMaMachineByCode(String maCode);
}

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

@ -3,6 +3,8 @@ package com.bonus.sgzb.app.service.impl;
import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper;
import com.bonus.sgzb.app.service.LeaseOutDetailsService;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.base.api.domain.MaMachine;
import com.bonus.sgzb.base.mapper.MaMachineMapper;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.springframework.stereotype.Service;
@ -24,6 +26,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
@Resource
private LeaseOutDetailsMapper leaseOutDetailsMapper;
@Resource
private MaMachineMapper maMachineMapper;
/**
* 根据任务id查询出库数据
* @param parentId 任务id
@ -44,6 +49,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (StringUtils.isNull(record)) {
return AjaxResult.error("领料出库失败,请检查参数是否填写完整!");
}
if (record.getOutNum() == null || record.getOutNum() < 0.1) {
record.setOutNum(1.00);
}
// 首先更新领料任务详情表的领料数及状态
int updateLeaseApplyDetailsOutNum = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record);
// 插入领料出库明细表
@ -74,7 +82,14 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
return AjaxResult.error("出库操作失败,更新领料数量及状态时出错!");
}
/**
* @param maMachine
* @return
*/
@Override
public List<MaMachine> getMaMachineByCode(String maCode) {
return maMachineMapper.getMaMachineByCode(maCode);
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
View File

@ -9,6 +9,8 @@ import java.util.List;
public interface MaMachineMapper {
public List<MaMachine> getMaMachine(MaMachine maMachine);
public List<MaMachine> getMaMachineByCode(String maCode);
public List<MaMachine> getMaMachineList(MaMachine maMachine);
public int maMachineAdd(MaMachine maMachine);

2
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -19,7 +19,7 @@
UPDATE
lease_apply_details
SET
al_num = al_num + 1,
al_num = al_num + #{record.outNum},
<if test="record.updateBy != null and record.updateBy!= '' ">
update_by = #{record.updateBy},
</if>

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

@ -454,7 +454,7 @@
</update>
<select id="getAuditListByLeaseTmTask" 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_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
@ -496,7 +496,6 @@
<if test="record.keyWord != null and record.keyWord != ''">
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
</if>
GROUP BY tt.task_id
</select>
<select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">

17
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -58,6 +58,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by m.ma_id desc
</select>
<select id="getMaMachineByCode" parameterType="java.lang.String" resultMap="MaMachineResult">
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
mmb.label_code labelCode
from ma_machine m
left join (select id,p_id,name from sys_dic where p_id in (select id from sys_dic where value = 'ma_status')) dic on m.ma_status = dic.id
left join ma_type mt on m.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
<where>
m.ma_code = #{maCode}
</where>
order by m.ma_id desc
</select>
<select id="getMaMachineList" parameterType="com.bonus.sgzb.base.api.domain.MaMachine" resultMap="MaMachineResult">
select ma_id, type_id, ma_code, pre_code, ma_status, qr_code, buy_price, ma_vender, out_fac_time, out_fac_code,

11
sgzb-ui/src/api/claimAndRefund/receive.js
View File

@ -132,6 +132,17 @@ export function getTaskDetail( params = {} ){
}
// 获取 物品类型
export function getUseTypeTreee(params = {}){
return request({
url: '/material/backApply/getUseTypeTree',
method: 'post',
data: params
})
}

10
sgzb-ui/src/api/claimAndRefund/return.js
View File

@ -51,5 +51,13 @@ export function ApiGetMaterialList(query) {
//审核
export function ApiBackApplyAudit(query) {
return request({
url: '/material/backApply/audit',
method: 'get',
params: query
})
}

12
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -100,12 +100,6 @@
<template slot-scope="scope">
<el-button size="mini" type="primary" plain icon="el-icon-zoom-in" @click="handleUpdate(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']">查看</el-button>
<el-button size="mini" type="primary" icon="el-icon-s-order" @click="handleUpdateOrder(scope.row)"
v-hasPermi="['store:labelType:edit']">退料单</el-button>
<el-button size="mini" type="warning" plain icon="el-icon-edit-outline"
@click="handleUpdate(scope.row, 'update')" v-hasPermi="['store:labelType:edit']">编辑</el-button>
<el-button size="mini" type="warning" icon="el-icon-check" @click="handleSubmit(scope.row)"
v-hasPermi="['store:labelType:edit']">提交</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']">删除</el-button>
</template>
@ -309,8 +303,8 @@ export default {
console.log("paramsparamsparams", params)
const res = await ApiGetBackApplyList(params)
console.log("res=====", res)
this.typeList = res.rows;
this.total = res.total;
this.typeList = res.data.rows;
this.total = res.data.total;
this.loading = false;
} catch (error) {
@ -493,7 +487,7 @@ export default {
},
resetQuery1(){
}

151
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -17,23 +17,24 @@
</el-select>
</el-form-item>
<el-form-item label="协议号" prop="agreementCode">
<el-input v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
<el-input v-model="queryParams.agreementCode" disabled></el-input>
</el-form-item>
<el-form-item label="物品类型" prop="status">
<el-cascader placeholder="请输入物品类型" :options="deviceTypeTree" :props="deviceTypeTreeProps"
v-model="deviceType" @change="deviceTypeChange" ref="deviceTypeCascader" filterable></el-cascader>
</el-form-item>
<el-form-item label="退料人" prop="roleName">
<el-input v-model="queryParams.leaseApplyInfo.leasePerson" placeholder="请输入退料人" clearable
<el-input v-model="queryParams.leaseApplyInfo.backPerson" placeholder="请输入退料人" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="退料时间" prop="roleName">
<el-date-picker v-model="queryParams.backTime" type="date" placeholder="选择时间">
</el-date-picker>
</el-form-item>
<el-form-item label="退料人电话" prop="roleName">
<el-input v-model="queryParams.leaseApplyInfo.phone" placeholder="请输入退料人电话" clearable
style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="退料协议编号" prop="dictName">
<el-input v-model="queryParams.dictName" placeholder="请输入关键字" clearable style="width: 240px" />
</el-form-item>
<el-form-item label="备注" prop="roleName">
<el-input v-model="queryParams.leaseApplyInfo.remark" placeholder="请输入备注" clearable rows="1"
type="textarea" style="width: 240px" @keyup.enter.native="handleQuery" />
@ -52,31 +53,44 @@
<el-button type="success" plain icon="el-icon-back" size="mini" @click="handleUpdate">退料管理</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:role:export']">导出</el-button>
<!-- <el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="120" />
<el-table-column label="类型名称" prop="typeCn" width="200" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="guigeCn" width="200" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" prop="unitCn" width="100" />
<el-table-column label="预领数量" align="center" prop="createTime" width="180">
<el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="55" align="center" />
<el-table-column label="序号" type="index" min-width="120" />
<el-table-column label="类型名称" prop="typeCn" min-width="200" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="guigeCn" min-width="200" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" prop="unitCn" min-width="100" />
<el-table-column label="在用数量" align="center" prop="createTime" min-width="180">
<template slot-scope="scope">
<el-input v-model.number="scope.row.preNum" placeholder="请输入预领数量" type="number" clearable
<el-input v-model.number="scope.row.num" placeholder="请输入在用数量" type="number" clearable
style="width: 100%" @keyup.enter.native="handleQuery" />
<!-- -->
</template>
</el-table-column>
<el-table-column label="预退数量" align="center" prop="createTime" min-width="180">
<template slot-scope="scope">
<el-input v-model.number="scope.row.preNum" placeholder="请输入预退数量" type="number" clearable
style="width: 100%" @keyup.enter.native="handleQuery" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="createTime" width="180">
<el-table-column label="备注" align="center" prop="createTime" min-width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%"
@keyup.enter.native="handleQuery" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="160px">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<!-- <el-button-->
<!-- size="mini"-->
@ -101,13 +115,19 @@
<script>
import { getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import { getProData, getUnitData, getDeviceTypeTree, getAgreementInfoById, submitLeaseApply } from '@/api/claimAndRefund/receive'
import { ApiSubmitBackApply, ApiGetMaterialList } from '@/api/claimAndRefund/receive'
import {
getProData,
getUnitData,
getDeviceTypeTree,
getAgreementInfoById,
submitLeaseApply,
getTaskDetail,
getUseTypeTreee
} from '@/api/claimAndRefund/receive'
import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
import { mapState } from 'vuex'
export default {
name: "Role",
dicts: ['sys_normal_disable'],
data() {
return {
// 遮罩层
@ -171,19 +191,23 @@ export default {
unitId: null,
proId: null,
agreementId: null, //协议id
agreementCode: null, //协议code
companyId: '', //登录信息中取
createBy: '', //用户名
taskType: 29,
taskStatus: 30,
backTime:'',//申请时间
//退料人信息
leaseApplyInfo: {
leasePerson: '',
backPerson: '',
phone: '',
remark: ''
},
//退料详情集合
leaseApplyDetails: []
},
leaseApplyDetails: [],
//退料详情单条模板
@ -249,7 +273,10 @@ export default {
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)
}
},
computed: {
...mapState(['user'])
@ -275,15 +302,17 @@ export default {
this.GetAgreementInfoById()
},
// 获取 设备树结构数据
async GetDeviceTypeTree() {
const params = {
level: 4
agreementId: 4
}
const res = await getDeviceTypeTree(params)
const res = await getUseTypeTreee(params)
this.deviceTypeTree = res.data
},
// 获取 协议id
async GetAgreementInfoById() {
if (this.queryParams.unitId && this.queryParams.proId) {
const params = {
@ -291,7 +320,6 @@ export default {
projectId: this.queryParams.proId
}
const res = await getAgreementInfoById(params)
console.log("getAgreementInfoById",res)
if (!(res.data && res.data.agreementId)) {
this.$message.error('当前单位和工程未上传');
@ -301,10 +329,51 @@ export default {
this.GetProData()
} else {
this.queryParams.agreementId = res.data.agreementId
this.queryParams.agreementCode = res.data.agreementCode
}
}
},
// 获取 任务详情数据
async GetTaskDetail(taskId) {
const res = await getTaskDetail({ taskId })
const data = res.rows[0]
console.log('GetTaskDetail =================', data)
// unitId:null,
// proId:null,
// agreementId:null, //协议id
// agreementCode: null,
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.projectId
this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfo.phone
this.queryParams.leaseApplyInfo.backPerson = data.leaseApplyInfo.backPerson
this.queryParams.agreementCode = data.agreementCode
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfo.remark
this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
return this.handelEchoData(item)
})
},
//生成回显数据
handelEchoData(item) {
const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
template.createBy = item.createBy
template.companyId = item.companyId
template.typeId = item.typeId
template.unitCn = item.unitName
template.typeCn = item.typeName
template.guigeCn = item.typeModelName
template.remark = item.remark
template.preNum = item.preNum
template.status = item.status
return template
},
/** 查询角色列表 */
async getList() {
@ -397,9 +466,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.roleId)
this.single = selection.length != 1
this.multiple = !selection.length
this.queryParams.leaseApplyDetails = selection
},
// 更多操作触发
handleCommand(command, row) {
@ -421,14 +488,18 @@ export default {
if (!valid) {
return false
} else {
console.log("this.queryParams.leaseApplyDetails", this.queryParams.leaseApplyDetails)
if (this.queryParams.leaseApplyDetails.length == 0) {
this.$message.error('请添加数据');
this.$message.error('请添加并勾选数据');
return
}
this.queryParams.createBy = this.user.name
this.queryParams.companyId = this.user.id
const res = await ApiGetMaterialList(this.queryParams)
console.log("ApiSubmitBackApplyInfo", this.queryParams)
return
const res = await ApiSubmitBackApply(this.queryParams)
if (res.code == 200) {
this.$message({
type: 'success',
@ -493,7 +564,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
this.queryParams.leaseApplyDetails.splice(row.index, 1)
this.leaseApplyDetails.splice(row.index, 1)
},
/** 导出按钮操作 */
handleExport() {
@ -507,29 +578,31 @@ export default {
/////// 设备类型树 切换
deviceTypeChange(val) {
let nodes = null;
nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
const nodes = this.$refs.deviceTypeCascader.getCheckedNodes()
console.log('this.deviceType1 =============', this.deviceType)
if (nodes[0].level != 4) {
return
}
this.queryParams.leaseApplyDetails.push(
this.leaseApplyDetails.push(
this.handelTableItemData(nodes[0])
)
console.log("88888888888888888888888888888",nodes)
// this.$refs.cascader.$refs.panel.clearCheckedNodes()
// // 设置为空可以让节点不高亮显示
// this.$refs.cascader.$refs.panel.activePath = []
this.deviceType = {}
console.log('this.deviceType2 =============', this.deviceType)
},
//// 将数据处理成 表格中需要的数据
handelTableItemData(node) {
const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
template.createBy = this.user.name
template.companyId = this.user.id
template.companyId = this.user.companyId
template.typeId = node.data.id
template.unitCn = node.data.unitName
template.typeCn = node.pathLabels[2]

705
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -1,423 +1,223 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="关键字" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入关键字"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<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-form-item>
<el-form-item label="单位名称" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入单位名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="单位名称" prop="unitId">
<el-select v-model="queryParams.unitId" clearable @change="getAgreementByUnit" style="width: 240px"
placeholder="请选择">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入工程名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" clearable @change="getAgreementByProId" style="width: 240px"
placeholder="请选择">
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工机具类型" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入工机具类型"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="工机具类型" prop="typeId">
<el-cascader v-model="queryParams.typeId" :options="deptOptions"
:props="{ expandTrigger: 'hover', label: 'label', value: 'id', checkStrictly: true }" @change="handleNodeClick"
aria-placeholder="请选择极具类型"> </el-cascader>
</el-form-item>
<el-form-item label="协议号" prop="agreementCode">
<el-input v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
</el-form-item>
<el-form-item label="退料状态" prop="taskStatus">
<el-select v-model="queryParams.taskStatus" clearable style="width: 240px"
placeholder="请选择">
<el-option v-for="item in taskStatusList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="退料状态" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请选择退料状态"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="协议号" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请选择协议号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="退料申请时间" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入退料申请时间"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="退料申请时间" prop="time">
<el-date-picker v-model="queryParams.time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- :disabled="multiple" -->
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
v-hasPermi="['store:labelType:add']"
@click="handleUpdate('111', 'update')"
>批量审核</el-button
>
<el-button type="primary" plain size="mini" @click="handleAdd"
v-hasPermi="['store:labelType:add']">退料申请</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button
>
<!-- :disabled="multiple" -->
<el-button type="warning" plain size="mini" @click="handleSubmit()"
v-hasPermi="['store:labelType:add']">批量提交</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['store:labelType:export']">导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<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="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" sortable align="center" prop="dictId" />
<el-table-column
label="退料单号"
align="center"
sortable
prop="dictName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料单位名称"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料工程名称"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料工机具类型"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人员"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人联系电话"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料申请时间"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="协议号"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="是否异常退料"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料状态"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="不通过原因"
align="center"
prop="dictName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200px"
>
<el-table-column label="序号" sortable align="center" type="index" />
<el-table-column label="退料单号" align="center" prop="code" sortable :show-overflow-tooltip="true" />
<el-table-column label="退料单位名称" align="center" sortable prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="退料工程名称" sortable align="center" prop="lotName" :show-overflow-tooltip="true" />
<el-table-column label="退料工机具类型" align="center" prop="typeName" sortable :show-overflow-tooltip="true" />
<el-table-column label="退料人员" align="center" prop="backPerson" sortable :show-overflow-tooltip="true" />
<el-table-column label="退料人联系电话" align="center" prop="phone" sortable :show-overflow-tooltip="true" />
<el-table-column label="退料申请时间" align="center" prop="backTime" sortable :show-overflow-tooltip="true" />
<el-table-column label="协议号" align="center" prop="agreementCode" sortable :show-overflow-tooltip="true" />
<el-table-column label="是否异常退料" align="center" prop="dictName" sortable :show-overflow-tooltip="true" >
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-zoom-in"
@click="handleUpdate(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']"
>查看</el-button
>
<el-button
size="mini"
type="warning"
icon="el-icon-circle-check"
@click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']"
>审核</el-button
>
<el-button
size="mini"
type="primary"
icon="el-icon-document"
@click="handleUpdateOrder(scope.row)"
v-hasPermi="['store:labelType:edit']"
>退料单</el-button
>
<div>
<!-- 暂时全部未否 -->
否
</div>
</template>
</el-table-column>
<el-table-column label="退料状态" align="center" sortable :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- 状态
37-待审核
38-已审核 -->
<el-button type="text" v-if="scope.row.taskStatus == '37'">
待审核
</el-button>
<el-button type="text" style="color:#67C23A" v-else-if="scope.row.taskStatus == '38'">
已审核
</el-button>
</template>
</el-table-column>
<el-table-column label="不通过原因" align="center" prop="dictName" sortable :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
<template slot-scope="scope">
<el-button size="mini" type="primary" plain icon="el-icon-zoom-in" @click="handleUpdate(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']">查看</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row>
<el-form-item label="退料单位" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入借出方单位"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
</el-form-item>
<el-form-item label="退料工程" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入借入方单位"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
</el-form-item>
<el-form-item label="退料协议编号" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入关键字"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入关键字" clearable style="width: 240px" />
</el-form-item>
</el-row>
<el-row>
<el-form-item label="退料人" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入借出方单位"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
</el-form-item>
<el-form-item label="退料人电话" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入借入方单位"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
</el-form-item>
</el-row>
<el-row>
<el-form-item label="关键字" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入借出方单位"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">重置</el-button>
</el-form-item>
</el-row>
</el-form>
<el-table
v-loading="loading"
:data="typeList"
height="500px"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="typeList" height="500px" @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-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"
class-name="small-padding fixed-width"
width="200"
>
<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" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-input
v-model="scope.row.dictName"
placeholder="请输入退料数量"
clearable
/>
<el-input v-model="scope.row.dictName" placeholder="请输入退料数量" clearable />
</template>
</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" />
<div
slot="footer"
class="dialog-footer"
style="text-align: center"
v-if="type == 'update'"
>
<el-button type="primary" @click="submitForm">通过</el-button>
<el-button @click="cancel">不通过</el-button>
<div slot="footer" class="dialog-footer" style="text-align: center" v-if="type == 'update'">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">取消</el-button>
</div>
</el-dialog>
<dialogForm
:dialogTitle="title"
:isShowFlag.sync="isShowOneFlag"
:priKey="priKey"
></dialogForm>
<!-- 退料单 -->
<dialogForm :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey"></dialogForm>
<!-- 提交 -->
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body
width="400px">
<div class="submit_box">
<div>
<i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
</div>
<div class="submit_box_title">
<div>{{ openTextOne }}</div>
<div>{{ openTextTwo }}</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">返回</el-button>
<el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
</div>
</el-dialog>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body
width="400px">
<div class="submit_box_two">
<div>
<i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
</div>
<div class="submit_box_title">{{ openTextThree }}</div>
</div>
<div slot="footer" class="dialog-footer"></div>
</el-dialog>
</div>
</template>
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { ApiGetBackApplyList } from "@/api/claimAndRefund/return.js"
import {
getInfo, h
} from "@/api/login";
import { getUnitData, getProData, getAgreementInfoById } from "@/api/claimAndRefund/receive.js"
import dialogForm from "./dialogForm.vue";
// 10:42开始日期startTime,结束日期endTime 机具类型typeId
// http://localhost/claimAndRefund/return/returnApply
export default {
components: { dialogForm, },
name: "Dict",
dicts: ['sys_normal_disable'],
components: { dialogForm, },
data() {
return {
isShowOneFlag: false,
fullscreenLoading: false,
type: '',
isShowOneFlag: false,
priKey: '',
// 遮罩层
loading: true,
// 选中数组
@ -442,9 +242,15 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined
keyWord: '',//关键字
unitId: "",//单位id
lotId: '',//工程id
taskStatus: '',//状态
typeId: '',//工机具类型
time: '',
agreementCode: '',//协议
startTime: '',
endTime: ''
},
// 表单参数
form: {},
@ -456,22 +262,55 @@ export default {
dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" }
]
}
},
openOne: false,
openTwo: false,
openTextOne: '',
openTextTwo: '',
openTextThree: '',
companyId: '',
deptOptions: [],
unitList: [],
proList: [],
taskStatusList:[
{
name:'待审核',
id:'37'
},
{
name:'已审核',
id:'38'
}
]
};
},
created() {
this.getList();
this.initSelectData()
this.InitIGetInfo()
},
methods: {
/** 查询字典类型列表 */
getList() {
// claimAndRefund/return/returnApplyAdd
// claimAndRefund/return/returnApplyAdd
/** 查询字典类型列表 startTime,结束日期endTime */
async getList() {
this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.total = response.total;
this.queryParams.startTime = this.queryParams.time[0]
this.queryParams.endTime = this.queryParams.time[1]
try {
let params = {
companyId: this.companyId,
...this.queryParams
}
console.log("paramsparamsparams", params)
const res = await ApiGetBackApplyList(params)
console.log("res=====", res)
this.typeList = res.rows;
this.total = res.total;
this.loading = false;
} catch (error) {
}
);
},
// 取消按钮
cancel() {
@ -497,14 +336,16 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
// this.resetForm("queryForm");
this.$refs.queryForm.resetFields()
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "计划借调";
// this.reset();
// // this.open = true;
// // this.title = "计划借调";
this.$router.push("/claimAndRefund/return/returnApplyAdd");
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -516,20 +357,29 @@ export default {
handleUpdate(row, type) {
this.type = type
this.reset();
// const dictId = row.dictId || this.ids
// getType(dictId).then(response => {
// this.form = response.data;
// this.open = true;
// this.title = "修改";
// });
this.open = true;
this.title = "修改";
const dictId = row.dictId || this.ids
getType(dictId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改";
});
},
// 退料单
handleUpdateOrder() {
this.title = "查看";
this.isShowOneFlag = true
},
// 提交
handleSubmit() {
this.title = "确认操作";
this.openTextOne = "确认提交申请么?";
this.openTextTwo = "确认提交申请么?";
this.openOne = true
},
submitOpenOneForm() {
this.openTextThree = "提交成功！";
this.openTwo = true
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
@ -572,7 +422,122 @@ export default {
this.$modal.msgSuccess("刷新成功");
this.$store.dispatch('dict/cleanDict');
});
},
InitIGetInfo() {
getInfo().then(res => {
this.companyId = res.user.companyId
console.log("9999999999999")
this.getList();
})
},
handleNodeClick(ev) {
},
initSelectData() {
this.GetUnitData()
this.GetProData()
},
// 获取 来往单位 列表数据
async GetUnitData() {
const params = {
}
const res = await getUnitData(params)
this.unitList = res.data
console.log('GetUnitData ======================', res)
},
// 获取 工程名称 列表数据
async GetProData() {
const params = {
id:this.queryParams.unitId
}
const res = await getProData(params)
this.proList = res.data
console.log('GetProData ======================', res)
},
// 获取 工程名称 列表数据
async InitGetAgreementInfoById() {
const {
unitId,
proId
} = this.queryParams
if (!unitId || !proId) {
return
}
const params = {
unitId: unitId,
projectId: proId
}
const res = await getAgreementInfoById(params)
// this.proList = res.data
console.log('getAgreementInfoById ======================', res)
this.queryParams.agreementCode = res.data.agreementCode
},
getAgreementByUnitAndProId() {
this.InitGetAgreementInfoById()
},
getAgreementByProId(){
this.InitGetAgreementInfoById()
},
getAgreementByUnit(){
this.GetProData()
},
handleQuery1(){
},
resetQuery1(){
}
}
};
</script>
<style lang="scss" scoped>
.submit_box {
display: flex;
justify-content: flex-start;
align-items: center;
.submit_box_title {
display: flex;
flex-direction: column;
margin-left: 15px;
:first-child {
font-size: 14px;
font-weight: 600;
}
:last-child {
margin-top: 6px;
font-size: 12px;
}
}
}
.submit_box_two {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
margin-left: 30%;
.submit_box_title {
display: flex;
flex-direction: column;
margin-left: 10px;
font-size: 18px;
font-weight: 600;
}
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important;
margin-bottom: 10px;
}
</style>

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

@ -40,7 +40,8 @@ module.exports = {
// target: `http://10.40.92.140:8080`,//丁/
// target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.111:8080`,//亮
target: `http://10.40.92.209:8080`,//刘川
target: `http://10.40.92.59:8080`,//亮
// target: `http://10.40.92.209:8080`,//刘川
changeOrigin: true,
pathRewrite: {