-优化页面

master/src/main/resources/mybatis/apply/TApplyOfflinevalveMapper.xml

@@ -216,8 +216,6 @@
             <if test="executionTime != null">execution_time = #{executionTime},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createrCode != null">creater_code = #{createrCode},</if>
-            <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>

master/src/main/resources/mybatis/apply/TApplySafetychangeMapper.xml

@@ -233,8 +233,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createrCode != null">creater_code = #{createrCode},</if>
-            <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>

ui/src/views/apply/offlinevalve/index.vue

@@ -149,7 +149,14 @@
             type="text"
             icon="el-icon-document"
             @click="openDetail(scope.row)"
-          >申请单详情
+          >详情
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="todoMethod"
+          >流转详情
           </el-button>
         </template>
       </el-table-column>
@@ -355,7 +362,7 @@ export default {
       executorList:[],
       confirmerList:[],
       status: {0: "未完成", 1: "已完成"},
-      approveStatus: {0: "待申请", 1: "申请中", 2: "已通过", 3: "已驳回", 4: "已拒绝"},
+      approveStatus: {1: "申请中", 2: "已通过", 3: "已拒绝"},
       statusFlag: '',
       approveStatusFlag: '',
       //label样式
@@ -503,6 +510,13 @@ export default {
     });
   },
   methods: {
+    todoMethod() {
+      this.$confirm('功能开发中......', "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "info"
+      })
+    },
     // 字典翻译
     statusFormat(row, column) {
       let s = this.selectDictLabel(this.statusList, row.status);
@@ -516,13 +530,11 @@ export default {
     approveStatusFormat(row, column) {
       let s = this.selectDictLabel(this.approveStatusList, row.approveStatus)
       let type = '';
-      if (row.approveStatus === '0') {
-        type = 'info';
-      } else if (row.approveStatus === '2') {
+      if (row.approveStatus === '2') {
         type = 'success';
-      } else if (row.approveStatus === '3') {
+      } else if (row.approveStatus === '1') {
         type = 'warning';
-      } else if (row.approveStatus === '4') {
+      } else if (row.approveStatus === '3') {
         type = 'danger';
       }
       return <el-tag type={type}>{s}</el-tag>;
@@ -553,13 +565,11 @@ export default {
       if (row.status === 1) {
         this.statusFlag = 'success';
       }
-      if (row.approveStatus === '0') {
-        this.approveStatusFlag = 'info';
-      } else if (row.approveStatus === '2') {
+      if (row.approveStatus === '2') {
         this.approveStatusFlag = 'success';
-      } else if (row.approveStatus === '3') {
+      } else if (row.approveStatus === '1') {
         this.approveStatusFlag = 'warning';
-      } else if (row.approveStatus === '4') {
+      } else if (row.approveStatus === '3') {
         this.approveStatusFlag = 'danger';
       }
     },

ui/src/views/apply/safetychange/index.vue

@@ -147,7 +147,14 @@
             type="text"
             icon="el-icon-document"
             @click="openDetail(scope.row)"
-          >申请单详情
+          >详情
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="todoMethod"
+          >流转详情
           </el-button>
         </template>
       </el-table-column>
@@ -359,7 +366,7 @@ export default {
       statusFlag: '',
       approveStatusFlag: '',
       status: {0: "未完成", 1: "已完成"},
-      approveStatus: {0: "待申请", 1: "申请中", 2: "已通过", 3: "已驳回", 4: "已拒绝"},
+      approveStatus: {1: "申请中", 2: "已通过", 3: "已拒绝"},
       // 字典
       statusList: [],
       approveStatusList: [],
@@ -497,13 +504,11 @@ export default {
       if (row.status === 1) {
         this.statusFlag = 'success';
       }
-      if (row.approveStatus === '0') {
-        this.approveStatusFlag = 'info';
-      } else if (row.approveStatus === '2') {
+      if (row.approveStatus === '2') {
         this.approveStatusFlag = 'success';
-      } else if (row.approveStatus === '3') {
+      } else if (row.approveStatus === '1') {
         this.approveStatusFlag = 'warning';
-      } else if (row.approveStatus === '4') {
+      } else if (row.approveStatus === '3') {
         this.approveStatusFlag = 'danger';
       }
     },
@@ -538,16 +543,21 @@ export default {
     approveStatusFormat(row, column) {
       let s = this.selectDictLabel(this.approveStatusList, row.approveStatus)
       let type = '';
-      if (row.approveStatus === '0') {
-        type = 'info';
-      } else if (row.approveStatus === '2') {
+      if (row.approveStatus === '2') {
         type = 'success';
-      } else if (row.approveStatus === '3') {
+      } else if (row.approveStatus === '1') {
         type = 'warning';
-      } else if (row.approveStatus === '4') {
+      } else if (row.approveStatus === '3') {
         type = 'danger';
       }
-      return <el-tag type={type}>{s}</el-tag>;
+      return <el-tag type={type}>{s}</el-tag> ;
+    },
+    todoMethod() {
+      this.$confirm('功能开发中......', "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "info"
+      })
     },
     /** 查询组织保护措施状态变更申请列表 */
     getList() {