技术交底表单

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java

@@ -105,6 +105,12 @@ public class CmcProjectCommentController extends BaseController
             cmcProjectComment.setManageApprover(getLoginUser().getUserId());
             cmcProjectComment.setManageApprovalTime(new Date());
         }
+        CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
+        StringBuilder scApprover = new StringBuilder();
+        if (!projectComment.getScApprover().equals("")) {
+            scApprover.append(projectComment.getScApprover()).append(",").append(cmcProjectComment.getScApprover());
+        }
+            cmcProjectComment.setScApprover(scApprover.substring(0, scApprover.length() - 1));
         return toAjax(cmcProjectCommentService.updateCmcProjectComment(cmcProjectComment));
     }
 

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

@@ -204,7 +204,8 @@
               <!-- 综合事务部管理人员填写 -->
               <el-form-item label="车牌号：">
                 <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">
+                  <el-checkbox :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
+                    v-if="item.remark == null">
                     {{ item.licensePlate }}
                   </el-checkbox>
                 </el-checkbox-group>

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

@@ -41,7 +41,7 @@
             <el-input v-model="form.disclosureComment" placeholder="请输入安全交底意见" type="textarea" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-form-item label="安全交底人" prop="disclosurer">
-            {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}
+            <span class="auditor"> {{ form.disclosurerUser ? form.disclosurerUser.nickName : form.user.nickName }}</span>
           </el-form-item>
           <el-form-item label="安全交底时间" prop="disclosureTime">
             <el-date-picker clearable v-model="form.disclosureTime" type="date" value-format="yyyy-MM-dd"
@@ -145,11 +145,11 @@ export default {
       // 表单校验
       rules: {
       },
+      formTotal: 0,
       flowData: {}
     };
   },
   created() {
-    this.form.disclosureTime = new Date();
     this.form.acceptTime = new Date();
     this.form.user.nickName = this.$store.getters.name;
     this.getProjectById();
@@ -166,10 +166,12 @@ export default {
     initForm() {
       getSafe(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
           this.form.disclosurer = this.$store.getters.userId;
           this.form.disclosureTime = new Date();
         }
         else {
+          this.formTotal = 1;
           this.form = res.data;
         }
       })
@@ -261,7 +263,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.safeId != null) {
+          if (this.formTotal != 0) {
             updateSafe(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -313,3 +315,10 @@ export default {
   }
 };
 </script>
+
+<style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

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

@@ -0,0 +1,455 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '技术交底'">
+            <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
+            <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>
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="承担部门" label-class-name="my-label">
+                <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+              }}</el-descriptions-item>
+            </el-descriptions>
+          </el-form-item>
+          <el-row>
+            <el-col :span="8" :xs="24">
+              <el-form-item label="技术负责人" prop="technicalDirector">
+                <el-select v-model="form.technicalDirector" filterable clearable style="width:220px"
+                  :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-form-item>
+            </el-col>
+            <el-col :span="8" :xs="24">
+              <el-form-item label="技术设计人" prop="technicalDesigner">
+                <el-select v-model="form.technicalDesigner" filterable clearable style="width:220px"
+                  :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-form-item>
+            </el-col>
+            <el-col :span="8" :xs="24">
+              <el-form-item label="质量检查员" prop="qualityInspector">
+                <el-select v-model="form.qualityInspector" filterable multiple clearable style="width:220px"
+                  :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-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="技术安排意见" prop="planComment">
+            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" prop="technicalPlanner" v-if="showFormItem('技术安排')">
+                <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期" prop="technicalTime" v-if="showFormItem('技术安排')">
+                <el-date-picker style="width:170px;" clearable v-model="form.technicalTime" type="date"
+                  value-format="yyyy-MM-dd" placeholder="请选择技术安排时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-form-item label="技术方案" prop="technicalDocument">
+            <el-input v-model="form.technicalDocument" placeholder="请输入技术方案" :disabled="taskName != '方案上传'" />
+          </el-form-item>
+          <el-form-item label="方案说明" prop="designDescription">
+            <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明"
+              :disabled="taskName != '方案上传'" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" prop="designUser" v-if="showFormItem('方案上传')">
+                <span class="auditor"> {{ form.designUser ? form.designUser.nickName : designUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期" prop="technicalUploadTime" v-if="showFormItem('方案上传')">
+                <el-date-picker style="width:170px;" clearable v-model="form.technicalUploadTime" type="date"
+                  value-format="yyyy-MM-dd" placeholder="请选择方案上传时间" :disabled="taskName != '方案上传'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-form-item label="技术部审核意见" prop="technicalComment">
+            <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
+              :disabled="taskName != '技术审核'" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" prop="technicalPlanner" v-if="showFormItem('技术审核')">
+                <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期" prop="techApprovalTime" v-if="showFormItem('技术审核')">
+                <el-date-picker style="width:170px;" clearable v-model="form.techApprovalTime" type="date"
+                  value-format="yyyy-MM-dd" placeholder="请选择技术审核时间" :disabled="taskName != '技术审核'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="总工程师审核意见" prop="manageComment">
+            <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
+              :disabled="taskName != '总工审核'" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名" prop="manager" v-if="showFormItem('总工审核')">
+                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期" prop="manageApprovalTime" v-if="showFormItem('总工审核')">
+                <el-date-picker style="width:170px;" clearable v-model="form.manageApprovalTime" type="date"
+                  value-format="yyyy-MM-dd" placeholder="请选择总工审核时间" :disabled="taskName != '总工审核'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
+import { getProject } from "@/api/oa/project/project";
+import { listUser } from '@/api/system/user';
+import flow from '@/views/flowable/task/todo/detail/flow';
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { flowXmlAndNode } from "@/api/flowable/definition";
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
+
+export default {
+  components: {
+    flow
+  },
+  name: "Technical",
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      planUser: '',
+      managerUser: '',
+      designUser: '',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc技术交底表格数据
+      technicalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        technicalDirector: null,
+        technicalDesigner: null,
+        technicalPlanner: null,
+        planComment: null,
+        qualityInspector: null,
+        technicalTime: null,
+        technicalDocument: null,
+        designDescription: null,
+        technicalComment: null,
+        manageComment: null,
+        technicalUploadTime: null,
+        techApprovalTime: null,
+        manageApprovalTime: null
+      },
+      // 表单参数
+      form: {
+        qualityInspector: [],
+      },
+      // 表单校验
+      rules: {
+      },
+      userList: [],
+      chooseProject: {},
+      isSelect: false,
+      // 表单参数
+      form: {},
+      formTotal: 0,
+      flowData: {}
+    };
+  },
+  created() {
+    if (this.taskName == '技术安排')
+      this.planUser = this.$store.getters.name;
+    if (this.taskName == '方案上传')
+      this.designUser = this.$store.getters.name;
+    if (this.taskName == '技术审核')
+      this.planUser = this.$store.getters.name;
+    if (this.taskName == '总工审核')
+      this.managerUser = this.$store.getters.name;
+    this.getProjectById();
+    this.getUserList();
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    initForm() {
+      getTechnical(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.technicalPlanner = this.$store.getters.userId;
+          this.form.technicalTime = new Date();
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+          if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
+            data.qualityInspector = []
+          } else {
+            let arr = []
+            data.qualityInspector = data.qualityInspector.split(',');
+            for (let inspector of data.qualityInspector) {
+              arr.push(parseInt(inspector))
+            }
+            data.qualityInspector = arr
+          }
+        }
+      })
+    },
+    // 查询项目
+    getProjectById() {
+      getProject(this.$route.query.formId).then(response => {
+        this.chooseProject = response.data;
+        this.isSelect = true
+      });
+    },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    /** 查询cmc技术交底列表 */
+    getList() {
+      this.loading = true;
+      listTechnical(this.queryParams).then(response => {
+        this.technicalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        technicalId: null,
+        projectId: null,
+        technicalDirector: null,
+        technicalDesigner: null,
+        technicalPlanner: null,
+        planComment: null,
+        qualityInspector: null,
+        technicalTime: null,
+        technicalDocument: null,
+        designDescription: null,
+        technicalComment: null,
+        manageComment: null,
+        technicalUploadTime: null,
+        techApprovalTime: null,
+        manageApprovalTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.technicalId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc技术交底";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const technicalId = row.technicalId || this.ids
+      getTechnical(technicalId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc技术交底";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              if (this.taskName == '方案上传') {
+                this.$set(this.taskForm.variables, "approval", this.form.technicalPlanner);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+              else if (this.taskName == '技术审核') {
+                getUsersDeptLeaderByDept({ deptId: 110 }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                });
+              }
+              else if (this.taskName == '总工审核') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+            })
+          } else {
+            this.form.qualityInspector = '';
+            addTechnical(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+              this.$set(this.taskForm.variables, "approval", this.form.technicalDesigner);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              });
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const technicalIds = row.technicalId || this.ids;
+      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
+        return delTechnical(technicalIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/technical/export', {
+        ...this.queryParams
+      }, `technical_${new Date().getTime()}.xlsx`)
+    },
+    showFormItem(name) {
+      let isShow = false;
+      if (name == '技术安排')
+        isShow = true;
+      else if (name == '方案上传')
+        isShow = (this.taskName != '技术安排');
+      else if (name == '技术审核')
+        isShow = (this.taskName != '技术安排' && this.taskName != '方案上传');
+      else if (name == '总工审核')
+        isShow = (this.taskName == '总工审核');
+      return isShow;
+    },
+  }
+};
+</script>
+
+<style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -33,6 +33,7 @@
           <budget-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'" @goBack="goBack"></budget-index>
           <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'" @goBack="goBack"></borrow-form>
           <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'" @goBack="goBack"></safe-form>
+          <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'" @goBack="goBack"></technical-form>
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -183,6 +184,7 @@ import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
 import AddBudget from '@/views/oa/budget/addBudget.vue';
 import borrowForm from '@/views/flowable/form/borrowForm.vue';
 import safeForm from '@/views/flowable/form/safeForm.vue';
+import technicalForm from '@/views/flowable/form/technicalForm.vue';
 import budgetIndex from '@/views/flowable/form/budget/budget.vue';
 import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
 
@@ -205,6 +207,7 @@ export default {
     AddBudget,
     borrowForm,
     safeForm,
+    technicalForm,
     budgetIndex,
     businessReview
   },
@@ -564,7 +567,7 @@ export default {
     isShowApprove() {
       if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批'
        || this.taskForm.procDefName == '用车审批（工会）' || this.taskForm.procDefName == '设备审批'|| this.taskForm.procDefName == '项目流转'
-       || this.taskForm.procDefName == '项目预算'|| this.taskForm.procDefName == '借款审批'|| this.taskForm.procDefName == '安全交底') {
+       || this.taskForm.procDefName == '项目预算' || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术交底') {
         return false
       } else {
         return true