新增设备审批里安排设备的操作；新增设备审批保存按钮；新增用车审批保存按钮；修改项目台账里流程图异常

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1392,10 +1392,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String id) {
+    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
         try {
             List<FlowVarInst> flowVarInst = flowVarInstMapper.selectProcInstByVar(formId);
-            List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployListById(id);
+            List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployListById(name);
             AjaxResult result = flowXmlAndNode(flowVarInst.get(0).getProcInstId(), flowProcDefList.get(0).getDeploymentId());
             if (result.isSuccess()) {
                 result.put("procInsId", flowVarInst.get(0).getProcInstId());

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

@@ -41,11 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             ACT_RE_PROCDEF rp
                 LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_
-        <where>
-            <if test="id != null and id != ''">
-               and rd.id_ like concat('%', #{id}, '%')
-            </if>
-        </where>
+        where rd.id_ = #{param}
         order by rd.id_ asc
     </select>
 

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

@@ -2,11 +2,14 @@
  * @Author: ysh
  * @Date: 2024-03-27 11:10:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-15 17:35:10
+ * @LastEditTime: 2024-07-29 11:19:05
 -->
 <template>
   <div>
     <el-form :inline="true">
+      <el-form-item label="出厂编号：">
+        <el-input v-model="queryParams.code" clearable @keyup.enter.native="getList"></el-input>
+      </el-form-item>
       <el-form-item label="设备状态：">
         <el-select v-model="queryParams.status" filterable clearable @change="getList">
           <el-option :value="'0'" label="被领用"></el-option>
@@ -26,15 +29,13 @@
       <el-form-item label="品牌：">
         <el-input v-model="queryParams.brand" clearable @keyup.enter.native="getList"></el-input>
       </el-form-item>
-      <el-form-item label="出厂编号：">
-        <el-input v-model="queryParams.code" clearable @keyup.enter.native="getList"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button @click="getList" type="primary">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table ref="chooseCar" :data="list" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+    <el-table ref="chooseDevice" :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">
         <template slot-scope="scope">
           <el-tag :type="statusType(scope.row.status)">
@@ -56,9 +57,12 @@
     </div>
     <div>
       已选设备：
-      <el-tag v-for="item in chooseList" style="margin: 5px;" :key="item.deviceIdId">
+      <el-tag v-if="multiple" v-for="item in chooseList" style="margin: 5px;" :key="item.deviceIdId">
         {{ item.name + '-' + item.series + '-' + item.brand }}
       </el-tag>
+      <el-tag v-if="!multiple" style="margin: 5px;">{{ chooseList.name + '-' + chooseList.series + '-' +
+      chooseList.brand
+        }}</el-tag>
       <div style="text-align: center;margin-top: 20px;">
         <el-button type="primary" @click="confirmChoose">确认选择</el-button>
         <el-button @click="clearChoose">清空选择</el-button>
@@ -68,24 +72,48 @@
 </template>
 
 <script>
-import { listDevice,listDeviceName } from "@/api/oa/device/device";
+import { listDevice, listDeviceName } from "@/api/oa/device/device";
+import { multiply } from 'ol/transform';
 export default {
+  props: {
+    multiple: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    multiple(newval) {
+      if (newval) {
+        this.chooseList = []
+      } else {
+        this.chooseList = {}
+      }
+      this.getList();
+      this.getNameList();
+    }
+  },
   data() {
     return {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: '仪器设备'
+        type: '仪器设备',
+        status: '1'
       },
       list: [],
       form: {},
       total: 0,
       loading: false,
-      chooseList: [],
+      chooseList: undefined,
       nameList: [],
     }
   },
   created() {
+    if (this.multiply) {
+      this.chooseList = []
+    } else {
+      this.chooseList = {}
+    }
     this.getList();
     this.getNameList();
   },
@@ -96,24 +124,40 @@ export default {
         this.list = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.clearChoose();
       });
     },
-    getNameList(){
-      listDeviceName().then(res=>{
+    getNameList() {
+      listDeviceName().then(res => {
         this.nameList = res.data
       })
     },
     handleSelectionChange(val) {
       this.chooseList = val
     },
+    handleCurrentChange(val) {
+      if (!this.multiple) {
+        this.chooseList = val
+      }
+    },
     getRowKeys(row) {
       return row.deviceId;
     },
     confirmChoose() {
       this.$emit('chooseList', this.chooseList)
     },
+    confirmChooseBySingle() {
+      if (!this.multiple) {
+        if (this.chooseList)
+          this.$emit('chooseList', this.chooseList)
+      }
+    },
     clearChoose() {
-      this.$refs.chooseCar.clearSelection();
+      if (this.multiple)
+        this.$refs.chooseDevice.clearSelection();
+      else {
+        this.chooseDevice = {}
+      }
     },
     statusTypeText(row) {
       if (row == '0') {
@@ -132,7 +176,7 @@ export default {
         return '已报废'
       }
     },
-    statusType(row){
+    statusType(row) {
       if (row == '0') {
         return 'warning'
       }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-23 10:23:54
+ * @LastEditTime: 2024-07-29 17:04:01
 -->
 
 <template>
@@ -209,7 +209,7 @@
                 </el-col>
               </el-row>
               <!-- 综合事务部管理人员填写 -->
-              <el-form-item label="车牌号：">
+              <el-form-item label="车牌号：" prop="cars">
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
                   <el-checkbox :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
                     v-if="item.remark == null">
@@ -217,15 +217,15 @@
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
-              <el-form-item label="驾驶员：">
+              <el-form-item label="驾驶员：" prop="drivers">
                 <el-tag :key="'d' + index" class="mr10" v-for="item, index in chooseDriver">{{ item.nickName }}</el-tag>
                 <el-button v-if="taskName == '安排用车'" icon="el-icon-plus" @click="openCar = true"></el-button>
-                <el-select v-if="taskName != '安排用车'" v-model="form.drivers" filterable multiple clearable
+                <!-- <el-select v-if="taskName != '安排用车'" v-model="form.drivers" filterable multiple clearable
                   style="width:420px" :disabled="taskName != '安排用车'">
                   <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
                     v-if="item.nickName != 'admin'">
                   </el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
               <el-row>
                 <el-col :span="12" :xs="24">
@@ -233,7 +233,8 @@
                     <!-- <el-date-picker v-model="form.returnDate" clearable type="datetime" value-format="yyyy-MM-dd-HH-mm"
                       placeholder="选择日期" :disabled="taskName != '安排用车'">
                     </el-date-picker> -->
-                    <el-date-picker v-model="form.returnDate" type="datetime" placeholder="选择日期时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" :disabled="taskName != '安排用车'">
+                    <el-date-picker v-model="form.returnDate" type="datetime" placeholder="选择日期时间"
+                      format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" :disabled="taskName != '安排用车'">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
@@ -250,6 +251,7 @@
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
+              <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
               <el-button type="primary" v-if="taskName" @click="completeApply">完成审批</el-button>
             </el-row>
           </div>
@@ -284,10 +286,11 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { getUsersDeptLeader, getUsersManageLeader, getDeptLeaders } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
-import { listUser } from '@/api/system/user';
+import { listUser,getUser } from '@/api/system/user';
 import { getUserByRole } from "@/api/system/role";
 import chooseUser from "@/views/flowable/form/budget/components/choosePeople.vue";
 import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import { number } from 'echarts';
 export default {
   components: {
     flow,
@@ -403,8 +406,8 @@ export default {
     initRules() {
       if (this.taskName == '用车申请') {
         this.rules = {
-          projectNumber: [
-            { required: true, message: '请选择项目编号', trigger: 'change' },
+          projectId: [
+            { required: true, message: '请选择项目', trigger: 'blur' },
           ],
           passengers: [
             { required: true, message: '请选择输入乘车人数', trigger: 'change' },
@@ -453,6 +456,18 @@ export default {
         this.rules = {
           dispatchComment: [
             { required: true, message: '请输入安排用车意见', trigger: 'blur' }
+          ],
+          cars: [
+            { required: true, message: '请选择车牌号', trigger: 'change' }
+          ],
+          drivers: [
+            { required: true, message: '请选择驾驶员', trigger: 'blur' }
+          ],
+          returnDate: [
+            { required: true, message: '请选择返回时间', trigger: 'change' }
+          ],
+          kilometers: [
+            { required: true, message: '请输入行驶公里', trigger: 'blur' }
           ]
         }
       }
@@ -492,6 +507,12 @@ export default {
               arr.push(parseInt(driver))
             }
             data.drivers = arr
+            this.chooseDriver = [];
+            for(let d of arr){
+              getUser(Number(d)).then(res=>{
+                this.chooseDriver.push(res.data)
+              })
+            }
           }
           if (res.data.cars == null || res.data.cars == undefined || res.data.cars == "") {
             data.cars = []
@@ -537,22 +558,38 @@ export default {
             this.taskForm.formData = formData;
             this.getNextFlowNodeApproval();
           })
+        } else {
+          this.$message.error('必填项未填写完毕')
         }
       })
     },
-    completeApply() {
-      this.form.formId = this.taskForm.formId;
-      this.form.carApplyId = this.taskForm.formId;
+    saves() {
       let formData = new FormData();
       let jsonForm = JSON.stringify(this.form);
       formData.append("form", jsonForm);
-      modifyCarApproval(formData);
-      const params = { taskId: this.taskForm.taskId };
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        const data = res.data;
-        this.taskForm.formData = formData;
-        this.getNextFlowNodeApproval();
+      modifyCarApproval(formData).then(res=>{
+        this.$message.success('保存成功')
+      });
+    },
+    completeApply() {
+      this.$refs['carForm'].validate((valid) => {
+        if (valid) {
+          this.form.formId = this.taskForm.formId;
+          this.form.carApplyId = this.taskForm.formId;
+          let formData = new FormData();
+          let jsonForm = JSON.stringify(this.form);
+          formData.append("form", jsonForm);
+          modifyCarApproval(formData);
+          const params = { taskId: this.taskForm.taskId };
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            const data = res.data;
+            this.taskForm.formData = formData;
+            this.getNextFlowNodeApproval();
+          })
+        } else {
+          this.$message.error('必填项未填写完毕')
+        }
       })
     },
     // 获取下一个审批人
@@ -689,7 +726,8 @@ export default {
         for (let d of this.chooseDriver) {
           drivers.push(d.userId)
         }
-        this.form.drivers = drivers;
+        this.$set(this.form, 'drivers', drivers);
+        this.$refs.carForm.validateField('drivers');
       }
       this.openCar = false;
     },
@@ -700,7 +738,8 @@ export default {
       } else if (val.length == 1) {
         this.chooseProject = val[0]
         this.isSelect = true
-        this.form.projectId = val[0].projectId
+        this.$set(this.form, 'projectId', val[0].projectId);
+        this.$refs.carForm.validateField('projectId');
       }
       this.openProject = false
     },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-26 13:54:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-29 15:41:35
 -->
 
 <template>
@@ -18,13 +18,11 @@
               <el-row :gutter="20">
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
-                    <!-- <el-input v-model="form.user"></el-input> -->
                     {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="所在部门：" prop="dept.deptName">
-                    <!-- <el-input v-model="form.deptName"></el-input> -->
                     {{ form.dept.deptName }}
                   </el-form-item>
                 </el-col>
@@ -39,12 +37,6 @@
               <el-form-item label="项目编号：" prop="projectId">
                 <el-button type="primary" size="mini" @click="openProject = true"
                   v-if="taskName == '设备申请'">选择项目</el-button>
-                <!-- <el-select v-model="form.projectId" filterable allow-create placeholder="请选择"
-                  @change="handleSelectProject" clearable :disabled="taskName != '设备申请'">
-                  <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
-                    :value="item.projectId">
-                  </el-option>
-                </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
                     }}</el-descriptions-item>
@@ -60,21 +52,15 @@
                     }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
-              <el-form-item label="设备选择：">
-                <!-- <el-select style="width: 90%;" v-model="form.devices" filterable multiple placeholder="请选择" clearable
-                  disabled>
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-      + (item.code != null ? '（设备编号：' + item.code + '）' : '')" :value="item.deviceId">
-                  </el-option>
-                </el-select> -->
+              <el-form-item label="设备选择：" prop="devices">
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
                   :disabled="taskName != '设备申请'">选择设备</el-button>
                 <el-table :data="deviceList">
                   <el-table-column label="序号" type="index" />
+                  <el-table-column label="出厂编号" align="center" prop="code" />
                   <el-table-column label="设备品牌" align="center" prop="brand" />
                   <el-table-column label="设备名称" align="center" prop="name" />
                   <el-table-column label="规格型号" align="center" prop="series" />
-                  <el-table-column label="出厂编号" align="center" prop="code" />
                   <el-table-column label="存放地址" align="center" prop="place" />
                 </el-table>
               </el-form-item>
@@ -106,23 +92,24 @@
               </el-row>
               <!-- 安排设备意见 -->
               <el-divider></el-divider>
-              <el-form-item label-width="120px" label="拟发放设备：">
-                <!-- <el-select style="width: 90%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
-                  clearable disabled>
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
-                  </el-option>
-                </el-select> -->
-                <el-button type="primary" icon="el-icon-plus" size="mini" @click="openDevice = true"
-                  :disabled="taskName != '安排设备'">选择设备</el-button>
+              <el-form-item label-width="120px" label="拟发放设备：" prop="modifyDevices">
                 <el-table :data="modifyDeviceList">
                   <el-table-column label="序号" type="index" />
+                  <el-table-column label="出厂编号" align="center" prop="code" />
                   <el-table-column label="设备品牌" align="center" prop="brand" />
                   <el-table-column label="设备名称" align="center" prop="name" />
                   <el-table-column label="规格型号" align="center" prop="series" />
-                  <el-table-column label="出厂编号" align="center" prop="code" />
                   <el-table-column label="存放地址" align="center" prop="place" />
+                  <el-table-column label="操作" align="center" v-if="taskName == '安排设备'">
+                    <template slot-scope="scope">
+                      <el-button type="text" primary @click="replaceRowData(scope.row, scope.$index)">重新选择</el-button>
+                      <el-button type="text" style="color:#F56C6C"
+                        @click="deleteRowData(scope.row, scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
                 </el-table>
+                <el-button class="mt10" type="primary" size="mini" @click="addRowdata()" icon="el-icon-plus"
+                  :disabled="taskName != '安排设备'">新增设备</el-button>
               </el-form-item>
               <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="125px">
                 <el-input type="textarea" :rows="3" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
@@ -185,7 +172,8 @@
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" @click="completeApply" v-if="taskName">完成审批</el-button>
+              <el-button type="warning" @click="saves()">保存</el-button>
+              <el-button type="primary" @click="completeApply()" v-if="taskName">完成审批</el-button>
             </el-row>
           </div>
         </el-card>
@@ -198,14 +186,13 @@
             <flow :flowData="flowData" />
           </div>
         </el-card>
-
       </el-col>
     </el-row>
     <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
       <project-choose @chooseProject="confirmProject"></project-choose>
     </el-dialog>
     <el-dialog title="选择仪器" :visible.sync="openDevice" width="70%" append-to-body>
-      <choose-device @chooseList="confirmDevice"></choose-device>
+      <choose-device :multiple="multiple" @chooseList="confirmDevice"></choose-device>
     </el-dialog>
   </div>
 </template>
@@ -297,7 +284,10 @@ export default {
       deviceList: [],
       grantDeviceList: [],
       modifyDeviceList: [],
-      formTotal: 0
+      formTotal: 0,
+      clicDevice: {},
+      clickRowIndex: 0,
+      multiple: true,
     }
   },
   mounted() {
@@ -308,6 +298,9 @@ export default {
     initRules() {
       if (this.taskName == '设备申请') {
         this.rules = {
+          projectId: [
+            { required: true, message: '请选择项目', trigger: 'blur' },
+          ],
           devices: [
             { required: true, message: '请选择申请设备', trigger: 'change' },
           ],
@@ -320,6 +313,9 @@ export default {
           applyReason: [
             { required: true, message: '请输入申领理由', trigger: 'blur' },
           ],
+          devices: [
+            { required: true, message: '请选择设备', trigger: 'blur' },
+          ]
         }
       } else if (this.taskName == '分管审核') {
         this.rules = {
@@ -369,7 +365,7 @@ export default {
           }
           if (res.data.modifyDevices == null || res.data.modifyDevices == undefined || res.data.modifyDevices == "") {
             data.modifyDevices = []
-            this.modifyDeviceList = []
+            this.modifyDeviceList = this.deviceList
           } else {
             data.modifyDevices = data.modifyDevices.split(',');
             let arr = []
@@ -411,22 +407,48 @@ export default {
             this.taskForm.formData = formData;
             this.getNextFlowNodeApproval();
           })
+        } else {
+          this.$message.error('必填项未填写完毕')
+        }
+      })
+    },
+    saves() {
+      this.$refs['deviceForm'].validate((valid) => {
+        if (valid) {
+          this.form.formId = this.taskForm.formId;
+          this.form.deviceApplyId = this.taskForm.formId;
+          let formData = new FormData();
+          let jsonForm = JSON.stringify(this.form);
+          formData.append("form", jsonForm);
+          if (this.formTotal != 0) {
+            modifyDeviceApproval(formData).then(res => {
+              this.$message.success('保存成功')
+            });
+          }
+        } else {
+          this.$message.error('必填项未填写完毕')
         }
       })
     },
     completeApply() {
-      this.form.formId = this.taskForm.formId;
-      this.form.deviceApplyId = this.taskForm.formId;
-      let formData = new FormData();
-      let jsonForm = JSON.stringify(this.form);
-      formData.append("form", jsonForm);
-      modifyDeviceApproval(formData);
-      const params = { taskId: this.taskForm.taskId };
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        const data = res.data;
-        this.taskForm.formData = formData;
-        this.getNextFlowNodeApproval();
+      this.$refs['deviceForm'].validate((valid) => {
+        if (valid) {
+          this.form.formId = this.taskForm.formId;
+          this.form.deviceApplyId = this.taskForm.formId;
+          let formData = new FormData();
+          let jsonForm = JSON.stringify(this.form);
+          formData.append("form", jsonForm);
+          modifyDeviceApproval(formData);
+          const params = { taskId: this.taskForm.taskId };
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            const data = res.data;
+            this.taskForm.formData = formData;
+            this.getNextFlowNodeApproval();
+          })
+        } else {
+          this.$message.error('必填项未填写完毕')
+        }
       })
     },
     // 获取下一个审批人
@@ -537,25 +559,54 @@ export default {
       } else if (val.length == 1) {
         this.chooseProject = val[0]
         this.isSelect = true
-        this.form.projectId = val[0].projectId
+        this.$set(this.form, 'projectId', val[0].projectId);
+        this.$refs.deviceForm.validateField('projectId');
       }
       this.openProject = false
     },
     confirmDevice(val) {
       if (val) {
         let list = []
-        for (let v of val) {
-          list.push(v.deviceId)
-        }
         if (this.taskName == '设备申请') {
-          this.form.devices = list
+          for (let v of val) {
+            list.push(v.deviceId)
+          }
+          this.$set(this.form, 'devices', list);
+          this.$refs.deviceForm.validateField('devices');
           this.deviceList = val;
         } else if (this.taskName == '安排设备') {
-          this.form.modifyDevices = list
-          this.modifyDeviceList = val;
+          if (!this.multiple) {
+            this.$set(this.modifyDeviceList, this.clickRowIndex, val);
+          } else {
+            for (let i of val) {
+              this.modifyDeviceList.push(i);
+            }
+          }
+          for (let j of this.modifyDeviceList) {
+            list.push(j.deviceId)
+          }
+          this.form.modifyDevices = list;
         }
       }
       this.openDevice = false;
+    },
+    replaceRowData(row, rowIndex) {
+      this.openDevice = true;
+      this.clicDevice = row;
+      this.clickRowIndex = rowIndex;
+      this.multiple = false;
+    },
+    deleteRowData(row, rowIndex) {
+      let list = [];
+      this.modifyDeviceList = this.modifyDeviceList.slice(0, rowIndex).concat(this.modifyDeviceList.slice(rowIndex + 1));
+      for (let j of this.modifyDeviceList) {
+        list.push(j.deviceId)
+      }
+      this.form.modifyDevices = list;
+    },
+    addRowdata() {
+      this.openDevice = true;
+      this.multiple = true;
     }
   },
 }

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

@@ -17,15 +17,22 @@
           </el-select>
         </el-form-item>
         <el-form-item label="技术交底内容" prop="content">
-          <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea"
-            :autosize="{ minRows: 8 }" />
+          <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea" :autosize="{ minRows: 8 }" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <el-input v-model="form.document" placeholder="请输入附件" type="textarea"
-            :autosize="{ minRows: 8 }" />
+          <div v-if="form.document">
+            <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+              {{ getFileName(form.document) }}
+            </el-link>
+            <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+              :underline="false" target="_blank">
+              <span class="el-icon-download">下载文件</span>
+            </el-link>
+          </div>
         </el-form-item>
         <el-form-item label="技术交底意见" prop="disclosureComment">
-          <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea" :autosize="{ minRows: 4 }" />
+          <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
@@ -86,18 +93,19 @@ export default {
     projectName(newval) {
       this.$set(this.form, "projectName", newval);
     },
-    'taskForm.formId'(){
+    'taskForm.formId'() {
       this.loading = true;
       this.initForm();
     }
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       isEmpty: true,
       form: {},
       rules: {},
       userList: [],
-      loading:false,
+      loading: false,
     }
   },
   mounted() {

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

@@ -740,16 +740,16 @@ export default {
     },
     async clickProcess() {
       if (this.$route.query.projectId) {
-        let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+        let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '3001' })
         this.flowData = resData.data;
         this.drawerOpen = true;
-        let resData2 = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+        let resData2 = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '3001' })
         this.flowData = resData2.data;
         this.drawerOpen = true;
       }
     },
     async clickRecords() {
-      let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+      let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '3001' })
       let { procInsId, deployId } = resData
       this.clickRow = { procInsId, deployId }
       this.recordOpen = true;