wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

关闭弹窗bug

This commit is contained in:
851673013@qq.com 2022-07-21 13:52:30 +08:00
parent c0831d1eea
commit 66e479ed5f
2 changed files with 249 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
View File

@ -37,7 +37,9 @@
<h3>审批</h3> <h3>审批</h3>
<div> <div>
<el-button type="primary" @click="showDialog('同意')">同意</el-button> <el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')">拒绝</el-button> <el-button type="danger" plain @click="showDialog('拒绝')"
>拒绝</el-button
>
<!-- <el-radio-group v-model="agreeOrList" style="width: 230px"> <!-- <el-radio-group v-model="agreeOrList" style="width: 230px">
<el-radio-button label="同意" class="blueAll">同意</el-radio-button> <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
<el-radio-button label="退回" class="redAll">退回</el-radio-button> <el-radio-button label="退回" class="redAll">退回</el-radio-button>
@ -63,11 +65,16 @@
title="审批意见" title="审批意见"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:before-close="handleClose"> :before-close="handleClose"
>
<el-input v-model="input" placeholder="请输入审批意见"></el-input> <el-input v-model="input" placeholder="请输入审批意见"></el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose2">取 消</el-button> <el-button @click="handleClose2">取 消</el-button>
<el-button type="primary" @click="agreeOrNot()">确 定</el-button> <el-button
type="primary"
@click.native="agreeOrNot($store.state.contentTabsActiveName)"
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -157,11 +164,11 @@ export default {
}, },
handleClose (done) { handleClose (done) {
this.$confirm('确认关闭？') this.$confirm('确认关闭？')
.then(_ => { .then((_) => {
this.input = '' this.input = ''
done() done()
}) })
.catch(_ => {}) .catch((_) => {})
}, },
handleClose2 () { handleClose2 () {
this.dialogVisible = false this.dialogVisible = false
@ -185,15 +192,18 @@ export default {
}) })
}, },
// 同意与退回 // 同意与退回
agreeOrNot: debounce(function () { agreeOrNot: debounce(
function (data) {
if (this.dialogType === '同意') { if (this.dialogType === '同意') {
console.log('this.dataForm', this.dataForm) console.log('this.dataForm', this.dataForm)
const params = qs.stringify({ const params = qs.stringify({
taskId: this.dataForm.taskId, taskId: this.taskId,
comment: this.input comment: this.input
}) })
console.log(params) console.log(params)
this.$http.post('/act/task/complete?' + params).then(({ data: res }) => { this.$http
.post('/act/task/complete?' + params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error(res.msg) this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) { if (this.callbacks.taskHandleErrorCallback) {
@ -207,18 +217,23 @@ export default {
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.dialogVisible = false
this.input = ''
if (this.callbacks.taskHandleSuccessCallback) { if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res) this.callbacks.taskHandleSuccessCallback(res)
} }
} }
}) })
}).catch(() => {}) })
.catch(() => {})
} else if (this.dialogType === '拒绝') { } else if (this.dialogType === '拒绝') {
const params = qs.stringify({ const params = qs.stringify({
taskId: this.dataForm.taskId, taskId: this.dataForm.taskId,
comment: this.input comment: this.input
}) })
this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => { this.$http
.post('/act/task/backToFirst?', params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error(res.msg) this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) { if (this.callbacks.taskHandleErrorCallback) {
@ -239,7 +254,11 @@ export default {
}) })
}) })
} }
}, 1000, { leading: true, trailing: false }), this.tabRemoveHandle(data)
},
1000,
{ leading: true, trailing: false }
),
tabRemoveHandle (tabName) { tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') { if (tabName === 'home') {

132
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -7,27 +7,55 @@
--> -->
<!-- 流程业务表单 --> <!-- 流程业务表单 -->
<template> <template>
<el-card shadow="never" class="aui-card--fill" :key='showKey'> <el-card shadow="never" class="aui-card--fill" :key="showKey">
<!-- 申请人详情 --> <!-- 申请人详情 -->
<div> <div>
<h3>申请人信息</h3> <h3>申请人信息</h3>
<div class="big-BOX"> <div class="big-BOX">
<p> <p>
<span class="text">申请人：<span> {{dataForm.content.user || '--'}}</span></span> <span class="text"
<span class="text">电话：<span>{{dataForm.content.phone || '--'}}</span></span> >申请人：<span> {{ dataForm.content.user || '--' }}</span></span
<span class="text">单位：<span>{{dataForm.content.unit || '--'}}</span></span> >
<span class="text"
>电话：<span>{{ dataForm.content.phone || '--' }}</span></span
>
<span class="text"
>单位：<span>{{ dataForm.content.unit || '--' }}</span></span
>
</p> </p>
<p> <p>
<span class="text"> 能力申请标题：<span> {{dataForm.content.title|| '--'}}</span></span> <span class="text">
<span class="text">应用系统：<span>{{dataForm.content.applicationSystem || '--'}}</span></span> 能力申请标题：<span>
<span class="text">应用场景：<span> {{dataForm.content.applicationSceneStr || '--'}}</span></span> {{ dataForm.content.title || '--' }}</span
></span
>
<span class="text"
>应用系统：<span>{{
dataForm.content.applicationSystem || '--'
}}</span></span
>
<span class="text"
>应用场景：<span>
{{ dataForm.content.applicationSceneStr || '--' }}</span
></span
>
</p> </p>
<p> <p>
<span> 能力应用期望效果：<span> {{dataForm.content.effectWish|| '--'}}</span></span> <span>
能力应用期望效果：<span>
{{ dataForm.content.effectWish || '--' }}</span
></span
>
</p> </p>
<p v-if="dataForm.content.enclosure"> <p v-if="dataForm.content.enclosure">
<span> 申请附件：<span> {{dataForm.content.enclosure|| '--'}}<button @click="downloadFile2(dataForm.content.enclosure)">预览</button></span></span> <span>
申请附件：<span>
{{ dataForm.content.enclosure || '--'
}}<button @click="downloadFile2(dataForm.content.enclosure)">
预览
</button></span
></span
>
</p> </p>
</div> </div>
</div> </div>
@ -38,12 +66,12 @@
<ul v-for="item in dataList" :key="item.id"> <ul v-for="item in dataList" :key="item.id">
<!-- <li class="title">{{item.address}}</li> --> <!-- <li class="title">{{item.address}}</li> -->
<li class="clearfix"> <li class="clearfix">
<img <img src="~@/assets/img/imgLeft.png" />
src="~@/assets/img/imgLeft.png"
/>
<div> <div>
<h2>{{item.name}}<span>{{item.type}}</span></h2> <h2>
<p>{{item.describe}}</p> {{ item.name }}<span>{{ item.type }}</span>
</h2>
<p>{{ item.describe }}</p>
</div> </div>
</li> </li>
</ul> </ul>
@ -66,7 +94,9 @@
<el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button> <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
</el-radio-group> --> </el-radio-group> -->
<el-button type="primary" @click="showDialog('同意')">同意</el-button> <el-button type="primary" @click="showDialog('同意')">同意</el-button>
<el-button type="danger" plain @click="showDialog('拒绝')">拒绝</el-button> <el-button type="danger" plain @click="showDialog('拒绝')"
>拒绝</el-button
>
<!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input> <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
<el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input> <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
<el-button class="inputBule" @click="agreeOrNot">提交</el-button> --> <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
@ -79,11 +109,16 @@
title="审批意见" title="审批意见"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" width="30%"
:before-close="handleClose"> :before-close="handleClose"
>
<el-input v-model="input" placeholder="请输入审批意见"></el-input> <el-input v-model="input" placeholder="请输入审批意见"></el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose2">取 消</el-button> <el-button @click="handleClose2">取 消</el-button>
<el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button> <el-button
type="primary"
@click.native="agreeOrNot($store.state.contentTabsActiveName)"
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</el-card> </el-card>
@ -179,11 +214,11 @@ export default {
}, },
handleClose (done) { handleClose (done) {
this.$confirm('确认关闭？') this.$confirm('确认关闭？')
.then(_ => { .then((_) => {
this.input = '' this.input = ''
done() done()
}) })
.catch(_ => {}) .catch((_) => {})
}, },
handleClose2 () { handleClose2 () {
this.dialogVisible = false this.dialogVisible = false
@ -200,21 +235,36 @@ export default {
// 获取信息 // 获取信息
getInfo () { getInfo () {
this.$http this.$http
.get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`) .get(
`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`
)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
console.log(res.data) console.log(res.data)
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
console.log(res.data, this.dataForm, 'elas============================') console.log(
res.data,
this.dataForm,
'elas============================'
)
if (res.data.tAbilityApplicationDTOList[0].applicationScene) { if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr = '' res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
res.data.tAbilityApplicationDTOList[0].applicationScene.map((val, index) => { res.data.tAbilityApplicationDTOList[0].applicationScene.map(
res.data.tAbilityApplicationDTOList[0].applicationSceneStr += val (val, index) => {
if (index < res.data.tAbilityApplicationDTOList[0].applicationScene.length - 1) { res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
res.data.tAbilityApplicationDTOList[0].applicationSceneStr += '、' val
if (
index <
res.data.tAbilityApplicationDTOList[0].applicationScene
.length -
1
) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
'、'
} }
}) }
)
} }
this.dataForm.content = res.data.tAbilityApplicationDTOList[0] this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
const obj = { const obj = {
@ -223,12 +273,12 @@ export default {
describe: '' describe: ''
} }
let flag = false let flag = false
res.data.tAbilityApplicationDTOList.map(val => { res.data.tAbilityApplicationDTOList.map((val) => {
if (val.cameraList) { if (val.cameraList) {
flag = true flag = true
obj.describe += val.system obj.describe += val.system
} else { } else {
this.$http.get('/resource/' + val.resourceId).then(res1 => { this.$http.get('/resource/' + val.resourceId).then((res1) => {
// console.log(res1.data.data, '1111111111111111111111111111111111') // console.log(res1.data.data, '1111111111111111111111111111111111')
this.dataList.push({ this.dataList.push({
name: res1.data.data.name, name: res1.data.data.name,
@ -260,7 +310,8 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
// 同意与退回 // 同意与退回
agreeOrNot: debounce(function (data) { agreeOrNot: debounce(
function (data) {
if (this.dialogType === '同意') { if (this.dialogType === '同意') {
console.log('this.dataForm', this.dataForm) console.log('this.dataForm', this.dataForm)
const params = qs.stringify({ const params = qs.stringify({
@ -268,7 +319,9 @@ export default {
comment: this.input comment: this.input
}) })
console.log(params) console.log(params)
this.$http.post('/act/task/complete?' + params).then(({ data: res }) => { this.$http
.post('/act/task/complete?' + params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error(res.msg) this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) { if (this.callbacks.taskHandleErrorCallback) {
@ -282,18 +335,22 @@ export default {
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.visible = false this.visible = false
this.dialogVisible = false
if (this.callbacks.taskHandleSuccessCallback) { if (this.callbacks.taskHandleSuccessCallback) {
this.callbacks.taskHandleSuccessCallback(res) this.callbacks.taskHandleSuccessCallback(res)
} }
} }
}) })
}).catch(() => {}) })
.catch(() => {})
} else if (this.dialogType === '拒绝') { } else if (this.dialogType === '拒绝') {
const params = qs.stringify({ const params = qs.stringify({
taskId: this.dataForm.taskId, taskId: this.dataForm.taskId,
comment: this.input comment: this.input
}) })
this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => { this.$http
.post('/act/task/backToFirst?', params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.$message.error(res.msg) this.$message.error(res.msg)
if (this.callbacks.taskHandleErrorCallback) { if (this.callbacks.taskHandleErrorCallback) {
@ -316,7 +373,10 @@ export default {
} }
this.tabRemoveHandle(data) this.tabRemoveHandle(data)
// this.getDataList(data) // this.getDataList(data)
}, 1000, { leading: true, trailing: false }), },
1000,
{ leading: true, trailing: false }
),
tabRemoveHandle (tabName) { tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') { if (tabName === 'home') {
@ -450,7 +510,7 @@ export default {
} }
.clearfix:after { .clearfix:after {
display: block; display: block;
content: ""; content: '';
clear: both; clear: both;
} }
.title { .title {
@ -460,7 +520,7 @@ export default {
border-bottom: 0; border-bottom: 0;
} }
.title:before { .title:before {
content: ""; content: '';
width: 6px; width: 6px;
height: 6px; height: 6px;
display: inline-block; display: inline-block;