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

能力下架功能开发

This commit is contained in:
a0049873 2022-08-17 16:42:46 +08:00
parent 3f235f3d81
commit 080682f6b7
3 changed files with 142 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
back/src/views/modules/activiti/demo/putaway-process3.vue
View File

@ -9,7 +9,7 @@
<div class="basic-information-content"> <div class="basic-information-content">
<p> <p>
<span class="text"> <span class="text">
能力申请标题：<span> {{ dataForm.name || '--' }}</span></span 能力申请标题：<span> {{ dataForm.undercarriageTitle || '--' }}</span></span
> >
<span class="text" <span class="text"
>下架单号：<span>{{ dataForm.applyNumber || '--' }}</span></span >下架单号：<span>{{ dataForm.applyNumber || '--' }}</span></span
@ -22,17 +22,22 @@
></span ></span
> >
<span class="text" <span class="text"
>电话：<span>{{ dataForm.deptPhone || '--' }}</span></span >电话：<span>{{ dataForm.undercarriageUserPhone || '--' }}</span></span
> >
<span class="text" <span class="text"
>单位：<span>{{ dataForm.deptName || deptName }}</span></span >单位：<span>{{ dataForm.deptName || deptName }}</span></span
> >
</p> </p>
<p v-if="dataForm.enclosure" class="accessory"> <p>
<span class="text"
>能力下架原因：<span>{{ dataForm.undercarriageReason || '--' }}</span></span
>
</p>
<p v-if="dataForm.undercarriageEnclosure" class="accessory">
<span> <span>
申请附件：<span> 申请附件：<span>
{{ dataForm.enclosure || '--' {{ dataForm.undercarriageEnclosureName || '--'
}}<button @click="downloadFile2(dataForm.enclosure)"> }}<button @click="downloadFile2(dataForm.undercarriageEnclosure)">
预览 预览
</button></span </button></span
></span ></span

13
front/src/views/personalCenter/components/MyPublish.vue
View File

@ -171,7 +171,7 @@
width="12.1rem" width="12.1rem"
@ok="del()" @ok="del()"
@cancel="reason = ''" @cancel="reason = ''"
footer="{}" footer=""
> >
<TheShelvesAbility v-if="visible" :delObj="delObj"></TheShelvesAbility> <TheShelvesAbility v-if="visible" :delObj="delObj"></TheShelvesAbility>
<!-- <a-input v-model:value="reason" placeholder="请输入下架原因" /> --> <!-- <a-input v-model:value="reason" placeholder="请输入下架原因" /> -->
@ -457,7 +457,11 @@
const del = () => { const del = () => {
console.log('下架================》', delObj.value) console.log('下架================》', delObj.value)
undercarriage({ undercarriage({
reason: reason.value, reason: delObj2.value.reason,
title: delObj2.value.title,
phone: delObj2.value.phone,
enclosure: delObj2.value.fileList[0].response.data,
enclosureName: delObj2.value.fileList[0].name,
resource: [ resource: [
{ resourceId: delObj.value.id, resourceName: delObj.value.name }, { resourceId: delObj.value.id, resourceName: delObj.value.name },
], ],
@ -479,8 +483,8 @@
}) })
//提交申请按钮 //提交申请按钮
mybus.on('Determine', (val) => { mybus.on('Determine', (val) => {
delObj.value.name = val.title console.log('下架==============》', val)
reason.value = val.reason delObj2.value = val
del() del()
}) })
onBeforeUnmount(() => { onBeforeUnmount(() => {
@ -490,6 +494,7 @@
const reason = ref('') const reason = ref('')
const visible = ref(false) const visible = ref(false)
const delObj = ref({}) const delObj = ref({})
const delObj2 = ref({})
const showModal = (item) => { const showModal = (item) => {
if (item.delFlag == 0) { if (item.delFlag == 0) {
delObj.value = item delObj.value = item

246
front/src/views/personalCenter/components/TheShelvesAbility.vue
View File

@ -263,7 +263,7 @@
getUserInfo().then((res) => { getUserInfo().then((res) => {
formName.value.title = props.delObj.name formName.value.title = props.delObj.name
formName.value.user = res.data.data.realName formName.value.user = res.data.data.realName
formName.value.phone = props.delObj.deptPhone formName.value.phone = props.delObj.mobile
// formName.value.fileList = props.delObj.undercarriageEnclosure // formName.value.fileList = props.delObj.undercarriageEnclosure
deptIdQuery(res.data.data.deptId).then((resValue) => { deptIdQuery(res.data.data.deptId).then((resValue) => {
formName.value.unit = resValue.data.data.name formName.value.unit = resValue.data.data.name
@ -326,150 +326,150 @@
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.TheShelvesAbility { .TheShelvesAbility {
.title-h1 { .title-h1 {
font-size: 0.22rem;
line-height: 0.22rem;
margin-bottom: 0.25rem;
color: #212121;
}
.title-h2 {
display: flex;
justify-content: space-between;
font-size: 0.16rem;
color: #212121;
line-height: 0.16rem;
border-bottom: 0.01rem #dddee1 solid;
margin: 0 0.6rem 0.2rem 0.6rem;
padding-bottom: 0.1rem;
}
.TheShelvesAbility-top {
margin: 0 0.6rem 0 0.6rem;
.deptName {
color: #0558e1;
font-size: 0.22rem; font-size: 0.22rem;
display: flex;
align-items: center;
line-height: 0.22rem; line-height: 0.22rem;
margin-bottom: 0.2rem; margin-bottom: 0.25rem;
span { color: #212121;
display: inline-block;
width: 0.05rem;
height: 0.05rem;
background: #0558e1;
border-radius: 0.05rem;
margin-right: 0.05rem;
}
} }
.data-list { .title-h2 {
display: flex; display: flex;
border-bottom: 1px solid #dddee1; justify-content: space-between;
margin-bottom: 0.1rem; font-size: 0.16rem;
.data-list-left { color: #212121;
width: 0.8rem; line-height: 0.16rem;
height: 1.1rem; border-bottom: 0.01rem #dddee1 solid;
background: url('~@/assets/personalCenter/Capabilitydiagram.png') margin: 0 0.6rem 0.2rem 0.6rem;
no-repeat; padding-bottom: 0.1rem;
background-size: 0.8rem 0.8rem; }
background-position: center; .TheShelvesAbility-top {
margin-left: 0.1rem; margin: 0 0.6rem 0 0.6rem;
padding-bottom: 0.3rem; .deptName {
} color: #0558e1;
.data-list-right { font-size: 0.22rem;
width: calc(100% - 0.83rem); display: flex;
margin-left: 0.1rem; align-items: center;
padding-bottom: 0.2rem; line-height: 0.22rem;
border-left: 1px solid #dddee1; margin-bottom: 0.2rem;
font-size: 0.18rem; span {
color: #000000; display: inline-block;
.data-list-right-titleAndDescription { width: 0.05rem;
padding-left: 0.1rem; height: 0.05rem;
padding-right: 0.2rem; background: #0558e1;
border-bottom: 1px solid #dddee1; border-radius: 0.05rem;
padding-bottom: 0.1rem; margin-right: 0.05rem;
.data-list-right-title {
display: flex;
justify-content: space-between;
margin-bottom: 0.2rem;
.title-left {
span:first-child {
font-weight: 600;
}
span:last-child {
font-size: 0.14rem;
display: inline-block;
margin-left: 0.08rem;
padding: 0 0.05rem;
border-radius: 0.3rem;
background: #00b8e6;
color: #fff;
}
}
}
} }
.data-list-right-table { }
.data-list-right-table-title { .data-list {
margin-left: 0.1rem; display: flex;
margin-top: 0.2rem; border-bottom: 1px solid #dddee1;
margin-bottom: 0.2rem; margin-bottom: 0.1rem;
font-size: 0.14rem; .data-list-left {
display: inline-block; width: 0.8rem;
margin-left: 0.08rem; height: 1.1rem;
padding: 0 0.05rem; background: url('~@/assets/personalCenter/Capabilitydiagram.png')
border-radius: 0.3rem; no-repeat;
background: #00b8e6; background-size: 0.8rem 0.8rem;
color: #fff; background-position: center;
} margin-left: 0.1rem;
.data-list-right-table-list { padding-bottom: 0.3rem;
padding: 0 0.05rem; }
.data-list-right-table-list-tab { .data-list-right {
display: grid; width: calc(100% - 0.83rem);
grid-template-columns: repeat(4, 25%); margin-left: 0.1rem;
background: rgba(191, 191, 191, 0.1); padding-bottom: 0.2rem;
span { border-left: 1px solid #dddee1;
display: inline-block; font-size: 0.18rem;
text-align: center; color: #000000;
padding: 0.05rem 0; .data-list-right-titleAndDescription {
padding-left: 0.1rem;
padding-right: 0.2rem;
border-bottom: 1px solid #dddee1;
padding-bottom: 0.1rem;
.data-list-right-title {
display: flex;
justify-content: space-between;
margin-bottom: 0.2rem;
.title-left {
span:first-child {
font-weight: 600;
}
span:last-child {
font-size: 0.14rem;
display: inline-block;
margin-left: 0.08rem;
padding: 0 0.05rem;
border-radius: 0.3rem;
background: #00b8e6;
color: #fff;
}
} }
} }
.data-list-right-table-list-content { }
& > div { .data-list-right-table {
.data-list-right-table-title {
margin-left: 0.1rem;
margin-top: 0.2rem;
margin-bottom: 0.2rem;
font-size: 0.14rem;
display: inline-block;
margin-left: 0.08rem;
padding: 0 0.05rem;
border-radius: 0.3rem;
background: #00b8e6;
color: #fff;
}
.data-list-right-table-list {
padding: 0 0.05rem;
.data-list-right-table-list-tab {
display: grid; display: grid;
grid-template-columns: repeat(4, 25%); grid-template-columns: repeat(4, 25%);
background: rgba(191, 191, 191, 0.1);
span { span {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
padding: 0.05rem 0; padding: 0.05rem 0;
} }
} }
div:nth-child(even) { .data-list-right-table-list-content {
background: rgba(191, 191, 191, 0.1); & > div {
} display: grid;
div:nth-child(odd) { grid-template-columns: repeat(4, 25%);
span { span {
padding: 0.2rem 0; display: inline-block;
text-align: center;
padding: 0.05rem 0;
}
}
div:nth-child(even) {
background: rgba(191, 191, 191, 0.1);
}
div:nth-child(odd) {
span {
padding: 0.2rem 0;
}
} }
} }
} .zanwu {
.zanwu { margin-top: 0.2rem;
margin-top: 0.2rem; text-align: center;
text-align: center; }
} }
} }
} }
} }
} }
} .TheShelvesAbility-bottom {
.TheShelvesAbility-bottom { margin: 0.5rem 0.6rem 0 0.6rem;
margin: 0.5rem 0.6rem 0 0.6rem; .base-info {
.base-info { display: flex;
display: flex; justify-content: space-between;
justify-content: space-between; }
} .button-bottom {
.button-bottom { display: flex;
display: flex; justify-content: center;
justify-content: center; }
} }
} }
}
</style> </style>