系统用户及缓存管理

components/page/filed.vue

 <template>
   <Col :span="span" class="filed-col">
-    <label v-text="name" class="label"></label>
-    <span>
+    <div class="label">
+      <label v-text="name"></label>
+    </div>
+    <div class="value">
       <slot></slot>
-    </span>
+    </div>
   </Col>
 </template>
 <script>
 export default {
-  name: 'filed',
+  name: "filed",
   props: {
     name: {
       type: String
@@ -18,29 +20,70 @@ export default {
       default: 12
     }
   }
-}
+};
 </script>
 <style lang="less">
 .detail {
   display: table;
+  height: 100%;
   border-collapse: collapse;
+  background: white;
+  .ivu-row {
+    border: 1px solid #ddd;
+    border-top: none;
+    height: 100%;
+    .filed-col {
+      border: 1px solid #ddd;
+      border-right: none;
+      margin: 0 -1px -1px -1px;
+      // box-sizing: border-box;
+      display: flex;
+      flex-direction: row;
+      line-height: 40px;
+      > .label {
+        background: #f7f7f7;
+        flex-grow: 0;
+        width: 120px;
+        text-align: right;
+        padding: 0 8px;
+        border-right: 1px solid #ddd;
+        flex-shrink: 0;
+      }
+      > .value {
+        word-break: break-all;
+        word-wrap: break-word;
+        flex-grow: 1;
+        padding-left: 10px;
+        > div {
+          line-height: 30px;
+        }
+      }
+    }
+  }
+}
+.new-detail {
   .ivu-row {
-    display: table-row;
-    border-top: 1px solid #ddd;
-    border-left: 1px solid #ddd;
+    width: 100% !important;
     .filed-col {
-      display: table-cell;
-      border-bottom: 1px solid #ddd;
-      border-right: 1px solid #ddd;
-      //  margin: 0 0 -1px -1px;
-      line-height: 30px;
       box-sizing: border-box;
-      .label {
-        background: #e8eaf1;
+      line-height: 70px;
+      display: flex;
+      flex-direction: row;
+      > .label {
         display: inline-block;
         width: 100px;
         text-align: right;
-        padding: 0 5px;
+        line-height: 40px;
+        height: 100%;
+        font-weight: bold;
+      }
+      > .value {
+        text-align: left;
+        height: 100%;
+        word-break: break-all;
+        word-wrap: break-word;
+        line-height: 20px;
+        padding-top: 10px;
       }
     }
   }

components/page/opration.vue

@@ -47,7 +47,7 @@ export default {
       detail:"查看",
       edit:"编辑",
       add:"添加",
-      delete:"删除"
+      delete:"删除",
     };
     
     if(oprates[this.oprate]){      
@@ -56,7 +56,7 @@ export default {
     }else if(this.oprate){
       this.css=this.oprate;
     }else if(this.type=='icon'){
-      this.css='icon'
+      this.css='icon';
     }
   },
   methods:{

pages/basicData/cache/add.vue

@@ -3,17 +3,15 @@
     <Row>
       <Col :span="12"
         ><FormItem :label="l('code')" prop="code">
-          <Input v-model="entity.code"> </Input> </FormItem
-      ></Col>
+          <Input v-model="entity.code"> </Input> </FormItem></Col>
       <Col :span="12"
         ><FormItem :label="l('name')" prop="name">
-          <Input v-model="entity.name"> </Input> </FormItem
-      ></Col>
+          <Input v-model="entity.name"> </Input> </FormItem></Col>
 
       <Col :span="12"
         ><FormItem :label="l('duration')" prop="duration">
-          <InputNumber v-model="entity.duration"></InputNumber> </FormItem
-      ></Col>
+          <InputNumber v-model="entity.duration" ></InputNumber> </FormItem>
+          </Col>
       <Col :span="12"
         ><FormItem :label="l('strategy')" prop="strategy">
           <Dictionary
@@ -63,7 +61,7 @@ export default {
         code: "",
         name: "",
         describe: "",
-        duration: null,
+        duration: 0,
         strategy: 0,
         type: 0,
         state: 0,
@@ -71,7 +69,7 @@ export default {
       rules: {
         code: [{ required: true, message: "必填", trigger: "blur" }],
         name: [{ required: true, message: "必填", trigger: "blur" }],
-        duration: [{ required: true, message: "必填", trigger: "blur" }],
+        duration: [{ required: true, message: "必填", trigger: "blur",type:"number" }],
       },
     };
   },

pages/basicData/cache/detail.vue

@@ -33,10 +33,11 @@
         <State code="mes.cache_config.State" :value="entity.state" />
       </Filed>
       <Filed :span="24" :name="l('size')">
-          {{ entity.size }}
-        <Button type="primary" v-if="entity.size > 0">清理缓存</Button>
+        {{ entity.size }}
+        <Button type="error" v-if="entity.size > 0" @click="clears(entity.id)"
+          >清理缓存</Button
+        >
       </Filed>
-
       <Filed :span="24" :name="l('describe')">{{ entity.describe }}</Filed>
     </Row>
   </div>
@@ -76,6 +77,19 @@ export default {
       key = "cache_config" + "." + key;
       return this.$t(key);
     },
+    clears(id) {
+      this.$Modal.confirm({
+        title: "确认",
+        content: "确认要清理缓存吗？",
+        onOk: () => {
+          Api.clears(id).then((r) => {
+            if (r.success) {
+              this.$Message.success("缓存已清除");
+            }
+          });
+        },
+      });
+    },
   },
   watch: {
     eid(v) {

pages/basicData/cache/edit.vue

@@ -63,7 +63,7 @@ export default {
       rules: {
         code: [{ required: true, message: "必填", trigger: "blur" }],
         name: [{ required: true, message: "必填", trigger: "blur" }],
-        duration: [{ required: true, message: "必填", trigger: "blur" }],
+        duration: [{ required: true, message: "必填", trigger: "blur",type:"number" }],
       },
     };
   },

pages/basicData/cache/index.vue

@@ -23,9 +23,7 @@
       </template>
       <template slot="batch">
         <Button type="primary" @click="allClear">批量清理</Button>
-      </template>
-      <template slot="batch">
-        <Button type="primary" @click="inSure">确定</Button>
+        <Button type="error" @click="inSure">批量删除</Button>
       </template>
       <template slot="buttons">
         <Button type="primary" @click="add">新增</Button>
@@ -71,6 +69,7 @@ export default {
         },
         {
           key: "selection",
+          title: "多选",
           width: 60,
           align: "center",
           type: "selection",
@@ -81,26 +80,31 @@ export default {
           align: "left",
           easy: true,
           high: true,
-           render: (h, params) => {
-                        return h("div", {
-                            class: "action"
-                        }, [
-                            h(
-                                "op", {
-                                    attrs: {
-                                        oprate: "detail"
-                                    },
-                                    on: {
-                                        click: () => this.view(params.row.id)
-                                    },
-                                },
-                                params.row.name
-                            ),
-                        ]);
-                    },
+          render: (h, params) => {
+            return h(
+              "op",
+              {
+                attrs: {
+                  oprate: "detail",
+                },
+                on: {
+                  click: () => this.view(params.row.id),
+                },
+              },
+              params.row.name
+            );
+          },
         },
-        
+       
         {
+          key: "state",
+          title: this.l("state"),
+          align: "left",
+          high: true,
+          code: "mes.cache_config.State",
+        },
+         { key: "code", title: this.l("code"), align: "left", high: true },
+         {
           key: "creatorUserId",
           title: this.l("creatorUserId"),
           align: "left",
@@ -136,7 +140,7 @@ export default {
         //   align: "left",
         //   high: true,
         // },
-        { key: "code", title: this.l("code"), align: "left", high: true },
+       
 
         {
           key: "duration",
@@ -151,20 +155,15 @@ export default {
           high: true,
           code: "mes.cache_config.Strategy",
         },
-        {
+       
+  {
           key: "type",
           title: this.l("type"),
           align: "left",
           high: true,
           code: "mes.cache_config.Type",
         },
-        {
-          key: "state",
-          title: this.l("state"),
-          align: "left",
-          high: true,
-          code: "mes.cache_config.State",
-        },
+       
         {
           key: "creationTime",
           title: this.l("creationTime"),
@@ -175,7 +174,7 @@ export default {
           title: "操作",
           key: "action",
           width: 170,
-          align: "center",
+          align: "right",
           render: (h, params) => {
             return h("div", { class: "action" }, [
               h(
@@ -198,7 +197,7 @@ export default {
               h(
                 "op",
                 {
-                  attrs: { oprate: "clears" },
+                  attrs: { oprate: "delete", msg: "确认要清理缓存吗？" },
                   on: { click: () => this.clears(params.row.id) },
                 },
                 "清理"
@@ -310,21 +309,33 @@ export default {
       this.results = statueArry;
     },
     inSure() {
-      Api.deletes(this.results).then((r) => {
-        if (r.success) {
-          this.$refs.grid.load();
-          this.$refs.grid.selectAll(false);
-          this.$Message.success("删除成功");
-        }
+      this.$Modal.confirm({
+        title: "确认",
+        content: "是否确认批量删除？",
+        onOk: () => {
+          Api.deletes(this.results).then((r) => {
+            if (r.success) {
+              this.$refs.grid.load();
+              this.$refs.grid.selectAll(false);
+              this.$Message.success("删除成功");
+            }
+          });
+        },
       });
     },
     allClear() {
-      Api.allClears(this.results).then((r) => {
-        if (r.success) {
-          this.$refs.grid.load();
-          this.$refs.grid.selectAll(false);
-          this.$Message.success("缓存已清除");
-        }
+      this.$Modal.confirm({
+        title: "确认",
+        content: "是否确认批量清除数据？",
+        onOk: () => {
+          Api.allClears(this.results).then((r) => {
+            if (r.success) {
+              this.$refs.grid.load();
+              this.$refs.grid.selectAll(false);
+              this.$Message.success("缓存已清除");
+            }
+          });
+        },
       });
     },
   },

pages/basicData/systemUser/add.vue

+<template>
+<div class="addUser">
+    <Form ref="form" :model="entity" :rules="rules" :label-width="100">
+        <Row class="rowTitle100">
+            <Col :span="12">
+            <FormItem :label="l('userName')" prop="userName">
+                <Input v-model="entity.userName"></Input>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('cardNo')" prop="cardNo">
+                <Input v-model="entity.cardNo"></Input>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('status')" prop="status">
+                <Dictionary code="User.base.status" v-model="entity.status" type="radio"></Dictionary>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('gender')" prop="gender">
+                <Dictionary code="User.base.gender" v-model="entity.gender" type="radio"></Dictionary>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('birthday')" prop="birthday">
+                <DatePicker type="date" v-model="entity.birthday" placeholder="请选择"></DatePicker>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('degreeId')" prop="degreeId">
+                <Dictionary code="User.base.degree" v-model="entity.degreeId"></Dictionary>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('departmentTitle')" prop="departmentTitle">
+                <DepartmentSelect v-model="entity.departmentId" @on-change="setDepartmentTitle" />
+            </FormItem>
+            </Col>
+
+            <Col :span="12">
+            <FormItem :label="l('phone')" prop="phone">
+                <Input v-model="entity.phone" />
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('email')">
+                <Input v-model="entity.email" />
+            </FormItem>
+            </Col>
+            <!-- <Col :span="12">
+          <FormItem :label="l('enableEquip')" prop="enableEquip">
+            <Input v-model="entity.enableEquip"></Input>
+          </FormItem>
+        </Col>-->
+            <Col :span="12">
+            <FormItem :label="l('positionId')" prop="positionId">
+                <Dictionary code="User.base.position" v-model="entity.positionId"></Dictionary>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('titleId')" prop="titleId">
+                <Dictionary code="User.base.jobtitle" v-model="entity.titleId"></Dictionary>
+            </FormItem>
+            </Col>
+            <Col :span="12">
+            <FormItem :label="l('licensedToWork')" prop="licensedToWork">
+                <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>
+            </FormItem>
+            </Col>
+        </Row>
+        <FormItem>
+            <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
+            <Button @click="handleClose" class="ml20">取消</Button>
+        </FormItem>
+    </Form>
+</div>
+</template>
+
+    
+<script>
+import Api from "./api";
+import util from '@/libs/util';
+const valideTel = (rule, value, callback) => {
+    var re = /^1[3-9]{1}[0-9]{9}/;
+    if (value === "" || value === null) {
+        callback(new Error("请输入手机号"));
+    } else if (!re.test(value)) {
+        callback(new Error("请输入正确手机号"));
+    } else {
+        callback();
+    }
+};
+export default {
+    name: "Add",
+    components: {},
+    data() {
+        const validateCarNo = (rule, value, callback) => {
+            if (!value) {
+                return callback(new Error("员工编号不能为空"));
+            }
+            Api.list(value).then(r => {
+                if (r.result.length > 0) {
+                    return callback(new Error("员工编号已经存在"));
+                } else {
+                    callback();
+                }
+            });
+        };
+        return {
+            disabled: false,
+            showDeptTree: false,
+            entity: {
+                gender: 1,
+                status: 1,
+                property: false,
+                userType:2
+            },
+            rules: {
+                userName: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }],
+                cardNo: [{
+                        required: true,
+                        message: "必填",
+                        trigger: "blur"
+                    },
+                    {
+                        validator: validateCarNo,
+                        trigger: "blur"
+                    }
+                ],
+                departmentTitle: [{
+                    required: true,
+                    message: "必选",
+                    trigger: "change"
+                }],
+                //  email: [
+                //   { required: true, message: '必填', trigger: 'blur', type: 'email' }
+                // ],
+                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 => {
+                if (v) {
+                    if (this.entity.property) {
+                        this.entity.property = 2;
+                    } else {
+                        this.entity.property = "";
+                    }
+                    this.disabled = true;
+                    Api.create(this.entity)
+                        .then(r => {
+                            this.disabled = false;
+                            if (r.success) {
+                                this.$Message.success("保存成功");
+                                //账户同步操作start
+                                let parms = {
+                                    userId: r.result.id,
+                                    loginName: this.entity.phone, //用户电话
+                                    status: this.entity.status, //状态
+                                    // tenantCode: this.$store.state.userInfo.tenantCode, //商户号
+                                    tenantCode: util.cookies.get('tenantCode'), //商户号
+                                    name: this.entity.userName
+                                };
+                                Api.authAccount(parms).then(res => {
+                                    if (res.success) {
+                                        this.$Message.success("账户同步成功");
+                                        //修改用户表的accountId start
+                                        let parms1 = {
+                                            userId: parms.userId,
+                                            accountId: res.result
+                                        };
+                                        Api.updateAccount(parms1).then(res1 => {
+                                            if (res1.success) {
+                                                this.$Message.success("操作成功");
+                                                this.$emit("on-ok");
+                                            } else {
+                                                this.$Message.error("同步失败");
+                                            }
+                                        });
+                                        //修改用户表的accountId end
+                                    }
+                                });
+
+                                //账户同步操作end
+                            } else {
+                                this.$Message.error(r.error.message);
+                            }
+                        })
+                        .catch(err => {
+                            //  alert(JSON.stringify(err))
+                            console.warn(err);
+                            this.disabled = false;
+                            this.$Message.error(err.error.message);
+                        });
+                }
+            });
+        },
+        handleClose() {
+            this.$emit("on-close");
+        },
+        l(key) {
+            key = "user" + "." + key;
+            return this.$t(key);
+        },
+        setDepartmentTitle(v, item) {
+            this.entity.departmentTitle = item.name;
+        },
+        selectDepart() {
+            this.showDeptTree = true;
+        },
+        getBirthday(value) {
+            this.entity.birthday = value;
+        }
+    },
+    watch: {
+        v() {
+            this.entity = this.$u.clone(this.v);
+        }
+    }
+};
+</script>
+
+<style lang="less">
+.addUser {
+    .ivu-radio-wrapper {
+        vertical-align: top;
+    }
+}
+</style>

pages/basicData/systemUser/api.js

+import Api from '@/plugins/request'
+export default {
+    index: `${systemUrl}/user/paged`,
+    paged(params) {
+        return Api.post(`${systemUrl}/user/paged`, params);
+    },
+    list(cardNo) {
+        var params={
+            "conditions": [
+              {
+                "fieldName": "cardNo",
+                "fieldValue": cardNo,
+                "conditionalType": "Equal"
+              }
+            ],
+            "pageSize": 3
+          }
+        return Api.post(`${systemUrl}/user/list`, params);
+    },
+    get(params) {
+        return Api.get(`${systemUrl}/user/get`, params);
+    },
+    create(params) {
+        return Api.post(`${systemUrl}/user/create`, params);
+    },
+    update(params) {
+        return Api.post(`${systemUrl}/user/update`, params);
+    },
+    //在10010上更新用户信息//新增、修改、删除、修改密码
+    authAccount(params) {
+        return Api.post(`${Platform}/account/sync`, params);//168
+       // return Api.post(`${Platform}/api/services/app/useraccount/sync`, params);
+    },
+    //10010重置密码
+    authResetpassword(params) {
+        return Api.post(`${UserUrl}/api/services/app/account/resetpassword`, params);
+    },
+    //10010修改密码
+    authChangepassword(params) {
+        return Api.post(`${authUrl}/api/services/app/useraccount/changepassword`, params);
+    },
+    //在10020上更新用户AccountId信息
+    updateAccount(params) {
+        return Api.post(`${systemUrl}/user/updateaccountid`, params);
+    },
+    //删除：
+    delete(params) {
+        return Api.delete(`${systemUrl}/user/delete`, {
+            params: params
+        });
+    },
+    //重置密码
+    accountreset(params) {
+        return Api.post(`${systemUrl}/user/accountreset`, params);
+    },
+     //批量导入用户
+     userImport(params) {
+        return Api.post(`${systemUrl}/userimportservice/import`, params);
+    },
+    
+}
\ No newline at end of file

pages/basicData/systemUser/detail.vue

+<template>
+  <div class="addUser">
+    <Form ref="form" :model="entity" :label-width="90">
+      <Row class="row_border_bottom">
+        <Col :span="8">
+          <!-- <FormItem :label="l('userName')" prop="userName">{{entity.userName}}</FormItem> -->
+          <b>{{l('userName')}}</b>
+          <p>{{entity.userName}}</p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('cardNo')" prop="cardNo">{{entity.cardNo}}</FormItem> -->
+          <b>{{l('cardNo')}}</b>
+          <p>{{entity.cardNo}}</p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('gender')" prop="gender">
+            <state code="User.base.gender" :value="entity.gender" type="text"></state>
+          </FormItem> -->
+          <b>{{l('gender')}}</b>
+          <p><state code="User.base.gender" :value="entity.gender" type="text"></state></p>
+        </Col>
+      </Row>
+      <Row class="row_border_bottom">
+        <Col :span="8">
+          <!-- <FormItem :label="l('birthday')" prop="birthday">{{entity.birthday}}</FormItem> -->
+          <b>{{l('birthday')}}</b>
+          <p>{{entity.birthday}}</p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('degreeId')" prop="degreeId">
+            <state code="User.base.degree" :value="entity.degreeId" type="text"></state>
+          </FormItem> -->
+          <b>{{l('degreeId')}}</b>
+          <p><state code="User.base.degree" :value="entity.degreeId" type="text"></state></p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('departmentTitle')" prop="departmentTitle">{{entity.departmentTitle}}</FormItem> -->
+          <b>{{l('departmentTitle')}}</b>
+          <p>{{entity.departmentTitle}}</p>
+        </Col>
+      </Row>
+      <Row class="row_border_bottom">
+        <Col :span="8">
+          <!-- <FormItem :label="l('status')" prop="status">
+            <state code="User.base.status" :value="entity.status" type="text"></state>
+          </FormItem> -->
+          <b>{{l('status')}}</b>
+          <p><state code="User.base.status" :value="entity.status" type="text"></state></p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('phone')" prop="phone">{{entity.phone}}</FormItem> -->
+          <b>{{l('phone')}}</b>
+          <p>{{entity.phone}}</p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('email')" prop="email">{{entity.email}}</FormItem> -->
+          <b>{{l('email')}}</b>
+          <p>{{entity.email}}</p>
+        </Col>
+        <!-- <Col :span="12">
+          <FormItem :label="l('enableEquip')" prop="enableEquip">{{entity.enableEquip}}</FormItem>
+        </Col> -->
+      </Row>
+      <Row class="row_border_bottom">
+        <Col :span="8">
+          <!-- <FormItem :label="l('positionId')" prop="positionId">
+            <state code="User.base.position" :value="entity.positionId" type="text"></state>
+          </FormItem> -->
+          <b>{{l('positionId')}}</b>
+          <p><state code="User.base.position" :value="entity.positionId" type="text"></state></p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('titleId')" prop="titleId">
+            <state code="User.base.jobtitle" :value="entity.titleId" type="text"></state>
+          </FormItem> -->
+          <b>{{l('titleId')}}</b>
+          <p><state code="User.base.titleId" :value="entity.titleId" type="text"></state></p>
+        </Col>
+        <Col :span="8">
+          <!-- <FormItem :label="l('licensedToWork')" prop="licensedToWork">
+            <state code="User.base.workLicense" :value="entity.licensedToWork" type="text"></state>
+          </FormItem> -->
+          <b>{{l('workLicense')}}</b>
+          <p><state code="User.base.workLicense" :value="entity.workLicense" type="text"></state></p>
+        </Col>
+      </Row>
+      <Row class="row_border_bottom">
+        <Col :span="24">
+          <!-- <FormItem :label="l('remark')" prop="remark">{{entity.remark}}</FormItem> -->
+          <b>{{l('remark')}}</b>
+          <p>{{entity.remark}}</p>
+        </Col>
+      </Row>
+    </Form>
+  </div>
+</template>
+<script>
+import Api from './api'
+export default {
+  name: 'Add',
+  data() {
+    return {
+      entity: {}
+    }
+  },
+  props: {
+    eid: Number
+  },
+  methods: {
+    load(v) {
+      Api.get({ id: v }).then((r) => {
+        this.entity = r.result
+        this.$emit('on-load')
+      })
+    },
+    handleClose() {
+      this.$emit('on-close')
+    },
+    l(key) {
+      key = 'user' + '.' + key
+      return this.$t(key)
+    }
+  },
+  watch: {
+    eid(v) {
+      if (v != 0) {
+        this.load(v)
+      }
+    }
+  }
+}
+</script>
+<style lang="less">
+.addUser {
+  .ivu-radio-wrapper {
+    vertical-align: top;
+  }
+}
+</style>

pages/basicData/systemUser/search.vue

+<template>
+  <div class="addUser">
+    <Form ref="form" :model="condition" :label-width="100">
+      <Row class="rowTitle100">
+        <Col :span="12" v-if="condition.id.show">
+          <FormItem :label="l('id')" prop="id">
+            <Input v-model="condition.id.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.userName.show">
+          <FormItem :label="l('userName')" prop="userName">
+            <Input v-model="condition.userName.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.cardTypeId.show">
+          <FormItem :label="l('cardTypeId')" prop="cardTypeId">
+            <Input v-model="condition.cardTypeId.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.cardNo.show">
+          <FormItem :label="l('cardNo')" prop="cardNo">
+            <Input v-model="condition.cardNo.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.status.show">
+          <FormItem :label="l('status')" prop="status">
+            <Dictionary code="User.base.status" v-model="condition.status.value" type="radio"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.gender.show">
+          <FormItem :label="l('gender')" prop="gender">
+            <Dictionary code="User.base.gender" v-model="condition.gender.value" type="radio"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.birthday.show">
+          <FormItem :label="l('birthday')" prop="birthday">
+            <DTSearch v-model="condition.birthday.value" @on-change="setTime" :showFast="false" type="date"></DTSearch>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.departmentTitle.show">
+          <FormItem :label="l('departmentTitle')" prop="departmentTitle">
+            <DepartmentSelect
+              v-model="condition.departmentId.value"
+              @on-change="setDepartmentTitle"
+            />
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.national.show">
+          <FormItem :label="l('national')" prop="national">
+            <Input v-model="condition.national.value"></Input>
+          </FormItem>
+        </Col>
+
+        <Col :span="12" v-if="condition.creatorUserId.show">
+          <FormItem :label="l('creatorUserId')" prop="creatorUserId">
+            <Input v-model="condition.creatorUserId.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.creationTime.show">
+          <FormItem :label="l('creationTime')" prop="creationTime">
+            <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.lastModifierUserId.show">
+          <FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
+            <Input v-model="condition.lastModifierUserId.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.lastModificationTime.show">
+          <FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
+            <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.accountId.show">
+          <FormItem :label="l('accountId')" prop="accountId">
+            <Input v-model="condition.accountId.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.isDeleted.show">
+          <FormItem :label="l('isDeleted')" prop="isDeleted">
+            <Dictionary v-model="condition.isDeleted.value"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.userType.show">
+          <FormItem :label="l('userType')" prop="userType">
+            <Input v-model="condition.userType.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.phone.show">
+          <FormItem :label="l('phone')" prop="phone">
+            <Input v-model="condition.phone.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.email.show">
+          <FormItem :label="l('email')" prop="email">
+            <Input v-model="condition.email.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.degreeId.show">
+          <FormItem :label="l('degreeId')" prop="degreeId">
+            <Dictionary code="User.base.degree" v-model="condition.degreeId.value"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.avatarUrl.show">
+          <FormItem :label="l('avatarUrl')" prop="avatarUrl">
+            <Input v-model="condition.avatarUrl.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.enableEquip.show">
+          <FormItem :label="l('enableEquip')" prop="enableEquip">
+            <Input v-model="condition.enableEquip.value"></Input>
+          </FormItem>
+        </Col>
+
+        <Col :span="12" v-if="condition.positionId.show">
+          <FormItem :label="l('positionId')" prop="positionId">
+            <Dictionary code="User.base.position" v-model="condition.positionId.value"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.titleId.show">
+          <FormItem :label="l('titleId')" prop="titleId">
+            <Dictionary code="User.base.jobtitle" v-model="condition.titleId.value"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.licensedToWork.show">
+          <FormItem :label="l('licensedToWork')" prop="licensedToWork">
+            <Dictionary code="User.base.workLicense" v-model="condition.licensedToWork.value"></Dictionary>
+          </FormItem>
+        </Col>
+        <Col :span="12" v-if="condition.jobNo.show">
+          <FormItem :label="l('jobNo')" prop="jobNo">
+            <Input v-model="condition.jobNo.value"></Input>
+          </FormItem>
+        </Col>
+        <Col :span="24" v-if="condition.remark.show">
+          <FormItem :label="l('remark')" prop="remark">
+            <Input v-model="condition.remark.value"></Input>
+          </FormItem>
+        </Col>
+
+        <Col :span="12" v-if="condition.roleTitles.show">
+          <FormItem :label="l('roleTitles')" prop="roleTitles">
+            <Input v-model="condition.roleTitles.value"></Input>
+          </FormItem>
+        </Col>
+      </Row>
+    </Form>
+  </div>
+</template>
+<script>
+import Api from './api'
+export default {
+  name: 'Search',
+  data() {
+    return {
+      showDeptTree: false,
+      values: ['2001-01-01', '2015-12-05'],
+      condition: {
+        id: { op: 'Equal', value: null, show: false },
+        userName: { op: 'Equal', value: null, show: true },
+        cardTypeId: { op: 'Equal', value: null, show: false },
+        cardNo: { op: 'Equal', value: null, show: true },
+        gender: { op: 'Equal', value: null, show: true },
+        birthday: { op: 'Range', value: null, show: true },
+        degreeId: { op: 'Equal', value: null, show: true },
+        departmentId: { op: 'Equal', value: null, show: false },
+        national: { op: 'Equal', value: null, show: false },
+        status: { op: 'Equal', value: null, show: true },
+        creatorUserId: { op: 'Equal', value: null, show: false },
+        creationTime: { op: 'Range', value: null, show: false },
+        lastModifierUserId: { op: 'Equal', value: null, show: false },
+        lastModificationTime: { op: 'Range', value: null, show: false },
+        accountId: { op: 'Equal', value: null, show: false },
+        isDeleted: { op: 'Equal', value: null, show: false },
+        userType: { op: 'Equal', value:'2', show: false },
+        phone: { op: 'Equal', value: null, show: true },
+        email: { op: 'Equal', value: null, show: true },
+        avatarUrl: { op: 'Equal', value: null, show: false },
+        enableEquip: { op: 'Equal', value: null, show: false },
+        licensedToWork: { op: 'Equal', value: null, show: true },
+        positionId: { op: 'Equal', value: null, show: true },
+        titleId: { op: 'Equal', value: null, show: true },
+        jobNo: { op: 'Equal', value: null, show: false },
+        remark: { op: 'Equal', value: null, show: false },
+        departmentTitle: { op: 'Equal', value: null, show: true },
+        departmentId: { op: 'Equal', value: null, show: false },
+        roleTitles: { op: 'Equal', value: null, show: true }
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit('on-close')
+    },
+    l(key) {
+      key = 'user' + '.' + key
+      return this.$t(key)
+    },
+    setDepartmentTitle(v, item) {
+      this.condition.departmentTitle.value = item.name
+    },
+    setTime(v) {
+      this.condition.birthday.value = v
+    },
+  },
+  watch: {}
+}
+</script>
+<style lang="less">
+.addUser {
+  .ivu-radio-wrapper {
+    vertical-align: top;
+  }
+}
+</style>
+

pages/basicData/user/add.vue

@@ -123,7 +123,8 @@ export default {
             entity: {
                 gender: 1,
                 status: 1,
-                property: false
+                property: false,
+                userType:0
             },
             rules: {
                 userName: [{

pages/basicData/user/index.vue

@@ -115,6 +115,10 @@ export default {
                     op: "In",
                     value: ""
                 },
+                 userType: {
+                    op: "Equal",
+                    value: "0"
+                },
             },
             treeData: [],
             tdHeight: "",

pages/basicData/user/search.vue

@@ -172,7 +172,7 @@ export default {
         lastModificationTime: { op: 'Range', value: null, show: false },
         accountId: { op: 'Equal', value: null, show: false },
         isDeleted: { op: 'Equal', value: null, show: false },
-        userType: { op: 'Equal', value: null, show: false },
+        userType: { op: 'Equal', value:'0', show: false },
         phone: { op: 'Equal', value: null, show: true },
         email: { op: 'Equal', value: null, show: true },
         avatarUrl: { op: 'Equal', value: null, show: false },