Bläddra i källkod

技术交底流程更新

lamphua 11 månader sedan
förälder
incheckning
23dc448dbc

+ 0
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallTechActivityExecutionListener.java Visa fil

1
 package com.ruoyi.flowable.oa;
1
 package com.ruoyi.flowable.oa;
2
 
2
 
3
-import com.ruoyi.common.utils.spring.SpringUtils;
4
-import com.ruoyi.system.mapper.SysUserPostMapper;
5
 import org.flowable.common.engine.impl.identity.Authentication;
3
 import org.flowable.common.engine.impl.identity.Authentication;
6
 import org.flowable.engine.delegate.DelegateExecution;
4
 import org.flowable.engine.delegate.DelegateExecution;
7
 import org.flowable.engine.delegate.ExecutionListener;
5
 import org.flowable.engine.delegate.ExecutionListener;

+ 5
- 6
oa-back/sql/sql.sql
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 2
- 0
oa-ui/src/views/flowable/form/safeForm.vue Visa fil

304
             });
304
             });
305
             const params = { taskId: this.taskForm.taskId };
305
             const params = { taskId: this.taskForm.taskId };
306
             getNextFlowNode(params).then(res => {
306
             getNextFlowNode(params).then(res => {
307
+              if (this.taskName == '安全交底')                
308
+                this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
307
               complete(this.taskForm).then(response => {
309
               complete(this.taskForm).then(response => {
308
                 this.$modal.msgSuccess(response.msg);
310
                 this.$modal.msgSuccess(response.msg);
309
                 this.$emit('goBack')
311
                 this.$emit('goBack')

+ 29
- 2
oa-ui/src/views/flowable/form/technicalForm.vue Visa fil

32
               :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
32
               :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
33
           </el-form-item>
33
           </el-form-item>
34
           <el-form-item label="附件" prop="document">
34
           <el-form-item label="附件" prop="document">
35
-            <el-input v-model="form.document" placeholder="请输入附件" type="textarea"
36
-              :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
35
+            <FileUpload v-if="taskName == '技术交底'" ref="bsFile" :limit="1" :filePathName="'技术交底'"
36
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
37
+            <div v-if="form.document && taskName != '技术交底'">
38
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
39
+                {{ getFileName(form.document) }}
40
+              </el-link>
41
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
42
+                :underline="false" target="_blank">
43
+                <span class="el-icon-download">下载文件</span>
44
+              </el-link>
45
+            </div>
37
           </el-form-item>
46
           </el-form-item>
38
           <el-form-item label="技术交底意见" prop="disclosureComment">
47
           <el-form-item label="技术交底意见" prop="disclosureComment">
39
             <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea"
48
             <el-input v-model="form.disclosureComment" placeholder="请输入技术交底意见" type="textarea"
110
   },
119
   },
111
   data() {
120
   data() {
112
     return {
121
     return {
122
+      baseUrl: process.env.VUE_APP_BASE_API,
113
       disclosurerUser: '',
123
       disclosurerUser: '',
114
       accepterUser: '',
124
       accepterUser: '',
115
       // 遮罩层
125
       // 遮罩层
298
             });
308
             });
299
             const params = { taskId: this.taskForm.taskId };
309
             const params = { taskId: this.taskForm.taskId };
300
             getNextFlowNode(params).then(res => {
310
             getNextFlowNode(params).then(res => {
311
+              if (this.taskName == '技术交底')                
312
+                this.$set(this.taskForm.variables, "approval", this.form.disclosureAccepter);
301
               complete(this.taskForm).then(response => {
313
               complete(this.taskForm).then(response => {
302
                 this.$modal.msgSuccess(response.msg);
314
                 this.$modal.msgSuccess(response.msg);
303
                 this.$emit('goBack')
315
                 this.$emit('goBack')
324
         }
336
         }
325
       });
337
       });
326
     },
338
     },
339
+    getFileName(name) {
340
+      if (name) {
341
+        let arr = name.split('/')
342
+        return arr[arr.length - 1];
343
+      }
344
+    },
345
+    getTechnicalDoc(val) {
346
+      if (val) {
347
+        let arr = val.split('/upload')
348
+        this.form['document'] = arr[1]
349
+        if (val == "") {
350
+          this.form['document'] = ""
351
+        }
352
+      }
353
+    },
327
     /** 删除按钮操作 */
354
     /** 删除按钮操作 */
328
     handleDelete(row) {
355
     handleDelete(row) {
329
       const technicalIds = row.technicalId || this.ids;
356
       const technicalIds = row.technicalId || this.ids;

Loading…
Avbryt
Spara