Merge remote-tracking branch 'origin/liujun-2024-02-04-相关方新流程上线后新提需求' into 2024年2月22日v1.0.55

src/utils/useDownloadFile.js

@@ -0,0 +1,16 @@
+export default async function useDownloadFile(url) {
+  if (!url) throw new Error('没有下载地址')
+  fetch(config.fileUrl + url)
+    .then((res) => res.blob())
+    .then((blob) => {
+      const a = document.createElement('a')
+      document.body.appendChild(a)
+      a.style.display = 'none'
+      const url = window.URL.createObjectURL(blob)
+      a.href = url
+      a.download = url.substring(url.lastIndexOf('/') + 1)
+      a.click()
+      document.body.removeChild(a)
+      window.URL.revokeObjectURL(url)
+    })
+}

src/views/xgf/flow/components/flowInfo.vue

@@ -7,31 +7,38 @@
     title="审批流程"
     width="60%">
     <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
-      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
+      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT+''">
         <template slot="description">
-          <el-card class="box-card" style="width: 900px;">
+          <el-card class="box-card a" style="width: 900px;">
             <div slot="header" class="clearfix">
               <span>{{ item.STEP_NAME }}</span>
             </div>
             <div>
               <el-row>
-                <el-col v-if="item.APPROVER_NAME">
+                <el-col :span="12">
-                  审批人：{{ item.APPROVER_NAME }}
+                  <el-row>
+                    <el-col v-if="item.APPROVER_NAME">
+                      审批人：{{ item.APPROVER_NAME }}
+                    </el-col>
+                    <el-col>
+                      审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+                    </el-col>
+                    <el-col>
+                      审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
+                    </el-col>
+                    <el-col>
+                      审批时间：{{ item.APPROVER_TIME }}
+                    </el-col>
+                    <el-col v-if="item.APPROVER_OPINION">
+                      审批意见：{{ item.APPROVER_OPINION }}
+                    </el-col>
+                    <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
+                      审批结束
+                    </el-col>
+                  </el-row>
                 </el-col>
-                <el-col>
+                <el-col v-if="item.APPOINT_ANNEX" :span="12">
-                  审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+                  <el-button icon="el-icon-download" type="primary" @click = "download(item)">下载附件</el-button>
-                </el-col>
-                <el-col>
-                  审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
-                </el-col>
-                <el-col>
-                  审批时间：{{ item.APPROVER_TIME }}
-                </el-col>
-                <el-col v-if="item.APPROVER_OPINION">
-                  审批意见：{{ item.APPROVER_OPINION }}
-                </el-col>
-                <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
-                  审批结束
                 </el-col>
               </el-row>
             </div>
@@ -47,6 +54,7 @@
 
 <script>
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import useDownloadFile from '../../../../utils/useDownloadFile'
 
 export default {
   props: {
@@ -77,6 +85,9 @@ export default {
     },
     closeWindow() {
       this.handleClose()
+    },
+    download(item) {
+      useDownloadFile(item.APPOINT_ANNEX)
     }
   }
 }

src/views/xgf/flow/components/sendUtil.vue

@@ -225,6 +225,7 @@ export default {
         APPOINT_DEPARTMENT_NAME: '',
         APPOINT_USER_ID: '',
         APPOINT_USER_NAME: '',
+        OPINION: '',
         user: '',
         list: [],
         tm: new Date().getTime()

src/views/xgf/flowApply/components/userInfo.vue

@@ -62,7 +62,7 @@
 
             <tr>
               <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
               <th>婚姻状况</th>
               <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
               <th>政治面貌</th>
@@ -137,6 +137,22 @@
               <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
             </tr>
           </table>
+          <div v-if="userDetailForm.ANNEX" style="padding-bottom: 10px">
+            <div class="level-title">
+              <h1>承诺书</h1>
+            </div>
+            <div>
+              <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.ANNEX)">下载附件</el-button>
+            </div>
+          </div>
+          <div v-if="userDetailForm.ATTORNEY" style="padding-bottom: 10px">
+            <div class="level-title">
+              <h1>委托书</h1>
+            </div>
+            <div>
+              <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.ATTORNEY)">下载附件</el-button>
+            </div>
+          </div>
           <div>
             <div class="level-title">
               <h1>培训记录</h1>
@@ -317,6 +333,7 @@
 import vueQr from 'vue-qr'
 import dateformat from '@/utils/dateformat'
 import { requestFN } from '@/utils/request'
+import useDownloadFile from '../../../../utils/useDownloadFile'
 
 export default {
   components: { vueQr },
@@ -401,6 +418,9 @@ export default {
       } else {
         return ''
       }
+    },
+    download(item) {
+      useDownloadFile(item)
     }
   }
 }

src/views/xgf/flowList/components/list.vue

@@ -44,8 +44,8 @@
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批记录</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批记录</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
           <el-button v-if="false" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>