LY 会议

master/src/main/java/com/ruoyi/project/plant/controller/TMtMeetingController.java

@@ -93,6 +93,16 @@ public class TMtMeetingController extends BaseController
         return AjaxResult.success(tMtMeetingService.selectTMtMeetingById(id));
     }
 
+    /**
+     * 获取装置会议详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
+    @GetMapping("/last")
+    public AjaxResult getLast(TMtMeeting tMtMeeting)
+    {
+        return AjaxResult.success(tMtMeetingService.selectTMtMeetingLast(tMtMeeting));
+    }
+
     /**
      * 新增装置会议
      */

master/src/main/java/com/ruoyi/project/plant/mapper/TMtMeetingMapper.java

@@ -6,23 +6,25 @@ import com.ruoyi.project.plant.domain.TMtMeeting;
 
 /**
  * 装置会议Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2020-12-30
  */
-public interface TMtMeetingMapper 
+public interface TMtMeetingMapper
 {
     /**
      * 查询装置会议
-     * 
+     *
      * @param id 装置会议ID
      * @return 装置会议
      */
     public TMtMeeting selectTMtMeetingById(Long id);
 
+    TMtMeeting selectTMtMeetingLast(TMtMeeting tMtMeeting);
+
     /**
      * 查询装置会议列表
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 装置会议集合
      */
@@ -31,7 +33,7 @@ public interface TMtMeetingMapper
 
     /**
      * 新增装置会议
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TMtMeetingMapper
 
     /**
      * 修改装置会议
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TMtMeetingMapper
 
     /**
      * 删除装置会议
-     * 
+     *
      * @param id 装置会议ID
      * @return 结果
      */
@@ -55,9 +57,11 @@ public interface TMtMeetingMapper
 
     /**
      * 批量删除装置会议
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     public int deleteTMtMeetingByIds(Long[] ids);
+
+
 }

master/src/main/java/com/ruoyi/project/plant/service/ITMtMeetingService.java

@@ -5,23 +5,24 @@ import com.ruoyi.project.plant.domain.TMtMeeting;
 
 /**
  * 装置会议Service接口
- * 
+ *
  * @author ruoyi
  * @date 2020-12-30
  */
-public interface ITMtMeetingService 
+public interface ITMtMeetingService
 {
     /**
      * 查询装置会议
-     * 
+     *
      * @param id 装置会议ID
      * @return 装置会议
      */
     public TMtMeeting selectTMtMeetingById(Long id);
 
+    public TMtMeeting selectTMtMeetingLast(TMtMeeting tMtMeeting);
     /**
      * 查询装置会议列表
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 装置会议集合
      */
@@ -29,7 +30,7 @@ public interface ITMtMeetingService
 
     /**
      * 新增装置会议
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface ITMtMeetingService
 
     /**
      * 修改装置会议
-     * 
+     *
      * @param tMtMeeting 装置会议
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface ITMtMeetingService
 
     /**
      * 批量删除装置会议
-     * 
+     *
      * @param ids 需要删除的装置会议ID
      * @return 结果
      */
@@ -53,9 +54,11 @@ public interface ITMtMeetingService
 
     /**
      * 删除装置会议信息
-     * 
+     *
      * @param id 装置会议ID
      * @return 结果
      */
     public int deleteTMtMeetingById(Long id);
+
+
 }

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtMeetingServiceImpl.java

@@ -49,6 +49,11 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         return tMtMeetingMapper.selectTMtMeetingById(id);
     }
 
+    @Override
+    public TMtMeeting selectTMtMeetingLast(TMtMeeting tMtMeeting) {
+        return  tMtMeetingMapper.selectTMtMeetingLast(tMtMeeting);
+    }
+
     /**
      * 查询装置会议列表
      *

master/src/main/resources/mybatis/plant/TMtMeetingMapper.xml

@@ -47,6 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+
+    <select id="selectTMtMeetingLast" parameterType="TMtMeeting" resultMap="TMtMeetingResult">
+        <include refid="selectTMtMeetingVo"/>
+        where d.DEL_FLAG = 0
+        ORDER BY d.id DESC
+        FETCH FIRST 1 ROW ONLY
+    </select>
+
     <insert id="insertTMtMeeting" parameterType="TMtMeeting">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_mt_meeting.NEXTVAL as id FROM DUAL

ui/src/api/plant/meeting.js

@@ -17,6 +17,15 @@ export function getMeeting(id) {
   })
 }
 
+// 查询装置会议详细
+export function getLastMeeting(query) {
+  return request({
+    url: '/plant//meeting/last',
+    method: 'get',
+    params: query
+  })
+}
+
 // 新增装置会议
 export function addMeeting(data) {
   return request({

ui/src/views/components/meeting/actionlist.vue

@@ -148,7 +148,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item :label="$t('责任人')" prop="responsible">
-          <el-select v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
+          <el-select v-if="form.isPerson" style="width: 150px" v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
             <el-option
               v-for="dict in stffmgrOptions"
               :key="dict.userId"
@@ -158,6 +158,9 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
             </el-option>
           </el-select>
+          <el-input v-else v-model="form.responsible"  style="width: 150px" :placeholder="$t('请输入') + $t('负责人姓名')" />
+
+          <el-checkbox style="margin-left: 50px" v-model="form.isPerson">指定责任人</el-checkbox>
         </el-form-item>
         <el-form-item :label="$t('行动')" prop="action">
           <el-input v-model="form.action" :placeholder="$t('请输入') + $t('行动')" />
@@ -441,6 +444,10 @@
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      if (this.$route.params.tableId) {
+        this.form.meetingId = this.$route.params.tableId
+        this.form.isHis = 1
+      }
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('装置会议执行');
     },

ui/src/views/components/meeting/person.vue

@@ -44,7 +44,7 @@
       <el-table-column :label="$t('员工号')" align="center" prop="staffid" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('姓名')" align="center" prop="name" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('部门')" align="center" prop="unit" />
-      <el-table-column :label="$t('联系方式')" align="center" prop="contact" :show-overflow-tooltip="true"/>
+      <el-table-column label="邮箱" align="center" prop="contact" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ui/src/views/plant/dailyMeeting/detail.vue

@@ -89,9 +89,10 @@
           <tr class="yellowbg">
             <td>1.1</td>
             <td>裂解炉运行模式：
-              <el-input v-model="form.optMode" style="width: 360px"></el-input>
-              <el-checkbox-group v-model="optItemList" @change="changeOpt" >
-                <el-checkbox v-for="dict in optItemOptions" :label="dict.dictLabel" border >
+              <el-input v-model="optModeData" style="width: 360px"></el-input>
+
+              <el-checkbox-group style="margin-top: 5px" v-model="optItemList" @change="changeOpt" >
+                <el-checkbox v-for="dict in optItemOptions" style="margin-left: 0px;margin-right: 5px;" :label="dict.dictLabel" border >
 
                 </el-checkbox>
               </el-checkbox-group>
@@ -110,7 +111,7 @@
           </tr>
           <tr class="yellowbg" v-for="(item1, index) in form.items1" :key="'item1'+index">
             <td>1.{{ 3 + index}}</td>
-            <td><el-input type="textarea" autosize="{ minRows: 1}" v-model="item1.description"></el-input></td>
+            <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item1.description"></el-input></td>
             <td><el-select v-model="item1.actionby">
               <el-option
                 v-for="dict in actionOptions"
@@ -134,7 +135,7 @@
           </tr>
           <tr class="greenbg" v-for="(item2, index) in form.items2" :key="'item2'+index">
             <td>2.{{ 1 + index}}</td>
-            <td><el-input type="textarea" autosize="{ minRows: 1}" v-model="item2.description"></el-input></td>
+            <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item2.description"></el-input></td>
             <td><el-select v-model="item2.actionby">
               <el-option
                 v-for="dict in actionOptions"
@@ -158,7 +159,7 @@
           </tr>
           <tr class="yellowbg" v-for="(item3, index) in form.items3" :key="'item3'+index">
             <td>3.{{ 1 + index}}</td>
-            <td><el-input type="textarea" autosize="{ minRows: 1}" v-model="item3.description"></el-input></td>
+            <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item3.description"></el-input></td>
             <td><el-select v-model="item3.actionby">
               <el-option
                 v-for="dict in actionOptions"
@@ -181,7 +182,7 @@
           </tr>
           <tr class="greenbg" v-for="(item4, index) in form.items4" :key="'item4'+index">
             <td>4.{{ 1 + index}}</td>
-            <td><el-input type="textarea" autosize="{ minRows: 1}" v-model="item4.description"></el-input></td>
+            <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item4.description"></el-input></td>
             <td><el-select v-model="item4.actionby">
               <el-option
                 v-for="dict in actionOptions"
@@ -204,7 +205,7 @@
           </tr>
           <tr class="yellowbg" v-for="(item5, index) in form.items5" :key="'item5'+index">
             <td>2.{{ 1 + index}}</td>
-            <td><el-input type="textarea" autosize="{ minRows: 1}" v-model="item5.description">
+            <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item5.description">
 
             </el-input></td>
             <td><el-select v-model="item5.actionby">
@@ -238,6 +239,7 @@ import { listDailyMeetingConfig, getDailyMeetingConfig} from "@/api/plant/dailyM
 export default {
   data () {
     return {
+      optModeData: null,
       venueOptions: null,
       optModeOptions: null,
       optItemOptions: null,
@@ -346,12 +348,13 @@ export default {
         this.attendCtmList= response.data.attendCtm.split(",")
         this.attendCtaList= response.data.attendCta.split(",")
         this.attendLabList= response.data.attendLab.split(",")
+        this.optModeData = response.data.optMode
       });
     }else {
       this.form.safetyTopic =  "1、现场动火安全 \n" +
         "2、环保注意事项"
       this.attendCrackerList = this.attendCrackerOptions;
-      this.form.optMode = "7+0+A+B"
+      this.optModeData = "9+0+A+B"
     }
   },
   methods: {
@@ -389,6 +392,7 @@ export default {
         this.form.attendCtm = this.attendCtmList.join(",")
         this.form.attendCta = this.attendCtaList.join(",")
         this.form.attendLab = this.attendLabList.join(",")
+        this.form.optMode = this.optModeData
         updateDailyMeeting(this.form).then(response => {
           this.msgSuccess("修改成功");
         });
@@ -398,6 +402,7 @@ export default {
         this.form.attendCtm = this.attendCtmList.join(",")
         this.form.attendCta = this.attendCtaList.join(",")
         this.form.attendLab = this.attendLabList.join(",")
+        this.form.optMode = this.optModeData
         addDailyMeeting(this.form).then(response => {
           this.msgSuccess("新增成功");
           this.close()
@@ -405,8 +410,9 @@ export default {
       }
     },
     changeOpt(data){
-      let arr1 = ["H110","H112","H113","H115","H116","H118","111"]
-      let arr2 = ["111"]
+      console.log(data)
+      let arr1 = ["H110","H112","H113","H115","H116","H118","H111","H114","H117"]
+      let arr2 = ["H130"]
       let arr3 = ["H109A"]
       let arr4 = ["H109B"]
       let val1 = this.countDupVal(data,arr1)
@@ -419,7 +425,9 @@ export default {
       if (this.countDupVal(data,arr4) > 0) {
         val1 = val1 + "+B"
       }
-      this.form.optMode = val1
+      console.log(val1)
+      this.optModeData = val1
+
     },
 
     countDupVal(array1, array2) {

ui/src/views/plant/hismeeting/index.vue

@@ -93,13 +93,12 @@
           <span>{{ parseTime(scope.row.meetingDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :formatter="plantCodeFormat" />
-      <el-table-column :label="$t('记录人')" align="center" prop="recorder" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('会议编号')" align="center" prop="meetingNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('会议地点')" align="center" prop="venue" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('主题')" align="center" prop="subject" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('记录人')" align="center" prop="recorder" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('会议编号')" align="center" prop="meetingNo"  width="160" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('会议地点')" align="center" prop="venue" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('主题')" align="center" prop="subject"  />
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

ui/src/views/plant/weekmeeting/index.vue

@@ -47,22 +47,16 @@
     <!-- 添加或修改装置会议对话框 -->
     <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('装置名称')" prop="plantCode">
-          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
-            <el-option
-              v-for="dict in plantCodeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('记录人')" prop="recorder">
-          <el-input v-model="form.recorder" :placeholder="$t('请输入') + $t('记录人')" />
-        </el-form-item>
-        <el-form-item :label="$t('会议编号')" prop="meetingNo">
-          <el-input v-model="form.meetingNo" :placeholder="$t('请输入') +$t('会议编号')" />
-        </el-form-item>
+<!--        <el-form-item :label="$t('装置名称')" prop="plantCode">-->
+<!--          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">-->
+<!--            <el-option-->
+<!--              v-for="dict in plantCodeOptions"-->
+<!--              :key="dict.dictValue"-->
+<!--              :label="dict.dictLabel"-->
+<!--              :value="dict.dictValue"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item :label="$t('会议时间')" prop="meetingDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.meetingDate"
@@ -71,18 +65,26 @@
                           :placeholder="$t('请选择') + $t('会议时间')">
           </el-date-picker>
         </el-form-item>
+
+        <el-form-item :label="$t('会议编号')" prop="meetingNo">
+          <el-input v-model="form.meetingNo" :placeholder="$t('请输入') +$t('会议编号')" />
+        </el-form-item>
+
         <el-form-item :label="$t('会议地点')" prop="venue">
           <el-input v-model="form.venue" :placeholder="$t('请输入') + $t('会议地点')" />
         </el-form-item>
         <el-form-item :label="$t('主题')" prop="subject">
           <el-input v-model="form.subject" :placeholder="$t('请输入') + $t('主题')" />
         </el-form-item>
+        <el-form-item :label="$t('记录人')" prop="recorder">
+          <el-input v-model="form.recorder" :placeholder="$t('请输入') + $t('记录人')" />
+        </el-form-item>
         <el-form-item :label="$t('备注')" prop="remarks">
           <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
         </el-form-item>
-        <el-form-item :label="$t('归属部门')" prop="deptId">
-          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-        </el-form-item>
+<!--        <el-form-item :label="$t('归属部门')" prop="deptId">-->
+<!--          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -93,7 +95,7 @@
 </template>
 
 <script>
-import { listMeeting, getMeeting, delMeeting, addMeeting, updateMeeting, exportMeeting, importTemplate} from "@/api/plant/meeting";
+import { listMeeting, getMeeting,getLastMeeting, delMeeting, addMeeting, updateMeeting, exportMeeting, importTemplate} from "@/api/plant/meeting";
 import Keymaintenance from "../../components/meeting/keymaintenance";
 import Actionlist from "../../components/meeting/actionlist";
 import Ehsopenitem from "../../components/meeting/ehsopenitem";
@@ -175,8 +177,8 @@ export default {
       },
       // 表单校验
       rules: {
-        plantCode: [
-          { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
+        meetingDate: [
+          { required: true, message: this.$t('不能为空'), trigger: "change" }
         ],
       }
     };
@@ -253,8 +255,13 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;
-      this.title = this.$t('新增') + " " + this.$t('装置会议');
+      let param = {}
+      getLastMeeting(param).then(response => {
+        this.form = response.data;
+        this.form.meetingDate = null
+        this.open = true;
+        this.title = this.$t('新增') + " " + this.$t('装置会议');
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {