Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue

@@ -367,7 +367,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue

@@ -407,7 +407,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue

@@ -193,7 +193,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }

attendance-performance-manager-ui/admin/src/views/workman/dialogshow.vue

@@ -3,37 +3,68 @@
   <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
-                <Field label="姓名" prop="name" v-model="form.name" placeholder="请输入姓名" :maxLength="20"/>
-                <Field label="电话号码" prop="phone" v-model="form.phone" placeholder="请输入电话号码" :maxLength="11"/>
-                <Field label="工号" prop="number" v-model="form.number" placeholder="请输入工号" :maxLength="15"/> 
+        <Field
+          label="姓名"
+          prop="name"
+          v-model="form.name"
+          placeholder="请输入姓名"
+          :maxLength="20"
+        />
+        <Field
+          label="电话号码"
+          prop="phone"
+          v-model="form.phone"
+          placeholder="请输入电话号码"
+          :maxLength="11"
+        />
+        <Field
+          label="工号"
+          prop="number"
+          v-model="form.number"
+          placeholder="请输入工号"
+          :maxLength="15"
+        />
       </el-row>
 
       <el-form-item label="所属部门" prop="deptId">
-                <el-cascader v-model="deptList" style="width:50%" @change="cascaderChange" :options="dict.deptId" clearable
-                :props="{label:'label',value:'id'}">
+        <el-cascader
+          v-model="deptList"
+          style="width:50%"
+          @change="cascaderChange"
+          :options="dict.deptId"
+          clearable
+          :props="{ label: 'label', value: 'id' }"
+        >
         </el-cascader>
       </el-form-item>
 
       <el-form-item label="照片" prop="photoPath">
-                <ImageUpload :value="form.photoPath" 
-                @input="replaceImage"></ImageUpload>
+        <ImageUpload
+          :value="form.photoPath"
+          @input="replaceImage"
+        ></ImageUpload>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-            <el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button>
+      <el-button
+        type="primary"
+        v-if="pageInfo.type !== 'view'"
+        @click="submitForm"
+        >确 定</el-button
+      >
       <el-button @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-    import form from "@/assets/mixins/formdialog";
-    import dialogShow from "./dialogshow";
-    import {findParentIds} from "@/assets/utils/common.js"
-    export default {
+import form from "@/assets/mixins/formdialog";
+import dialogShow from "./dialogshow";
+import { findParentIds } from "@/assets/utils/common.js";
+export default {
   mixins: [form],
   components: {
-            dialogShow ,
+    dialogShow,
   },
   data() {
     return {
@@ -43,93 +74,94 @@
       title: "工作人员",
       // 是否显示弹出层
       open: false,
-                toString:[
-                ],
+      toString: [],
       // 表单校验
       rules: {
         name: [
-                        {required: true,message: "请输入姓名", trigger: "blur" },
-                        {max: 20,message: "最多只能录入20个字符",trigger: "blur",},
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 20, message: "最多只能录入20个字符", trigger: "blur" },
         ],
         phone: [
-                        {required: true,message: "请输入电话号码", trigger: "blur" },
-                        {max: 11,message: "最多只能录入个字符",trigger: "blur",},
-                    ]
+          { required: true, message: "请输入电话号码", trigger: "blur" },
+          { max: 11, message: "最多只能录入个字符", trigger: "blur" },
+        ],
       },
-                deptList:[]
-            }
+      deptList: [],
+    };
   },
   methods: {
     // formSelect(){
     //     let treeId = getTreeIds(this.dict.deptId,this.form.deptId)
     // },
-            cascaderChange(val){
-                if(this.deptList.length > 0){
-                    this.form.deptId = this.deptList[this.deptList.length - 1]
-                }else{
-                    this.form.deptId = ''
+    cascaderChange(val) {
+      if (this.deptList.length > 0) {
+        this.form.deptId = this.deptList[this.deptList.length - 1];
+      } else {
+        this.form.deptId = "";
       }
-                console.log(this.form.deptId,'当前选择')
+      console.log(this.form.deptId, "当前选择");
     },
-            replaceImage(val){
-                this.form.photoPath = val
+    replaceImage(val) {
+      this.form.photoPath = val;
     },
     /** 编辑 */
     edit(row) {
-                this.reset()
+      this.reset();
       this.query = { id: row.id };
-                this.urls.currUrl ="workman/edit";
+      this.urls.currUrl = "workman/edit";
       this.getData();
-                this.pageInfo.type="edit"
+      this.pageInfo.type = "edit";
       this.title = "编辑";
     },
     /** 新增 */
     add(row) {
-                this.reset()
+      this.reset();
       this.urls.currUrl = "workman/add";
       this.getData();
-                this.pageInfo.type="add"
+      this.pageInfo.type = "add";
       this.title = "新增";
-
     },
     /** 查看*/
     view(row) {
-                this.reset()
+      this.reset();
       this.query = { id: row.id };
-                this.urls.currUrl ="workman/view";
+      this.urls.currUrl = "workman/view";
       this.getData();
-                this.pageInfo.type="view"
+      this.pageInfo.type = "view";
       this.title = "工作人员详细";
     },
     /**取消按钮 */
     cancel() {
       this.open = false;
-                this.deptList = []
+      this.deptList = [];
     },
 
     /**获取数据后弹框 */
     afterRender(data) {
       this.open = true;
-                this.deptList = findParentIds(this.dict.deptId,this.form.deptId).reverse()
-                this.deptList = this.deptList.concat(this.form.deptId)
-                console.log(this.deptList,'ddd')
+      this.deptList = findParentIds(
+        this.dict.deptId,
+        this.form.deptId
+      ).reverse();
+      this.deptList = this.deptList.concat(this.form.deptId);
+      console.log(this.deptList, "ddd");
     },
 
     afterSubmit(data) {
       this.open = false;
-                this.reset()
-                this.deptList = []
+      this.reset();
+      this.deptList = [];
       this.$emit("ok");
     },
 
     // 表单重置
     reset() {
       this.form = {
-                    deptId : 0,
-                    name : "",
-                    number : "",
-                    phone : "",
-                    photoPath : "",
+        deptId: 0,
+        name: "",
+        number: "",
+        phone: "",
+        photoPath: "",
       };
       this.resetForm("form");
     },
@@ -137,9 +169,9 @@
       if (this.$refs[refName]) {
         this.$refs[refName].resetFields();
       }
-            }
-        }
-    }
+    },
+  },
+};
 </script>
 <style scoped>
 .avatar-uploader .el-upload {
@@ -150,7 +182,7 @@
   overflow: hidden;
 }
 .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
+  border-color: #409eff;
 }
 .avatar-uploader-icon {
   font-size: 28px;