森语-质量事故单

src/views/activiti/form/demoForm2.vue

@@ -786,7 +786,12 @@ export default {
               var all = 0
               value.map(item=>{
                 item.accident_sum = item.accident_sum?item.accident_sum:0
-                  all+=item.accident_sum
+                all+=Number(item.accident_sum)
+                let reg = new RegExp("[\\u4E00-\\u9FFF]+","g")
+	            if(reg.test(item.plan_number) &&item.plan_number&&item.plan_number!==''){
+                    this.$message.error('计划单号不可输入汉字，请重新输入！')
+                    item.plan_number =''
+	            }
               })
               this.$refs.KFB.setData({total_money:all})   
           }
@@ -976,11 +981,15 @@ export default {
         },
         // handler
         handleSubmit (e) {
+            var that =this
             // return new Promise((resolve)=>{
             // 通过函数获取数据
             this.$refs.KFB.getData()
                 .then(res => {
-                    var addForm = 'no'
+                let formData1 = JSON.parse(JSON.stringify(res))
+                  // 获取数据成功
+                let formData = JSON.parse(JSON.stringify(res))  
+                 var addForm = 'no'
                  if(this.processData.businessTable == 'employee_leave'){
                     var estimate = this.$refs.KFB.form.getFieldValue('leave_days'),
                    //   actual = that.$refs.KFB.form.getFieldValue('practical_leave'),
@@ -995,15 +1004,32 @@ export default {
                      }
                      }
                   if(this.processData.businessTable == 'incident_ticket'){
+                    var sonTable=[]
+                   // 获取子表数据
+                   _.keys(formData1).forEach(r => {
+                        if (r.indexOf('child&') != -1) {
+                            sonTable=formData1[r]
+                        }
+                    })
+                    var all = 0
+                    sonTable.map(item=>{
+                        item.accident_sum = item.accident_sum?item.accident_sum:0
+                        all+= Number(item.accident_sum)
+                    })
+                    formData.total_money = all
                     var supplier = this.$refs.KFB.form.getFieldValue('responsibility_company')
-                    var responsibility = this.$refs.KFB.form.getFieldValue('responsibility_person1')
-                    var factory = this.$refs.KFB.form.getFieldValue('factory_signature')
-                    if((!supplier||supplier=='') && (!responsibility || responsibility=='')){
+                    var responsibility1 = this.$refs.KFB.form.getFieldValue('responsibility_person1')          
+                    if(sonTable.length==0){
+                        this.$message.error('请添加子表数据！')
+                        addForm = 'yes'
+                    }else{ 
+                    if((!supplier||supplier=='') && (!responsibility1 || responsibility1=='')){
                         this.$message.error('责任人和责任单位必填其一')
                         addForm = 'yes'
-                    }
-                    if(supplier&&supplier!==''){
+                       }
+                     if(supplier&&supplier!==''){
                         var type = this.$refs.KFB.form.getFieldValue('business_type')
+                        var factory = this.$refs.KFB.form.getFieldValue('factory_signature')
                         if(!type|| type==''){
                             this.$message.error('请选择业务类型')
                             addForm = 'yes'
@@ -1012,9 +1038,36 @@ export default {
                             addForm = 'yes'
                         }
                     }
+                    if(responsibility1&&responsibility1!==''){
+                        var responsibility2 = this.$refs.KFB.form.getFieldValue('responsibility_person2')
+                        var responsibility3 = this.$refs.KFB.form.getFieldValue('responsibility_person3')
+                        var responsibility4 = this.$refs.KFB.form.getFieldValue('responsibility_person4')
+                        var sum1 = this.$refs.KFB.form.getFieldValue('sum1')
+                        var sum2 = this.$refs.KFB.form.getFieldValue('sum2')
+                        var sum3 = this.$refs.KFB.form.getFieldValue('sum3')
+                        var sum4 = this.$refs.KFB.form.getFieldValue('sum4')
+                       
+                        var dd =[
+                            {responsibility:responsibility1,sum:sum1,index:1},
+                            {responsibility:responsibility2,sum:sum2,index:2},
+                            {responsibility:responsibility3,sum:sum3,index:3},
+                            {responsibility:responsibility4,sum:sum4,index:4},
+                        ]
+                        dd.every(item=>{
+                            if((item.responsibility&&item.responsibility!=='') && (!item.sum|| item.sum=='')){
+                                this.$message.error('请填写金额'+item.index)
+                                addForm = 'yes'
+                                return false
+                            }
+                            return true
+                        })
+                    }
+                    } 
+                   
                   }
-                  let formData1 = JSON.parse(JSON.stringify(res))
-                  console.log("orl",formData1)
+                 
+
+
                     // 处理手机端子表数据
                     if (this.isSJ) {
                         this.itemData(res)
@@ -1025,12 +1078,11 @@ export default {
                             delete res[r]
                         }
                     })
-                    // 获取数据成功
-                    let formData = JSON.parse(JSON.stringify(res))
                     console.log(formData)
                     formData.id = this.data.id
                     formData.procDefId = this.processData.id
                     formData.procDeTitle = this.processData.name
+                   
 
                     if (!formData.tableName) formData.tableName = this.processData.businessTable
                     formData.filedNames = _.keys(res).join(',')

src/views/oa/modules/IncidentTicketModal.vue

@@ -468,7 +468,6 @@
           var addData = 'yes'
           this.incidentTicketChildrenTable.dataSource.every(item=>{
             if(item.zhanghaoId==''||!item.zhanghaoId){
-              debugger
               this.$message.warning('请选择账套号！')
                addData = 'no'
                return false;
@@ -483,6 +482,7 @@
                addData = 'no'
                return false;
             }
+            return true
           })
       this.$refs.form.validate(valid => {
         if (valid) {