Merge branch 'ch/jinrui1.0' of eta_mini/eta_mini_crm_front into debug_jr

src/components/AllUserForDepart.vue

@@ -41,6 +41,9 @@ function formatData(arr) {
     if (props.onlySelectUser && !item.Children.length) {
       item.disabled = item.NodeType === 1;
     }
+    if (item.NodeType === 1) { // 如果是部门节点，则NodeId乘10000以区分用户和部门节点
+      item.NodeId = item.NodeId * 10000;
+    }
     if (item.Children) {
       formatData(item.Children);
     }

src/views/customer/CompanyEdit.vue

@@ -153,7 +153,7 @@ function handleChangeList() {
           </div>
           <div class="flex form-tr-box">
             <el-form-item label="投资者名称" prop="CompanyName">
-              <el-input v-model="formState.CompanyName" placeholder="请输入机构投资者名称全程" />
+              <el-input v-model="formState.CompanyName" placeholder="请输入机构投资者名称全称" />
             </el-form-item>
             <el-form-item label="社会信用码" prop="CreditCode">
               <el-input

src/views/customer/components/ToFormalize.vue

@@ -125,8 +125,7 @@ async function handleSubmitForm() {
           <all-user-for-depart
             style="width: 100%"
             :props="{
-              emitPath: false,
-              checkStrictly: true,
+             emitPath: false,
             }"
             :filterable="true"
             onlySelectUser