From 9cb331f41406192cc5dc2e0f19a41b5d7f8bbf5f Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Thu, 28 Mar 2024 20:47:38 +0800
Subject: [PATCH] flat:12312

---
 src/common/dic.js                             | 13 ++++
 src/views/manage/station/mainList.vue         | 71 ++++++++++++++++++-
 .../tenant/mission/Dialog/CopyMission.vue     | 43 ++++++-----
 vue.config.js                                 |  2 +-
 4 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/src/common/dic.js b/src/common/dic.js
index 639f3d9..deac88d 100644
--- a/src/common/dic.js
+++ b/src/common/dic.js
@@ -365,3 +365,16 @@ export const dataSourcesEnum = [
   { value: 3, label: "社区发布" },
   { value: 4, label: "爬取" },
 ]
+export  const companyEnum = [
+  { value: 1,	label: "机关/事业单位" },
+  { value: 2,	label: "国有企业" },
+  { value: 3,	label: "私营企业" },
+  { value: 4,	label: "外商及港澳台投资企业" },
+  { value: 5,	label: "股份制企业" },
+  { value: 6,	label: "学校/下级学院" },
+  { value: 7,	label: "医院" },
+  { value: 8,	label: "律师事务所" },
+  { value: 9,	label: "银行" },
+  { value: 10, label: "非盈利社会组织" },
+  { value: 11, label: "其它" },
+]
diff --git a/src/views/manage/station/mainList.vue b/src/views/manage/station/mainList.vue
index 756413a..bf761ad 100644
--- a/src/views/manage/station/mainList.vue
+++ b/src/views/manage/station/mainList.vue
@@ -42,7 +42,8 @@ import { companyInfoAdd, companyStationInfo, companyDetail, companyUpdate, stati
 import { mapGetters } from "vuex";
 import { isMobile, check18IdCardNo, validatenull } from "@/util/validate";
 import { putFile } from "@/api/resource/oss";
-
+import {getTradeDic} from "@/api/manage/trade";
+import {companyEnum} from "@/common/dic"
 const accept = [
   "image/png",
   "image/jpeg",
@@ -269,6 +270,68 @@ export default {
                   },
                 ],
               },
+              {
+                type: "select",
+                label: "企业性质",
+                prop: "nature",
+                dicData: companyEnum,
+                rules: [
+                  {
+                    required: true,
+                    message: "请输入企业性质",
+                    trigger: "blur",
+                  },
+                ],
+                span: 12,
+              },
+              {
+                type: "select",
+                label: "行业",
+                size: "small",
+                prop: "tradeId",
+                dicUrl: getTradeDic(),
+                props: {
+                  label: "name",
+                  value: "id"
+                },
+                dicFormatter(resp) {
+                  var result=[];
+                  resp.data.forEach(ele => {
+                    if(ele.name!="1"){
+                      result.push(ele)
+                    }
+                  });
+                  return result;
+                },
+                rules:[
+                  {
+                    required:true,
+                    validator: (rule,value,callback) => {
+                      if(value=='请选择行业'){
+                        callback(new Error('请选择行业'));
+                      }else{
+                        callback();
+                      }
+                    },
+                    trigger:'blur'
+                  }
+                ]
+              },
+              {
+                type: "textarea",
+                label: "备注",
+                span: 20,
+                display: true,
+                size: "small",
+                prop: "remarks",
+                rules: [
+                  {
+                    required: true,
+                    whitespace: true,
+                    message: "请输入备注",
+                  },
+                ],
+              },
               {
                 type: "upload",
                 label: "法人身份证（人像）",
@@ -395,6 +458,9 @@ export default {
       // console.log(row, '----------------------------------');
       companyInfoAdd({
         authUrlId: row.authUrlId,
+        nature: row.nature,
+        tradeId: row.tradeId,
+        remarks: row.remarks,
         cityId: row.cityId,
         companyAddress: row.companyAddress,
         companyName: row.companyName,
@@ -430,6 +496,9 @@ export default {
       row.identityUrl5Id = getPath(row.identityUrl5Id)
       companyUpdate({
         id: row.id,
+        nature: row.nature,
+        tradeId: row.tradeId,
+        remarks: row.remarks,
         authUrlId: row.authUrlId,
         cityId: row.cityId,
         companyAddress: row.companyAddress,
diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue
index 0d40f02..fc2fdff 100644
--- a/src/views/tenant/mission/Dialog/CopyMission.vue
+++ b/src/views/tenant/mission/Dialog/CopyMission.vue
@@ -426,24 +426,24 @@ export default {
                 ],
                 span: 12,
               },
-              {
-                label: "行业类型",
-                prop: "tradeId",
-                type: "select",
-                dicData: this.tradeData,
-                props: {
-                  label: "name",
-                  value: "id",
-                },
-                rules: [
-                  {
-                    required: true,
-                    // validator: tradeId,
-                    trigger: "blur",
-                  },
-                ],
-                span: 12,
-              },
+              // {
+              //   label: "行业类型",
+              //   prop: "tradeId",
+              //   type: "select",
+              //   dicData: this.tradeData,
+              //   props: {
+              //     label: "name",
+              //     value: "id",
+              //   },
+              //   rules: [
+              //     {
+              //       required: true,
+              //       // validator: tradeId,
+              //       trigger: "blur",
+              //     },
+              //   ],
+              //   span: 12,
+              // },
               {
                 label: "工种",
                 prop: "workSkills",
@@ -640,6 +640,12 @@ export default {
                     trigger: "blur",
                   },
                 ],
+                type: "select",
+                dicData: this.tradeData,
+                props: {
+                  label: "name",
+                  value: "id",
+                },
                 span: 12,
               },
               {
@@ -1047,6 +1053,7 @@ export default {
           ageDesc: row.ageDesc,
           education: row.education,
           experienceDesc: row.experienceDesc,
+          missionCompanyIndustry: row.missionCompanyIndustry,
           missionCompanyDescription: row.missionCompanyDescription,
           callName: row.callName,
           callTel: row.callTel,
diff --git a/vue.config.js b/vue.config.js
index daacde0..d02b6dc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://10.165.0.173:8000',
+        target: 'http://192.168.1.106:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {