From 080682f6b787dc8feace881223ca4ab47c5032ec Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 17 Aug 2022 16:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8B=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/demo/putaway-process3.vue        |  15 +-
 .../personalCenter/components/MyPublish.vue   |  13 +-
 .../components/TheShelvesAbility.vue          | 246 +++++++++---------
 3 files changed, 142 insertions(+), 132 deletions(-)

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 @@
       <div class="basic-information-content">
         <p>
           <span class="text">
-            能力申请标题：<span> {{ dataForm.name || '--' }}</span></span
+            能力申请标题：<span> {{ dataForm.undercarriageTitle || '--' }}</span></span
           >
           <span class="text"
             >下架单号：<span>{{ dataForm.applyNumber || '--' }}</span></span
@@ -22,17 +22,22 @@
             ></span
           >
           <span class="text"
-            >电话：<span>{{ dataForm.deptPhone || '--' }}</span></span
+            >电话：<span>{{ dataForm.undercarriageUserPhone || '--' }}</span></span
           >
           <span class="text"
             >单位：<span>{{ dataForm.deptName || deptName }}</span></span
           >
         </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>
-              {{ dataForm.enclosure || '--'
-              }}<button @click="downloadFile2(dataForm.enclosure)">
+              {{ dataForm.undercarriageEnclosureName || '--'
+              }}<button @click="downloadFile2(dataForm.undercarriageEnclosure)">
                 预览
               </button></span
             ></span
diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue
index 03508c97..bedb603d 100644
--- a/front/src/views/personalCenter/components/MyPublish.vue
+++ b/front/src/views/personalCenter/components/MyPublish.vue
@@ -171,7 +171,7 @@
       width="12.1rem"
       @ok="del()"
       @cancel="reason = ''"
-      footer="{}"
+      footer=""
     >
       <TheShelvesAbility v-if="visible" :delObj="delObj"></TheShelvesAbility>
       <!-- <a-input v-model:value="reason" placeholder="请输入下架原因" /> -->
@@ -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 @@
 </script>
 
 <style scoped lang="less">
-.TheShelvesAbility {
-  .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;
+  .TheShelvesAbility {
+    .title-h1 {
       font-size: 0.22rem;
-      display: flex;
-      align-items: center;
       line-height: 0.22rem;
-      margin-bottom: 0.2rem;
-      span {
-        display: inline-block;
-        width: 0.05rem;
-        height: 0.05rem;
-        background: #0558e1;
-        border-radius: 0.05rem;
-        margin-right: 0.05rem;
-      }
+      margin-bottom: 0.25rem;
+      color: #212121;
     }
-    .data-list {
+    .title-h2 {
       display: flex;
-      border-bottom: 1px solid #dddee1;
-      margin-bottom: 0.1rem;
-      .data-list-left {
-        width: 0.8rem;
-        height: 1.1rem;
-        background: url('~@/assets/personalCenter/Capabilitydiagram.png')
-          no-repeat;
-        background-size: 0.8rem 0.8rem;
-        background-position: center;
-        margin-left: 0.1rem;
-        padding-bottom: 0.3rem;
-      }
-      .data-list-right {
-        width: calc(100% - 0.83rem);
-        margin-left: 0.1rem;
-        padding-bottom: 0.2rem;
-        border-left: 1px solid #dddee1;
-        font-size: 0.18rem;
-        color: #000000;
-        .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;
-              }
-            }
-          }
+      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;
+        display: flex;
+        align-items: center;
+        line-height: 0.22rem;
+        margin-bottom: 0.2rem;
+        span {
+          display: inline-block;
+          width: 0.05rem;
+          height: 0.05rem;
+          background: #0558e1;
+          border-radius: 0.05rem;
+          margin-right: 0.05rem;
         }
-        .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;
-              grid-template-columns: repeat(4, 25%);
-              background: rgba(191, 191, 191, 0.1);
-              span {
-                display: inline-block;
-                text-align: center;
-                padding: 0.05rem 0;
+      }
+      .data-list {
+        display: flex;
+        border-bottom: 1px solid #dddee1;
+        margin-bottom: 0.1rem;
+        .data-list-left {
+          width: 0.8rem;
+          height: 1.1rem;
+          background: url('~@/assets/personalCenter/Capabilitydiagram.png')
+            no-repeat;
+          background-size: 0.8rem 0.8rem;
+          background-position: center;
+          margin-left: 0.1rem;
+          padding-bottom: 0.3rem;
+        }
+        .data-list-right {
+          width: calc(100% - 0.83rem);
+          margin-left: 0.1rem;
+          padding-bottom: 0.2rem;
+          border-left: 1px solid #dddee1;
+          font-size: 0.18rem;
+          color: #000000;
+          .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;
                 grid-template-columns: repeat(4, 25%);
+                background: rgba(191, 191, 191, 0.1);
                 span {
                   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;
+              .data-list-right-table-list-content {
+                & > div {
+                  display: grid;
+                  grid-template-columns: repeat(4, 25%);
+                  span {
+                    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 {
-              margin-top: 0.2rem;
-              text-align: center;
+              .zanwu {
+                margin-top: 0.2rem;
+                text-align: center;
+              }
             }
           }
         }
       }
     }
-  }
-  .TheShelvesAbility-bottom {
-    margin: 0.5rem 0.6rem 0 0.6rem;
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-    .button-bottom {
-      display: flex;
-      justify-content: center;
+    .TheShelvesAbility-bottom {
+      margin: 0.5rem 0.6rem 0 0.6rem;
+      .base-info {
+        display: flex;
+        justify-content: space-between;
+      }
+      .button-bottom {
+        display: flex;
+        justify-content: center;
+      }
     }
   }
-}
 </style>