Merge remote-tracking branch 'origin/serveChange' into serveChange

src/api/tenant/mission.js

@@ -136,7 +136,7 @@ export const employList = (current, size, params, missionNo) => {
 }
 
 /*录用人员 */
-export const employ = (missionNo, ids,fpTitleId,fpAddressId) => {
+export const employ = (missionNo, ids, fpTitleId, fpAddressId) => {
   return request({
     url: '/api/jobslink-api/missions/mission/apply/employed/new',
     method: 'post',
@@ -275,7 +275,7 @@ export const personCountList = () => {
   })
 }
 /*未申请任务的人才库人员列表接口 */
-export const userLists = (missionNo,groupIds) => {
+export const userLists = (missionNo, groupIds) => {
   return request({
     url: '/api/jobslink-api/missions/mission/apply/tenant/group/userlist',
     method: 'get',
@@ -286,12 +286,12 @@ export const userLists = (missionNo,groupIds) => {
   })
 }
 /*未申请任务的人才库人员列表接口  导出*/
-export const userListsExport = (missionNo,groupIds) => {
+export const userListsExport = (missionNo, groupIds) => {
-  return  `jobslink-api/missions/mission/apply/tenant/group/userlist/export?missionNo=${missionNo}&groupIds=${groupIds}&Jobslink-Auth=${getToken()}`
+  return `jobslink-api/missions/mission/apply/tenant/group/userlist/export?missionNo=${missionNo}&groupIds=${groupIds}&Jobslink-Auth=${getToken()}`
 }
 /*未申请任务的人才库人员列表接口  导出*/
-export const recommendExportList = (missionNo,name,worktypes,groupId) => {
+export const recommendExportList = (missionNo, name, worktypes, groupId) => {
-  return  `/api/jobslink-api/tenant/talents/recommend/exportList?missionNo=${missionNo}&name=${name}&worktypes=${worktypes}&groupId=${groupId}&Jobslink-Auth=${getToken()}`
+  return `/api/jobslink-api/tenant/talents/recommend/exportList?missionNo=${missionNo}&name=${name}&worktypes=${worktypes}&groupId=${groupId}&Jobslink-Auth=${getToken()}`
 }
 //新增行业类型
 export const tradeListAdd = (name) => {
@@ -304,7 +304,7 @@ export const tradeListAdd = (name) => {
   })
 }
 //新增工种
-export const workListAdd = (tradeId,name) => {
+export const workListAdd = (tradeId, name) => {
   return request({
     url: '/api//jobslink-api/tenant/worktypes/base/company/add',
     method: 'post',
@@ -315,7 +315,7 @@ export const workListAdd = (tradeId,name) => {
   })
 }
 //新增技能
-export const skillListAdd = (worktypesId,name) => {
+export const skillListAdd = (worktypesId, name) => {
   return request({
     url: '/api/jobslink-api/tenant/skills/base/company/add',
     method: 'post',
@@ -353,6 +353,13 @@ export const getDictionary = (params) => {
     params
   })
 }
+export const listCompany = (params) => {
+  return request({
+    url: '/api/jobslink-api/tenant/company/list/company',
+    method: 'get',
+    params
+  })
+}
 
 /*导入任务*/
 export const upload = () => {

src/views/tenant/main/talents/latent/index.vue

@@ -185,18 +185,18 @@
           @onCancel="diaLogCancel"
           @onConfirm="diaLogConfirm"
         >
-          <template v-slot:header>
+          <!--          <template v-slot:header>-->
-            <div class="input_box" style="margin-top: 20px">
+          <!--            <div class="input_box" style="margin-top: 20px">-->
-              <el-select style="width: 100%" clearable v-model="GroupValue" placeholder="请选择分组 (驳回不用选择此项)">
+          <!--              <el-select style="width: 100%" clearable v-model="GroupValue" placeholder="请选择分组 (驳回不用选择此项)">-->
-                <el-option
+          <!--                <el-option-->
-                  v-for="item in selecTreeData"
+          <!--                  v-for="item in selecTreeData"-->
-                  :key="item.id"
+          <!--                  :key="item.id"-->
-                  :label="item.groupName"
+          <!--                  :label="item.groupName"-->
-                  :value="item.id">
+          <!--                  :value="item.id">-->
-                </el-option>
+          <!--                </el-option>-->
-              </el-select>
+          <!--              </el-select>-->
-            </div>
+          <!--            </div>-->
-          </template>
+          <!--          </template>-->
         </PromptDialog>
 
       </basic-container>
@@ -768,32 +768,32 @@ export default {
       }
     },
     diaLogConfirm(value) {
-      if (this.GroupValue) {
+      // if (this.GroupValue) {
-        let params = {
+      let params = {
-          idNumber: this.dialogInfo.idNumber,
+        idNumber: this.dialogInfo.idNumber,
-          id: this.dialogInfo.id,
+        id: this.dialogInfo.id,
-          name: this.dialogInfo.name,
+        name: this.dialogInfo.name,
-          approvalStatus: 0,
+        approvalStatus: 0,
-          content: value,
+        content: value,
-          groupId: this.GroupValue
+        // groupId: this.GroupValue
-        }
-        this.$confirm("确定通过?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return talentsApproval(params);
-          })
-          .then(() => {
-            this.initDept();
-            this.onLoad(this.page, this.query);
-            this.dialogFlag = false
-            this.$message.success('操作成功');
-          });
-      } else {
-        this.$message.error("请选择分组");
       }
+      this.$confirm("确定通过?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return talentsApproval(params);
+        })
+        .then(() => {
+          this.initDept();
+          this.onLoad(this.page, this.query);
+          this.dialogFlag = false
+          this.$message.success('操作成功');
+        });
+      // } else {
+      //   this.$message.error("请选择分组");
+      // }
     },
     handleExport() {
       this.downloadButton = true

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -26,6 +26,25 @@
         ></jl-cityLabel-cascader>
       </template>
 
+      <template slot="missionCompanyName" slot-scope="{row,disabled}">
+        <el-select
+          v-model="obj.missionCompanyName"
+          filterable
+          :remote="true"
+          :remoteMethod="remoteMethod"
+          @change="selectMissionCompany"
+          :loading="missionCompanyLoad"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in options23"
+            :key="item.label"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </template>
+
       <template slot-scope="{ disabled }" slot="skillIds">
         <skill-select
           ref="skillSelect"
@@ -127,7 +146,16 @@
 </template>
 
 <script>
-import {add, detail, update, tradeListAdd, workListAdd, getMounthDays, getDictionary} from "@/api/tenant/mission";
+import {
+  add,
+  detail,
+  update,
+  tradeListAdd,
+  workListAdd,
+  getMounthDays,
+  getDictionary,
+  listCompany
+} from "@/api/tenant/mission";
 import {getTrade, getWork, getWorkTypes} from "@/api/tenant/common";
 import SkillSelect from "../Dialog/Skill";
 import {isvalidatemobile} from "@/util/validate";
@@ -150,6 +178,8 @@ const validateTel = (rule, value, callback) => {
 export default {
   data() {
     return {
+      options23: [],
+      missionCompanyLoad: false,
       skillArr: [],
       id: "",
       title: "",
@@ -606,30 +636,33 @@ export default {
                     trigger: "blur",
                   },
                 ],
+                formslot: true,
                 span: 12,
               },
               {
                 label: "单位信用代码",
                 prop: "missionCompanyScale",
-                rules: [
+                disabled: true,
-                  {
+                // rules: [
-                    required: true,
+                //   {
-                    message: "请输入单位信用代码",
+                //     required: true,
-                    trigger: "blur",
+                //     message: "请输入单位信用代码",
-                  },
+                //     trigger: "blur",
-                ],
+                //   },
+                // ],
                 span: 12,
               },
               {
                 label: "所属行业",
                 prop: "missionCompanyIndustry",
-                rules: [
+                disabled: true,
-                  {
+                // rules: [
-                    required: true,
+                //   {
-                    message: "请输入所属行业",
+                //     required: true,
-                    trigger: "blur",
+                //     message: "请输入所属行业",
-                  },
+                //     trigger: "blur",
-                ],
+                //   },
+                // ],
                 type: "select",
                 dicData: this.tradeData,
                 props: {
@@ -641,19 +674,20 @@ export default {
               {
                 label: "单位性质",
                 prop: "missionCompanyNature",
+                disabled: true,
                 type: 'select',
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
                   label: "dictValue",
                   value: "dictKey",
                 },
-                rules: [
+                // rules: [
-                  {
+                //   {
-                    required: true,
+                //     required: true,
-                    message: "请输入单位性质",
+                //     message: "请输入单位性质",
-                    trigger: "blur",
+                //     trigger: "blur",
-                  },
+                //   },
-                ],
+                // ],
                 span: 12,
               },
               {
@@ -752,6 +786,23 @@ export default {
     },
   },
   methods: {
+    selectMissionCompany(item) {
+      const value = this.options23.find((vi) => vi.label === item)
+      this.obj.missionCompanyScale = value.jobCompanyScale
+      this.obj.missionCompanyIndustry = value.jobCompanyIndustry
+      this.obj.missionCompanyNature = value.jobCompanyNature
+    },
+    async remoteMethod(query) {
+      this.missionCompanyLoad = true
+      let resData = await listCompany({companyName: query})
+      this.missionCompanyLoad = false
+      if (resData.data.code === 200) {
+        this.options23 = resData.data.data.records.map((item) => ({
+          label: item.jobCompanyName,
+          ...item
+        }))
+      }
+    },
     wageBlur(e) {
       const value = e.target.value
       const val = this.wallMaxAndMin

src/views/tenant/works/Dialog/CopyMission.vue

@@ -56,6 +56,25 @@
           placeholder="请选择 工作地址"
         ></jl-cityLabel-cascader>
       </template>
+
+      <template slot="jobCompanyName" slot-scope="{row,disabled}">
+        <el-select
+          v-model="obj.jobCompanyName"
+          filterable
+          :remote="true"
+          :remoteMethod="remoteMethod"
+          @change="selectMissionCompany"
+          :loading="missionCompanyLoad"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in options23"
+            :key="item.label"
+            :label="item.label"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </template>
       <template slot="cityIdFrom" slot-scope="{ disabled }">
         <jl-cityLabel-cascader
           :disabled="disabled"
@@ -173,6 +192,7 @@
 </template>
 
 <script>
+import {listCompany} from "@/api/tenant/mission";
 import {add, detail, update, tradeListAdd, getMounthDays, getDictionary} from "@/api/tenant/postzp";
 import {getTrade, getWork, getSkillList, getWorkTypes} from "@/api/tenant/common";
 import SkillSelect from "../Dialog/Skill";
@@ -197,6 +217,8 @@ const validateTel = (rule, value, callback) => {
 export default {
   data() {
     return {
+      options23: [],
+      missionCompanyLoad: false,
       skillArr: [],
       id: "",
       title: "",
@@ -741,48 +763,52 @@ export default {
                     trigger: "blur",
                   },
                 ],
+                formslot: true,
                 span: 12,
               },
               {
                 label: "单位信用代码",
                 prop: "jobCompanyScale",
-                rules: [
+                disabled: true,
-                  {
+                // rules: [
-                    required: true,
+                //   {
-                    message: "请输入单位信用代码",
+                //     required: true,
-                    trigger: "blur",
+                //     message: "请输入单位信用代码",
-                  },
+                //     trigger: "blur",
-                ],
+                //   },
+                // ],
                 span: 12,
               },
               {
                 label: "所属行业",
                 prop: "jobCompanyIndustry",
-                rules: [
+                disabled: true,
-                  {
+                // rules: [
-                    required: true,
+                //   {
-                    message: "请输入所属行业",
+                //     required: true,
-                    trigger: "blur",
+                //     message: "请输入所属行业",
-                  },
+                //     trigger: "blur",
-                ],
+                //   },
+                // ],
                 span: 12,
               },
               {
                 prop: "jobCompanyNature",
                 label: "单位性质",
                 type: 'select',
+                disabled: true,
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
                   label: "dictValue",
                   value: "dictKey",
                 },
-                rules: [
+                // rules: [
-                  {
+                //   {
-                    required: true,
+                //     required: true,
-                    message: "请输入单位性质",
+                //     message: "请输入单位性质",
-                    trigger: "blur",
+                //     trigger: "blur",
-                  },
+                //   },
-                ],
+                // ],
                 span: 12,
               },
               {
@@ -881,6 +907,23 @@ export default {
     },
   },
   methods: {
+    selectMissionCompany(item) {
+      const value = this.options23.find((vi) => vi.label === item)
+      this.obj.jobCompanyScale = value.jobCompanyScale
+      this.obj.jobCompanyIndustry = value.jobCompanyIndustry
+      this.obj.jobCompanyNature = value.jobCompanyNature
+    },
+    async remoteMethod(query) {
+      this.missionCompanyLoad = true
+      let resData = await listCompany({companyName: query})
+      this.missionCompanyLoad = false
+      if (resData.data.code === 200) {
+        this.options23 = resData.data.data.records.map((item) => ({
+          label: item.jobCompanyName,
+          ...item
+        }))
+      }
+    },
     wageBlur(e) {
       const value = e.target.value
       const val = this.wallMaxAndMin