feat(审批详情):生产审批移动端开发1

api/system/approve.js

@@ -83,4 +83,43 @@ export function getProcessInstanceStatus(instanceId) {
         url: `/sysprocessbasic/getProcessInstanceStatus/${instanceId}`,
         method: 'get'
     })
-}
+}
\ No newline at end of file
+// 1. 工具点检_根据流程实例id查找流程实例审批详情
+export function getToolProcessDetail(businessId) {
+    return request({
+      url: '/toolInspectMonitor/getDetail/'+businessId,
+      method: 'get',
+    })
+  }
+  // 2. 工具点检_工具点检流程审批
+  export function toolProcessGxApproval(approve) {
+    return request({
+      url: '/toolInspectMonitor/processToolApproval',
+      method: 'post',
+      data: approve,
+      headers: {
+        'Content-Type': 'application/json;charset=UTF-8' // 接口修改传参类型
+      }
+    })
+  }
+  // 1. 生产辅材_根据流程实例id查找流程实例审批详情
+export function getMateriaProcessDetail(businessId) {
+    return request({
+      url: '/aeauxiliarymaterial/getDetail/'+businessId,
+      method: 'get',
+    })
+  }
+  // 1. 设备标定_根据流程实例id查找流程实例审批详情
+export function getSignProcessDetail(businessId) {
+    return request({
+      url: '/qc/equipment/sign/getDetail/'+businessId,
+      method: 'get',
+    })
+  }
+  // 1. 设备TPM_根据流程实例id查找流程实例审批详情
+export function getTpmProcessDetail(businessId) {
+    return request({
+      url: '/qc/equipment/tpm/getDetail/'+businessId,
+      method: 'get',
+    })
+  }
\ No newline at end of file

components/home-approval/base-data-approval.vue

@@ -315,13 +315,14 @@ export default {
       text-align: left;
       font-style: normal;
       text-transform: none;
+      min-width: 130rpx;
     }
     .subContent {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
       font-size: 28rpx;
       color: #222222;
-      text-align: center;
+      text-align: right;
       font-style: normal;
       text-transform: none;
     }

components/home-approval/base-data-start.vue

@@ -314,13 +314,14 @@ export default {
       text-align: left;
       font-style: normal;
       text-transform: none;
+      min-width: 130rpx;
     }
     .subContent {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
       font-size: 28rpx;
       color: #222222;
-      text-align: center;
+      text-align: right;
       font-style: normal;
       text-transform: none;
     }

components/home-approval/production-approval.vue

 <!--生产信息审批-->
 <template>
-  <scroll-view
-      class="scroll-view"
-      scroll-y="true"
-      @scrolltolower="scrolltolower"
-      :scroll-with-animation="true">
-    <view v-for="(item,key) in noticeList" :key="key" style="display: flex;background-color: #ffffff">
+  <scroll-view class="scroll-view" scroll-y="true" @scrolltolower="scrolltolower" :scroll-with-animation="true">
+    <view v-for="(item, key) in noticeList" :key="key" style="display: flex;background-color: #ffffff">
       <!-- 原消息卡片模板 -->
-      <view class="noticeCard" @click="goDetail">
+      <view class="noticeCard"
+        @click="goDetail(item.businessId, item.processCode, item.processStatus, item.allowApprove, item.processName)">
         <view class="noticeTop">
           <view class="titleClass">
-<!--            <img :src="leftIconOne" />-->
-            {{item.processName}}
+            <!--            <img :src="leftIconOne" />-->
+            {{ item.processName }}
           </view>
-          <view class="statusText" :style="{color: statusMap[item.processStatus].color}">
-            {{statusMap[item.processStatus].text}}
+          <view class="statusText" :style="{ color: statusMap[item.processStatus].color }">
+            {{ statusMap[item.processStatus].text }}
           </view>
         </view>
         <view class="subTitleClass">
@@ -23,7 +20,7 @@
               发起时间
             </view>
             <view class="subContent">
-              {{ parseTimeA(item.initiateDate,'YYYY/MM/DD {h}:{i}:{s}') }}
+              {{ parseTimeA(item.initiateDate, 'YYYY/MM/DD {h}:{i}:{s}') }}
             </view>
           </view>
           <view class="subRow">
@@ -31,7 +28,8 @@
               当前审批人
             </view>
             <view class="subContent">
-              {{ item.currentApproveUserName || '-' }}{{ item.currentApproveUserOrgName ? '·' + item.currentApproveUserOrgName : '' }}
+              {{ item.currentApproveUserName || '-' }}{{ item.currentApproveUserOrgName ? '·' +
+    item.currentApproveUserOrgName : '' }}
             </view>
           </view>
           <view class="subRow">
@@ -47,7 +45,7 @@
               结束时间
             </view>
             <view class="subContent">
-              {{ parseTimeA(item.completeDate,'YYYY/MM/DD {h}:{i}:{s}') }}
+              {{ parseTimeA(item.completeDate, 'YYYY/MM/DD {h}:{i}:{s}') }}
             </view>
           </view>
         </view>
@@ -55,12 +53,8 @@
     </view>
     <!--底部加载-->
     <view v-show="total > 0 && loadStatus !== 'loading'" style="text-align: center;padding-bottom: 5rpx;">
-      <u-loadmore
-          :status="loadStatus"
-          :loadmore-text="loadText.loadmore"
-          :loading-text="loadText.loading"
-          :nomore-text="loadText.nomore"
-      />
+      <u-loadmore :status="loadStatus" :loadmore-text="loadText.loadmore" :loading-text="loadText.loading"
+        :nomore-text="loadText.nomore" />
     </view>
     <view v-show="loadStatus === 'loading'" style="text-align: center">
       <!-- <image src="../../static/images/home/loading.gif"  style="width: 50rpx;height: 60rpx;" /> -->
@@ -71,7 +65,7 @@
 <script>
 import { queryInstanceByPage } from '../../api/system/approve'
 import { parseTime } from '../../api/utils/ruoyi'
-import {getDicts} from "../../api/system/baseConfig";
+import { getDicts } from "../../api/system/baseConfig";
 import leftIconOne from "../../static/images/leftIconOne.png";
 import leftIconTwo from "../../static/images/leftIconTwo.png";
 
@@ -133,15 +127,27 @@ export default {
     },
   },
   methods: {
-    goDetail () {
+    goDetail(processId, processCode, processStatus, allowApprove, processName) {
+      let path = ''
+      if (this.processCode === '00016' || this.processCode === '00017') {
+        // 00016(铸造科对发动机装配科发起追溯) 00017(机加工科对发动机装配科发起追溯) => drawerShowEngineTrace
+        path = 'drawerShowEngineTrace'
+      } else if (this.processCode !== '00019') {
+        // processCode.value !== '00019' =>drawerShow
+        path = 'drawerShow'
+      } else {
+        console.log('3', this.processCode)
+        // 00019(追溯完成度异常提醒) => drawerShowTraceError
+        path = 'drawerShowTraceError'
+      }
       uni.navigateTo({
-        url: '/pages/approval_detail/baseDetail?id=1'
+        url: `/pages/approval_detail/${path}?processId=${processId}&processStatus=${processStatus}&processCode=${processCode}&allowApprove=${allowApprove}&processName=${processName}`
       })
     },
     /**
      * 指定列表,根据值,取label
      */
-    getLabelByValue (list, value, key = 'value', label = 'label') {
+    getLabelByValue(list, value, key = 'value', label = 'label') {
       const item = list.find(item => item[key] === value)
       return item ? item[label] : '-'
     },
@@ -188,16 +194,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.scroll-view{
+.scroll-view {
   height: 960rpx;
 }
-.no-message{
+
+.no-message {
   text-align: center;
   height: calc(100vh - 350rpx);
   display: flex;
   justify-content: center;
   align-items: center;
 }
+
 .topTips {
   width: 100%;
   height: 80rpx;
@@ -209,22 +217,26 @@ export default {
   text-align: center;
   padding-top: 20rpx;
 }
+
 .notice-container {
   width: 100%;
   margin-top: 542rpx;
   background-color: #fff;
   overflow-y: hidden;
 }
+
 .topContent {
   display: flex;
   padding-top: 32rpx;
   padding-bottom: 32rpx;
   padding-left: 32rpx;
   background-color: #f0f0f0;
+
   .topSelect {
     width: 588rpx;
     height: 88rpx;
   }
+
   .topButton {
     margin-left: 32rpx;
     margin-top: 22rpx;
@@ -234,6 +246,7 @@ export default {
     color: #343744;
   }
 }
+
 .topContent_read {
   display: flex;
   padding: 34rpx 32rpx;
@@ -242,24 +255,28 @@ export default {
   font-family: Source Han Sans CN-Bold, Source Han Sans CN;
   font-weight: bold;
   line-height: 40rpx;
+
   .fontColor {
-    background-image: -webkit-linear-gradient(top, #02A7BA,#62AE79);
-    -webkit-background-clip:text;
-    -webkit-text-fill-color:transparent;
+    background-image: -webkit-linear-gradient(top, #02A7BA, #62AE79);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
   }
 }
+
 .noticeCard {
   width: 100%;
   background-color: #F9F9F9;
   margin: 20rpx 22rpx 0 20rpx;
   padding-bottom: 32rpx;
   border-radius: 15rpx;
-  .noticeTop{
+
+  .noticeTop {
     display: flex;
     justify-content: space-between;
-    border-bottom: 2rpx solid  #F2F2F2;
+    border-bottom: 2rpx solid #F2F2F2;
     padding: 22rpx 34rpx 24rpx 0;
   }
+
   .titleClass {
     display: flex;
     align-items: center;
@@ -271,11 +288,13 @@ export default {
     font-style: normal;
     text-transform: none;
     padding-left: 22rpx;
-    img{
+
+    img {
       margin-right: 22rpx;
     }
   }
-  .statusText{
+
+  .statusText {
     font-family: PingFangSC, PingFang SC;
     font-weight: 500;
     font-size: 28rpx;
@@ -283,6 +302,7 @@ export default {
     font-style: normal;
     text-transform: none;
   }
+
   .subTitleClass {
     font-family: PingFangSC, PingFang SC;
     font-weight: 400;
@@ -293,10 +313,12 @@ export default {
     text-transform: none;
     padding: 28rpx 32rpx 0 32rpx;
   }
-  .subRow{
+
+  .subRow {
     display: flex;
     justify-content: space-between;
     margin-bottom: 12rpx;
+
     .subTitle {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
@@ -305,17 +327,20 @@ export default {
       text-align: left;
       font-style: normal;
       text-transform: none;
+      min-width: 130rpx;
     }
+
     .subContent {
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
       font-size: 28rpx;
       color: #222222;
-      text-align: center;
+      text-align: right;
       font-style: normal;
       text-transform: none;
     }
   }
+
   .timeClass {
     font-family: PingFangSC, PingFang SC;
     font-weight: 400;
@@ -326,16 +351,20 @@ export default {
     text-transform: none;
   }
 }
+
 // 有导航栏后 防止滑到最上面
 .scroll-y {
   height: calc(100vh - 88px)
 }
+
 ::v-deep .u-line {
   border-bottom-width: 3px !important;
 }
+
 ::v-deep .u-subsection {
   background-color: #fff
 }
+
 .checkView {
   width: 76rpx;
   align-content: center;
@@ -344,19 +373,23 @@ export default {
   //margin-top: 20rpx;
   //position: absolute;
 }
+
 ::v-deep .u-checkbox-group {
   //background-color: red;
   //padding-left: 16rpx;
   height: 80rpx;
   position: relative;
-  top: 50%; /*偏移*/
+  top: 50%;
+  /*偏移*/
   transform: translateY(-50%);
 }
+
 ::v-deep .u-checkbox {
   margin: auto;
   width: 64rpx;
   height: 64rpx;
 }
+
 ::v-deep .u-checkbox__icon-wrap {
   margin-left: 25rpx;
   margin-right: 0 !important;
@@ -366,14 +399,17 @@ export default {
 ::v-deep .u-subsection__bar {
   background: linear-gradient(180deg, #02A7BA 0%, #62AE79 100%);
 }
+
 ::v-deep .u-subsection__item {
   border: none !important;
   //border-color: none;
 }
+
 ::v-deep .u-subsection {
   height: 88rpx !important;
   border-radius: 16rpx 16rpx 16rpx 16rpx;
 }
+
 ::v-deep .u-subsection__item__text {
   font-size: 34rpx !important;
   font-family: Source Han Sans CN-Bold, Source Han Sans CN;
@@ -387,26 +423,29 @@ export default {
 
 
 
-::v-deep .u-loading-page__warpper__loading-icon__img{
+::v-deep .u-loading-page__warpper__loading-icon__img {
   width: 90rpx !important;
   height: 90rpx !important;
 }
-::v-deep .u-tabs__wrapper__nav__item__text{
+
+::v-deep .u-tabs__wrapper__nav__item__text {
   font-family: PingFangSC, PingFang SC;
   font-weight: 500;
   font-size: 28rpx;
 }
-.top-tabs{
+
+.top-tabs {
   display: flex;
   justify-content: center;
   align-items: center;
   margin-top: 20rpx;
   border-bottom: 2rpx solid #F2F2F2;
-  ::v-deep .u-tabs{
+
+  ::v-deep .u-tabs {
     width: 60%;
   }
 }
+
 //::v-deep .u-subsection {
 //  background: black;
-//}
-</style>
+//}</style>
\ No newline at end of file
\ No newline at end of file

pages.json

@@ -21,6 +21,27 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/approval_detail/drawerShowEngineTrace",
+      "style": {
+        "navigationBarTitleText": "DHEC QMS",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/approval_detail/drawerShow",
+      "style": {
+        "navigationBarTitleText": "DHEC QMS",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/approval_detail/drawerShowTraceError",
+      "style": {
+        "navigationBarTitleText": "DHEC QMS",
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/mine/setting/aboutUs",
       "style": {

pages/approval_detail/baseDetail.vue

@@ -335,6 +335,7 @@ export default {
 <style lang="scss" scoped>
 .base-detail {
   background: #FFFFFF;
+  min-height: 100vh;
 
   // height: 100vh;
   .container {