修改安全要求

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-07-04 10:38:39
+ * @LastEditTime: 2024-07-09 17:09:23
  */
 import request from '@/utils/request'
 
@@ -35,6 +35,12 @@ const apiEndpoints = [
       '/oa/carApproval/:id',
     ]
   },
+  {
+    procDefName: '设备审批',
+    apiUrl: [
+      '/oa/deviceApproval/:id',
+    ]
+  },
   {
     procDefName: '项目流转',
     apiUrl: [

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

@@ -0,0 +1,133 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-07-09 11:13:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-09 14:27:31
+-->
+<template>
+  <div>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="128px">
+      <el-form-item label="安全提示类型">
+        <el-select v-model="queryParams.safeType" clearable placeholder="请选择" @change="handleQuery">
+          <el-option label="环境管理要求" value="0"></el-option>
+          <el-option label="安全生产与职业健康要求" value="1"></el-option>
+          <el-option label="信息安全管理要求" value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="safeRequestList" @selection-change="handleSelectionChange"
+      :row-key="getRowKeys">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
+      <el-table-column label="安全提示类型" align="center" prop="safeType" :formatter="formatterLabel" width="120" />
+      <el-table-column label="内容" prop="content" />
+    </el-table>
+
+    <div class="text-center mt20">
+      <el-button type="primary" @click="confirm">确 定</el-button>
+      <el-button @click="$emit('close')">取 消</el-button>
+    </div>
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
+  </div>
+</template>
+
+<script>
+import { listSafeRequest, getSafeRequest } from '@/api/oa/safe/safeRequest'
+export default {
+  props: {
+    safeType: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    safeType(val) {
+      this.queryParams.safeType = val;
+      this.handleQuery();
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // cmc安全要求表格数据
+      safeRequestList: [],
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 99,
+        safeType: null,
+        content: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      chooseList: []
+    }
+  },
+  created() {
+    this.queryParams.safeType = this.safeType;
+    this.getList();
+  },
+  mounted() {
+  },
+  methods: {
+    /** 查询cmc安全要求列表 */
+    getList() {
+      this.loading = true;
+      listSafeRequest(this.queryParams).then(response => {
+        this.safeRequestList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      this.chooseList = val
+    },
+    getRowKeys(row) {
+      return row.requestId;
+    },
+    formatterLabel(row) {
+      switch (row.safeType) {
+        case '0':
+          return '环境管理要求'
+        case '1':
+          return '安全生产与职业健康要求'
+        case '2':
+          return '信息安全管理要求'
+      }
+    },
+    formatterChooseList(arr){
+      let contentList = [];
+      arr.forEach(item => {
+        contentList.push(item.content)
+      })
+      let str = contentList.join('\n')
+      return str
+    },
+    confirm() {
+      let confirmRequest = this.formatterChooseList(this.chooseList);
+      this.$emit('confirm',confirmRequest)
+      this.$emit('close')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 18:19:39
+ * @LastEditTime: 2024-07-09 14:41:48
 -->
 <template>
   <div class="project-wrapper">
@@ -48,56 +48,6 @@
       <el-form-item label="联系电话：" prop="telephone">
         <el-input v-model="addForm.telephone"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="项目概况：">
-        <table border="1">
-          <tr>
-            <td style="width: 180px">工作内容</td>
-            <td>等级或比例尺</td>
-            <td>单位</td>
-            <td>工作量</td>
-            <td style="width: 100px">要求完成时间</td>
-            <td>备注</td>
-          </tr>
-          <tr v-for="(work, index) in workList" :key="index">
-            <td>
-              <el-input v-model="work.content" type="textarea" clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
-            </td>
-            <td>
-              <el-select v-model="work.scale" placeholder="请选择" clearable>
-                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
-                  :value="dict.label" />
-              </el-select>
-            </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-select>
-            </td>
-            <td>
-              <el-input v-model="work.workload" clearable></el-input>
-            </td>
-            <td>
-              <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                placeholder="选择日期">
-              </el-date-picker>
-            </td>
-            <td>
-              <el-input v-model="work.remark" type="textarea" clearable
-                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
-            </td>
-            <td>
-              <el-button type="text" style="color:#F56C6C" size="mini" @click="deletWorkItem(index)">删除行</el-button>
-            </td>
-          </tr>
-        </table>
-
-        <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
-      </el-form-item> -->
-      <!-- 项目安排 -->
-      <!-- <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}`)">
@@ -136,7 +86,7 @@
       <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
     </div>
-    <el-dialog title="选择合同" :visible.sync="openContract" width="1000px" append-to-body>
+    <el-dialog title="选择合同" :visible.sync="openContract" width="70%" append-to-body>
       <choose-contract @choose="setContract" @close="openContract = false"></choose-contract>
     </el-dialog>
   </div>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 18:52:08
+ * @LastEditTime: 2024-07-09 09:28:51
 -->
 <template>
   <div class="app-container">
@@ -31,10 +31,13 @@
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">
-            <el-tag effect="plain" type="warning" style="margin-right: 10px;"
+            <el-select v-model="form.projectLeader" placeholder="请选择项目负责人" size="large" disabled>
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+            </el-select>
+            <!-- <el-tag effect="plain" type="warning" style="margin-right: 10px;"
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
-      form.projectLeaderName }}</el-tag>
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
+      form.projectLeaderName }}</el-tag> -->
+            <el-button type="primary" plain icon="el-icon-plus" @click="choosePeople">选择</el-button>
           </el-form-item>
         </el-col>
         <el-col :span="12" :xs="24">
@@ -131,6 +134,9 @@ export default {
         deptId: [
           { required: true, message: "请选择承担部门", trigger: "change" }
         ],
+        projectLeader: [
+          { required: true, message: "请选择项目负责人", trigger: "change" }
+        ]
       },
       deptList: [],
       deptLeaderList: [],
@@ -247,19 +253,19 @@ export default {
         type: 'warning'
       }).then(async () => {
         this.save();
-        let resData = await getDeptLeadersByDeptId({ deptId: 105 });
+        let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
         let approvalId;
         if (resData.data) {
-          approvalId = resData.data[0].userId;
+          approvalId = resData.data.userId;
         }
         console.log(approvalId);
         const params = { taskId: this.taskForm.taskId };
         // 获取下一个流程节点
         getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
-        this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
-        this.$set(this.taskForm.variables, "approval", approvalId);
+          this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+          this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
+          this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
+          this.$set(this.taskForm.variables, "approval", approvalId);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack');

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

@@ -128,7 +128,9 @@ export default {
     },
     getProjectWorkList() {
       listProjectWork({ projectId: this.taskForm.formId }).then(res => {
-        this.workList = res.rows;
+        if (res.rows.length != 0) {
+          this.workList = res.rows;
+        }
       })
     },
     addWorkList() {
@@ -175,10 +177,10 @@ export default {
     },
     async confirm() {
       this.save();
-      let resData = await getDeptLeadersByDeptId({ deptId: 105 });
+      let resData = await getUsersDeptLeaderByDept({ deptId: 105 });
       let approval;
       if (resData.data) {
-        approval = resData.data[1].userId;
+        approval = resData.data.userId;
       }
       this.$set(this.taskForm.variables, "approval", approval);
       const params = { taskId: this.taskForm.taskId };

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

@@ -28,14 +28,23 @@
             </el-select>
           </el-form-item>
           <el-form-item label="环境管理要求" prop="environmentComment">
+              <div v-if="taskName == '安全交底'">
+                <el-button size="mini" plain @click="chooseSafe('0')" type="primary" icon="el-icon-plus">选择要求</el-button>
+              </div>
             <el-input v-model="form.environmentComment" placeholder="请输入环境管理要求" type="textarea"
               :disabled="taskName != '安全交底'" :autosize="{ minRows: 8 }" />
           </el-form-item>
           <el-form-item label="安全生产与职业健康要求" prop="outsideComment">
+              <div v-if="taskName == '安全交底'">
+                <el-button size="mini" plain @click="chooseSafe('1')" type="primary" icon="el-icon-plus">选择要求</el-button>
+              </div>
             <el-input v-model="form.outsideComment" placeholder="请输入安全生产与职业健康要求" type="textarea"
               :disabled="taskName != '安全交底'" :autosize="{ minRows: 8 }" />
           </el-form-item>
           <el-form-item label="信息安全管理要求" prop="insideComment">
+              <div v-if="taskName == '安全交底'">
+                <el-button size="mini" plain @click="chooseSafe('2')" type="primary" icon="el-icon-plus">选择要求</el-button>
+              </div>
             <el-input v-model="form.insideComment" placeholder="请输入信息安全管理要求" type="textarea" :autosize="{ minRows: 8 }"
               :disabled="taskName != '安全交底'" />
           </el-form-item>
@@ -86,6 +95,10 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+      <choose-saferequest :safeType="safeType" @close="open = false" @confirm="setRequestVals"></choose-saferequest>
+    </el-dialog>
   </div>
 </template>
 
@@ -96,10 +109,12 @@ 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 ChooseSaferequest from './components/chooseSaferequest.vue';
 
 export default {
   components: {
-    flow
+    flow,
+    ChooseSaferequest
   },
   name: "Safe",
   props: {
@@ -116,6 +131,7 @@ export default {
     return {
       disclosurerUser: '',
       accepterUser: '',
+      safeType:'',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -347,6 +363,19 @@ export default {
       this.download('oa/safe/export', {
         ...this.queryParams
       }, `safe_${new Date().getTime()}.xlsx`)
+    },
+    chooseSafe(type){
+      this.safeType = type
+      this.open = true;
+    },
+    setRequestVals(input){
+      if(this.safeType == '0'){
+        this.form.environmentComment = input
+      }else if(this.safeType == '1'){
+        this.form.outsideComment = input
+      }else{
+        this.form.insideComment = input
+      }
     }
   }
 };

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

@@ -1,16 +1,11 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-09 14:08:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-09 17:01:08
 -->
 <template>
   <div class="app-container" v-loading="loading">
-    <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
-    <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
-      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
-        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
-    </el-dialog>
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 19 : 24" :xs="24">
         <h2 class="text-center">项目结算表</h2>
@@ -100,7 +95,7 @@
               </el-link>
             </div>
           </el-form-item>
-          <el-form-item label="项目管理部审核结算单" prop="">
+          <!-- <el-form-item label="项目管理部审核结算单" prop="">
             <FileUpload v-if="taskName == '项目管理部结算'" :limit="1" :filePathName="'项目结算/项目管理部审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setModifyDocument">
             </FileUpload>
@@ -112,7 +107,7 @@
                 </span>
               </el-link>
             </div>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="分管领导审核结算单" prop="">
             <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
@@ -465,6 +460,7 @@
           </div>
         </el-form>
         <div style="text-align: center" v-if="!disabled">
+          <el-button type="success" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
           <el-button type="warning" @click="preserve">保存</el-button>
           <el-button type="primary" @click="submitNextFlow">提交下一个流程</el-button>
         </div>
@@ -479,6 +475,10 @@
       </el-col>
     </el-row>
 
+    <el-dialog title="结算表格预览" :visible.sync="printOpen" width="65%" append-to-body>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList"
+        :settleList="oldSettleSumList" @cancel="printOpen = false"></settle-print>
+    </el-dialog>
     <el-drawer title="选择单价" :visible.sync="drawer" direction="rtl">
       <choose-price :row="clickWork" @getPrice="getPrice" @cancel="drawer = false"></choose-price>
     </el-drawer>
@@ -688,14 +688,14 @@ export default {
         this.form.jsUserName = this.$store.state.user.name;
         this.form.jsUserId = this.$store.state.user.id;
         this.form.jsTime = parseTime(new Date(), "{y}-{m}-{d}");
-      // } else if (this.taskName == "项目管理部结算") {
-      //   this.form.xmUserName = this.$store.state.user.name;
-      //   this.form.xmUserId = this.$store.state.user.id;
-      //   this.form.xmTime = parseTime(new Date(), "{y}-{m}-{d}");
-      // } else if (this.taskName == "结算发起人确认") {
-      //   this.form.deptUserName = this.$store.state.user.name;
-      //   this.form.deptUserId = this.$store.state.user.id;
-      //   this.form.deptTime = parseTime(new Date(), "{y}-{m}-{d}");
+        // } else if (this.taskName == "项目管理部结算") {
+        //   this.form.xmUserName = this.$store.state.user.name;
+        //   this.form.xmUserId = this.$store.state.user.id;
+        //   this.form.xmTime = parseTime(new Date(), "{y}-{m}-{d}");
+        // } else if (this.taskName == "结算发起人确认") {
+        //   this.form.deptUserName = this.$store.state.user.name;
+        //   this.form.deptUserId = this.$store.state.user.id;
+        //   this.form.deptTime = parseTime(new Date(), "{y}-{m}-{d}");
       } else if (this.taskName == "经营发展部校核") {
         this.form.jyUserName = this.$store.state.user.name;
         this.form.jyUserId = this.$store.state.user.id;
@@ -785,10 +785,10 @@ export default {
               this.getNextFlowNodeFn(null, 110, false);
             } else if (this.taskName == "技术质量部审核") {
               this.getNextFlowNodeFn(null, 107, false);
-            // } else if (this.taskName == "项目管理部结算") {
-            //   this.getNextFlowNodeFn();
-            // } else if (this.taskName == "结算发起人确认") {
-            //   this.getNextFlowNodeFn(null, 105, false);
+              // } else if (this.taskName == "项目管理部结算") {
+              //   this.getNextFlowNodeFn();
+              // } else if (this.taskName == "结算发起人确认") {
+              //   this.getNextFlowNodeFn(null, 105, false);
             } else if (this.taskName == "经营发展部校核") {
               this.getNextFlowNodeFn(null, this.deptId, true);
             } else if (this.taskName == "分管审核") {
@@ -798,7 +798,7 @@ export default {
             } else if (this.taskName == "总经理审批") {
               this.getNextFlowNodeFn();
             }
-          }else{
+          } else {
             this.$message.error('结算合计总金额不能大于预算内项目结算总金额！')
           }
         } else {
@@ -950,7 +950,7 @@ export default {
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
-      if(sum < 600){
+      if (sum < 600) {
         this.$message.warning('不足600，按600算')
         work.remark = '不足600，按600算'
         sum = 600

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 14:36:12
+ * @LastEditTime: 2024-07-09 15:26:58
 -->
 <template>
   <div class="project-wrapper">
@@ -108,8 +108,8 @@
           <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="['oa:project:edit']">修改</el-button>
+            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['oa:project:edit']">修改</el-button> -->
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
               v-hasPermi="['oa:project:remove']">删除</el-button>
           </template>

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

@@ -91,7 +91,7 @@
                 <svg-icon slot="prefix" icon-class="dept" />
                 承担部门
               </template>
-              {{ project.undertakingDeptName }}
+              {{ getDeptNames(project.undertakingDept) }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -150,17 +150,26 @@
       </div>
       <!-- 项目管理部安排 -->
       <div class="box1 mt20">
-        <div class="title">项目管理部安排
+        <div class="title">项目安排
           <div class="line"></div>
         </div>
         <div class="info mt20">
-          <el-descriptions class="descriptions" border :column="4" style="text-align: center;">
+          <el-descriptions class="descriptions" border :column="2" style="text-align: center;">
             <el-descriptions-item>
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="dept" />
                 承担部门
               </template>
-              {{ project.undertakingDeptName }}
+              <div style="display: flex;">
+                <div>{{ getDeptNames(project.undertakingDept) }}</div>
+                <div>
+                  <el-button class="ml20" type="success" plain size="mini" icon="el-icon-refresh"
+                    @click="deptOpen = true" v-hasPermi="['oa:project:edit']">
+                    更换部门
+                  </el-button>
+                </div>
+              </div>
+
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -174,10 +183,10 @@
                 <svg-icon slot="prefix" icon-class="user" />
                 项目负责人
               </template>
-              <div style="display: flex;justify-content:space-between;">
+              <div style="display: flex;">
                 <div>{{ project.projectLeaderUser ? project.projectLeaderUser.nickName : "" }}</div>
                 <div>
-                  <el-button class="ml20" type="warning" plain size="mini" icon="el-icon-plus"
+                  <el-button class="ml20" type="success" plain size="mini" icon="el-icon-refresh"
                     @click="prLeaderOpen = true" v-hasPermi="['oa:project:edit']">
                     更换项目负责人
                   </el-button>
@@ -191,7 +200,7 @@
               </template>
               {{ getUserName(project.siteLeader) }}
             </el-descriptions-item>
-            <el-descriptions-item>
+            <el-descriptions-item :span="3">
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="form" />
                 项目预算编制
@@ -199,7 +208,7 @@
               <!-- v-hasPermi="['oa:project:edit']" -->
               <el-link type="primary" @click="openBudget = true">项目预算表</el-link>
             </el-descriptions-item>
-            <el-descriptions-item>
+            <!-- <el-descriptions-item>
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="date" />
                 组织交底时间
@@ -220,13 +229,13 @@
                   <span class="el-icon-download">下载文件</span>
                 </el-link>
               </div>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
           </el-descriptions>
         </div>
       </div>
       <!-- 技术质量部安排 -->
       <div class="box1 mt20">
-        <div class="title">技术质量部安排
+        <div class="title">技术安排
           <div class="line"></div>
         </div>
         <div class="info mt20">
@@ -279,8 +288,8 @@
                 <el-input disabled type="textarea" v-model="projectComment.jyComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.jyUser ? projectComment.jyUser.nickName :
-                    ''
-                  }}</span>
+        ''
+                      }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.jyApprovalTime }}</span></div>
                 </div>
@@ -295,7 +304,7 @@
                 <el-input disabled type="textarea" v-model="projectComment.manageComment"></el-input>
                 <div class="sign mt10">
                   <div class="mr20">签名：<span class="auditor">{{ projectComment.managerUser ?
-                    projectComment.managerUser.nickName : '' }}</span>
+        projectComment.managerUser.nickName : '' }}</span>
                   </div>
                   <div class="ml20"><span>审核时间：{{ projectComment.manageApprovalTime }}</span></div>
                 </div>
@@ -346,7 +355,7 @@
               </template>
               <el-select v-model="devices" multiple disabled style="width:100%">
                 <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-                  + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
                 </el-option>
               </el-select>
             </el-descriptions-item>
@@ -449,6 +458,24 @@
     <el-dialog title="更换项目负责人" :visible.sync="prLeaderOpen" width="1000px" append-to-body>
       <choose-people :multiple="false" @chooseUser="changeProjectLeader"></choose-people>
     </el-dialog>
+    <el-dialog title="更换承担部门" :visible.sync="deptOpen" width="1000px" append-to-body>
+      <el-form>
+        <el-form-item label="当前承担部门：">
+          {{ getDeptNames(project.undertakingDept) }}
+        </el-form-item>
+        <el-form-item label="更换承担部门：">
+          <el-select v-model="undertakingDept" multiple clearable style="width:80%">
+            <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div class="text-center">
+        <el-button type="primary" @click="changeUndertakingDept">确定</el-button>
+        <el-button @click="deptOpen = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -508,6 +535,7 @@ export default {
       openSafe: false,
       openTech: false,
       prLeaderOpen: false,
+      deptOpen: false,
       taskForm: {
         formId: ''
       },
@@ -515,7 +543,8 @@ export default {
       devices: [],
       cars: [],
       drivers: [],
-      participates: []
+      participates: [],
+      undertakingDept: []
     }
   },
   methods: {
@@ -651,7 +680,7 @@ export default {
     changeProjectLeader(val) {
       let preLeader = this.getUserName(this.project.projectLeader);
       let curLeader = val.nickName;
-      this.$confirm('项目负责人将由' + preLeader + '变更为' + curLeader + '，是否确认', '提示', {
+      this.$confirm('项目负责人将由 [' + preLeader + '] 变更为 [' + curLeader + '] ，是否确认', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -664,6 +693,24 @@ export default {
           this.$router.go(0);
         })
       }).catch(() => { });
+    },
+    changeUndertakingDept() {
+      let deptIds = this.undertakingDept.join(',');
+      let currentDept = this.getDeptNames(deptIds);
+      let preDept = this.getDeptNames(this.project.undertakingDept);
+      this.$confirm('承担部门将由 [' + preDept + '] 变更为 [' + currentDept + '] ，是否确认', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updateProject(
+          { projectId: this.project.projectId, undertakingDept: deptIds }
+        ).then(res => {
+          this.$message.success('承担部门修改成功');
+          this.deptOpen = false;
+          this.$router.go(0);
+        })
+      })
     }
   },
 }

oa-ui/src/views/oa/safe/request.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
+      <el-form-item label="安全提示类型">
+        <el-select v-model="queryParams.safeType" clearable placeholder="请选择" @change="handleQuery">
+          <el-option label="环境管理要求" value="0"></el-option>
+          <el-option label="安全生产与职业健康要求" value="1"></el-option>
+          <el-option label="信息安全管理要求" value="2"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -9,88 +16,55 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:safe:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:safe:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:safe:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:safe:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:safe:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:safe:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:safe:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:safe:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="safeRequestList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="常用要求id" align="center" prop="requestId" />
-      <el-table-column label="安全提示类型" align="center" prop="safeType" />
-      <el-table-column label="内容" align="center" prop="content" />
+      <el-table-column label="序号" width="55" align="center" prop="requestId" />
+      <el-table-column label="安全提示类型" align="center" prop="safeType" :formatter="formatterLabel" />
+      <el-table-column label="内容" prop="content" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:safe:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:safe:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:safe:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:safe:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc安全要求对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="安全提示类型">
+          <el-select v-model="form.safeType" clearable placeholder="请选择" @change="handleQuery">
+          <el-option label="环境管理要求" value="0"></el-option>
+          <el-option label="安全生产与职业健康要求" value="1"></el-option>
+          <el-option label="信息安全管理要求" value="2"></el-option>
+        </el-select>
+        </el-form-item>
         <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <!-- <editor v-model="form.content" :min-height="192" /> -->
+          <el-input type="textarea" v-model="form.content" :autosize="{ minRows: 4}"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -180,14 +154,14 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.requestId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc安全要求";
+      this.title = "添加安全要求";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -196,7 +170,7 @@ export default {
       getSafeRequest(requestId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc安全要求";
+        this.title = "修改安全要求";
       });
     },
     /** 提交按钮 */
@@ -222,18 +196,30 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const requestIds = row.requestId || this.ids;
-      this.$modal.confirm('是否确认删除cmc安全要求编号为"' + requestIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc安全要求编号为"' + requestIds + '"的数据项？').then(function () {
         return delSafeRequest(requestIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/safeRequest/export', {
         ...this.queryParams
       }, `safeRequest_${new Date().getTime()}.xlsx`)
+    },
+    formatterLabel(row){
+      console.log(row);
+      switch (row.safeType){
+        case '0':
+          return '环境管理要求'
+        case '1':
+          return '安全生产与职业健康要求'
+        case '2':
+          return '信息安全管理要求'
+      }
+         
     }
   }
 };