查询设备检定证书;结算审批相关人员

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java

     @Excel(name = "存放地点")
     private String place;
 
+    /** 检定证书 */
+    private String document;
+
     /** 管理部门id */
     @Excel(name = "管理部门")
     private String deptName;
         return status;
     }
 
+    public void setDocument(String document)
+    {
+        this.document = document;
+    }
+
+    public String getDocument()
+    {
+        return document;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceMapper.xml

         <result property="remark"    column="remark"    />
         <result property="manageDept"    column="manage_dept"    />
         <result property="status"    column="status"    />
+        <result property="document"    column="document"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
     </resultMap>
 
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name from cmc_device as d left join sys_dept as dept on dept.dept_id = d.manage_dept
+        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name, de.document from cmc_device as d
+        left join sys_dept as dept on dept.dept_id = d.manage_dept
+        left join (select * from cmc_device_expense as cde where cde.expense_type = '3') as de on de.device_id = d.device_id
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">

oa-ui/src/views/file/index.vue

  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-23 17:20:57
+ * @LastEditTime: 2024-09-03 16:08:10
 -->
 <template>
   <div class="warpper-container">
     <!-- 鼠标移动坐标 -->
     <div id="mouse-position"></div>
     <!-- 项目信息弹出框 -->
-    <info-box :datas="datas" :maps="map" @closePopup="closePopup" @open="openAchiList"></info-box>
+    <info-box :datas="clickFeature" :maps="map" @closePopup="closePopup" @open="openProject"></info-box>
     <!-- 工具栏列表 -->
     <div class="tool-box">
       <div class="item">
         </el-tooltip>
       </div>
     </div>
+    <transition-group appear name="animate__animated animate__bounce" enter-active-class="animate__fadeInLeft"
+      leave-active-class="animate__fadeOutLeft">
+      <div class="layer-type dialog_wrap" v-if="layersOpen" @mousedown.stop="move">
+        <div class="layer-content">
+          <div>
+            <el-icon class="close" @click="layersOpen = false">
+              <CloseBold />
+            </el-icon>
+          </div>
+          <el-tabs v-model="activeName" class="demo-tabs">
+            <el-tab-pane label="项目图层" name="first">
+              <project-layer :proTree="projectList" :maps="map"></project-layer>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </transition-group>
     <!-- 项目信息弹出框 -->
-    <div id="popup" class="ol-popup">
+    <div id="popup" class="ol-popup" v-if="clickFeature != null">
       <span id="popup-closer" class="ol-popup-closer" @click="closePopup"></span>
       <div id="popup-content">
-        <el-descriptions :column="1" border v-if="clickFeacture.type == 'projectPoint'">
+        <el-descriptions :column="1" border v-if="clickFeature.type == 'projectPoint'">
           <el-descriptions-item label="项目编号" width="130px">
-            {{ clickFeacture.projectNumber }}
+            {{ clickFeature.projectNumber }}
           </el-descriptions-item>
           <el-descriptions-item label="项目名称" width="130px">
-            {{ clickFeacture.projectName }}
+            {{ clickFeature.projectName }}
           </el-descriptions-item>
           <el-descriptions-item label="项目负责人" width="130px">
-            {{ getUserName(clickFeacture.projectLeader) }}
+            {{ getUserName(clickFeature.projectLeader) }}
           </el-descriptions-item>
           <el-descriptions-item label="存放地址" width="130px">
-            {{ clickFeacture.storageAddress == '' || clickFeacture.storageAddress == null ? '暂无' :
-              clickFeacture.storageAddress }}
+            {{ clickFeature.storageAddress == '' || clickFeature.storageAddress == null ? '暂无' :
+              clickFeature.storageAddress }}
           </el-descriptions-item>
         </el-descriptions>
 
-        <div v-if="clickFeacture.type == 'featurePoint'">
-          <div class="title">项目编号:{{ clickFeacture.projectNumber }}</div>
+        <div v-if="clickFeature.type == 'featurePoint'">
+          <div class="title">项目编号:{{ clickFeature.projectNumber }}</div>
           <el-descriptions :column="1" border>
             <el-descriptions-item label="名称" width="130px">
-              <!-- {{ clickFeacture.selectFeatures.values_.name }} -->
+              <!-- {{ clickFeature.selectFeatures.values_.name }} -->
             </el-descriptions-item>
           </el-descriptions>
         </div>
       </div>
-      <div class="look-achi" @click="" v-if="clickFeacture.type == 'projectPoint'">成果目录>></div>
+      <div class="look-achi" @click="" v-if="clickFeature.type == 'projectPoint'">成果目录>></div>
     </div>
     <!-- 项目目录 -->
     <div class="right-project" :class="{ closeProBox: isOpenPro }">
 import { Tianditu, ZhongKe, ArcGISBlue, Autonavi, google, terrain, vect } from '@/utils/maps'
 import { listProject, getProject } from '@/api/oa/project/project'
 import infoBox from './index/infoBox.vue';
+import ProjectLayer from './index/projectLayer.vue';
 import sjxActive from '@/assets/images/gis/sjd.png';
 // ---------------------------------ol引用------------------------------------------------
 import 'ol/ol.css'
 import { MousePosition, ScaleLine, defaults as defaultControls } from 'ol/control';
 import { getAchievementByProject, listAchievement } from "@/api/file/achievement";
 export default {
-  components: { infoBox },
+  components: { infoBox, ProjectLayer },
   dicts: ['cmc_achi_type', 'cmc_scale_grade'],
   data() {
     return {
       popup: null,
       clusters: null,
       drawBox: null,
-
+      activeName: 'first',
       isDrawing: false,
       viewCenter: [105.55, 34.18],
       layersOpen: false,
       searchType: '',
       projectList: [],
       allproTableData: [],
+      clusters: null,
       total: 0,
       loading: true,
       tableHeight: 0,
-      clickFeacture: {},
+      clickFeature: {},
       clickDatas: {
         selectFeatures: null,
         selectProjectNumber: "",
       seletctedCluters: [],
       dialogTitle: '',
       dialogTableVisible: false,
-      datas: {
-        clickFeacture: {},
-        selectFeatures: null,
-        selectProjectNumber: "",
-        type: '',
-        infoData: {}
-      }
     }
   },
   mounted() {
     this.setTableDomHeight();
     this.initMap();
     this.observer();
-    this.getProjectList();
+    let param = {
+      pageNum: 1,
+      pageSize: 10000,
+    }
+    this.getProjectCluster(param); //地图数据集cluster对应allproTableData，此值不变    
+    this.getProjectList(this.queryParams); //项目列表对应projectList，此值随搜索变化
   },
   methods: {
     // 设置侧边项目目录的高度
       })
       this.map.addOverlay(this.popup);
       this.mapClick(this.map);
-      // this.clickFeacturePopInfo();
+      // this.clickFeaturePopInfo();
       this.addKeyDownFun()
     },
     observer() {
           let features = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
             // 如果只需要知道有特征，而不关心具体是哪个，这里可以返回 true  
             // OpenLayers 会继续查找更多特征，但我们不需要  
-            return true;
+            return feature.get('features');
           });
-
           // features 现在是一个数组，包含了在点击像素位置找到的所有特征  
           if (features && features.length > 0) {
             // 如果只有一个特征  
             if (features.length === 1) {
-              let feature = features[0]; // 直接从数组中取第一个特征  
-              let num = feature.get('name'); // 使用 get 方法来获取属性  
-              let projectId = feature.get('projectId');
-
+              let feature = features[0]; // 直接从数组中取第一个特征
+              let projectId = feature.projectId;
               // 假设 getProject 是一个返回 Promise 的函数  
               getProject(projectId).then(res => {
                 if (res.data) {
                   // 假设 this 在这里指向 Vue 组件实例或其他上下文  
                   that.clickFeature = res.data;
                   that.clickFeature.type = 'projectPoint';
-                  this.popup.setPosition(coordinate);
+                  that.popup.setPosition(coordinate);
                 }
               })
             } else {
               // 如果有多个特征，这里可以根据需要处理  
-              this.popup.setPosition(undefined);
+              that.popup.setPosition(undefined);
             }
           } else {
-            this.popup.setPosition(undefined);
+            that.popup.setPosition(undefined);
           }
 
 
         }
       })
     },
-    clickFeacturePopInfo() {
+    clickFeaturePopInfo() {
       let that = this;
       if (that.select !== null) {
         that.map.removeInteraction(that.select);
         that.map.addInteraction(that.select);
         that.select.on('select', function (e) {
           if (e.target.getFeatures().getArray().length == 1) {
-            that.clickFeacture = e.target.getFeatures().getArray()[0];
-            let properties = that.clickFeacture.getProperties();
+            that.clickFeature = e.target.getFeatures().getArray()[0];
+            let properties = that.clickFeature.getProperties();
             if (!properties.features) {
               let fatherLayers = e.target.featureLayerAssociation_;
               // for (let layers in fatherLayers) {
               // }
               let coordinate = e.mapBrowserEvent.coordinate;
               that.popup.setPosition(coordinate);
-              that.clickFeacture.type = 'featurePoint';
+              that.clickFeature.type = 'featurePoint';
             }
           }
         })
     closePopup() {
       this.popup.setPosition(undefined);
     },
-    openAchiList() {
+    openProject() {
       this.dialogTableVisible = true;
-      // let projectId = datas.clickFeacture.id;
-      // this.dialogTitle = datas.clickFeacture.projectNumber
+      // let projectId = datas.clickFeature.id;
+      // this.dialogTitle = datas.clickFeature.projectNumber
       listAchievement({ projectId }).then(res => {
         if (res.total == 0) {
           this.$message.error('暂无成果，请添加');
       }
       return layer;
     },
-    getProjectList() {
+    getProjectCluster(queryParams) {
       this.loading = true
-      listProject(this.queryParams).then(res => {
+      listProject(queryParams).then(res => {
         let data = res.rows;
         this.total = res.total;
-        this.projectList = data;
         this.allproTableData = data;
-        this.loading = false
+        this.loading = false;
         this.addProjectCluster(data);
       })
     },
+    getProjectList(queryParams) {
+      this.loading = true
+      listProject(queryParams).then(res => {
+        let data = res.rows;
+        this.total = res.total;
+        this.projectList = data;
+        this.loading = false
+      })
+    },
     /* 格式化表格显示 */
     formatterKmlurl(row, cloumn) {
       if (row.projectKml == "" || row.projectKml == null) {
     },
     // 添加项目点在地图上
     addProjectCluster(data) {
-      let features = [], projectPoints = []
+      let features = []
       for (let d of data) {
         if (d.kmlLat && d.kmlLng) {
           let f = new Feature(new Point([Number(d.kmlLng), Number(d.kmlLat)]));
           f.name = d.projectNumber;
           f.projectId = d.projectId;
           features.push(f);
-          projectPoints.push(d);
         }
       }
       let source = new VectorSource({
         zIndex: 99
       })
       this.map.addLayer(this.clusters);
+      this.map.on('click', (e) => {
+        this.clusters.getFeatures(e.pixel).then((clickedFeatures) => {
+          if (clickedFeatures.length) {
+            // Get clustered Coordinates
+            const features = clickedFeatures[0].get('features');
+            if (features.length > 1) {
+              const extent = boundingExtent(
+                features.map((r) => r.getGeometry().getCoordinates())
+              );
+              this.map.getView().fit(extent, { duration: 1000, padding: [100, 100, 100, 100] });
+            }
+          }
+        });
+      });
     },
     handleCurrentChange(val) {
       this.queryParams.pageNum = val
-      this.getProjectList()
+      this.getProjectList(this.queryParams)
     },
     /* 得到项目的点位绘制到地图上 */
     clusterStyle(feature, resolution) {
       }
       listProject(param).then(res => {
         let data = res.rows;
-        let datas = [];
-        for (let d of data) {
-          if (d.kmlLat && d.kmlLng) {
-            datas.push(d);
-          }
-        }
         this.projectList = data;
       })
     },
         document.onmouseup = null;
         document.body.onselectstart = document.body.ondrag = () => { return true }
       }
-
     },
   }
 }

oa-ui/src/views/flowable/form/budget/components/chooseDevice.vue

 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 17:00:21
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-04 09:40:26
 -->
 <template>
   <div>
         <el-button @click="getList" type="primary">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="chooseDeviceRef" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys"
+    <el-table border ref="chooseDeviceRef" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys"
       @current-change="handleCurrentChange" @row-dblclick="confirmChooseBySingle" :highlight-current-row="!multiple">
       <el-table-column type="selection" width="50" align="center" :reserve-selection="true" v-if="multiple" />
       <el-table-column label="设备状态" align="center" prop="status">
       <el-table-column label="设备名称" align="center" prop="name" />
       <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="存放地址" align="center" prop="place" />
-      <el-table-column label="单日成本" align="center" prop="dayCost" />
+      <!-- <el-table-column label="单日成本" align="center" prop="dayCost" /> -->
+      <el-table-column label="检定证书" align="center" width="200" prop="document">
+        <template slot-scope="scope">
+          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + scope.row.document}`" v-if="scope.row.document"
+            :underline="false" target="_blank">
+            <el-button type="warning" plain icon="el-icon-download" size="mini"></el-button>
+          </el-link>
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' +  scope.row.document}`)">
+            {{ getFileName(scope.row.document) }}
+          </el-link>
+        </template>
+      </el-table-column>
     </el-table>
     <div style="text-align: right;">
       <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         type: '仪器设备',
-        status: '1'
+        status: '1',
       },
       list: [],
       form: {},

oa-ui/src/views/flowable/form/projectProcess/manageReview.vue

  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-30 09:28:03
+ * @LastEditTime: 2024-09-03 11:01:13
 -->
 <template>
   <div class="app-container">
     },
     getDeptLeader(val) {
       this.deptLeaderList = [this.projectLeader];
-      for (let v of val) {
-        getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
-          this.deptLeaderList.push(res.data.userId);
+      for (let i = 0; i < val.length; i++) {
+        getUsersDeptLeaderByDept({ deptId: Number(val[i]) }).then(res => {
+          if (res.data) {
+            this.deptLeaderList.push(res.data.userId);
+            if (i == val.length - 1)
+              this.deptLeaderList.shift();
+          }
           this.$store.commit('SET_UNDERLEADERID', this.deptLeaderList)
         })
       }

oa-ui/src/views/flowable/form/settleForm.vue

  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-30 14:00:09
+ * @LastEditTime: 2024-09-02 15:41:43
 -->
 <template>
   <div class="app-container" v-loading="loading">
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="工作上报人：" prop="reporterName">
                 <span class="auditor">
-                  {{ getUserName(form.reporter) }}
+                  {{ form.reporterName ? "" : getUserName(form.reporter) }}
                 </span>
               </el-form-item>
             </el-col>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.zhUserId) }} </span>
+                  <span class="auditor"> {{ form.zhUserName ? "" : getUserName(form.zhUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.jsUserId) }} </span>
+                  <span class="auditor"> {{ form.jsUserName ? "" : getUserName(form.jsUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.jyUserId) }} </span>
+                  <span class="auditor"> {{ form.jyUserName ? "" : getUserName(form.jyUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.managerUserId) }} </span>
+                  <span class="auditor"> {{ form.managerUserName ? "" : getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.gmUserId) }} </span>
+                  <span class="auditor"> {{ form.gmUserName ? "" : getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
 
         getUser(this.form.reporter).then((res) => {
           if (res.data) {
-            this.form.reporterName = res.data.nickName;
             this.deptId = res.data.deptId;
           }
         });
         this.flag = false;
         if (this.taskName == "结算发起") {
           this.form.reporter = this.$store.state.user.id;
-          this.form.reporterName = this.$store.state.user.name;
           this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
         }
       }
         this.form.dszUserId = this.$store.state.user.id;
         this.form.dszTime = parseTime(new Date(), "{y}-{m}-{d}");
       }
-      this.getReviewerName();
-    },
-    // 获取审核人
-    getReviewerName() {
-      if (this.form.zhUserId) {
-        this.form.zhUserName = this.getUserName(this.form.zhUserId)
-      }
-      if (this.form.jsUserId) {
-        this.form.jsUserName = this.getUserName(this.form.jsUserId)
-      }
-      if (this.form.jyUserId) {
-        getUser(this.form.jyUserId).then((res) => {
-          this.form.jyUserName = res.data.nickName;
-        });
-      }
-      if (this.form.managerUserId) {
-        getUser(this.form.managerUserId).then((res) => {
-          this.form.managerUserName = res.data.nickName;
-        });
-      }
-      if (this.form.gmUserId) {
-        getUser(this.form.gmUserId).then((res) => {
-          this.form.gmUserName = res.data.nickName;
-        });
-      }
     },
     // 保存按钮
     preserve() {

oa-ui/src/views/flowable/form/settleOther.vue

  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: wrh
- * @LastEditTime: 2024-08-30 13:52:06
+ * @LastEditTime: 2024-09-02 15:38:34
 -->
 <template>
   <div class="app-container" v-loading="loading">
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="工作上报人：" prop="reporterName">
                 <span class="auditor">
-                  {{ getUserName(form.reporter) }}
+                  {{form.reporterName ? "" : getUserName(form.reporter) }}
                 </span>
               </el-form-item>
             </el-col>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.managerUserId) }} </span>
+                  <span class="auditor"> {{ form.managerUserName ? "" : getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ getUserName(form.gmUserId) }} </span>
+                  <span class="auditor"> {{ form.gmUserName ? "" : getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
 
         getUser(this.form.reporter).then((res) => {
           if (res.data) {
-            this.form.reporterName = res.data.nickName;
             this.deptId = res.data.deptId;
           }
         });
         this.flag = false;
         if (this.taskName == "结算发起") {
           this.form.reporter = this.$store.state.user.id;
-          this.form.reporterName = this.$store.state.user.name;
           this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
         }
       }
         this.form.gmUserId = this.$store.state.user.id;
         this.form.gmTime = parseTime(new Date(), "{y}-{m}-{d}");
       }
-      this.getReviewerName();
-    },
-    // 获取审核人
-    getReviewerName() {
-      if (this.form.managerUserId) {
-        getUser(this.form.managerUserId).then((res) => {
-          this.form.managerUserName = res.data.nickName;
-        });
-      }
-      if (this.form.gmUserId) {
-        getUser(this.form.gmUserId).then((res) => {
-          this.form.gmUserName = res.data.nickName;
-        });
-      }
     },
     // 保存按钮
     preserve() {

oa-ui/src/views/oa/project/index.vue

 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-30 15:34:36
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-03 11:06:11
 -->
 <template>
   <div class="project-wrapper">
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
+        <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" />
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
           width="120px" />
         <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel" width="120px">