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

前端领退料模块问题修改

This commit is contained in:
zzyuan 2024-04-20 14:29:59 +08:00
parent 7b312fbffc
commit 8dc56bcde9
13 changed files with 65 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,7 @@ export default {
},
}
},
created() {
mounted() {
this.GetUserInfo()
this.GetUnitData()

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

@ -1,5 +1,5 @@
<template>
<div class="app-container" id="receiveExamine">
<div class="app-container" id="ReceiveExamine">
<el-row :gutter="10" class="mb8">
<h3>{{ queryParams.applyFor }}提交的领料申请</h3>
<div>领料单号：{{ queryParams.code }}</div>
@ -315,7 +315,7 @@
} from '@/api/claimAndRefund/receive'
import { mapState } from 'vuex'
export default {
name: 'ReceiveExamine',
name: 'receiveExamine',
data() {
return {
flowPath: [
@ -423,7 +423,7 @@
computed: {
...mapState(['user']),
},
created() {
mounted() {
let taskId = this.$route.query.taskId
let isView = this.$route.query.isView
this.isView = false

2
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
View File

@ -197,7 +197,7 @@
label="任务状态"
align="center"
prop="taskName"
:show-overflow-tooltip="true"
:show-overflow-tooltip="true" width="150"
/>
<el-table-column
label="审批意见 "

6
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
View File

@ -356,7 +356,7 @@ export default {
}
};
},
created() {
mounted() {
this.GetUserInfo()
this.GetUnitData()
@ -604,7 +604,9 @@ export default {
v = Object.assign(v,this.queryParams.leaseApplyInfo)
this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
})
if(this.$route.query.isBack){
this.queryParams.souceByRefuse=1
}
const params = {
...this.queryParams,taskId:this.taskId,
leaseApplyInfoList:this.leaseApplyInfoList

42
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
View File

@ -175,14 +175,7 @@
<p class="time">申请时间：{{queryParams.updateTimes}}</p>
</el-card>
</el-timeline-item>
<el-timeline-item
v-for="(v,i) in flowPath"
:type="v.type"
:color="v.color"
:icon="v.icon"
:key="i"
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>
<p class="title">{{v.name}}</p>
<p class="author" v-if="queryParams[v.authorKey]">审核人：{{queryParams[v.authorKey]}}</p>
@ -285,7 +278,7 @@ import {
} from '@/api/claimAndRefund/receive'
import { mapState } from 'vuex'
export default {
name: 'ReceiveExamine',
name: 'receiveExamine',
data() {
return {
flowPath: [
@ -313,9 +306,9 @@ export default {
{
id: 117,
name: '机具分公司确认',
remarkKey: 'directAuditRemark',
authorKey: 'directAuditBy',
timeKey: 'directAuditTime',
// remarkKey: 'deptAuditRemark',
// authorKey: 'deptAuditBy',
// timeKey: '',
},
],
isView: false,
@ -382,14 +375,14 @@ export default {
computed: {
...mapState(['user']),
},
created() {
mounted() {
let taskId = this.$route.query.taskId
let isView = this.$route.query.isView
console.log("mounted")
this.isView = false
if (isView) {
this.isView = true
}
// console.log(isView)
if (taskId) {
this.getData(taskId)
}
@ -482,7 +475,9 @@ export default {
},
/** 查询 */
async getData(taskId) {
this.loading=true;
const res = await getLeaseListAllCq({ taskId })
this.loading=false;
this.queryParams = { ...this.queryParams, ...res.rows[0] }
this.$set(this.queryParams, 'leaseApplyInfo', this.queryParams.leaseApplyInfoList[0])
this.queryParams.leaseApplyDetails.forEach(v => {
@ -520,7 +515,7 @@ export default {
this.flowPath[2].icon = 'el-icon-check'
}
// console.log(this.flowPath)
if (this.queryParams.examineStatusId == 98) {
if (this.queryParams.examineStatusId == 99) {
this.flowPath[0].color = 'red'
this.flowPath[0].icon = 'el-icon-close'
this.flowPath[1].color = ''
@ -529,16 +524,25 @@ export default {
this.flowPath[2].color = ''
this.flowPath[2].icon = ''
}
if (this.queryParams.examineStatusId == 99) {
if (this.queryParams.examineStatusId == 100) {
this.flowPath[1].color = 'red'
this.flowPath[1].icon = 'el-icon-close'
this.flowPath[2].color = ''
this.flowPath[2].icon = ''
}
if (this.queryParams.examineStatusId == 100) {
this.flowPath[2].color = 'red'
this.flowPath[2].icon = 'el-icon-close'
// if (this.queryParams.examineStatusId == 100) {
// this.flowPath[2].color = 'red'
// this.flowPath[2].icon = 'el-icon-close'
// }
if(this.queryParams.leaseType=='1'){
this.flowPath = [this.flowPath[2]]
}else{
this.flowPath = this.flowPath
}
},
// 取消按钮
cancel() {

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -117,7 +117,7 @@
prop="createTimes"
:show-overflow-tooltip="true"
/>
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" width="150"/>
<!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
<el-table-column label="备注" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -503,6 +503,7 @@ export default {
// this.title = "添加字典类型";
},
handleExamine(row, type) {
this.$tab.closePage({path: '/claimAndRefund/receiveByCq/receiveExamine'})
this.$tab.closeOpenPage({
path: '/claimAndRefund/receiveByCq/receiveExamine',
query: {
@ -511,6 +512,7 @@ export default {
})
},
handleView(row) {
this.$tab.closePage({path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true'})
this.$tab.closeOpenPage({
path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true',
query: {

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

@ -412,7 +412,7 @@ export default {
rowId:''
};
},
created() {
mounted() {
this.GetUnitData()
this.GetProData()
this.GetDeviceTypeTreeFn()
@ -780,7 +780,7 @@ export default {
/////// 设备类型树 切换
async deviceTypeChange(val) {
let nodes = null;
console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)])
// console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)])
nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
console.log("nodes", nodes)
const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId })
@ -788,6 +788,16 @@ export default {
if (nodes[0].level != 4) {
return
}
if (nodes[0].data.useNum < 1) {
this.$modal.msgError("所选机具类型当前无在用!");
return
}
for (let i = 0; i < this.leaseApplyDetails.length; i++) {
if (this.leaseApplyDetails[i].typeId == nodes[0].data.typeId) {
this.leaseApplyDetails.splice(i, 1)
break
}
}
this.leaseApplyDetails.push(
this.handelTableItemData(nodes[0])
)

15
sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
View File

@ -412,7 +412,7 @@ export default {
rowId:''
};
},
created() {
mounted() {
this.GetUnitData()
this.GetProData()
this.GetDeviceTypeTreeFn()
@ -651,6 +651,8 @@ export default {
this.$message.error('退料数量不能为空！');
return;
}
this.queryParams.createBy = this.user.name
this.queryParams.companyId = this.companyId
this.queryParams.backApplyInfo = {
@ -777,7 +779,16 @@ export default {
if (nodes[0].level != 4) {
return
}
if (nodes[0].data.useNum < 1) {
this.$modal.msgError("所选机具类型当前无在用!");
return
}
for (let i = 0; i < this.leaseApplyDetails.length; i++) {
if (this.leaseApplyDetails[i].typeId == nodes[0].data.typeId) {
this.leaseApplyDetails.splice(i, 1)
break
}
}
this.leaseApplyDetails.push(
this.handelTableItemData(nodes[0])
)

2
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

@ -477,7 +477,7 @@ export default {
numList: [], //数量弹窗表格数据
}
},
created() {
mounted() {
if (this.$route.query.isView) {
this.isView = this.$route.query.isView
} else {

2
sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
View File

@ -593,7 +593,7 @@
applyList: [],
}
},
created() {
mounted() {
let arr = JSON.parse(this.$route.query.rowData)
this.rowData = arr
this.getDataAll()

2
sgzb-ui/src/views/monitor/job/log.vue
View File

@ -216,7 +216,7 @@ export default {
}
};
},
created() {
mounted() {
const jobId = this.$route.params && this.$route.params.jobId;
if (jobId !== undefined && jobId != 0) {
getJob(jobId).then(response => {

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

@ -249,7 +249,7 @@ export default {
}
};
},
created() {
mounted() {
const taskId = this.$route.query && this.$route.query.taskId;
this.taskId = taskId;
console.log(this.taskId)

2
sgzb-ui/src/views/store/newBuy/planAdd.vue
View File

@ -251,7 +251,7 @@ export default {
}
}
},
created() {
mounted() {
const planId = this.$route.query && this.$route.query.planId;
this.planId = planId;
if (this.planId == '' || !this.planId) {