Browse Source

调整代码提交

user5 1 year atrás
parent
commit
e77749f7b7
1 changed files with 18 additions and 3 deletions
  1. 18 3
      src/views/jy/notify/NotifyTaskForm.vue

+ 18 - 3
src/views/jy/notify/NotifyTaskForm.vue

@@ -191,6 +191,7 @@
   import UserSelectButton from '@/components/userSelectButton/DividerButton'
   import UserService from '@/api/sys/UserService'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import CommonApi from '@/api/cw/common/CommonApi'
   export default {
     props: {
       businessId: {
@@ -235,6 +236,7 @@
           pluginNotifyUserDTOList: [],
           editorFilesDTOList: [],
 			pageSize: 3,
+			procInsId: '',
         },
         keyWatch: '',
         tableKeyOffice: '',
@@ -273,8 +275,10 @@
       UpLoadComponent
     },
     notifyService: null,
+	  commonApi: null,
     created () {
       this.notifyService = new NotifyService()
+		this.commonApi = new CommonApi()
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -307,6 +311,7 @@
           pluginNotifyUserDTOList: [],
           editorFilesDTOList: [],
 			pageSize: 3,
+			procInsId: '',
         }
         this.inputForm.id = id
 		  console.log('this.inputForm.id ',this.inputForm.id )
@@ -396,7 +401,7 @@
         })
       },
       // 表单提交
-      doSubmit (status, callback) {
+		async doSubmit (status, callback) {
         if (status === 'save') {
           // 暂存
           this.inputForm.status = '1'
@@ -426,7 +431,16 @@
           this.inputForm.status = '2'
         } else if (status === 'agree') {
           // 审核同意
-          this.inputForm.status = '5'
+			console.log("进入方法是")
+			await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
+				if (this.commonJS.isNotEmpty(da)) {
+					if (da === '总经理审核') {
+						this.inputForm.status = '5'
+					}else{
+						this.inputForm.status = '2'
+					}
+				}
+			})
         } else if (status === 'reapply') {
           this.inputForm.status = '2'
         }
@@ -473,7 +487,8 @@
             this.getEditorFilesDTOList()
             this.notifyService.saveForm(this.inputForm).then((data) => {
               this.loading = false
-				let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [发起通知]`
+				console.log("创建人:",this.inputForm.createBy.name)
+				let processTitle = this.inputForm.createBy.name + ` 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [发起通知]`
 				this.inputForm.title = processTitle
               callback(data.businessTable, data.businessId, this.inputForm)
             }).catch(() => {