职工管理、领导信息、组织架构 附件详情修改

ruoyi-ui/src/views/kaohe/employee/index.vue

@@ -103,9 +103,16 @@
             size="mini"
             type="text"
             icon="el-icon-view"
+            v-hasPermi="['kaohe:employee:query']"
+            @click="viewFuJian(scope.row)"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             v-hasPermi="['kaohe:employee:docs']"
             @click="handleFuJian(scope.row)"
-          >附件详情/编辑</el-button>
+          >编辑</el-button>
         </template>
       </el-table-column>
       <el-table-column label="手机号" align="center" prop="phone" />
@@ -276,7 +283,7 @@
     </el-dialog>
 
     <!-- 附件详情对话框 -->
-    <el-dialog title="附件详情/编辑" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="附件编辑" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
 
       <div v-for="item in uploadFJ.docDiscripList">
         <el-row :gutter="20">
@@ -323,6 +330,31 @@
       </div>
     </el-dialog>
 
+    <!-- 详情对话框 -->
+    <el-dialog title="附件详情" :visible.sync="viewUploadFJ.open" width="800px" append-to-body>
+
+      <el-row :gutter="20" v-for="item in viewUploadFJ.docDiscripList">
+        <el-col :span="24">
+          <span>附件主题：</span><span>{{ item.title }}</span>
+        </el-col>
+        <el-col class="mt10" :span="24">
+          <span>附件简介：</span><span>{{ item.docDiscrip }}</span>
+        </el-col>
+      </el-row>
+
+      <el-card style="margin-bottom: 10px;margin-top: 10px;">
+        <div slot="header">
+          <span>附件</span>
+        </div>
+        <div v-for="(item,index) in viewUploadFJ.fileList" :key="item.url" class="yy_fj_list1">
+          <a :href="item.url" :download="item.name" target="_blank">{{ item.name }}</a>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="viewUploadFJ.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -388,6 +420,15 @@ export default {
       },
       // 修改内容行
       updataRow: {},
+      // 附件详情参数
+      viewUploadFJ: {
+        // 是否显示弹出层
+        open: false,
+        // 附件上传
+        fileList: [],
+        // 附件上传
+        docDiscripList: []
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -420,10 +461,16 @@ export default {
   },
   created() {
     let userInfo = this.$store.state.user
+    console.log(userInfo);
+    // 职工角色 employee
     if(userInfo.roles.length===1 && userInfo.roles[0]==='employee'){
       this.isEmployee = true;
       this.queryParams.wordId = userInfo.name
     }
+    // 部门角色 deptRole
+    if(userInfo.roles.length===1 && userInfo.roles[0]==='deptRole'){
+      this.queryParams.deptId = userInfo.deptId
+    }
     this.getList()
     this.getDeptTree()
   },
@@ -579,6 +626,26 @@ export default {
       this.$refs.upload.submit()
     },
     // 附件详情
+    viewFuJian(row){
+      this.viewUploadFJ.fileList = [];
+      this.viewUploadFJ.docDiscripList = [{
+        title:'',
+        docDiscrip:'',
+      }];
+      if(row.docs){
+        let arr = row.docs.split(';');
+        arr.forEach( item => {
+          let arr1 = item.split(',');
+          this.viewUploadFJ.fileList.push({
+            name: arr1[0],
+            url: arr1[1]
+          });
+        })
+        this.viewUploadFJ.docDiscripList = JSON.parse(row.docDiscrip);
+      }
+      this.viewUploadFJ.open = true;
+    },
+    // 附件编辑
     handleFuJian(row){
       this.updataRow = row;
       this.uploadFJ.fileList = [];
@@ -686,5 +753,11 @@ export default {
       width: 360px;
     }
   }
+
+  .yy_fj_list1 {
+    height: 36px;
+    line-height: 36px;
+    border-bottom: 1px solid #39CCCC;
+  }
 }
 </style>

ruoyi-ui/src/views/kaohe/ld_employee/index.vue

@@ -105,9 +105,9 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            v-hasPermi="['kaohe:employee:docs']"
+            v-hasPermi="['kaohe:employee:query']"
-            @click="handleFuJian(scope.row)"
+            @click="viewFuJian(scope.row)"
-          >附件详情</el-button>
+          >详情</el-button>
         </template>
       </el-table-column>
 <!--      <el-table-column label="手机号" align="center" prop="phone" />
@@ -278,7 +278,7 @@
     </el-dialog>
 
     <!-- 附件详情对话框 -->
-    <el-dialog title="附件详情" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
+<!--    <el-dialog title="附件详情" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
 
       <div v-for="item in uploadFJ.docDiscripList">
         <el-row :gutter="20">
@@ -323,6 +323,31 @@
         <el-button type="primary" @click="updateFileFJ" disabled>确定</el-button>
         <el-button @click="uploadFJ.open = false">取 消</el-button>
       </div>
+    </el-dialog>-->
+
+    <!-- 详情对话框 -->
+    <el-dialog title="附件详情" :visible.sync="viewUploadFJ.open" width="800px" append-to-body>
+
+      <el-row :gutter="20" v-for="item in viewUploadFJ.docDiscripList">
+        <el-col :span="24">
+          <span>附件主题：</span><span>{{ item.title }}</span>
+        </el-col>
+        <el-col class="mt10" :span="24">
+          <span>附件简介：</span><span>{{ item.docDiscrip }}</span>
+        </el-col>
+      </el-row>
+
+      <el-card style="margin-bottom: 10px;margin-top: 10px;">
+        <div slot="header">
+          <span>附件</span>
+        </div>
+        <div v-for="(item,index) in viewUploadFJ.fileList" :key="item.url" class="yy_fj_list1">
+          <a :href="item.url" :download="item.name" target="_blank">{{ item.name }}</a>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="viewUploadFJ.open = false">取 消</el-button>
+      </div>
     </el-dialog>
 
   </div>
@@ -417,7 +442,16 @@ export default {
         wordId: [
           { required: true, message: "工号不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 附件详情参数
+      viewUploadFJ: {
+        // 是否显示弹出层
+        open: false,
+        // 附件上传
+        fileList: [],
+        // 附件上传
+        docDiscripList: []
+      },
     }
   },
   created() {
@@ -664,7 +698,27 @@ export default {
           this.getList();
         })
       }
-    }
+    },
+    // 附件详情
+    viewFuJian(row){
+      this.viewUploadFJ.fileList = [];
+      this.viewUploadFJ.docDiscripList = [{
+        title:'',
+        docDiscrip:'',
+      }];
+      if(row.docs){
+        let arr = row.docs.split(';');
+        arr.forEach( item => {
+          let arr1 = item.split(',');
+          this.viewUploadFJ.fileList.push({
+            name: arr1[0],
+            url: arr1[1]
+          });
+        })
+        this.viewUploadFJ.docDiscripList = JSON.parse(row.docDiscrip);
+      }
+      this.viewUploadFJ.open = true;
+    },
   }
 }
 </script>
@@ -704,5 +758,13 @@ export default {
       width: 360px;
     }
   }
+
+
+  .yy_fj_list1 {
+    height: 36px;
+    line-height: 36px;
+    border-bottom: 1px solid #39CCCC;
+  }
+
 }
 </style>

ruoyi-ui/src/views/system/dept/index.vue

@@ -64,9 +64,16 @@
             size="mini"
             type="text"
             icon="el-icon-view"
+            v-hasPermi="['system:dept:query']"
+            @click="viewFuJian(scope.row)"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             v-hasPermi="['system:dept:docs']"
             @click="handleFuJian(scope.row)"
-          >附件详情/编辑</el-button>
+          >编辑</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
@@ -167,8 +174,8 @@
       </div>
     </el-dialog>
 
-    <!-- 附件详情对话框 -->
+    <!-- 附件编辑对话框 -->
-    <el-dialog title="附件详情/编辑" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="附件编辑" :visible.sync="uploadFJ.open" width="900px" append-to-body :close-on-click-modal="false">
 
       <div v-for="item in uploadFJ.docDiscripList">
         <el-row :gutter="20">
@@ -215,6 +222,31 @@
       </div>
     </el-dialog>
 
+    <!-- 详情对话框 -->
+    <el-dialog title="附件详情" :visible.sync="viewUploadFJ.open" width="800px" append-to-body>
+
+      <el-row :gutter="20" v-for="item in viewUploadFJ.docDiscripList">
+        <el-col :span="24">
+          <span>附件主题：</span><span>{{ item.title }}</span>
+        </el-col>
+        <el-col class="mt10" :span="24">
+          <span>附件简介：</span><span>{{ item.docDiscrip }}</span>
+        </el-col>
+      </el-row>
+
+      <el-card style="margin-bottom: 10px;margin-top: 10px;">
+        <div slot="header">
+          <span>附件</span>
+        </div>
+        <div v-for="(item,index) in viewUploadFJ.fileList" :key="item.url" class="yy_fj_list1">
+          <a :href="item.url" :download="item.name" target="_blank">{{ item.name }}</a>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="viewUploadFJ.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -298,6 +330,15 @@ export default {
       },
       // 修改内容行
       updataRow: {},
+      // 附件详情参数
+      viewUploadFJ: {
+        // 是否显示弹出层
+        open: false,
+        // 附件上传
+        fileList: [],
+        // 附件上传
+        docDiscripList: []
+      },
     }
   },
   created() {
@@ -489,7 +530,27 @@ export default {
           this.getList();
         })
       }
-    }
+    },
+    // 附件详情
+    viewFuJian(row){
+      this.viewUploadFJ.fileList = [];
+      this.viewUploadFJ.docDiscripList = [{
+        title:'',
+        docDiscrip:'',
+      }];
+      if(row.docs){
+        let arr = row.docs.split(';');
+        arr.forEach( item => {
+          let arr1 = item.split(',');
+          this.viewUploadFJ.fileList.push({
+            name: arr1[0],
+            url: arr1[1]
+          });
+        })
+        this.viewUploadFJ.docDiscripList = JSON.parse(row.docDiscrip);
+      }
+      this.viewUploadFJ.open = true;
+    },
   }
 }
 </script>
@@ -529,5 +590,12 @@ export default {
       width: 360px;
     }
   }
+
+  .yy_fj_list1 {
+    height: 36px;
+    line-height: 36px;
+    border-bottom: 1px solid #39CCCC;
+  }
+
 }
 </style>