Просмотр исходного кода

团队长管理增加来源,机构增加部门数量

@dongkboy 2 лет назад
Родитель
Сommit
e0d159c732

+ 2 - 2
config/dev.env.js

@@ -9,9 +9,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

+ 13 - 3
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -471,7 +471,7 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:2 //树分类过滤参数
 })
@@ -481,7 +481,7 @@ export default {
     tree,
     KtCommonTable,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1",
@@ -557,6 +557,12 @@ export default {
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "managementSource",
+          label: "来源",
+          minWidth: 80,
+          formatter: this.managementSourceFormatter
+        },
         {
           prop: "status",
           label: "状态",
@@ -575,6 +581,10 @@ export default {
   created() {
   },
   methods: {
+    managementSourceFormatter(row){
+      const managementSource=row.managementSource=='2'?"个代":"渠道"
+      return managementSource;
+    },
     //状态改变时
     statusChange(e) {
       if (e == 0) {
@@ -770,7 +780,7 @@ export default {
         this.$message.info("请选择第六级机构");
         return;
       }
-      
+
       // let deptId=''
       // if(this.formData.deptId){
       //    deptId = this.formData.deptId.at(-1);

+ 2 - 3
src/views/Sys/Deptall.vue

@@ -81,6 +81,8 @@
         >
           <el-table-column prop="name" label="部门管理" width="300">
           </el-table-column>
+          <el-table-column prop="deptCount" label="部门数量" width="80" align="center">
+          </el-table-column>
           <el-table-column prop="id" label="ID" width="150" align="center">
           </el-table-column>
           <el-table-column
@@ -924,7 +926,6 @@ export default {
       if (this.dataForm.comlevel === "5") {
         //第5级是门店,去服务器获取最大编号
         this.$api.dept.findMaxHouseId(this.currentTreeNode.id).then((res) => {
-          console.log(res);
           let newId = parseInt(res.data) + 1;
           if (newId < 10) {
             newId = "0" + newId;
@@ -944,7 +945,6 @@ export default {
           type: "info",
         });
       }
-      console.log(this.currentTreeNode.id);
       if (this.currentTreeNode.id.indexOf("D") >= 0) {
         return this.$message({
           message: "部门下无法增设部门",
@@ -956,7 +956,6 @@ export default {
       this.deptDataForm.deptType = "D"; //类型是机构(C是机构,D是部门)
       this.deptDataForm.parentId = this.currentTreeNode.id;
       this.$api.dept.findMaxDeptId(this.currentTreeNode.id).then((res) => {
-        console.log(res);
         let newId = parseInt(res.data) + 1;
         if (newId < 10) {
           newId = "0" + newId;