技术交底流程更新

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallTechActivityExecutionListener.java

@@ -1,7 +1,5 @@
 package com.ruoyi.flowable.oa;
 
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.system.mapper.SysUserPostMapper;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;

oa-ui/src/views/flowable/form/safeForm.vue

@@ -304,6 +304,8 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
+              if (this.taskName == '安全交底')                
+                this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')

oa-ui/src/views/flowable/form/technicalForm.vue

@@ -32,8 +32,17 @@
               :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
           </el-form-item>
           <el-form-item label="附件" prop="document">
-            <el-input v-model="form.document" placeholder="请输入附件" type="textarea"
-              :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
+            <FileUpload v-if="taskName == '技术交底'" ref="bsFile" :limit="1" :filePathName="'技术交底'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
+            <div v-if="form.document && taskName != '技术交底'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+                {{ getFileName(form.document) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
           </el-form-item>
           <el-form-item label="技术交底意见" prop="disclosureComment">
             <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea"
@@ -110,6 +119,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       disclosurerUser: '',
       accepterUser: '',
       // 遮罩层
@@ -298,6 +308,8 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
+              if (this.taskName == '技术交底')                
+                this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
@@ -324,6 +336,21 @@ export default {
         }
       });
     },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
+    getTechnicalDoc(val) {
+      if (val) {
+        let arr = val.split('/upload')
+        this.form['document'] = arr[1]
+        if (val == "") {
+          this.form['document'] = ""
+        }
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const technicalIds = row.technicalId || this.ids;