Merge branch 'master' into 'pengxi'

修改部分缺陷

See merge request !1

src/assets/utils/table.js

@@ -128,8 +128,7 @@ function handleTree(data, id, parentId, children, rootId) {
       data.map((item) => {
         return item[parentId];
       })
-    ) ||
-    null;
+    ) ;
   //对源数据深度克隆
   const cloneData = JSON.parse(JSON.stringify(data));
   //循环所有项
@@ -142,7 +141,6 @@ function handleTree(data, id, parentId, children, rootId) {
     //返回第一层
     return father[parentId] === rootId;
   });
-  console.log(treeData);
   return treeData != "" ? treeData : data;
 }
 

src/views/dept/dialogshow.vue

@@ -15,7 +15,6 @@
                 </el-col>
 
                 <Field :span="22" label="部门名称" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入部门名称"/>
-                <Field :span="22" label="部门状态" prop="deptStatus" v-model="form.deptStatus" type="select" :enumData="dict.deptStatus" placeholder="请选择部门状态"/>
                 <Field :span="22" label="顺序" prop="orderNum" v-model="form.orderNum" placeholder="请输入顺序"/>
                 <Field :span="22" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 

src/views/dept/list.vue

 <template>
-  <div class="page">
-    <LayoutTable ref="layoutTable" :data="tableData" :config="tableConfig" />
-    <dialog-show ref="dialogform" @ok="getData" />
+  <div className="page">
+    <LayoutTable ref="layoutTable" :data="tableData" notAdd :config="tableConfig"/>
+    <dialog-show ref="dialogform" @ok="getData"/>
 
   </div>
 </template>
 
 <script>
-import { handleTree } from "@/assets/utils/table";
+import {handleTree} from "@/assets/utils/table";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import table from "@/assets/mixins/table";
 import dialogShow from "./dialogshow";
+
 export default {
   name: "Dept",
   mixins: [table],
-  components: { Treeselect, dialogShow },
+  components: {Treeselect, dialogShow},
   created() {
   },
   methods: {
     afterRender(data) {
-      data.data = handleTree(data.data, "id","parentId");
+      data.data = handleTree(data.data, "id", "parentId");
+      console.log("tree",data.data)
       this.deptOptions = data.data;
-      this.$refs.layoutTable.showType="treetable"
+      this.$refs.layoutTable.showType = "treetable"
     },
 
     handleAdd(row) {
@@ -36,10 +38,10 @@ export default {
     /** 重写编辑方法 */
     toEdit(row) {
       this.loading = true;
-      this.$post(this.pageInfo.exclude, {id : row.id })
+      this.$post(this.pageInfo.exclude, {id: row.id})
           .then((res) => {
             if (res && res.code && res.code == 1) {
-              this.deptOptions = handleTree(res.data.data);
+              this.deptOptions = handleTree(res.data.result);
               this.$refs.dialogform.edit(row, this.deptOptions);
               this.loading = false;
             }
@@ -57,14 +59,16 @@ export default {
     return {
       config: {
         /** 树表是否默认展开 */
-        expand:true,
+        expand: true,
         showType: "treetable",
-        search: [
-        ],
+        search: [],
         columns: [
           {label: "部门名称", prop: "deptName"},
           {label: "部门编码", prop: "deptCode"},
           {label: "顺序", prop: "orderNum"},
+          {label: "部门人数", prop: "personNum"},
+          {label: "绩效分数", prop: "score", formatter: this.formatterMoney},
+
           {
             label: "操作",
             width: 280,
@@ -119,7 +123,7 @@ export default {
   box-shadow: none;
 }
 
-.el-radio-button__orig-radio:checked+.el-radio-button__inner {
+.el-radio-button__orig-radio:checked + .el-radio-button__inner {
   background: rgba(0, 0, 0, 0);
   border: 1px solid #3E7BFA !important;
   color: #3E7BFA;

src/views/staff/drawershow.vue

@@ -14,6 +14,8 @@
         label-width="120px"
         style="width: 100%;"
       >
+
+
         <div class="cell2">
           <div class="history">
             <span>姓名：</span>
@@ -109,6 +111,9 @@
             >
             </el-switch>
           </div>
+        </div>
+
+        <el-row>
 
           <Field
               label="所属部门"
@@ -119,7 +124,8 @@
               placeholder="请选择所属部门"
           />
 
-        </div>
+        </el-row>
+
         <form-buttons
           @submit="submitForm"
           noCancelBtn

vue.config.js

@@ -10,7 +10,9 @@ module.exports = {
 			'/attendance': {
 				//target: 'http://192.168.0.98:11039',
 				//   target: 'http://112.19.80.237:11039',
-				   target: 'http://localhost:17500',
+				//   target: 'http://localhost:17500',
+				//   target: 'http://118.122.189.109:11039',
+				   target: 'http://10.102.252.13:11039',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',