fix: bug单fix

h5app/src/views/pages/company/edit.vue

@@ -677,6 +677,7 @@ export default defineComponent({
         formState.dataModel.businScope = matchedFirmInfo.businScope;
         formState.dataModel.industryID = matchedFirmInfo.industryID;
         formState.dataModel.industryName = matchedFirmInfo.industryName;
+        setEstateCategoryID(matchedFirmInfo.industryName);
         formState.dataModel.signInPoliticalArea = matchedFirmInfo.signInPoliticalArea;
         formState.dataModel.establishmentTime = matchedFirmInfo.establishmentTime;
       }else{
@@ -690,6 +691,10 @@ export default defineComponent({
       formState.dataModel.industryID = data.value;
       formState.dataModel.industryName = data.text;
       const text = data.text.split("-")[0] as string;
+      setEstateCategoryID(text)
+    }
+
+    function setEstateCategoryID(industryName: any) {
       // 所属产业判断
       const categoryMap: { [key: string]: any } = {
         '农、林、牧、渔业': 1,
@@ -698,8 +703,8 @@ export default defineComponent({
         '电力、热力、燃气及水生产和供应业': 2,
         '建筑业': 2
       };
-      if (text) {
-        formState.dataModel.estateCategoryID = categoryMap[text] || 3;
+      if (industryName) {
+        formState.dataModel.estateCategoryID = categoryMap[industryName] || 3;
       } else {
         formState.dataModel.estateCategoryID = "3";
       }

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -613,6 +613,7 @@ export default defineComponent({
         formState.dataModel.businScope = matchedFirmInfo.businScope;
         formState.dataModel.industryID = matchedFirmInfo.industryID;
         formState.dataModel.industryName = matchedFirmInfo.industryName;
+        setEstateCategoryID(matchedFirmInfo.industryName);
         formState.dataModel.signInPoliticalArea = matchedFirmInfo.signInPoliticalArea;
         formState.dataModel.establishmentTime = matchedFirmInfo.establishmentTime;
       }else{
@@ -626,6 +627,10 @@ export default defineComponent({
       formState.dataModel.industryID = data.value;
       formState.dataModel.industryName = data.text;
       const text = data.text.split("-")[0] as string;
+      setEstateCategoryID(text)
+    }
+
+    function setEstateCategoryID(industryName: any) {
       // 所属产业判断
       const categoryMap: { [key: string]: any } = {
         '农、林、牧、渔业': 1,
@@ -634,8 +639,8 @@ export default defineComponent({
         '电力、热力、燃气及水生产和供应业': 2,
         '建筑业': 2
       };
-      if (text) {
-        formState.dataModel.estateCategoryID = categoryMap[text] || 3;
+      if (industryName) {
+        formState.dataModel.estateCategoryID = categoryMap[industryName] || 3;
       } else {
         formState.dataModel.estateCategoryID = "3";
       }

vue/src/views/companyService/company/edit.vue

@@ -676,6 +676,10 @@ export default defineComponent(
         if (value.length >= 2) {
           formState.dataModel.industryName = selectedOptions[1].label;
         }
+        setEstateCategoryID(selectedOptions[0]);
+      }
+
+      function setEstateCategoryID(industryName: any) {
         // 所属产业判断
         const categoryMap = {
           '农、林、牧、渔业': 1,
@@ -684,12 +688,11 @@ export default defineComponent(
           '电力、热力、燃气及水生产和供应业': 2,
           '建筑业': 2
         };
-        if (selectedOptions[0]) {
-          formState.dataModel.estateCategoryID = categoryMap[selectedOptions[0].label] || 3;
+        if (industryName) {
+          formState.dataModel.estateCategoryID = categoryMap[industryName] || 3;
         } else {
           formState.dataModel.estateCategoryID = 3;
         }
-
       }
 
       // 同步获取企业信息
@@ -706,6 +709,10 @@ export default defineComponent(
             Object.keys(result).forEach(key => {
               if (result[key] != null) {
                 formState.dataModel[key] = result[key];
+                if (key == 'industryName') {
+                  formState.dataModel.showIndustryName = result[key];
+                  setEstateCategoryID(result[key]);
+                }
               }
             })
             // 调用地址变更事件

vue/src/views/companyService/company/index.vue

@@ -235,7 +235,7 @@ export default defineComponent({
         {cnName: '企业联系人', enName: 'userName', width: 100},
         {cnName: '企业联系电话', enName: 'userMobile', width: 100},
         {cnName: '企业状态', enName: 'recordStatusName', width: 100},
-        {cnName: '用工情况(人)', enName: 'workSituation', width: 100},
+        {cnName: '用工情况(人，含临时人员)', enName: 'workSituation', width: 100},
         {cnName: '所属县区', enName: 'regionName', width: 100},
         {cnName: '所属街道', enName: 'streetName', width: 100},
         {cnName: '法定代表人(负责人)', enName: 'frName', width: 140},