EOEG SAI

master/src/main/resources/mybatis/production/TEoegSaiApplyMapper.xml

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and handler like concat(concat('%', #{currentUser}), '%')
                 and apply_status != 4
                 and apply_status != 5
-                and tpm_status != '现场已完成'
+                or (sai_type = 'TPM' and tpm_status = '现场未完成' and apply_status != 4 and apply_status != 5)
             </if>
             <if test="tab == 2">
                 and (handler like concat(concat('%', #{currentUser}), '%')

ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -459,9 +459,11 @@
     <div slot="footer" class="dialog-footer">
       <!-- 当前登录用户为处理人（之一） -->
       <span v-if="dataForm.handler.indexOf(loginStaffInfo.userId) != -1" style="margin-right: 10px;">
-        <el-button v-if="taskName != null && dataForm.applyStatus != 4 && dataForm.applyStatus != 5" @click="dataFormSave()">{{ $t('保存') }}</el-button>
-        <el-button type="success" v-if="taskName != null && dataForm.veResult != '0'" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>
-        <el-button type="danger" v-if="taskName == '验收' && dataForm.veResult == '0'" @click="dataFormSubmit(2)">{{ $t('驳回') }}</el-button>
+        <span v-if="showType == 'handle'">
+          <el-button v-if="taskName != null && dataForm.applyStatus != 4 && dataForm.applyStatus != 5" @click="dataFormSave()">{{ $t('保存') }}</el-button>
+          <el-button type="success" v-if="taskName != null && dataForm.veResult != '0'" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>
+          <el-button type="danger" v-if="taskName == '验收' && dataForm.veResult == '0'" @click="dataFormSubmit(2)">{{ $t('驳回') }}</el-button>
+        </span>
         <el-button type="info" v-if="taskName == '评估'" @click="dataFormSubmit(0)">{{ $t('中止') }}</el-button>
       </span>
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
@@ -657,11 +659,13 @@ export default {
       inspectorsOptions: [],
       executorsOptions: [],
       assessorsOptions: [],
+      showType: '',
     }
   },
   methods: {
     // 初始化
-    init(id, taskId, processId, taskName) {
+    init(id, taskId, processId, taskName, showType) {
+      this.showType = showType;
       this.doc.id = id;
       this.doc.queryParams.pId = id;
       this.doc.pId = id;

ui/src/views/production/eoegapply/all/index.vue

@@ -262,7 +262,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row, 'handle')"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
             && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
@@ -272,7 +272,7 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row, 'detail')"
           >详情</el-button>
           <el-button
             size="mini"
@@ -1721,10 +1721,10 @@ export default {
       });
     },
     /** 处理/详情操作 */
-    handleDetail(row) {
+    handleDetail(row, showType) {
       this.saiApplyVisible = true;
       this.$nextTick(() => {
-        this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName);
+        this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName, showType);
       });
     },
     /** 提交申请操作 */

ui/src/views/production/eoegapply/mine/index.vue

@@ -255,7 +255,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row), 'handle'"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
             && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
@@ -265,7 +265,7 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row), 'detail'"
           >详情</el-button>
           <el-button
             size="mini"
@@ -1508,10 +1508,10 @@
         });
       },
       /** 处理/详情操作 */
-      handleDetail(row) {
+      handleDetail(row, showType) {
         this.saiApplyVisible = true;
         this.$nextTick(() => {
-          this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName);
+          this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName, showType);
         });
       },
       /** 提交申请操作 */

ui/src/views/production/eoegapply/pending/index.vue

@@ -255,7 +255,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row, 'handle')"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
             && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
@@ -265,7 +265,7 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleDetail(scope.row)"
+            @click="handleDetail(scope.row, 'detail')"
           >详情</el-button>
           <el-button
             size="mini"
@@ -1508,10 +1508,10 @@
         });
       },
       /** 处理/详情操作 */
-      handleDetail(row) {
+      handleDetail(row, showType) {
         this.saiApplyVisible = true;
         this.$nextTick(() => {
-          this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName);
+          this.$refs.saiApplyDetail.init(row.saiApplyId, row.taskId, row.processId, row.taskName, showType);
         });
       },
       /** 提交申请操作 */