LY bug fix

master/src/main/java/com/ruoyi/project/listener/yearSemsApprove/YearEndSucessListener.java

@@ -54,7 +54,7 @@ public class YearEndSucessListener implements Serializable, ExecutionListener {
                     TReportYlrq reportYlrqEntity = tReportYlrqService.selectTReportYlrqById(Long.parseLong(i));
                     reportYlrqEntity.setApproveStatus(0l);
                     //更新检查日期
-                    reportYlrqEntity.setCheckDate(approveEntity.getCheckDate());
+//                    reportYlrqEntity.setCheckDate(approveEntity.getCheckDate());
                     tReportYlrqService.updateTReportYlrq(reportYlrqEntity);
                     //审批通过新增历史年度报告数据
                     reportYlrqEntity.setBuildDate(new Date());
@@ -70,7 +70,7 @@ public class YearEndSucessListener implements Serializable, ExecutionListener {
                     TReportYlgd reportYlgdEntity = tReportYlgdService.selectTReportYlgdById(Long.parseLong(i));
                     reportYlgdEntity.setApproveStatus(0l);
                     //更新检查日期
-                    reportYlgdEntity.setCheckDate(approveEntity.getCheckDate());
+//                    reportYlgdEntity.setCheckDate(approveEntity.getCheckDate());
                     tReportYlgdService.updateTReportYlgd(reportYlgdEntity);
                     //审批通过新增历史年度报告数据
                     reportYlgdEntity.setBuildDate(new Date());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -196,7 +196,7 @@ public class TSpecdevCcController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备叉车台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -191,7 +191,7 @@ public class TSpecdevDtController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备电梯台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -191,7 +191,7 @@ public class TSpecdevDzsbController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备起重机械台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -200,7 +200,7 @@ public class TSpecdevGlController extends BaseController
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备锅炉台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate()

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -198,7 +198,7 @@ public class TSpecdevYlgdController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备压力管道台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -228,7 +228,7 @@ public class TSpecdevYlrqController extends BaseController {
     /**
      * 去重
      */
-    @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
+    @PreAuthorize("@ss.hasPermi('system:plant:remove')")
     @Log(title = "特种设备压力容器台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
     public AjaxResult duplicate() {

master/src/main/resources/mybatis/sems/TReportYlgdMapper.xml

@@ -236,6 +236,8 @@
             <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
+            <if test="yearWarnDate != null">check_date</if>
+            <if test="yearNextWarnDate != null">next_check_date </if>
             pj1,pj2,pj3,pj4,pj5,pj6,pj7,pj8,pj9,pj10,pj11,pj12,pj13,con
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -254,6 +256,8 @@
             <if test="createdate != null">#{createdate},</if>
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
+            <if test="yearWarnDate != null">#{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">#{yearNextWarnDate},</if>
             <![CDATA[
             '√','√','√','√','√','√','√','√','√','√','√','√','√','1']]>
         </trim>
@@ -278,7 +282,6 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="yearWarnDate != null">check_date = #{yearWarnDate},</if>
             <if test="yearNextWarnDate != null">next_check_date = #{yearNextWarnDate},</if>
-            <if test="checkConclusion != null">con = #{checkConclusion},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/sems/TReportYlrqMapper.xml

@@ -206,6 +206,8 @@
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
             <if test="yearReportNo != null">year_report_no,</if>
+            <if test="yearWarnDate != null">check_date</if>
+            <if test="yearNextWarnDate != null">next_check_date </if>
             pj1,pj2,pj3,pj4,pj5,pj6,pj7,pj8,pj9,pj10,pj11,pj12,pj13,pj14,pj15,pj16,pj17,
             pj18,pj19,pj20,pj21,pj22,pj23,pj24,pj25,pj26,pj27,pj28,pj29,pj30,pj31,pj32,con
         </trim>
@@ -222,6 +224,8 @@
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
             <if test="yearReportNo != null">#{yearReportNo},</if>
+            <if test="yearWarnDate != null">#{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">#{yearNextWarnDate},</if>
             <![CDATA[
             '√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','1']]>
         </trim>
@@ -243,7 +247,6 @@
             <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
             <if test="yearWarnDate != null">check_date = #{yearWarnDate},</if>
             <if test="yearNextWarnDate != null">next_check_date = #{yearNextWarnDate},</if>
-            <if test="checkConclusion != null">con = #{checkConclusion},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -471,7 +471,7 @@
         UPDATE  T_SPECDEV_YLGD set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLGD b
-        where b.DEVNO = T_SPECDEV_YLGD.DEVNO and b.plant_code = T_SPECDEV_YLGD.plant_code and T_SPECDEV_YLGD.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.useno = T_SPECDEV_YLGD.useno and b.DEVNO = T_SPECDEV_YLGD.DEVNO and b.plant_code = T_SPECDEV_YLGD.plant_code and T_SPECDEV_YLGD.DEL_FLAG = 0 and b.DEL_FLAG = 0
             and T_SPECDEV_YLGD.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -406,7 +406,7 @@
         UPDATE  T_SPECDEV_YLRQ set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLRQ b
-        where b.DEVNO = T_SPECDEV_YLRQ.DEVNO and b.plant_code = T_SPECDEV_YLRQ.plant_code and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.useno = T_SPECDEV_YLRQ.useno and,b.DEVNO = T_SPECDEV_YLRQ.DEVNO and b.plant_code = T_SPECDEV_YLRQ.plant_code and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_YLRQ.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -118,9 +118,8 @@
         <where>
 
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
-
             and d.del_flag = 0
             and d.hi_type = 2
         </where>

master/src/main/resources/mybatis/sems/his/TSpechiDtMapper.xml

@@ -102,7 +102,7 @@
         <include refid="selectTSpechiDtVo"/>
         <where>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
             and d.del_flag = 0
             and d.hi_type = 2

master/src/main/resources/mybatis/sems/his/TSpechiDzsbMapper.xml

@@ -102,7 +102,7 @@
         <include refid="selectTSpechiDzsbVo"/>
         <where>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
             and d.del_flag = 0
             and d.hi_type = 2

master/src/main/resources/mybatis/sems/his/TSpechiGlMapper.xml

@@ -112,7 +112,7 @@
         <include refid="selectTSpechiGlVo"/>
         <where>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
             and d.del_flag = 0
             and d.hi_type = 2

master/src/main/resources/mybatis/sems/his/TSpechiYlgdMapper.xml

@@ -134,7 +134,7 @@
         <include refid="selectTSpechiYlgdVo"/>
         <where>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
             and d.del_flag = 0
             and d.hi_type = 2

master/src/main/resources/mybatis/sems/his/TSpechiYlrqMapper.xml

@@ -122,7 +122,7 @@
         <include refid="selectTSpechiYlrqVo"/>
         <where>
             <if test="operName != null  and operName != ''"> and oper_name like concat(concat('%', #{operName}), '%')</if>
-            <if test="operTime != null "> and oper_time = #{operTime}</if>
+            <if test="operTime != null "> and to_CHAR(oper_time,'YYYY-MM-DD') = to_CHAR(#{operTime} , 'YYYY-MM-DD')</if>
             <if test="operType != null  and operType != ''"> and oper_type like concat(concat('%', #{operType}), '%')</if>
             and d.del_flag = 0
             and d.hi_type = 2

ui/src/lang/en.js

@@ -1206,6 +1206,7 @@ export default {
   internalInspection: 'Internal',
   externalInspection: 'External',
   downloadSelect: 'Download Selected',
+  govFileUrls: 'govFileUrls',
   压力容器安全状况等级: 'PressureVessel\nSafetyLevel',
   压力管道安全状况等级: 'PressurePiping\nSafetyLevel',
   锅炉台账: 'Boiler Account',
@@ -1761,4 +1762,5 @@ export default {
   '是否置顶': 'Pinned',
   '是否确认置顶公告编号为 ':'Whether to pin the announcement No.',
   '是否确认取消置顶公告编号为 ':'Whether to unpin the announcement No.',
+  '设备出厂编号': 'Factory No',
 }

ui/src/lang/zh.js

@@ -1206,6 +1206,7 @@ export default {
   internalInspection: '内检',
   externalInspection: '外检',
   downloadSelect: '下载选中的设备',
+  govFileUrls: '政府回执文件',
   压力容器安全状况等级: '压力容器安全状况等级',
   压力管道安全状况等级: '压力管道安全状况等级',
   锅炉台账: '锅炉台账',
@@ -1752,4 +1753,14 @@ export default {
   周五:'周五',
   周六:'周六',
   '如果是多腔压力容器': '如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。',
+  // 特种设备通知公告置顶
+  '置顶': '置顶',
+  '已置顶': '已置顶',
+  '取消置顶': '取消置顶',
+  '置顶成功': '置顶成功',
+  '取消置顶成功': '取消置顶成功',
+  '是否置顶': '是否置顶',
+  '是否确认置顶公告编号为 ':'是否确认置顶公告编号为',
+  '是否确认取消置顶公告编号为 ':'是否确认取消置顶公告编号为',
+  '设备出厂编号': '设备出厂编号',
 }

ui/src/views/approve/approveDetail/spec-detail.vue

@@ -449,6 +449,12 @@
             :label="$t('结论')"
             :formatter="conFormat">
           </el-table-column>
+          <el-table-column
+            prop="yearReportNo"
+            header-align="center"
+            align="center"
+            :label="$t('报告编号')">
+          </el-table-column>
           <el-table-column
             prop="remarks"
             header-align="center"
@@ -537,12 +543,7 @@
             align="center"
             :label="$t('检验单位')">
           </el-table-column>
-          <el-table-column
-            prop="yearReportNo"
-            header-align="center"
-            align="center"
-            :label="$t('报告编号')">
-          </el-table-column>
+
           <el-table-column
             prop="safeClass"
             header-align="center"
@@ -722,6 +723,12 @@
             :label="$t('结论')"
             :formatter="conFormat">
           </el-table-column>
+          <el-table-column
+            prop="yearReportNo"
+            header-align="center"
+            align="center"
+            :label="$t('报告编号')">
+          </el-table-column>
         </el-table>
         <el-table
           v-show="dataForm.approveType != 7 && dataForm.devType == 1"

ui/src/views/invoice/bookingworkticket/index.vue

@@ -146,7 +146,7 @@
 
     <u-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable"
               :span-method="mergeMethod" @selection-change="handleSelectionChange" :height="clientHeight" border
-             use-virtual
+             use-virtual :row-key="row => { return row.id }"
              showBodyOverflow="title"
               >
       <u-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
@@ -617,6 +617,7 @@ export default {
       loadingFlash: false,
       // 选中数组
       ids: [],
+      dataListSelections: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -843,7 +844,10 @@ export default {
     //作业票统计
     tickedStatis(row) {
       console.log(row)
-      let putData = row? [row] : this.$refs.multipleTable.selection
+      var rows = this.dataListSelections.map(item => {
+        return item
+      })
+      let putData = row? [row] : rows
       for (let i = 0; i <putData.length ; i++) {
         if (putData[i].bookingworkticket.status != 3) {
           this.$alert(this.$t('只能提交状态为已完成的预约票'), this.$t('提示'), {
@@ -1127,6 +1131,7 @@ export default {
       this.ids = selection.map(item => item.bookingticketId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
+      this.dataListSelections = selection
       // console.log(selection)
     },
     /** 新增按钮操作 */

ui/src/views/sems/reportYlgd/yearapprove.vue

@@ -164,14 +164,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('检查日期')" label-width="140" prop="checkDate">
-        <el-date-picker
-          v-model="dataForm.checkDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          :placeholder="$t('请选择')+$t('检查日期')">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item :label="$t('检查日期')" label-width="140" prop="checkDate">-->
+<!--        <el-date-picker-->
+<!--          v-model="dataForm.checkDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          :placeholder="$t('请选择')+$t('检查日期')">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">{{ $t('提交') }}</el-button>

ui/src/views/sems/reportYlrq/yearapprove.vue

@@ -455,14 +455,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('检查日期')" label-width="140" prop="checkDate">
-        <el-date-picker
-          v-model="dataForm.checkDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          :placeholder="$t('请选择')+$t('检查日期')">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item :label="$t('检查日期')" label-width="140" prop="checkDate">-->
+<!--        <el-date-picker-->
+<!--          v-model="dataForm.checkDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          :placeholder="$t('请选择')+$t('检查日期')">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm">{{ $t('提交') }}</el-button>

ui/src/views/sems/specCc/operlog.vue

@@ -37,13 +37,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" ref="deviceTable" :data="ccList" :height="clientHeight" border>
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" fixed="left" align="center" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>

ui/src/views/sems/specDt/index.vue

@@ -298,7 +298,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入') + $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入') + $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specDt/operlog.vue

@@ -39,13 +39,13 @@
 
     <el-table v-loading="loading" :data="dtList" @selection-change="handleSelectionChange" :height="clientHeight" border>
 
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>

ui/src/views/sems/specDt/ty.vue

@@ -269,7 +269,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入') + $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入') + $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specDzsb/index.vue

@@ -335,7 +335,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('设备注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specDzsb/operlog.vue

@@ -41,13 +41,14 @@
 
     <el-table v-loading="loading" :data="dzsbList" @selection-change="handleSelectionChange" :height="clientHeight" border>
 
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" fixed="left" align="center" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>

ui/src/views/sems/specDzsb/ty.vue

@@ -305,7 +305,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('设备注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specGl/index.vue

@@ -333,14 +333,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('使用证号码')" prop="useno">
-              <el-input v-model="form.useno" :placeholder="$t('请输入')+ $t('使用证号码')"/>
+              <el-input v-model="form.useno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('使用证号码')"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册编号')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册编号')"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

ui/src/views/sems/specGl/operlog.vue

@@ -40,13 +40,13 @@
 
     <el-table v-loading="loading" :data="glList" @selection-change="handleSelectionChange" :height="clientHeight" border>
 
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" fixed="left" align="center" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <!--      <el-table-column :label="$t('状态')" align="center"  fixed="left" prop="status" :formatter="statusFormat" />-->

ui/src/views/sems/specGl/ty.vue

@@ -303,14 +303,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('使用证号码')" prop="useno">
-              <el-input v-model="form.useno" :placeholder="$t('请输入')+ $t('使用证号码')"/>
+              <el-input v-model="form.useno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('使用证号码')"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册编号')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册编号')"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">

ui/src/views/sems/specYlgd/index.vue

@@ -401,7 +401,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('使用登记证编号')" prop="useno">
-              <el-input v-model="form.useno" :placeholder="$t('请输入')+ $t('使用登记证编号')"/>
+              <el-input v-model="form.useno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('使用登记证编号')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specYlgd/operlog.vue

@@ -38,13 +38,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ylgdList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" fixed="left" align="center" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>

ui/src/views/sems/specYlgd/ty.vue

@@ -369,7 +369,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('使用登记证编号')" prop="useno">
-              <el-input v-model="form.useno" :placeholder="$t('请输入')+ $t('使用登记证编号')"/>
+              <el-input v-model="form.useno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('使用登记证编号')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specYlrq/index.vue

@@ -344,7 +344,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specYlrq/operlog.vue

@@ -38,13 +38,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ylrqList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column label="操作人" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作时间" align="center" fixed="left" prop="operTime" width="160">
+
+      <el-table-column :label="$t('操作人员')" align="center" fixed="left" prop="operName" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作时间')" align="center" fixed="left" prop="operTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作类型" fixed="left" align="center" prop="operType" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作类型')" align="center" fixed="left" prop="operType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>

ui/src/views/sems/specYlrq/ty.vue

@@ -314,7 +314,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('注册编号')" prop="regno">
-              <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')"/>
+              <el-input v-model="form.regno" v-bind:disabled="dataForm == 1" :placeholder="$t('请输入')+ $t('注册代码')"/>
             </el-form-item>
           </el-col>
         </el-row>