Merge remote-tracking branch 'origin/dev' into dev

src/components/jeecgbiz/JSelectDepart.vue

@@ -29,38 +29,38 @@
     props:{
       modalWidth:{
         type:Number,
-        default:500,
+        initialValue:500,
         required:false
       },
       multi:{
         type:Boolean,
-        default:false,
+        initialValue:false,
         required:false
       },
       rootOpened:{
         type:Boolean,
-        default:true,
+        initialValue:true,
         required:false
       },
       value:{
         type:String,
-        default:'',
+        initialValue:'',
         required:false
       },
       disabled:{
         type: Boolean,
         required: false,
-        default: false
+        initialValue: false
       },
       treeOpera:{
         type: Boolean,
         required: false,
-        default: true
+        initialValue: true
       },
       checkStrictly:{
         type: Boolean,
         required: false,
-        default: true
+        initialValue: true
       },
       // 自定义返回字段，默认返回 id
       customReturnField: {

src/views/activiti/applyHome.vue

@@ -359,10 +359,10 @@
               _this.nodeList=arry;
               if (arry.length>0){
                 // console.log(_this.nodeList[0],"用户信息！")
-                if (!_this.nodeList[0].users[0]){
-                  _this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
-                  ss= true;
-                }
+                // if (!_this.nodeList[0].users[0]){
+                //   _this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
+                //   ss= true;
+                // }
               }
             }
             resolve(callback(ss));

src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue

@@ -16,7 +16,7 @@
           </a-col>
           <a-col :xs="24" :sm="8">
             <a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
-              <j-select-depart v-decorator="['departId']"  multi disabled/>
+              <j-select-depart  v-decorator="['departId']"   disabled/>
             </a-form-model-item>
           </a-col>