Merge remote-tracking branch 'origin/master'

danger-manage-system/src/main/resources/mapper/system/TBreakRulesPersonRecordMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTimeBegin != null and reportTimeEnd != null"> and report_time BETWEEN #{ reportTimeBegin } AND #{ reportTimeEnd }</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        ORDER BY report_time DESC
     </select>
     
     <select id="selectTBreakRulesPersonRecordById" parameterType="Long" resultMap="TBreakRulesPersonRecordResult">

danger-manage-web/src/views/safetyManagement/enterpriseSystem/index.vue

@@ -78,7 +78,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />-->
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -95,7 +95,7 @@
             icon="el-icon-edit"
             @click="handleDetail(scope.row)"
           >详情</el-button>
-          <!--<el-button
+          <el-button
             v-if="scope.row.status == '0'"
             size="mini"
             type="text"
@@ -108,6 +108,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleApproval(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >审批</el-button>
           <el-button
             v-if="scope.row.status == '2'"
@@ -115,7 +116,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInvalid(scope.row)"
-          >作废</el-button>-->
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
+          >作废</el-button>
           <el-button
             size="mini"
             type="text"
@@ -176,10 +178,10 @@
               </span>
               <span v-else>-</span>
             </el-form-item>
-            <!--<el-form-item v-show="operate" label="审批" prop="status">
+            <el-form-item v-show="operate" label="审批" prop="status">
               <el-radio v-model="form.status" label="2">通过</el-radio>
               <el-radio v-model="form.status" label="0">驳回</el-radio>
-            </el-form-item>-->
+            </el-form-item>
           </div>
           <div style="width: 58%;margin-left: 2%">
             <div class="dialogTitle">制度内容</div>
@@ -312,6 +314,7 @@ export default {
       };
       this.resetForm("form");
       this.fileList = [];
+      this.operate=false;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -362,7 +365,7 @@ export default {
     },
     /** 审批按钮操作 */
     handleApproval(row) {
-      this.readOnly = true;
+      this.readOnly = false;
       this.reset();
       const systemId = row.systemId || this.ids
       getEnterpriseSystem(systemId).then(response => {

danger-manage-web/src/views/safetyManagement/laws/index.vue

@@ -84,9 +84,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />-->
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150px" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210px" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -101,12 +101,13 @@
             icon="el-icon-edit"
             @click="handleDetail(scope.row)"
           >详情</el-button>
-          <!--<el-button
+          <el-button
             v-if="scope.row.status == '0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handlePublish(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >发布</el-button>
           <el-button
             v-if="scope.row.status == '1'"
@@ -114,6 +115,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleApproval(scope.row)"
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
           >审批</el-button>
           <el-button
             v-if="scope.row.status == '2'"
@@ -121,7 +123,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInvalid(scope.row)"
-          >作废</el-button>-->
+            v-hasPermi="['safetyManagement:enterpriseSystem:edit']"
+          >作废</el-button>
           <el-button
             size="mini"
             type="text"
@@ -198,10 +201,10 @@
               </span>
               <span v-else>-</span>
             </el-form-item>
-            <!--<el-form-item v-show="operate" label="审批" prop="status">
+            <el-form-item v-show="operate" label="审批" prop="status">
               <el-radio v-model="form.status" label="2">通过</el-radio>
               <el-radio v-model="form.status" label="0">驳回</el-radio>
-            </el-form-item>-->
+            </el-form-item>
           </div>
           <div style="width: 58%;margin-left: 2%">
             <div class="dialogTitle">法律法规内容</div>
@@ -333,6 +336,7 @@ export default {
       };
       this.resetForm("form");
       this.fileList = [];
+      this.operate=false;
     },
     /** 搜索按钮操作 */
     handleQuery() {

pom.xml

@@ -23,7 +23,7 @@
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
-        <fastjson.version>1.2.76</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>5.6.0</oshi.version>
         <jna.version>5.7.0</jna.version>
         <commons.io.version>2.5</commons.io.version>