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

代码合并 宁夏

This commit is contained in:
BianLzhaoMin 2024-05-06 09:51:10 +08:00
parent 86935fa01f
commit 3501c258f7
1 changed files with 438 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,6 @@
<template>
<div class="app-container" id="receiveApplyAdd">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:rules="queryRules"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :rules="queryRules" :inline="true" v-show="showSearch">
<el-row>
<el-form-item label="领料单位" prop="unitId">
<el-select
@ -19,12 +11,7 @@
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
<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="proId">
@ -36,21 +23,11 @@
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in proList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
<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="agreementCode">
<el-input
maxlength="50"
v-model="queryParams.agreementCode"
disabled
style="width: 240px"
></el-input>
<el-input maxlength="50" v-model="queryParams.agreementCode" disabled></el-input>
</el-form-item>
<el-form-item label="物品类型" prop="status">
<el-cascader
@ -61,7 +38,6 @@
@change="deviceTypeChange"
ref="deviceTypeCascader"
filterable
style="width: 240px"
></el-cascader>
</el-form-item>
<el-form-item label="领料人" prop="leasePerson">
@ -70,7 +46,6 @@
v-model="queryParams.leaseApplyInfo.leasePerson"
placeholder="请输入领料人"
clearable
style="width: 240px"
/>
</el-form-item>
<el-form-item label="领料人电话" prop="phone">
@ -78,8 +53,7 @@
maxlength="11"
v-model="queryParams.leaseApplyInfo.phone"
placeholder="请输入领料人电话"
clearable
onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
clearable onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
style="width: 240px"
/>
</el-form-item>
@ -100,24 +74,10 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-back"
size="mini"
@click="handleBack"
>领料申请</el-button
>
<el-button type="success" plain icon="el-icon-back" size="mini" @click="handleBack">领料申请</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
v-if="isEdit == 'true'"
@click="handleAdd"
>
<el-button type="primary" plain icon="el-icon-plus" size="mini" v-if="isEdit == 'true'" @click="handleAdd">
保存
</el-button>
</el-col>
@ -133,23 +93,11 @@
</el-col> -->
</el-row>
<el-table
v-loading="loading"
:data="leaseApplyDetails"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" type="index" width="80" />
<el-table-column
label="类型名称"
prop="typeCn"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
prop="guigeCn"
:show-overflow-tooltip="true"
/>
<el-table-column label="类型名称" prop="typeCn" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" prop="unitCn" />
<el-table-column label="库存数量" prop="num" />
<el-table-column label="预领数量" align="center">
@ -167,13 +115,7 @@
</el-table-column>
<el-table-column label="备注" align="center">
<template slot-scope="scope">
<el-input
maxlength="100"
v-model="scope.row.remark"
placeholder="请输入备注"
clearable
style="width: 100%"
/>
<el-input maxlength="100" v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%" />
</template>
</el-table-column>
<el-table-column
@ -195,9 +137,7 @@
size="mini"
type="text"
icon="el-icon-delete"
@click="
handleDelete({ ...scope.row, index: scope.$index })
"
@click="handleDelete({ ...scope.row, index: scope.$index })"
>
删除
</el-button>
@ -208,20 +148,9 @@
</template>
<script>
import {
getRole,
delRole,
addRole,
updateRole,
dataScope,
changeRoleStatus,
deptTreeSelect,
} from '@/api/system/role'
import {
treeselect as menuTreeselect,
roleMenuTreeselect,
} from '@/api/system/menu'
import {
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,
@ -231,9 +160,9 @@
editLeaseApply,
getLeaseApplyListAll,
getLeaseApplyAuditListAll,
} from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login'
export default {
} from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login'
export default {
name: 'ReceiveApplyAdd',
data() {
const validatePhone = (rule, value, callback) => {
@ -392,27 +321,9 @@
},
// 表单校验
rules: {
roleName: [
{
required: true,
message: '角色名称不能为空',
trigger: 'blur',
},
],
roleKey: [
{
required: true,
message: '权限字符不能为空',
trigger: 'blur',
},
],
roleSort: [
{
required: true,
message: '角色顺序不能为空',
trigger: 'blur',
},
],
roleName: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
roleKey: [{ required: true, message: '权限字符不能为空', trigger: 'blur' }],
roleSort: [{ required: true, message: '角色顺序不能为空', trigger: 'blur' }],
},
}
},
@ -495,168 +406,6 @@
}
},
// 获取 任务详情数据
async GetTaskDetail(taskId) {
const res = await getLeaseApplyListAll({ taskId })
const data = res.rows[0]
// unitId:null,
// proId:null,
// agreementId:null, //协议id
// agreementCode: null,
if (data.taskStatus == 100) {
this.queryParams.taskStatus = 32
this.queryParams.examineStatusId = '32'
}
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.proId
this.queryParams.leaseApplyInfo.phone =
data.leaseApplyInfoList[0].phone
this.queryParams.leaseApplyInfo.leasePerson =
data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
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)
})
},
// 驳回提交 任务详情数据
async GetTaskDetail2(taskId) {
const res = await getLeaseApplyAuditListAll({ taskId })
const data = res.rows[0]
// unitId:null,
// proId:null,
// agreementId:null, //协议id
// agreementCode: null,
if (data.taskStatus == 100) {
this.queryParams.taskStatus = 32
this.queryParams.examineStatusId = '32'
}
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.proId
this.queryParams.leaseApplyInfo.phone =
data.leaseApplyInfoList[0].phone
this.queryParams.leaseApplyInfo.leasePerson =
data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
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)
})
},
//生成回显数据
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
template.parenntId = item.parenntId
template.num = item.num
return template
},
// 表单重置
reset() {
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([])
}
;(this.menuExpand = false),
(this.menuNodeAll = false),
(this.deptExpand = true),
(this.deptNodeAll = false),
(this.form = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: '0',
menuIds: [],
deptIds: [],
menuCheckStrictly: true,
deptCheckStrictly: true,
remark: undefined,
})
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
},
// 多选框选中数据
handleSelectionChange(selection) {
// this.queryParams.leaseApplyDetails = selection
this.single = selection.length != 1
this.multiple = !selection.length
},
// 更多操作触发
handleCommand(command, row) {
switch (command) {
case 'handleDataScope':
this.handleDataScope(row)
break
case 'handleAuthUser':
this.handleAuthUser(row)
break
default:
break
}
},
this.GetAgreementInfoById()
},
// 获取 设备树结构数据
async GetDeviceTypeTree() {
const params = {
level: 4,
}
const res = await getDeviceTypeTree(params)
this.deviceTypeTree = res.data
},
// 获取 协议id
async GetAgreementInfoById() {
if (this.queryParams.unitId && this.queryParams.proId) {
const params = {
unitId: this.queryParams.unitId,
projectId: this.queryParams.proId,
}
const res = await getAgreementInfoById(params)
if (!(res.data && res.data.agreementId)) {
this.$message.error('当前单位和工程未上传')
this.queryParams.unitId = null
this.queryParams.proId = null
this.GetUnitData()
this.GetProData()
} else {
this.queryParams.agreementId = res.data.agreementId
this.queryParams.agreementCode = res.data.agreementCode
}
}
},
// 获取 任务详情数据
async GetTaskDetail(taskId) {
const res = await getLeaseApplyListAll({ taskId })
@ -808,16 +557,9 @@
let res
if (this.taskId) {
this.leaseApplyInfoList.forEach((v) => {
v = Object.assign(
v,
this.queryParams.leaseApplyInfo,
)
this.$set(
v,
'leaseApplyDetails',
this.queryParams.leaseApplyDetails,
)
this.leaseApplyInfoList.forEach(v => {
v = Object.assign(v, this.queryParams.leaseApplyInfo)
this.$set(v, 'leaseApplyDetails', this.queryParams.leaseApplyDetails)
})
const params = {
@ -829,15 +571,10 @@
res = await editLeaseApply(params)
} else {
// console.log(this.queryParams)
let isNum =
this.queryParams.leaseApplyDetails.every(
(e) => e.num != 0,
)
let isNum = this.queryParams.leaseApplyDetails.every(e => e.num != 0)
if (!isNum) {
this.$message.error(
'机具类型库存量为零无法领料',
)
this.$message.error('机具类型库存量为零无法领料')
return
}
res = await submitLeaseApply(this.queryParams)
@ -847,18 +584,14 @@
type: 'success',
message: res.msg,
})
this.$tab.closeOpenPage({
path: '/claimAndRefund/receive/receiveApply',
})
this.$tab.closeOpenPage({ path: '/claimAndRefund/receive/receiveApply' })
}
}
})
},
/** 修改按钮操作 */
handleBack(row) {
this.$tab.closeOpenPage({
path: '/claimAndRefund/receive/receiveApply',
})
this.$tab.closeOpenPage({ path: '/claimAndRefund/receive/receiveApply' })
},
/** 删除按钮操作 */
handleDelete(row) {
@ -886,11 +619,7 @@
nodes =
this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
? this.$refs.deviceTypeCascader.getCheckedNodes()
: [
this.$refs.deviceTypeCascader.panel.getNodeByValue(
val,
),
]
: [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
if (nodes[0].level != 4) {
return
}
@ -907,9 +636,7 @@
},
//// 将数据处理成 表格中需要的数据
handelTableItemData(node) {
const template = JSON.parse(
JSON.stringify(this.leaseApplyDetailsItem),
)
const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
template.createBy = this.user.name
console.log(node.data)
template.num = node.data.num
@ -920,14 +647,12 @@
template.guigeCn = node.pathLabels[3]
if (this.taskId) {
const index = this.leaseApplyInfoList.find(
(key) => key.companyId == node.data.companyId,
)
const index = this.leaseApplyInfoList.find(key => key.companyId == node.data.companyId)
template.parenntId = index ? index.id : ''
}
return template
},
},
}
}
</script>