Explorar el Código

森语-质量事故单-自动生成质量事故单号

jbb hace 2 años
padre
commit
070288a548
Se han modificado 1 ficheros con 17 adiciones y 9 borrados
  1. 17 9
      src/views/activiti/form/demoForm2.vue

+ 17 - 9
src/views/activiti/form/demoForm2.vue

@@ -764,13 +764,14 @@ export default {
                            }else if(item[1].label =='automatic'){
                                var that = this
                                setTimeout(function(){
-                                  if(that.processData.businessTable == 'incident_ticket'){ // 森语-质量事故单-自动生成事故单号
-                                    if( that.processData.tableId==''|| !that.processData.tableId){
-                                       that.getAction('/sys/user/getNextNo',{name:'accidentCode'}).then(res => {
-                                            that.$refs.KFB.setData({accident_number:res})
-                                      }) 
-                                    }
-                                  }else if(that.processData.businessTable == 'expense_account'){//报销单-自动生成单号
+                                //   if(that.processData.businessTable == 'incident_ticket'){ // 森语-质量事故单-自动生成事故单号
+                                //     // if( that.processData.tableId==''|| !that.processData.tableId){
+                                //     //    that.getAction('/sys/user/getNextNo',{name:'accidentCode'}).then(res => {
+                                //     //         that.$refs.KFB.setData({accident_number:res})
+                                //     //   }) 
+                                //     // }
+                                //   }else 
+                                  if(that.processData.businessTable == 'expense_account'){//报销单-自动生成单号
                                     if( that.processData.tableId==''|| !that.processData.tableId){
                                        that.getAction('/sys/user/getNextNo',{name:'BXDCode'}).then(res => {
                                             that.$refs.KFB.setData({reimbursement_no:res})
@@ -1149,7 +1150,7 @@ export default {
             // return new Promise((resolve)=>{
             // 通过函数获取数据
             this.$refs.KFB.getData()
-                .then(res => {
+                .then(async(res) => {
                 // let formData1 = JSON.parse(JSON.stringify(res))
                 //   // 获取数据成功
                 // let formData = JSON.parse(JSON.stringify(res)) 
@@ -1350,8 +1351,15 @@ export default {
                     this.todoManageOperationObject.jsonData = jsonPamats
                     // 非我的待办节点打卡表单界面
                     if(addForm=='no'){
+                        if(this.processData.businessTable == 'incident_ticket'){ // 森语-质量事故单-自动生成事故单号
+                                    if( this.processData.tableId==''|| !this.processData.tableId){
+                                     await  this.getAction('/sys/user/getNextNo',{name:'accidentCode'}).then(res => {
+                                        formData.accident_number = res
+                                      }) 
+                                    }
+                                  }
                     this.btndisabled = true
-                    postFormDataAction(url, formData, { jsonContent: jsonPamats })
+                   await postFormDataAction(url, formData, { jsonContent: jsonPamats })
                         .then(res => {
                             if (res.success) {
                                 this.todoManageOperationObject.isSave = true