修改项目结算上传、项目生产细节

oa-ui/src/views/flowable/form/components/chooseProject.vue

       <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
       <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
       <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" :show-overflow-tooltip="true" />
-      <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeader"
+      <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeaderUser.nickName"
         :show-overflow-tooltip="true" />
       <el-table-column label="甲方公司" align="center" key="partyA" prop="partyA" :show-overflow-tooltip="true" />
       <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" />

oa-ui/src/views/flowable/form/inProgress/settleData.vue

  * @Author: ysh
  * @Date: 2024-05-10 14:45:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 19:02:03
+ * @LastEditTime: 2024-05-28 18:35:30
 -->
 <template>
   <div class="mt20">
     <el-table :data="dataList" style="width: 100%">
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="上报人" prop="reporterName" />
-      <el-table-column label="申请时间" prop="reportTime" />
-      <el-table-column label="综合事务部意见" prop="zhComment" />
-      <el-table-column label="技术质量部意见" prop="jsComment" />
-      <el-table-column label="项目管理部意见" prop="xmComment" />
-      <el-table-column label="承担部门意见" prop="deptComment" />
-      <el-table-column label="经营管理部意见" prop="jyComment" />
-      <el-table-column label="分管审核意见" prop="managerComment" />
-      <el-table-column label="总经理意见" prop="gmComment" />
+      <el-table-column label="申请时间" prop="reportTime" width="100" />
+      <el-table-column label="综合事务部意见" prop="zhComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="技术质量部意见" prop="jsComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="项目管理部意见" prop="xmComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="承担部门意见" prop="deptComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="经营管理部意见" prop="jyComment" show-overflow-tooltip  width="120" />
+      <el-table-column label="分管审核意见" prop="managerComment" show-overflow-tooltip width="120" />
+      <el-table-column label="总经理意见" prop="gmComment" show-overflow-tooltip width="120" />
       <el-table-column label="操作" fixed="right" header-align="center">
         <template slot-scope="scope">
           <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>

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

  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 10:23:07
+ * @LastEditTime: 2024-05-28 10:35:58
 -->
 <template>
   <div class="project-wrapper">
 
         <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="$route.query.taskName != '项目登记'" class="upload-list">
+          <el-link :href="`${baseUrl}${'/profile/upload' + addForm.taskDocument}`" :underline="false" target="_blank">
+            <span class="el-icon-document"> {{ getFileName(addForm.taskDocument) }} </span>
+          </el-link>
+        </div>
+      </el-form-item>
       <el-form-item label="备注：" prop="remark">
         <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
       </el-form-item>
   },
   data() {
     return {
+      baseUrl:process.env.VUE_APP_BASE_API,
       openContract: false,
       registerTime: undefined,
       // 查询参数
         return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
       };
     },
+    setProjectDocument(val) {
+      let arr = val.split('/upload')
+      this.addForm.taskDocument = arr[1]
+      if (val == "") {
+        this.addForm.taskDocument = ""
+      }
+    },
+    getFileName(name) {
+      if (name != null) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
   },
 };
 </script>

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

  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 09:34:12
+ * @LastEditTime: 2024-05-28 15:49:18
 -->
 <template>
   <div>
 import { mapGetters } from "vuex";
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { listProjectProgress, addProjectProgress, delProjectProgress } from "@/api/oa/project/projectProgress";
+import { listProjectProgress, getProjectProgress, addProjectProgress, delProjectProgress } from "@/api/oa/project/projectProgress";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval } from '@/api/oa/car/carApproval'
     },
   },
   created() {
-    if (this.taskName == "项目生产") {
+    // if (this.taskName == "项目生产") {
       // this.doesItExistBudget(this.taskForm.formId);
       this.initProgress();
       this.getUserList();
       this.getCarList();
-    }
+    // }
   },
   mounted() {
   },
           }
         }
       });
-      listProjectProgress({ projectId: this.taskForm.formId }).then(res => {
-        this.oldProgressList = res.rows
-        if (res.rows.length != 0) {
-          this.progressList = res.rows;
+      getProjectProgress(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.oldProgressList = res.data
+          if (res.data != 0) {
+            this.progressList = res.data;
+          }
         }
       });
     },

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

  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-27 17:25:35
+ * @LastEditTime: 2024-05-28 19:08:56
 -->
 <template>
   <div class="app-container" v-loading="loading">
         </div>
         <el-form ref="settleForm" :model="form" :rules="rules" label-width="160px" :disabled="disabled">
           <el-form-item label="项目编号" prop="projectId">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+            <el-button icon="el-icon-plus" size="mini" type="primary" @click="prOpen = true">选择项目</el-button>
+            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '结算发起'" clearable style="width: 100%">
               <el-option v-for="item in projectList" :key="item.value"
                 :label="item.projectNumber + '-' + item.projectName" :value="item.projectId">
               </el-option>
-            </el-select>
+            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px" :column="2">
               <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}
             </el-col>
           </el-row>
           <el-form-item label="原始上报数据" prop="">
-            <FileUpload v-if="taskName == '结算发起'" ref="jssh" :limit="1" :filePathName="'项目结算'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getYuanShi"></FileUpload>
-            <el-link v-if="taskName != '结算发起'" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
-              :underline="false" target="_blank">
-              <span class="el-icon-document"> {{ getFileName(form.modifyDocument) }} </span>
-            </el-link>
+            <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setSettleDocument">
+            </FileUpload>
+            <div v-if="taskName != '结算发起'" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.settleDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-document" style="color:#00f;"> {{ getFileName(form.settleDocument) }} </span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="项目管理部审核结算单" prop="">
-            <el-upload class="upload-demo" ref="upload" :file-list="fileList" action="" :auto-upload="false">
-              <el-button slot="trigger" size="mini" type="primary" icon="el-icon-upload"
-                :disabled="taskName != '项目管理部结算'">选取文件</el-button>
-              <div slot="tip" class="el-upload__tip">
-                只能上传docx/doc文件，且不超过500kb
-              </div>
-            </el-upload>
+            <FileUpload v-if="taskName == '项目管理部结算'" :limit="1" :filePathName="'项目结算/项目管理部审核结算单'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setModifyDocument">
+            </FileUpload>
+            <div v-if="taskName != '项目管理部结算' && form.modifyDocument" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-document" style="color:#00f;"> {{ getFileName(form.modifyDocument) }} </span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="分管领导审核结算单" prop="">
-            <el-upload class="upload-demo" ref="upload" :file-list="fileList" action="" :auto-upload="false">
-              <el-button slot="trigger" size="mini" type="primary" icon="el-icon-upload"
-                :disabled="taskName != '分管审核'">选取文件</el-button>
-              <div slot="tip" class="el-upload__tip">
-                只能上传docx/doc文件，且不超过500kb
-              </div>
-            </el-upload>
+            <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
+            </FileUpload>
+            <div v-if="taskName != '分管审核' && form.finalDocument" class="upload-list">
+              <el-link :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`" :underline="false"
+                target="_blank">
+                <span class="el-icon-document" style="color:#00f;"> {{ getFileName(form.finalDocument) }} </span>
+              </el-link>
+            </div>
           </el-form-item>
           <div class="headers">
             项目完成工作量及经费计算
     <el-drawer title="选择单价" :visible.sync="drawer" direction="rtl">
       <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
     </el-drawer>
+
+    <el-dialog title="选择项目" :visible.sync="prOpen" width="70%" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
   </div>
 </template>
 
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import SettlePrint from './components/settlePrint.vue';
 import { getDept } from "@/api/system/dept"
+import ChooseProject from './components/chooseProject.vue';
 export default {
   components: {
     flow,
     ChoosePrice,
     SettlePrint,
+    ChooseProject
   },
   props: {
     taskName: {
   },
   data() {
     return {
+      baseUrl:process.env.VUE_APP_BASE_API,
       printOpen: false,
       loading: true,
       drawer: false,
+      prOpen: false,
       flag: false,
       flowData: {},
       form: {},
               });
             })
           } else if (deptId && !isList) {
-            getUsersManageLeaderByDept({ deptId }).then(res => {
+            getUsersDeptLeaderByDept({ deptId }).then(res => {
               this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
         return arr[arr.length - 1];
       }
     },
-    getYuanShi(val) {
-      this.getDoc()
+    setSettleDocument(val) {
+      this.getDoc(val,'settleDocument')
+    },
+    setModifyDocument(val) {
+      this.getDoc(val,'modifyDocument')
+    },
+    setFinalDocument(val) {
+      this.getDoc(val,'finalDocument')
     },
     getDoc(val, name) {
       if (val) {
         }
       }
     },
+    confirmProject(val) {
+      console.log(val);
+      if (val.length == 1) {
+        this.prOpen = false
+        this.chooseProject = val[0]
+        this.form.projectId = val[0].projectId
+        this.isSelect = true
+      } else {
+        this.$message.error('项目只能选择一个！')
+        return
+      }
+
+    }
   },
 };
 </script>

oa-ui/src/views/flowable/task/finished/index.vue

 
     <el-table v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
       <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
       <el-table-column label="任务节点" align="center" prop="taskName" />
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
-          <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName }}</el-tag></label>
+          <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
+              }}</el-tag></label>
         </template>
       </el-table-column>
       <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
       <el-table-column label="耗时" align="center" prop="duration" width="180" />
       <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleFlowRecord(scope.row)">流转记录</el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
-          </el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-tickets"
+            @click="handleFlowRecord(scope.row)">流转记录</el-button>
+          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
             deployId: row.deployId,
             taskId: row.taskId,
             formId: res.data.formId,
-            procDefName:row.procDefName
+            procDefName: row.procDefName
           }
         })
       })
     },
     /** 撤回任务 */
     handleRevoke(row) {
-      const params = {
-        instanceId: row.procInsId,
-        taskId: row.taskId
-      }
-      revokeProcess(params).then(res => {
-        this.$modal.msgSuccess(res.msg);
-        this.getList();
-      });
+      this.$confirm('确定撤回任务吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          instanceId: row.procInsId,
+          taskId: row.taskId
+        }
+        revokeProcess(params).then(res => {
+          this.$modal.msgSuccess(res.msg);
+          this.getList();
+        });
+      }).catch(() => { });
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.deployId || this.ids
       getDeployment(id).then(response => {
         this.form = response.data;
         this.open = true;
   }
 };
 </script>
-

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

  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-09 17:39:50
+ * @LastEditTime: 2024-05-28 17:51:56
 -->
 <template>
   <div class="project-wrapper">
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+              v-hasPermi="['oa:project:query']">查看</el-button>
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:user:edit']">修改</el-button>
+              v-hasPermi="['oa:project:edit']">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['system:user:remove']">删除</el-button>
+              v-hasPermi="['oa:project:remove']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     handleAdd() {
       this.title = '新增项目'
       this.addOpen = true
+    },
+    handleView(row){
+
     },
     handleUpdate(row) {
       this.addForm = row;