Merge branch 'bjxz-dev' into 'bjxz-dhp'

# Conflicts:
#   src/store/index.js

src/assets/js/api/laborPerson.js

@@ -3,6 +3,7 @@
  */
 import {post, get, put} from '../http'
 // 劳务管理 ------ 人员管理
+export const getProjectChilderSystemUserListApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data);   //查询项目子系统用户
 export const getEnterpriseInfoList = data => post('xmgl/enterpriseInfo/list', data);   //劳务公司列表
 export const getEnterpriseTypeList = data => get('xmgl/enterpriseType/list', data);   //新增企业 -- 企业类型下拉
 export const setEnterpriseInfo = data => post('xmgl/enterpriseInfo/add', data);   //新增企业 -- 确认 新增 企业

src/assets/js/http.js

@@ -84,9 +84,9 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
-  // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
+  axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
   // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目

src/store/index.js

@@ -48,22 +48,22 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
-    WORKFLOWURL: 'http://192.168.34.126:88/#/workspace/forms',//测试工作流地址(本地)
+    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    // BASEURL: baseUrl
+    BASEURL: baseUrl
-    //   ? baseUrl
+      ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
+    UPLOADURL:
-    //   window.location.protocol +
+      window.location.protocol +
-    //   "//" +
+      "//" +
-    //   window.location.host +
+      window.location.host +
-    //   "/upload/image", //正式环境
+      "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
-    // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
+    WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
     // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
     // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址
     // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址

src/views/projectFront/configManage/groupStructureManagement.vue

@@ -167,11 +167,22 @@
             </el-form-item>
           </div>
           <div class="row-flex">
+            <!-- <el-form-item label="负责人" prop="leader" v-show="title === '编辑组织' || title === '编辑子组织'"> -->
             <el-form-item label="负责人" prop="leader">
-              <el-input
+
+              <el-select v-model="addEditForm.leader" placeholder="请选择"> 
+                <el-option
+                  v-for="item in projectChildUesrList"
+                  :key="item.userId"
+                  :label="item.workerName"
+                  :value="item.userId">
+                </el-option>
+              </el-select>
+
+              <!-- <el-input
                 v-model="addEditForm.leader"
                 placeholder="请输入"
-              ></el-input>
+              ></el-input> -->
             </el-form-item>
             <el-form-item label="联系电话" prop="phone">
               <el-input
@@ -324,13 +335,32 @@ export default {
       allVideoDev: [],
       configDevDialog: false,
       configDevType: 1, //1人脸设备，2视频监控
+
+      projectChildUesrList: []
     };
   },
   created() {
     this.getTableList();
     this.getList();
   },
+  watch:{
+    groupDialogVisible(newVal,oldVal){
+      if(newVal !== oldVal){
+        this.projectChildUesrList = []
+      }
+    }
+  },
   methods: {
+    getProjectChilderSystemUserList(item){
+      let data = {
+        xzProjectOrgId: item.id,
+        projectSn: this.$store.state.projectSn,
+      }
+      getProjectChilderSystemUserListApi(data).then((res) => {
+        console.log("==========查询项目子账号=========",res)
+       this.projectChildUesrList = res.result
+      })
+    },
     // 树形控件点击
     treeClick(data) {
       console.log(data);
@@ -408,7 +438,9 @@ export default {
     },
     edit(obj) {
       console.log("编辑", obj);
+      this.getProjectChilderSystemUserList(obj)
       this.title = "编辑组织";
+      
       this.addEditForm = JSON.parse(JSON.stringify(obj));
       if (this.addEditForm.parentObj) {
         this.selectTreeData = JSON.parse(this.addEditForm.parentObj);