人员

i18n/locale/zh-CN.js

@@ -65,7 +65,8 @@ export default {
         jobNo: '工号',
         departmentTitle: '所属部门',
         roleTitles: '角色名称',
-        enableEquip: '可操控设备'
+        enableEquip: '可操控设备',
+        property:'属性'
     },
     resource: {
         id: '编号',

pages/basicData/user/add.vue

@@ -68,6 +68,11 @@
             <Dictionary code="User.base.workLicense" v-model="entity.licensedToWork"></Dictionary>
           </FormItem>
         </Col>
+        <Col :span="12">
+          <FormItem :label="l('property')">
+            <Checkbox v-model="entity.property">排产资源</Checkbox>
+          </FormItem>
+        </Col>
         <Col :span="24">
           <FormItem :label="l('remark')" prop="remark">
             <Input v-model="entity.remark" type="textarea" :rows="3"></Input>
@@ -82,138 +87,143 @@
   </div>
 </template>
     <script>
-import Api from './api'
+import Api from "./api";
 const valideTel = (rule, value, callback) => {
-  var re = /^1[3-9]{1}[0-9]{9}/
-  if (value === '' || value === null) {
-    callback(new Error('请输入手机号'))
+  var re = /^1[3-9]{1}[0-9]{9}/;
+  if (value === "" || value === null) {
+    callback(new Error("请输入手机号"));
   } else if (!re.test(value)) {
-    callback(new Error('请输入正确手机号'))
+    callback(new Error("请输入正确手机号"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 export default {
-  name: 'Add',
+  name: "Add",
   components: {},
   data() {
     const validateCarNo = (rule, value, callback) => {
       if (!value) {
-        return callback(new Error('员工编号不能为空'))
+        return callback(new Error("员工编号不能为空"));
       }
-      Api.list(value).then((r) => {
+      Api.list(value).then(r => {
         if (r.result.length > 0) {
-          return callback(new Error('员工编号已经存在'))
+          return callback(new Error("员工编号已经存在"));
         } else {
-          callback()
-        }
-      })
+          callback();
         }
+      });
+    };
     return {
       disabled: false,
       showDeptTree: false,
       entity: {
         gender: 1,
-        status: 1
+        status: 1,
+        property: false
       },
       rules: {
-        userName: [{ required: true, message: '必填', trigger: 'blur' }],
+        userName: [{ required: true, message: "必填", trigger: "blur" }],
         cardNo: [
-          { required: true, message: '必填', trigger: 'blur' },
-          { validator: validateCarNo, trigger: 'blur' }
+          { required: true, message: "必填", trigger: "blur" },
+          { validator: validateCarNo, trigger: "blur" }
         ],
         departmentTitle: [
-          { required: true, message: '必选', trigger: 'change' }
+          { required: true, message: "必选", trigger: "change" }
         ],
         //  email: [
         //   { required: true, message: '必填', trigger: 'blur', type: 'email' }
         // ],
-        phone: [{ validator: valideTel, required: true, trigger: 'blur' }]
+        phone: [{ validator: valideTel, required: true, trigger: "blur" }]
         // degreeId: [
         //   { required: true, message: '必填', trigger: 'blur', type: 'number' }
         // ],
         // phone: [{ required: true, message: '必填', trigger: 'blur' }]
       }
-    }
+    };
   },
   props: {
     v: Object
   },
   methods: {
     handleSubmit() {
-      this.$refs.form.validate((v) => {
+      this.$refs.form.validate(v => {
         if (v) {
-          this.disabled = true
+          if (this.entity.property) {
+            this.entity.property = 2;
+          } else {
+            this.entity.property = "";
+          }
+          this.disabled = true;
           Api.create(this.entity)
-            .then((r) => {
-              this.disabled = false
+            .then(r => {
+              this.disabled = false;
               if (r.success) {
-                this.$Message.success('保存成功')
+                this.$Message.success("保存成功");
                 //账户同步操作start
                 let parms = {
                   userId: r.result.id,
                   loginName: this.entity.phone, //用户电话
-                  status:this.entity.status,//状态
+                  status: this.entity.status, //状态
                   tanantCode: this.$store.state.userInfo.tanantCode //商户号
-                }
-                Api.authAccount(parms).then((res) => {
+                };
+                Api.authAccount(parms).then(res => {
                   if (res.success) {
-                    this.$Message.success('账户同步成功')
+                    this.$Message.success("账户同步成功");
                     //修改用户表的accountId start
                     let parms1 = {
                       userId: parms.userId,
                       accountId: res.result
-                    }
-                    Api.updateAccount(parms1).then((res1) => {
+                    };
+                    Api.updateAccount(parms1).then(res1 => {
                       if (res1.success) {
-                        this.$Message.success('操作成功')
-                         this.$emit('on-ok')
-                      }
-                      else{
-                        this.$Message.error('同步失败')
+                        this.$Message.success("操作成功");
+                        this.$emit("on-ok");
+                      } else {
+                        this.$Message.error("同步失败");
                       }
-                    })
+                    });
                     //修改用户表的accountId end
                   }
-                })
+                });
 
                 //账户同步操作end
               } else {
-                this.$Message.error(r.error.message)
+                this.$Message.error(r.error.message);
               }
             })
-            .catch((err) => {
+            .catch(err => {
               //  alert(JSON.stringify(err))
-              console.warn(err)
-              this.disabled = false
-              this.$Message.error(err.error.message)
-            })
+              console.warn(err);
+              this.disabled = false;
+              this.$Message.error(err.error.message);
+            });
         }
-      })
+      });
     },
     handleClose() {
-      this.$emit('on-close')
+      this.$emit("on-close");
     },
     l(key) {
-      key = 'user' + '.' + key
-      return this.$t(key)
+      key = "user" + "." + key;
+      return this.$t(key);
     },
     setDepartmentTitle(v, item) {
-      this.entity.departmentTitle = item.name
+      this.entity.departmentTitle = item.name;
     },
     selectDepart() {
-      this.showDeptTree = true
+      this.showDeptTree = true;
     },
     getBirthday(value) {
-      this.entity.birthday = value
+      this.entity.birthday = value;
     }
   },
   watch: {
     v() {
-      this.entity = this.$u.clone(this.v)
+      this.entity = this.$u.clone(this.v);
     }
   }
-}
+};
 </script>
 <style lang="less">
 .addUser {