介绍信管理 详情 显示 审批情况

src/views/core/outIn/approve/index.vue

@@ -97,7 +97,7 @@
             type="text"
             icon="el-icon-view"
             @click="handleDetailInfo(scope.row)"
-            v-hasPermi="['core:letter:edit']"
+            v-hasPermi="['core:letter:query']"
           >详情</el-button>
           <el-button
             size="mini"
@@ -105,7 +105,7 @@
             icon="el-icon-check"
             v-if="canApprove(scope.row)"
             @click="handleApproveLetter(scope.row)"
-            v-hasPermi="['core:letter:edit']"
+            v-hasPermi="['core:letter:approve']"
           >审批</el-button>
         </template>
       </el-table-column>
@@ -206,8 +206,8 @@ export default {
     },
     canApprove(row)
     {
-      // console.log("canApprove",row.status ==1,row.approveStatus ==0,dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date())))
-      return row.status ==1 && row.approveStatus ==0 && dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date()))
+      //  console.log("canApprove",row.status ==1,row.approveStatus ==0,dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date())))
+      return row.status ==1 && row.approveStatus ==0 
     },
     handleDetailInfo(row)
     {

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -62,16 +62,41 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-table :data="formData.userInfos" style="margin-bottom: 10px;">
-            <el-table-column label="人员姓名" align="center" prop="userName" />
-            <el-table-column label="单位" align="center" prop="companyName" />
-            <el-table-column label="证件号码" align="center" prop="idCard">
-            </el-table-column>
-            <el-table-column label="证件照" align="center" prop="imgFile">
-              <template slot-scope="scope">
-                <img width="50" height="50" :src="scope.row.imgFile" />
-              </template> </el-table-column>
-          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="出入人员">
+                <el-table :data="formData.userInfos" style="margin-bottom: 10px;">
+                  <el-table-column label="人员姓名" header-align="center" align="center" prop="userName" />
+                  <el-table-column label="单位" header-align="center" align="center" prop="companyName" />
+                  <el-table-column label="证件号码" header-align="center" align="center" prop="idCard">
+                  </el-table-column>
+                  <el-table-column label="证件照" header-align="center" align="center" prop="imgFile">
+                    <template slot-scope="scope">
+                      <img width="50" height="50" :src="scope.row.imgFile" />
+                    </template> 
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
+          </el-row>
+         
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="接待机构">
+                <el-table :data="formData.approveInfos" style="margin-bottom: 10px;">
+                  <el-table-column label="机构名称" header-align="center" align="left" prop="orgName" />
+                  <el-table-column label="审批状态" align="center" prop="approveStatus" >
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
+                    </template>                    
+                  </el-table-column>
+                  <el-table-column label="审批说明" header-align="center" align="left" prop="approveRemark">
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -108,7 +133,7 @@ export default {
       imageList: [],
     };
   },
-  dicts: ["letter_status"],
+  dicts: ["letter_status","out_in_approve_status"],
   props: {},
   watch: {},
   created() {},