Merge branch 'blueBranch' into allTestUrgent

src/HManagement/department/staff/detail/modules/createUser.vue

@@ -41,6 +41,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`商品授权管控`)"  prop="is_control_product">
+                <el-radio-group v-model="form.is_control_product">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -80,7 +88,8 @@ export default {
         "accountno":"",
         "status": 1,
         "remarks":"",
-        "roleids":[]
+        "roleids":[],
+        "is_control_product":1
       },
       options:[],
       isShow:false,
@@ -128,7 +137,8 @@ export default {
             "accountno":this.form.accountno,
             "hrid":this.$route.query.id,
             "roleids":this.form.roleids,
-            "userid":this.form.userid
+            "userid":this.form.userid,
+            "is_control_product":this.form.is_control_product
           }
         })
           this.tool.showMessage(res,()=>{