diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index c489b1f9..f15c90d4 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -9,7 +9,7 @@
- 能力申请标题: {{ dataForm.name || '--' }} {{ dataForm.undercarriageTitle || '--' }}
下架单号:{{ dataForm.applyNumber || '--' }}
电话:{{ dataForm.deptPhone || '--' }}电话:{{ dataForm.undercarriageUserPhone || '--' }}
单位:{{ dataForm.deptName || deptName }}
-
+
+ 能力下架原因:{{ dataForm.undercarriageReason || '--' }}
+
+
申请附件:
- {{ dataForm.enclosure || '--'
- }}
@@ -457,7 +457,11 @@
const del = () => {
console.log('下架================》', delObj.value)
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: [
{ resourceId: delObj.value.id, resourceName: delObj.value.name },
],
@@ -479,8 +483,8 @@
})
//提交申请按钮
mybus.on('Determine', (val) => {
- delObj.value.name = val.title
- reason.value = val.reason
+ console.log('下架==============》', val)
+ delObj2.value = val
del()
})
onBeforeUnmount(() => {
@@ -490,6 +494,7 @@
const reason = ref('')
const visible = ref(false)
const delObj = ref({})
+ const delObj2 = ref({})
const showModal = (item) => {
if (item.delFlag == 0) {
delObj.value = item
diff --git a/front/src/views/personalCenter/components/TheShelvesAbility.vue b/front/src/views/personalCenter/components/TheShelvesAbility.vue
index 3d335956..3ebdf195 100644
--- a/front/src/views/personalCenter/components/TheShelvesAbility.vue
+++ b/front/src/views/personalCenter/components/TheShelvesAbility.vue
@@ -263,7 +263,7 @@
getUserInfo().then((res) => {
formName.value.title = props.delObj.name
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
deptIdQuery(res.data.data.deptId).then((resValue) => {
formName.value.unit = resValue.data.data.name
@@ -326,150 +326,150 @@