修改一张图，修改项目流转中去掉项目安排

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

@@ -79,6 +79,7 @@
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         <where>
+            <if test="projectId != null  and projectId != ''"> and p.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 16:43:47
+ * @LastEditTime: 2024-07-02 17:43:54
  */
 import request from '@/utils/request'
 
@@ -42,6 +42,13 @@ const apiEndpoints = [
     apiUrl: [
       '/oa/carApproval/:id',
     ]
+  },
+  {
+    procDefName: '项目流转',
+    apiUrl: [
+      '/oa/project/:id',
+      '/oa/projectWork/:id',
+    ]
   }
 ]
 

oa-ui/src/utils/maps.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-25 10:11:45
+ * @LastEditors: 
+ * @LastEditTime: 2024-07-01 13:54:24
+ */
 
 import TileLayer from 'ol/layer/Tile';
 import { Cluster, Vector as VectorSource, XYZ } from 'ol/source';
@@ -20,7 +26,7 @@ const ZhongKe = new TileLayer({
   properties: {
     name: '中科星图'
   },
-  visible: false
+  visible: true
 })
 
 // ArcGIS
@@ -42,7 +48,7 @@ const Autonavi = new TileLayer({
   properties: {
     name: '高德'
   },
-  visible: true
+  visible: false
 })
 // 谷歌
 const google = new TileLayer({

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-28 16:49:32
+ * @LastEditTime: 2024-07-01 17:05:09
 -->
 <template>
   <div class="warpper-container">
@@ -57,7 +57,7 @@
           <div class="title">项目编号:{{ clickFeacture.projectNumber }}</div>
           <el-descriptions :column="1" border>
             <el-descriptions-item label="名称" width="130px">
-              {{ clickFeacture.selectFeatures.values_.name }}
+              <!-- {{ clickFeacture.selectFeatures.values_.name }} -->
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -170,6 +170,8 @@
         </div>
       </div>
     </div>
+
+
   </div>
 </template>
 
@@ -177,6 +179,7 @@
 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 sjxActive from '@/assets/images/gis/sjd.png';
 // ---------------------------------ol引用------------------------------------------------
 import 'ol/ol.css'
 import { Map, View } from 'ol';
@@ -212,6 +215,9 @@ export default {
       select: null,
       popup: null,
       clusters: null,
+      drawBox: null,
+
+      isDrawing: false,
       viewCenter: [105.55, 34.18],
       layersOpen: false,
       isOpenPro: false, //项目列表是否展开
@@ -227,15 +233,18 @@ export default {
         selectFeatures: null,
         selectProjectNumber: "",
         type: '',
-      }
+      },
+      seletctedCluters: []
     }
   },
   mounted() {
     this.setTableDomHeight();
     this.initMap();
+    this.observer();
     this.getProjectList();
   },
   methods: {
+    // 设置侧边项目目录的高度
     setTableDomHeight() {
       let dom = document.querySelector('.right-project');
       dom.style.height = window.innerHeight - 110 + 'px'; //减去110为页头的高度
@@ -250,6 +259,7 @@ export default {
         resolve()
       })
     },
+    // 初始化地图
     initMap() {
       this.view = new View({
         projection: "EPSG:4326", // 坐标系，有EPSG:4326和EPSG:3857
@@ -276,7 +286,7 @@ export default {
         target: 'maps',
         controls: defaultControls().extend([this.control]),
         layers: [
-          Autonavi,
+          Autonavi, Tianditu, ZhongKe,
           new TileLayer({//标注
             source: new XYZ({
               url: "http://webst02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8",
@@ -290,35 +300,122 @@ export default {
       })
       this.map.addOverlay(this.popup);
       this.mapClick(this.map, this.popup);
+      // this.clickFeacturePopInfo();
+      this.addKeyDownFun()
     },
+    observer() {
+      let that = this;
+      // 选择需要观察变动的节点
+      const targetNode = document.querySelector('.sidebar-container');
+      // 观察器的配置（需要观察什么变动）
+      const config = { attributes: true, childList: true, subtree: true }
+      // 当观察到变动时执行的回调函数
+      const callback = function (mutationsList, observer) {
+        for (let mutation of mutationsList) {
+          if (mutation.type === 'childList') {
+          } else if (mutation.type === 'attributes') {
+            that.map.updateSize();
+          }
+        }
+      }
+      // 创建一个观察器实例并传入回调函数
+      const observer = new MutationObserver(callback);
+      // 以上述配置开始观察目标节点
+      observer.observe(targetNode, config);
+    },
+    addKeyDownFun() {
+      // 添加键盘事件监听器  
+      window.addEventListener('keydown', (event) => {
+        if (event.key === 'Escape') { // 检查是否按下了 ESC 键  
+          // 停止当前的绘制（或清除框选）  
+          if (this.drawBox && this.drawBox.getActive()) {
+            this.drawBox.finishDrawing(); // 如果有正在进行的绘制，结束它  
+            // 如果需要清除之前的绘制结果，可以在这里添加逻辑  
+            this.map.removeInteraction(this.drawBox);
+          }
+        }
+      });
+    },
+    // 地图点击事件
     mapClick(map, popup) {
       let that = this;
       map.on('singleclick', function (evt) {
-        const coordinate = evt.coordinate;
-        let features = map.forEachFeatureAtPixel(evt.pixel, (feature) => {
-          return feature;
-        });
-        if (features != undefined && features != null && features != "") {
-          let feature = features.values_.features;
-          if (feature.length == 1) {
-            let num = feature[0].name
-            let projectId = feature[0].projectId
-            getProject(projectId).then(res => {
-              if (res.data) {
-                that.clickFeacture = res.data;
-                that.clickFeacture.type = 'projectPoint';
-                console.log(that.clickFeacture);
-                popup.setPosition(coordinate);
-              }
-            })
+        if (!that.isDrawing) {
+          const coordinate = evt.coordinate;
+          let features = map.forEachFeatureAtPixel(evt.pixel, function (feature) {
+            // 如果只需要知道有特征，而不关心具体是哪个，这里可以返回 true  
+            // OpenLayers 会继续查找更多特征，但我们不需要  
+            return true;
+          });
+
+          // 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');
+
+              // 假设 getProject 是一个返回 Promise 的函数  
+              getProject(projectId).then(res => {
+                if (res.data) {
+                  // 假设 this 在这里指向 Vue 组件实例或其他上下文  
+                  that.clickFeature = res.data;
+                  that.clickFeature.type = 'projectPoint';
+                  popup.setPosition(coordinate);
+                }
+              })
+            } else {
+              // 如果有多个特征，这里可以根据需要处理  
+              popup.setPosition(undefined);
+            }
           } else {
             popup.setPosition(undefined);
           }
-        } else {
-          popup.setPosition(undefined);
+
+
+          that.clusters.getFeatures(evt.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())
+                );
+                that.map.getView().fit(extent, { duration: 1000, padding: [100, 100, 100, 100] });
+              }
+            }
+          });
         }
       })
     },
+    clickFeacturePopInfo() {
+      let that = this;
+      if (that.select !== null) {
+        that.map.removeInteraction(that.select);
+      }
+      that.select = new Select({
+        style: this.selectedStyle
+      })
+      if (that.select !== null) {
+        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();
+            if (!properties.features) {
+              let fatherLayers = e.target.featureLayerAssociation_;
+              // for (let layers in fatherLayers) {
+              //   datas.selectProjectNumber = fatherLayers[layers].values_.title;
+              // }
+              let coordinate = e.mapBrowserEvent.coordinate;
+              that.popup.setPosition(coordinate);
+              that.clickFeacture.type = 'featurePoint';
+            }
+          }
+        })
+      }
+    },
     /* 关闭信息框 */
     closePopup() {
       this.popup.setPosition(undefined);
@@ -342,10 +439,76 @@ export default {
       this.map.getView().setZoom(5)
     },
     rectSelect() {
-
+      let that = this;
+      that.select = new Select({
+        condition: never,
+        style: that.selectedStyle
+      });
+      // 创建框选图层
+      let drawLayer = new VectorLayer({
+        source: new VectorSource(),
+      });
+      // 创建绘制工具
+      that.drawBox = new Draw({
+        source: drawLayer.getSource(),
+        type: 'Circle',
+        geometryFunction: createBox()
+      });
+      that.drawBox.on('drawstart', function () {
+        that.seletctedCluters = [];
+        that.select.getFeatures().clear();
+        that.isDrawing = true;
+        // drawLayer.getSource().clear();
+      });
+      // 结束绘制
+      that.drawBox.on('drawend', function (e) {
+        if (e.feature) {
+          // 获取框选范围
+          let geometry = e.feature.getGeometry();
+          let extent = geometry.getExtent();
+          // 查询框选范围内的所有点
+          that.getLayerByName('clusters').getSource().forEachFeatureIntersectingExtent(extent, function (feature) {
+            that.select.getFeatures().push(feature);
+          });
+          // 遍历被选中的要素
+          let selected = [];
+          let selectedFeatures = that.select.getFeatures();
+          for (let i = 0; i < selectedFeatures.getLength(); i++) {
+            let feature = selectedFeatures.item(i);
+            feature = feature.values_.features;
+            if (feature.length == 1) {
+              let name = feature[0].name;
+              selected.push(name);
+            } else {
+              for (let f of feature) {
+                let name = f.name;
+                selected.push(name);
+              }
+            }
+            that.seletctedCluters = selected;
+          }
+        }
+        that.isDrawing = false;
+      })
+      that.map.addInteraction(that.select);
+      that.map.addInteraction(that.drawBox);
     },
     polygonSelect() {
 
+    },
+    /* 通过图层名称获取图层 */
+    getLayerByName(name) {
+      let allLayers = this.map.getLayers().getArray();
+      let layer = undefined;
+      if (allLayers.length) {
+        for (let i = 0; i < allLayers.length; i++) {
+          if (allLayers[i].get('name') === name) {
+            layer = allLayers[i];
+            break;
+          }
+        }
+      }
+      return layer;
     },
     getProjectList() {
       this.loading = true
@@ -455,6 +618,76 @@ export default {
       }
       return style;
     },
+    /* 被选中的样式 */
+    selectedStyle(feature, resolution) {
+      let styleCache = {};
+      let f = feature.get('features');
+      if (f) {
+        const size = feature.get('features').length;
+        let style = styleCache[size];
+        if (!style) {
+          style = [
+            new Style({
+              image: new Circle({
+                radius: 20,
+                fill: new Fill({
+                  color: 'rgba(255,0,0,0.4)',
+                }),
+              }),
+              text: new Text({
+                text: this.getText(feature, resolution),
+                fill: new Fill({
+                  color: '#fff',
+                }),
+                stroke: new Stroke({
+                  color: 'rgba(0, 0, 0, 0.6)',
+                  width: 3,
+                }),
+                font: '18px Calibri,sans-serif',
+                offsetY: -30
+              })
+            }),
+            new Style({
+              image: new Circle({
+                radius: 14,
+                fill: new Fill({
+                  color: 'rgba(255,0,0,0.9)',
+                }),
+              }),
+              text: new Text({
+                text: size.toString(),
+                fill: new Fill({
+                  color: '#fff',
+                }),
+                stroke: new Stroke({
+                  color: 'rgba(0, 0, 0, 0.6)',
+                  width: 3,
+                }),
+              })
+            })
+          ];
+          styleCache[size] = style;
+        }
+        return style;
+      } else {
+        let style = new Style({
+          // fill: new Fill({
+          //   color: [75, 126, 255, 0.6]
+          // }),
+          stroke: new Stroke({
+            width: 2,
+            color: '#FFFFFF',
+            lineDash: [8, 4],
+            lineCap: 'butt'
+          }),
+          image: new Icon({
+            src: sjxActive,
+            crossOrigin: 'anonymous',
+          })
+        })
+        return style
+      }
+    },
     getText(feature, resolution) {
       let features = feature.values_.features;
       let reo = resolution * 100;
@@ -650,8 +883,8 @@ export default {
   border-radius: 10px;
   // border: 1px solid #cccccc;
   bottom: 17px;
-  left: -220px;
-  min-width: 461px;
+  left: -168px;
+  min-width: 361px;
 
   .ol-popup-closer {
     text-decoration: none;

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-19 15:55:48
+ * @LastEditTime: 2024-07-02 09:46:00
 -->
 <template>
   <div class="app-container">
@@ -575,13 +575,13 @@ export default {
           document: '',
           commentTime: undefined
         },
-        {
-          deptId: 107,
-          userId: '',
-          comment: '',
-          document: '',
-          commentTime: undefined
-        },
+        // {
+        //   deptId: 107,
+        //   userId: '',
+        //   comment: '',
+        //   document: '',
+        //   commentTime: undefined
+        // },
         {
           deptId: 106,
           userId: '',
@@ -711,13 +711,13 @@ export default {
                   document: '',
                   commentTime: undefined
                 },
-                {
-                  deptId: 107,
-                  userId: '',
-                  comment: '',
-                  document: '',
-                  commentTime: undefined
-                },
+                // {
+                //   deptId: 107,
+                //   userId: '',
+                //   comment: '',
+                //   document: '',
+                //   commentTime: undefined
+                // },
                 {
                   deptId: 106,
                   userId: '',

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-28 14:26:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-02 10:11:22
 -->
 <template>
   <div class="app-container">
@@ -572,13 +572,13 @@ export default {
           document: '',
           commentTime: undefined
         },
-        {
-          deptId: 107,
-          userId: '',
-          comment: '',
-          document: '',
-          commentTime: undefined
-        },
+        // {
+        //   deptId: 107,
+        //   userId: '',
+        //   comment: '',
+        //   document: '',
+        //   commentTime: undefined
+        // },
         {
           deptId: 106,
           userId: '',

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

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-18 14:52:40
+ * @LastEditTime: 2024-07-02 18:17:03
 -->
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
-    <h2 style="text-align: center">项目登记</h2>
-    <el-form :model="addForm" :rules="rules" label-width="100px" :disabled="disabled">
+    <h2 style="text-align: center" id="scrollToMe">项目登记及安排</h2>
+    <el-form ref="projectAdd" :model="addForm" :rules="rules" label-width="110px" :disabled="disabled">
       <el-form-item label="项目编号：" prop="projectNumber">
         <el-input v-model="addForm.projectNumber"></el-input>
       </el-form-item><el-form-item label="项目名称：" prop="projectName">
@@ -18,13 +18,13 @@
         <el-input v-model="addForm.projectType"></el-input>
       </el-form-item>
       <el-form-item label="项目级别：" prop="projectLevel">
-        <el-radio v-model="addForm.projectLevel" label="0">一般项目</el-radio>
-        <el-radio v-model="addForm.projectLevel" label="1">重大项目</el-radio>
+        <el-radio v-model="addForm.projectLevel" label="0" border>一般项目</el-radio>
+        <el-radio v-model="addForm.projectLevel" label="1" border>重大项目</el-radio>
       </el-form-item>
       <el-form-item label="项目来源：" prop="projectSource">
         <el-radio-group v-model="addForm.projectSource" @change="changeProjectSource">
-          <el-radio label="0">院内</el-radio>
-          <el-radio label="1">院外</el-radio>
+          <el-radio label="0" border>院内</el-radio>
+          <el-radio label="1" border>院外</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="合同编码：">
@@ -71,7 +71,8 @@
             </td>
             <td>
               <el-select v-model="work.unit" placeholder="请选择" clearable>
-                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
               </el-select>
             </td>
             <td>
@@ -94,11 +95,11 @@
 
         <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
       </el-form-item>
-      <el-form-item label="附件上传：" prop="taskDocument">
-        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书'"
-          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setProjectDocument">
-        </FileUpload>
-        <div v-if="addForm.taskDocument && $route.query.taskName != '项目登记'" class="upload-list">
+      <!-- 项目安排 -->
+      <arrange-project ref="arrange" :taskForm="taskForm" :taskName="'项目登记'" :disabled="disabled"></arrange-project>
+      <!--  -->
+      <el-form-item label="任务书上传：" prop="taskDocument">
+        <div v-if="addForm.taskDocument" class="upload-list">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + addForm.taskDocument}`)">
             {{ getFileName(addForm.taskDocument) }}
           </el-link>
@@ -107,18 +108,21 @@
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </div>
+        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书'"
+          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setProjectDocument">
+        </FileUpload>
       </el-form-item>
       <el-form-item label="资料提交要求：" prop="projectRequest">
-        <el-input v-model="addForm.projectRequest" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+        <el-input v-model="addForm.projectRequest" type="textarea" :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
       </el-form-item>
       <el-form-item label="备注：" prop="remark">
-        <el-input v-model="addForm.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+        <el-input v-model="addForm.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
       </el-form-item>
       <el-row>
         <el-col :span="6" :xs="24" :offset="12">
           <el-form-item label="项目登记人：" prop="registrantUser">
             <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName :
-              registrantUser }} </span>
+      registrantUser }} </span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -129,6 +133,7 @@
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: center">
+      <el-button type="warning" @click="save" :disabled="disabled">暂 存</el-button>
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
       <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
     </div>
@@ -141,17 +146,18 @@
 <script>
 import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
-import { listProject, getProject, addProject, delProject } from "@/api/oa/project/project";
+import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
+import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import chooseContract from '../components/chooseContract.vue';
+import ArrangeProject from './arrangeProject.vue';
 export default {
-  components: { chooseContract },
+  components: { chooseContract, ArrangeProject },
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
@@ -171,6 +177,7 @@ export default {
       baseUrl: process.env.VUE_APP_BASE_API,
       openContract: false,
       registerTime: undefined,
+      formTotal: 0,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -188,7 +195,6 @@ export default {
       addForm: {
         registerTime: undefined,
         projectRegistrant: "",
-        projectSource: "0",
         projectLevel: "0"
       },
       chooseContractInfo: {
@@ -217,14 +223,7 @@ export default {
   },
   created() {
     this.registerTime = parseTime(new Date(), '{y}-{m}-{d}')
-    if (this.$route.query.taskName != '项目登记') {
-      this.getProjectInfo();
-      this.getProjectWorkList();
-    } else {
-      this.addForm.projectRegistrant = this.userId;
-      this.registrantUser = this.name;
-    }
-
+    this.initProjectForm();
     this.getPartyAList();
     this.getContractDataList();
     // this.getList();
@@ -249,7 +248,17 @@ export default {
         this.loading = false;
       });
     },
-
+    async initProjectForm() {
+      let datas = await listProject({ projectId: this.taskForm.formId });
+      if (datas.rows.length > 0) {
+        this.formTotal = 1
+        this.getProjectInfo(this.taskForm.formId)
+        this.getProjectWorkList();
+      } else {
+        this.addForm.projectRegistrant = this.userId;
+        this.registrantUser = this.name;
+      }
+    },
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
         this.addForm = res.data;
@@ -286,6 +295,55 @@ export default {
       this.chooseContractInfo = val;
       this.openContract = false;
     },
+    // 暂存
+    async save() {
+      if (this.formTotal == 0) {
+        this.$refs['projectAdd'].validate((vaild) => {
+          if (vaild) {
+            this.addForm.projectId = this.taskForm.formId;
+            for (let work of this.workList) {
+              work.projectId = this.taskForm.formId;
+              addProjectWork(work);
+            }
+            let addLog = addProject(this.addForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.getList();
+              this.$refs.arrange.save()
+            });
+            if (addLog.code == 200) {
+              this.$refs.arrange.save()
+            }
+            let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
+            let pcobj = { projectId: this.taskForm.formId, contractId }
+            if (contractId != '') {
+              addProjectContract(pcobj).then(response => {
+                this.$modal.msgSuccess("合同关联成功");
+              })
+            }
+          } else {
+            // this.$refs.scrollToMe.scrollIntoView({ behavior: 'smooth' }); 
+            let dom = document.getElementById('scrollToMe')
+            dom.scrollIntoView({ behavior: 'smooth' });
+          }
+        })
+      } else {
+        let updateLog = await updateProject(this.addForm).then(
+          this.$modal.msgSuccess("修改成功")
+        );
+        console.log(updateLog);
+        if (updateLog.code == 200) {
+          this.$refs.arrange.save()
+        }
+        delProjectWork(this.taskForm.formId).then(res => {
+          this.workList.forEach(work => {
+            work.projectId = this.taskForm.formId;
+            addProjectWork(work);
+          })
+
+        })
+      }
+
+    },
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
       for (let work of this.workList) {

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

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-14 14:57:08
+ * @LastEditTime: 2024-07-02 17:36:44
 -->
 <template>
   <div class="app-container">
-    <h2 style="text-align: center;">项目安排</h2>
+    <!-- <h2 style="text-align: center;">项目安排</h2> -->
     <el-form :model="form" :rules="rules" label-width="120px" :disabled="disabled">
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
@@ -57,10 +57,7 @@
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="组织交底文档：" prop="organizeDocument">
-            <FileUpload v-if="$route.query.taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setOrganizeDocument">
-            </FileUpload>
-            <div v-if="form.organizeDocument && $route.query.taskName != '项目安排'" class="upload-list">
+            <div v-if="form.organizeDocument" class="upload-list">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.organizeDocument}`)">
                 {{ getFileName(form.organizeDocument) }}
               </el-link>
@@ -69,6 +66,9 @@
                 <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
+            <FileUpload v-if="taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setOrganizeDocument">
+            </FileUpload>
           </el-form-item>
         </el-col>
       </el-row>
@@ -96,10 +96,10 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <div slot="footer" class="dialog-footer" style="text-align: center;">
+    <!-- <div slot="footer" class="dialog-footer" style="text-align: center;">
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
-      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
-    </div>
+      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
+    </div> -->
   </div>
 </template>
 
@@ -112,12 +112,15 @@ import { listProject, getProject, addProject, updateProject, delProject, submitP
 export default {
   props: {
     disabled: {
-      type: Boolean,
-      require: true,
+      type: Boolean
     },
     taskForm: {
       type: Object,
       required: true
+    },
+    taskName:{
+      type: String,
+      required: true
     }
   },
   data() {
@@ -143,34 +146,35 @@ export default {
 
   },
   mounted() {
-    if (this.$route.query.taskName != '项目登记') {
-      // this.form.projectId = this.taskForm.formId;
-      this.getDeptList();
-      this.initForm();
-    }
+    this.getDeptList();
+    this.initForm();
   },
   methods: {
-    initForm() {
-      getProject(this.taskForm.formId).then(res => {
-        this.form = res.data;
-        if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
-          this.form.deptId = this.form.undertakingDeptName.split(',')
-        }
-        if (this.form.projectLeaderUser) {
-          this.form.projectLeaderName = this.form.projectLeaderUser.nickName
-        }
-        this.$set(this.form, 'deptLeader', [])
-        if (this.form.undertakingDept) {
-          let arr = (this.form.undertakingDept.split(',')).map(Number)
-          this.$set(this.form, 'deptId', arr)
-          this.getDeptLeader(arr);
-        } else {
-          this.$set(this.form, 'deptId', [])
-        }
-        this.$store.commit('SET_PROJECTNUMBER', this.form.projectNumber)
-        this.$store.commit('SET_PROJECTNAME', this.form.projectName)
-        this.$store.commit('SET_PROJECT', this.form)
-      })
+    async initForm() {
+      let datas = await listProject({ projectId: this.taskForm.formId });
+      if (datas.rows.length > 0) {
+        getProject(this.taskForm.formId).then(res => {
+          this.form = res.data;
+          if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
+            this.form.deptId = this.form.undertakingDeptName.split(',')
+          }
+          if (this.form.projectLeaderUser) {
+            this.form.projectLeaderName = this.form.projectLeaderUser.nickName
+          }
+          this.$set(this.form, 'deptLeader', [])
+          if (this.form.undertakingDept) {
+            let arr = (this.form.undertakingDept.split(',')).map(Number)
+            this.$set(this.form, 'deptId', arr)
+            this.getDeptLeader(arr);
+          } else {
+            this.$set(this.form, 'deptId', [])
+          }
+          this.$store.commit('SET_PROJECTNUMBER', this.form.projectNumber)
+          this.$store.commit('SET_PROJECTNAME', this.form.projectName)
+          this.$store.commit('SET_PROJECT', this.form)
+        })
+      }
+
     },
     getDeptList() {
       listDept({
@@ -223,6 +227,12 @@ export default {
       this.peopleForm.userId = '';
       this.peopleVisible = false;
     },
+    save() {
+      this.form.projectId = this.taskForm.formId;
+      this.form.undertakingDept = this.form.deptId.join(',');
+      console.log(this.form);
+      updateProject(this.form)
+    },
     confirmPlanForm() {
       this.$confirm('项目安排之后会自动发起预算编制、技术方案、安全交底三个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-28 14:45:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-02 15:13:18
 -->
 
 <template>
@@ -13,9 +13,9 @@
           <el-tab-pane label="项目登记" name="项目登记">
             <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
           </el-tab-pane>
-          <el-tab-pane label="项目安排" name="项目安排">
+          <!-- <el-tab-pane label="项目安排" name="项目安排">
             <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="项目预算" name="项目预算">
             <budget-tab :taskForm="taskForm"  @goBack="goBack"></budget-tab>
           </el-tab-pane>
@@ -69,7 +69,7 @@ import ManageReview from './manageReview.vue'
 import ScConfirm from './scConfirm.vue'
 import InProgress from './inProgress.vue'
 import BudgetTab from './budgetTab.vue'
-import TechnicalTab from './planTab.vue'
+import planTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
 export default {
   props: {
@@ -80,7 +80,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, TechnicalTab, SafeTab },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab },
   data() {
     return {
       activeName: '项目登记',