Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

public/index.html

@@ -19,6 +19,10 @@
       margin: 0px;
       padding: 0px;
     }
+    .ant-modal-root>.ant-modal-wrap>.ant-modal {
+      min-width: 55% !important;
+    }
+      
     .chromeframe {
       margin: 0.2em 0;
       background: #ccc;

src/views/activiti/form/demoForm2.vue

@@ -1183,9 +1183,20 @@ export default {
                     })
                     if(sonTable!==''){
                     
-                }
+                    }
                     var supplier = this.$refs.KFB.form.getFieldValue('responsibility_company')
                     var responsibility1 = this.$refs.KFB.form.getFieldValue('responsibility_person1')     
+                    var factory = this.$refs.KFB.form.getFieldValue('factory_signature')     
+                    _.keys(factory).forEach(r => {
+                      let endName = factory[r].name;
+                      if(!endName.endsWith('.png') && !endName.endsWith('.jpg') && !endName.endsWith('.jpeg')){
+                        this.$message.error('工厂签章只能上传图片（png、jpg、jpeg格式）！')
+                        addForm = 'yes'
+                        return false
+                      }
+                       
+                     })
+                    
                     if(sonTable==''){
                         this.$message.error('计划单号未填写！')
                         addForm = 'yes'