首页领料任务催办功能完善，页面优化等问题
This commit is contained in:
BianLzhaoMin
parent
e4e4ce6dea
commit
2e0814935e
|
|
@ -54,11 +54,11 @@
|
|||
style="width: 240px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="selDeviceTypeChangeValue">
|
||||
<el-form-item label="设备类型" prop="companyId">
|
||||
<el-select
|
||||
@change="selDeviceTypeChange"
|
||||
style="width: 240px"
|
||||
v-model="selDeviceTypeChangeValue"
|
||||
v-model="queryParams.companyId"
|
||||
:disabled="leaseApplyDetails.length > 0"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
|
|
@ -399,6 +399,13 @@ export default {
|
|||
type: 'number',
|
||||
},
|
||||
],
|
||||
companyId: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择设备类型',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
// leasePerson: [
|
||||
// {
|
||||
// required: true, message: '请输入领料人', trigger: 'blur',
|
||||
|
|
@ -557,6 +564,7 @@ export default {
|
|||
this.queryParams.examineStatusId = '32'
|
||||
}
|
||||
this.queryParams.unitId = data.unitId
|
||||
this.queryParams.companyId = data.companyId
|
||||
this.queryParams.proId = data.proId
|
||||
this.queryParams.leaseApplyInfo.phone =
|
||||
data.leaseApplyInfoList[0].phone
|
||||
|
|
@ -586,6 +594,7 @@ export default {
|
|||
this.queryParams.examineStatusId = '32'
|
||||
}
|
||||
this.queryParams.unitId = data.unitId
|
||||
this.queryParams.companyId = data.companyId
|
||||
this.queryParams.proId = data.proId
|
||||
this.queryParams.leaseApplyInfo.phone =
|
||||
data.leaseApplyInfoList[0].phone
|
||||
|
|
@ -699,7 +708,7 @@ export default {
|
|||
throw e
|
||||
}
|
||||
this.queryParams.createBy = this.user.userName
|
||||
this.queryParams.companyId = this.user.companyId
|
||||
// this.queryParams.companyId = this.user.companyId
|
||||
this.queryParams.userId = this.user.userId
|
||||
let res
|
||||
|
||||
|
|
|
|||
|
|
@ -255,7 +255,9 @@
|
|||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
|
||||
<span>{{
|
||||
scope.row.leaseApplyInfoList[0].remark || ''
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="160">
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="领料人"
|
||||
label="现场领料人"
|
||||
align="center"
|
||||
prop="leasePerson"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="申请人"
|
||||
label="领料申请人"
|
||||
align="center"
|
||||
prop="applyFor"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
:pageContent="pageContent"
|
||||
@goBack="goBack"
|
||||
/>
|
||||
<keep-alive include="Home">
|
||||
<keep-alive :include="includeCom">
|
||||
<component
|
||||
:is="isShowComponent"
|
||||
:isView="isView"
|
||||
|
|
@ -35,11 +35,13 @@ export default {
|
|||
pageContent: '',
|
||||
auditingTaskId: '',
|
||||
isView: false,
|
||||
includeCom: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/* 审核按钮 */
|
||||
pickingAuditing(taskId) {
|
||||
this.includeCom = ''
|
||||
this.auditingTaskId = taskId
|
||||
this.isView = false
|
||||
this.pageContent = '领料任务审批'
|
||||
|
|
@ -47,6 +49,7 @@ export default {
|
|||
},
|
||||
/* 查看按钮 */
|
||||
pickingView(taskId) {
|
||||
this.includeCom = 'Home'
|
||||
this.auditingTaskId = taskId
|
||||
this.isView = true
|
||||
this.pageContent = '领料审批详情'
|
||||
|
|
|
|||
|
|
@ -51,10 +51,23 @@
|
|||
style="width: 240px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="selDeviceTypeChangeValue">
|
||||
<el-select
|
||||
@change="selDeviceTypeChange"
|
||||
style="width: 240px"
|
||||
v-model="selDeviceTypeChangeValue"
|
||||
:disabled="leaseApplyDetails.length > 0"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
>
|
||||
<el-option label="机具设备" value="101"></el-option>
|
||||
<el-option label="调试设备" value="102"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="物品类型" prop="status">
|
||||
<el-cascader
|
||||
placeholder="请输入物品类型"
|
||||
:options="deviceTypeTree"
|
||||
:options="deviceTypeTreeNew"
|
||||
:props="deviceTypeTreeProps"
|
||||
v-model="deviceType"
|
||||
@change="deviceTypeChange"
|
||||
|
|
@ -466,8 +479,11 @@ export default {
|
|||
},
|
||||
companyId: '',
|
||||
createBy: '',
|
||||
userId: '',
|
||||
isEdit: 'true',
|
||||
rowId: '',
|
||||
selDeviceTypeChangeValue: '',
|
||||
deviceTypeTreeNew: [],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -488,6 +504,7 @@ export default {
|
|||
getInfo().then((res) => {
|
||||
this.companyId = res.user.companyId
|
||||
this.createBy = res.user.userName
|
||||
this.userId = res.user.userId
|
||||
})
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -722,6 +739,7 @@ export default {
|
|||
}
|
||||
this.queryParams.createBy = this.user.name
|
||||
this.queryParams.companyId = this.companyId
|
||||
this.queryParams.userId = this.userId
|
||||
this.queryParams.backApplyInfo = {
|
||||
backPerson: this.queryParams.backPerson,
|
||||
phone: this.queryParams.phone,
|
||||
|
|
@ -733,6 +751,7 @@ export default {
|
|||
let params = {
|
||||
companyId: this.companyId,
|
||||
createBy: this.createBy,
|
||||
userId: this.userId,
|
||||
id: this.rowId,
|
||||
agreementId: this.queryParams.agreementId,
|
||||
backApplyInfo: this.queryParams.backApplyInfo,
|
||||
|
|
@ -754,6 +773,7 @@ export default {
|
|||
let params = {
|
||||
companyId: this.companyId,
|
||||
createBy: this.createBy,
|
||||
userId: this.userId,
|
||||
agreementId: this.queryParams.agreementId,
|
||||
backApplyInfo: this.queryParams.backApplyInfo,
|
||||
backApplyDetails:
|
||||
|
|
@ -894,6 +914,17 @@ export default {
|
|||
template.useNum = node.data.useNum
|
||||
return template
|
||||
},
|
||||
|
||||
// 设备类型选择 过滤对应的数据
|
||||
selDeviceTypeChange(val) {
|
||||
console.log(val, '设备类型选择-----')
|
||||
|
||||
console.log(this.deviceTypeTree, '树形数据源--')
|
||||
|
||||
this.deviceTypeTreeNew = this.deviceTypeTree.filter(
|
||||
(e) => e.companyId == val,
|
||||
)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@
|
|||
size="medium"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-if="scope.row.applyStatus == '0'"
|
||||
v-if="scope.row.taskStatus == '37'"
|
||||
v-hasPermi="['return:auditing:auditing']"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -203,12 +203,17 @@
|
|||
type="text"
|
||||
icon="el-icon-edit-outline"
|
||||
style="color: #e6a23c"
|
||||
v-if="row.taskTypeId == 29"
|
||||
v-if="
|
||||
row.taskTypeId == 29 &&
|
||||
userId === parseInt(row.createBy)
|
||||
"
|
||||
@click="
|
||||
handleUrging(
|
||||
row.taskTypeId,
|
||||
parseInt(row.taskTypeId), // 任务类型
|
||||
parseInt(row.companyId), // 机具类型
|
||||
row.taskEvent, // 任务状态
|
||||
parseInt(row.createBy), // 任务创建人
|
||||
row.taskCode,
|
||||
row.taskEvent,
|
||||
row.taskId,
|
||||
)
|
||||
"
|
||||
|
|
@ -267,6 +272,22 @@
|
|||
>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 催办详情 -->
|
||||
<DialogModel
|
||||
:dialogConfig="dialogConfig"
|
||||
@closeDialogOuter="closeDialogOuter"
|
||||
>
|
||||
<template slot="outerContent">
|
||||
<el-tag
|
||||
style="margin-right: 8px"
|
||||
v-for="item in toPersonInfoDetails"
|
||||
:key="item.v_user_id"
|
||||
>
|
||||
{{ item.v_name }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</DialogModel>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -277,8 +298,13 @@ import {
|
|||
getToPersonInfoAp,
|
||||
sendUrgingMessageApi,
|
||||
} from '@/api/index'
|
||||
|
||||
import DialogModel from '@/components/DialogModel'
|
||||
export default {
|
||||
name: 'myIndex',
|
||||
components: {
|
||||
DialogModel,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
|
@ -356,6 +382,16 @@ export default {
|
|||
// 接收人
|
||||
bmNoticeInfoList: [],
|
||||
},
|
||||
|
||||
dialogConfig: {
|
||||
outerWidth: '50%',
|
||||
outerTitle: '催办人详情',
|
||||
outerVisible: false,
|
||||
},
|
||||
|
||||
userId: parseInt(sessionStorage.getItem('userId')),
|
||||
deptId: parseInt(sessionStorage.getItem('deptId')),
|
||||
toPersonInfoDetails: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -422,18 +458,30 @@ export default {
|
|||
},
|
||||
|
||||
/* 催办按钮 */
|
||||
async handleUrging(id, taskCode, taskStatus, taskId) {
|
||||
/* 先获取催办人信息 */
|
||||
const { data: res } = await getToPersonInfoAp({
|
||||
async handleUrging(
|
||||
taskTypeId,
|
||||
companyId,
|
||||
taskStatus,
|
||||
})
|
||||
createBy,
|
||||
taskCode,
|
||||
taskId,
|
||||
) {
|
||||
const personParams = {
|
||||
taskTypeId, // 当前任务类型
|
||||
companyId, // 当前机具类型
|
||||
taskStatus, // 当前任务状态
|
||||
createBy, // 当前任务创建人
|
||||
deptId: this.deptId, // 当前任务的所属部门
|
||||
}
|
||||
/* 先获取催办人信息 */
|
||||
const { data: res } = await getToPersonInfoAp(personParams)
|
||||
res.map((e) => {
|
||||
this.toPersonInfo.push({
|
||||
noticeUser: e.userId,
|
||||
phone: e.phonenumber,
|
||||
modelName: '领料催办',
|
||||
companyId: e.companyId,
|
||||
v_name: e.nickName,
|
||||
v_name: e.userName,
|
||||
})
|
||||
})
|
||||
|
||||
|
|
@ -465,6 +513,31 @@ export default {
|
|||
this.toPersonInfo = []
|
||||
this.urgingDialogVisible = false
|
||||
},
|
||||
|
||||
/* 查看催办人详情 */
|
||||
async handleViewDetails(taskTypeId, companyId, taskStatus, createBy) {
|
||||
this.toPersonInfoDetails = []
|
||||
const personParams = {
|
||||
taskTypeId, // 当前任务类型
|
||||
companyId, // 当前机具类型
|
||||
taskStatus, // 当前任务状态
|
||||
createBy, // 当前任务创建人
|
||||
deptId: this.deptId, // 当前任务的所属部门
|
||||
}
|
||||
/* 先获取催办人信息 */
|
||||
const { data: res } = await getToPersonInfoAp(personParams)
|
||||
res.map((e) => {
|
||||
this.toPersonInfoDetails.push({
|
||||
v_user_id: e.userId,
|
||||
v_name: e.userName,
|
||||
})
|
||||
})
|
||||
this.dialogConfig.outerVisible = true
|
||||
},
|
||||
/* 关闭外层弹框 */
|
||||
closeDialogOuter(val) {
|
||||
this.dialogConfig.outerVisible = val
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,12 @@
|
|||
width="600px"
|
||||
>
|
||||
<div class="form_box_one" v-if="!isShow">
|
||||
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
|
||||
<el-form
|
||||
ref="dynamicValidateForm"
|
||||
:model="dynamicValidateForm"
|
||||
class="demo-dynamic"
|
||||
label-width="90px"
|
||||
>
|
||||
<div class="bor_box">
|
||||
<p class="form_box_title">编码管理设备</p>
|
||||
<div class="form_box_line"></div>
|
||||
|
|
@ -24,7 +29,10 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="损坏原因：">
|
||||
<el-radio-group style="width: 350px" v-model="dynamicValidateForm.scrapType">
|
||||
<el-radio-group
|
||||
style="width: 350px"
|
||||
v-model="dynamicValidateForm.scrapType"
|
||||
>
|
||||
<el-radio :label="1">人为</el-radio>
|
||||
<el-radio :label="0">自然</el-radio>
|
||||
</el-radio-group>
|
||||
|
|
@ -52,10 +60,14 @@
|
|||
>
|
||||
<template>
|
||||
<el-row class="upload-tip">
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
<el-button size="small" type="primary"
|
||||
>点击上传</el-button
|
||||
>
|
||||
</el-row>
|
||||
<el-row class="upload-tip">
|
||||
<span class="tip-text">请上传jpg、jpeg、png格式的图片，单张图片大小不可超过5M，最多可上传3张</span>
|
||||
<span class="tip-text"
|
||||
>请上传jpg、jpeg、png格式的图片，单张图片大小不可超过5M，最多可上传3张</span
|
||||
>
|
||||
</el-row>
|
||||
</template>
|
||||
</upload>
|
||||
|
|
@ -69,7 +81,12 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form_box_two" v-if="isShow">
|
||||
<el-form ref="dynamicValidateFormTwo" :model="dynamicValidateFormTwo" class="demo-dynamic" label-width="100px">
|
||||
<el-form
|
||||
ref="dynamicValidateFormTwo"
|
||||
:model="dynamicValidateFormTwo"
|
||||
class="demo-dynamic"
|
||||
label-width="100px"
|
||||
>
|
||||
<p class="form_box_title">数量管理设备</p>
|
||||
<div class="form_box_line"></div>
|
||||
<div class="form_box_item">
|
||||
|
|
@ -100,7 +117,10 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="损坏原因：">
|
||||
<el-radio-group style="width: 350px" v-model="dynamicValidateFormTwo.scrapType">
|
||||
<el-radio-group
|
||||
style="width: 350px"
|
||||
v-model="dynamicValidateFormTwo.scrapType"
|
||||
>
|
||||
<el-radio :label="1">人为</el-radio>
|
||||
<el-radio :label="0">自然</el-radio>
|
||||
</el-radio-group>
|
||||
|
|
@ -129,10 +149,14 @@
|
|||
>
|
||||
<template>
|
||||
<el-row class="upload-tip">
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
<el-button size="small" type="primary"
|
||||
>点击上传</el-button
|
||||
>
|
||||
</el-row>
|
||||
<el-row class="upload-tip">
|
||||
<span class="tip-text">请上传jpg、jpeg、png格式的图片，单张图片大小不可超过5M，最多可上传3张</span>
|
||||
<span class="tip-text"
|
||||
>请上传jpg、jpeg、png格式的图片，单张图片大小不可超过5M，最多可上传3张</span
|
||||
>
|
||||
</el-row>
|
||||
</template>
|
||||
</upload>
|
||||
|
|
@ -149,7 +173,10 @@
|
|||
<script>
|
||||
import uploadImage from './uploadImage.vue'
|
||||
import upload from './upload.vue'
|
||||
import { submitRepairApplyApi, getRepairMaTypeListApi } from '@/api/repairTest/repair'
|
||||
import {
|
||||
submitRepairApplyApi,
|
||||
getRepairMaTypeListApi,
|
||||
} from '@/api/repairTest/repair'
|
||||
import { getInfo } from '@/api/login'
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -214,10 +241,10 @@ export default {
|
|||
}
|
||||
},
|
||||
mounted() {
|
||||
this.$eventBus.$on('taskId', taskId => {
|
||||
this.$eventBus.$on('taskId', (taskId) => {
|
||||
this.taskId = taskId
|
||||
})
|
||||
getInfo().then(res => {
|
||||
getInfo().then((res) => {
|
||||
this.companyId = res.user.companyId
|
||||
})
|
||||
},
|
||||
|
|
@ -225,8 +252,10 @@ export default {
|
|||
handleRemove(file, fileList) {
|
||||
this.fileList = fileList
|
||||
console.log('fileListRemove', fileList)
|
||||
fileList.map(item => {
|
||||
this.fileIds = fileList.map(item => item.response.data.id).join(',')
|
||||
fileList.map((item) => {
|
||||
this.fileIds = fileList
|
||||
.map((item) => item.response.data.id)
|
||||
.join(',')
|
||||
})
|
||||
},
|
||||
handlePreview(file) {
|
||||
|
|
@ -237,14 +266,16 @@ export default {
|
|||
},
|
||||
handleSuccess(response, fileList) {
|
||||
this.fileList = fileList
|
||||
fileList.map(item => {
|
||||
this.fileIds = fileList.map(item => item.response.data.id).join(',')
|
||||
fileList.map((item) => {
|
||||
this.fileIds = fileList
|
||||
.map((item) => item.response.data.id)
|
||||
.join(',')
|
||||
})
|
||||
},
|
||||
//正则校验配件数量--维修数量
|
||||
numberIntegerValidator(rule, value, callback) {
|
||||
const reg = /^\+?[1-9][0-9]*$/
|
||||
if ((value && reg.test(value)) && value <= this.rowObj.repairNum) {
|
||||
if (value && reg.test(value) && value <= this.rowObj.repairNum) {
|
||||
callback()
|
||||
} else {
|
||||
callback(new Error('请输入大于0并且小于维修总量的正整数'))
|
||||
|
|
@ -255,7 +286,7 @@ export default {
|
|||
taskId: this.taskId,
|
||||
}
|
||||
this.loading = true
|
||||
getRepairMaTypeListApi(params).then(res => {
|
||||
getRepairMaTypeListApi(params).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.repairList = res.rows
|
||||
this.total = res.total
|
||||
|
|
@ -264,7 +295,7 @@ export default {
|
|||
})
|
||||
},
|
||||
submit() {
|
||||
this.$refs['dynamicValidateForm'].validate(valid => {
|
||||
this.$refs['dynamicValidateForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
// 编码管理传递参数
|
||||
let params = {
|
||||
|
|
@ -281,7 +312,7 @@ export default {
|
|||
}
|
||||
this.fullscreenLoading = true
|
||||
submitRepairApplyApi(params)
|
||||
.then(res => {
|
||||
.then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.fileList = []
|
||||
this.fileIds = []
|
||||
|
|
@ -301,7 +332,7 @@ export default {
|
|||
})
|
||||
},
|
||||
submitTwo() {
|
||||
this.$refs['dynamicValidateFormTwo'].validate(valid => {
|
||||
this.$refs['dynamicValidateFormTwo'].validate((valid) => {
|
||||
if (valid) {
|
||||
// 数量管理传递参数
|
||||
let params = {
|
||||
|
|
@ -319,7 +350,7 @@ export default {
|
|||
}
|
||||
this.fullscreenLoading = true
|
||||
submitRepairApplyApi(params)
|
||||
.then(res => {
|
||||
.then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$refs.dynamicValidateFormTwo.clearValidate()
|
||||
this.fileList = []
|
||||
|
|
@ -341,8 +372,8 @@ export default {
|
|||
})
|
||||
},
|
||||
fileListChange(data) {
|
||||
data.map(item => {
|
||||
this.fileIds = data.map(item => item.id).join(',')
|
||||
data.map((item) => {
|
||||
this.fileIds = data.map((item) => item.id).join(',')
|
||||
})
|
||||
},
|
||||
init() {
|
||||
|
|
@ -355,7 +386,7 @@ export default {
|
|||
this.dynamicValidateFormTwo = {}
|
||||
this.isShow = true
|
||||
}
|
||||
getInfo().then(res => {
|
||||
getInfo().then((res) => {
|
||||
this.companyId = res.user.companyId
|
||||
})
|
||||
this.fileList = []
|
||||
|
|
@ -363,7 +394,7 @@ export default {
|
|||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.$refs.dynamicValidateFormTwo.clearValidate()
|
||||
// this.$refs.dynamicValidateFormTwo.clearValidate()
|
||||
this.dialogShowFlag = false
|
||||
this.fileList = []
|
||||
},
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ module.exports = {
|
|||
// target: `http://10.40.92.51:28080`, //超
|
||||
// target: `http://10.40.92.81:8080`, //韩/
|
||||
// target: `http://10.40.92.74:8080`,//旭/
|
||||
target: `http://10.40.92.138:28080`, //帅
|
||||
// target: `http://10.40.92.253:28080`, //福
|
||||
// target: `http://10.40.92.138:28080`, //帅
|
||||
target: `http://10.40.92.253:28080`, //福
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
|
||||
|
|
|
|||
Loading…
Reference in New Issue